the first edition on publish.

ScarletYarn · May 5, 2019 · 48e1682 · 48e1682
1 parent 3f125a5
commit 48e1682
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/miniprogram/js/main.js b/miniprogram/js/main.js
@@ -10,6 +10,8 @@ import Button from './display/button.js'
 const openDataContext = wx.getOpenDataContext()
 const sharedCanvas = openDataContext.canvas
 
+let counter = 0
+
 let ctx = canvas.getContext('2d')
 let databus = new DataBus()
 let background = databus.images.home_page
@@ -58,7 +60,6 @@ const zoom = (index) => {
 let startbg = new Image()
 startbg.src = 'images/start/bg.png'
 
-console.log(wx.cloud.init)
 wx.cloud.init({
   env: 'class-release-8cfbab'
 })
@@ -217,6 +218,7 @@ export default class Main {
       this.player.changeColor(0)
     } else {
       let enemy = databus.enemys[0]
+      // console.log(`a touch occured: ${classification} for enemy ${enemy.classification}`)
       if (enemy.isLiving != 1) {
         if (enemy.classification == classification) {
           enemy.comeout(enemy.x, enemy.y, enemy.classification)
@@ -225,12 +227,17 @@ export default class Main {
           else if (databus.mode == 1) databus.score += 30
         }
 
+        counter++
         let piece = {
           choose: names[classification - 1],
-          answer: names[enemy.classification - 1]
+          answer: names[enemy.classification - 1],
+          stamp: classification
         }
-        if(enemy !== lastEnemy)
+        if ((enemy !== lastEnemy || enemy.classification == classification) &&
+            classification !== 0) {
+          // console.log('added')
           this.gameinfo.gameData.record.push(piece)
+        }
         lastEnemy = enemy
       }
 
@@ -301,7 +308,10 @@ export default class Main {
 
     databus.enemys.forEach((item) => {
         let piece = item.update()
-      if (piece !== null) this.gameinfo.gameData.record.push(piece)
+      if (piece !== null) {
+        this.gameinfo.gameData.record.push(piece)
+        lastEnemy = null
+      }
         if (item.isLiving == -1) {
 
           if(databus.life==1){

diff --git a/miniprogram/js/runtime/music.js b/miniprogram/js/runtime/music.js
@@ -27,7 +27,6 @@ export default class Music {
 
   playBgm() {
     if(databus.music) {
-      console.log('music')
       this.playAudio.pause()
       this.bgmAudio.play()
     }

diff --git a/miniprogram/openDataContext/index.js b/miniprogram/openDataContext/index.js
@@ -19,7 +19,6 @@ wx.onMessage(data => {
     wx.getFriendCloudStorage({
       keyList: ['score'],
       success: res => {
-        console.log(res)
         friendData = res.data
         drawRankList(res.data)
       },

diff --git a/project.config.json b/project.config.json
@@ -13,6 +13,8 @@
 	"projectname": "classification-master",
 	"miniprogramRoot": "miniprogram/",
 	"cloudfunctionRoot": "cloudfunction/",
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,