1.0.1提审

assets/Scene/scene.fire

@@ -352,7 +352,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1590
+      "height": 1790
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5693,7 +5693,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        12,
+        -6,
         0,
         0,
         0,
@@ -5874,7 +5874,7 @@
         "__id__": 121
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 123
@@ -5956,7 +5956,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 223,
+      "width": 222,
       "height": 76
     },
     "_anchorPoint": {
@@ -7393,7 +7393,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 191.19,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8086,7 +8086,7 @@
       "ctor": "Float64Array",
       "array": [
         -200,
-        111,
+        112,
         0,
         0,
         0,
@@ -10351,7 +10351,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 223,
+      "width": 222,
       "height": 76
     },
     "_anchorPoint": {
@@ -10504,7 +10504,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "label",
     "_objFlags": 0,
     "_parent": {
       "__id__": 214
@@ -10520,15 +10520,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 37,
-      "g": 64,
-      "b": 110,
+      "r": 38,
+      "g": 203,
+      "b": 26,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 366.86,
-      "height": 113
+      "height": 90.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -10539,8 +10539,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        25,
+        -1,
+        18,
         0,
         0,
         0,
@@ -10562,7 +10562,7 @@
     "_is3DNode": false,
     "_groupIndex": 0,
     "groupIndex": 0,
-    "_id": "daobAvDppF0b6YAlXZ/iK9"
+    "_id": "71J81+dmtJBZVnoODfMAV1"
   },
   {
     "__type__": "cc.Label",
@@ -10582,7 +10582,7 @@
     "_string": "Video ended, thank \nyou for your support.",
     "_N$string": "Video ended, thank \nyou for your support.",
     "_fontSize": 40,
-    "_lineHeight": 50,
+    "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -10595,7 +10595,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "28cLIaeSZKUbV411TxCm52"
+    "_id": "1aKrOLt0JEs5XCOpodmBcQ"
   },
   {
     "__type__": "cc.Sprite",
@@ -14115,7 +14115,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 94,
-      "height": 94
+      "height": 91
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14126,7 +14126,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -153,
+        -167,
         222,
         0,
         0,
@@ -14209,7 +14209,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 94,
-      "height": 94
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14220,7 +14220,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -153,
+        -164,
         22,
         0,
         0,
@@ -14303,7 +14303,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 94,
-      "height": 94
+      "height": 91
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14314,7 +14314,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -153,
+        -163,
         122,
         0,
         0,

assets/Script/ATAndroidJS2.ts

@@ -5,9 +5,9 @@ const classJavaParamName = "org/cocos2dx/javascript/AppActivity";
 const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
 
 /**
- * 正式的 HXZ
+ * 正式的 HXZ  reward Placement: n1g1eu3bk8frq9	
  */
-const placementID="n1g1eu3bk8g84q";
+const placementID="n1g1eu3bk8frq9";
 
 /**
  * 测试专用n6729e95f588aa    n66f7c61b71d4c   
@@ -182,9 +182,9 @@ const ATAndroidJS: ATAndroidJS = {
         return JSON.stringify(info);
     },
     getPlacementID:function(){
-       // return placementID;
+        return placementID;
     // return testPlacementID;
-       return testPlacementIDForDzk;
+      // return testPlacementIDForDzk;
     },
     getDeviceUserId: function(){
         return this.getDeviceId()

assets/Script/controller.js

@@ -108,6 +108,7 @@ cc.Class({
     }
   },
   openPictorial() {
+    console.log('zh:aaaaaaaaa openPictorial  aaaaaaa@@@@@@@@@@@@@')
 
     //ZH测试专用显示AD
     if (2 > 3) {

assets/Script/game.js

@@ -212,11 +212,11 @@ cc.Class({
     // 初始化SDK
 
     //ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用，可以显示广告 ？？？      
-    ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
+    //ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
 
-    //ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
+    ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
 
-    ATSDK.setLogDebug(true);
+    ATSDK.setLogDebug(false);//ZH:DIY
     var GDPRLevel = ATSDK.getGDPRLevel();
     //var state = false;
     //  const listener = {
@@ -424,11 +424,19 @@ cc.Class({
 
     //下面是上线后的逻辑
     setTimeout(() => {
+
       if (cc.sys.os === cc.sys.OS_ANDROID) {
         let placementID = AAJS2.getPlacementID();
         if (ATRewardedVideoSDK.hasAdReady(placementID)) {
           cc.sys.localStorage.setItem(yxAdMark, 'fuHuo');//看广告用于 复活 标记
           ATRewardedVideoSDK.showAd(placementID);
+
+          console.log('zh:clear timer s')
+          if (this.reviveTimer) {
+            clearInterval(this.reviveTimer)
+          }
+          console.log('zh:clear timer e')
+
         } else {
           this.clearAdMark();
           console.log('zh:AD 没有准备好')
@@ -455,7 +463,8 @@ cc.Class({
     this.revivePage.getChildByName('askRevive').active = false
     this.revivePage.getChildByName('successRevive').active = true
   },
-  onReviveCertainBtn() {
+  onReviveCertainBtn() {//应该是看了广告点击获取步数后执行
+    console.log('zh:onReviveCertainBtn  看了广告点击获取步数后执行')
     this._controller.pageManager.removePage(2)
     this.revivePage.active = false
     this._status = 1
@@ -471,10 +480,11 @@ cc.Class({
   onSkipReviveForDiy() {
     console.log('zh:onSkipReviveForDiy zh ')
     clearInterval(this.reviveTimer)
+    this.onReviveButton();
       // 5 复活页面
     //this._controller.pageManager.pages[5].active = false
     //this._score.onGameOver(true)
-    this.isRangeAction = false
+    //this.isRangeAction = false
   },
 
 

assets/Script/score.js

@@ -50,7 +50,7 @@ cc.Class({
     this.mainScoreLabel.node.active = false
     this.characterMgr.showHeroCharacter(this.level)
     this.hideChainSprite()
-
+    
     this.tipBox.init(this, 0)
     if (this._controller.social.node.active) {
       let height = this._controller.social.getHighestLevel()
@@ -124,15 +124,22 @@ cc.Class({
     this.chainSprite = this.node.getChildByName('UI').getChildByName('chainSprite').getComponent(cc.Sprite)
     this.failScore = this.failDialog.getChildByName('info').getChildByName('score').getComponent(cc.Label)
     this.failName = this.failDialog.getChildByName('info').getChildByName('level').getComponent(cc.Label)
-    this.failSprite = this.failDialog.getChildByName('info').getChildByName('sprite').getComponent(cc.Sprite)
     this.failHighScore = this.failDialog.getChildByName('info').getChildByName('highScore').getComponent(cc.Label)
+
+    console.log('zh:111111111')
+    console.log('zh:22222222=',this.failDialog.getChildByName('info'))
+    this.failSprite = this.failDialog.getChildByName('info').getChildByName('sprite').getComponent(cc.Sprite)
+
+
   },
   //--------------------- 分数控制 ---------------------
   // 增加 减少步数并且刷新UI
   onStep(num) {
+    console.log('zh:onStep  num=',num)
     this.leftStep += num
     return new Promise((resolve, reject) => {
       if (this.leftStep < 0) {
+        console.log('zh:onStep  leftStep<0')
         this.leftStep = 0
         this.onGameOver()
         resolve(false)
@@ -141,6 +148,7 @@ cc.Class({
       }
       this.leftStepLabel.string = this.leftStep
       if (num > 0) {
+        console.log('zh:onStep  num>0')
         this.showStepAni(num)
       }
     })

assets/Script/social.js

@@ -192,6 +192,7 @@ cc.Class({
   },
   // 控制打开广告
   onReviveButton(type) {
+    console.log('zh:onReviveButton   @@@@@type=',type)
     // 广告位
     let self = this
     this.adType = type //0表示加倍 1表示复活

assets/music/bgm.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "8e845931-9319-48d8-a30a-df24ba23474c",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 32.052245,
+  "duration": 163.224,
   "subMetas": {}
 }