wuwangdong il y a 4 ans
Parent
commit
d81fbb27c1
26 fichiers modifiés avec 475 ajouts et 483 suppressions
  1. 1 1
      assets/script/before/data/GameConst.ts
  2. 0 1
      assets/script/before/main/FactoryIcon.ts
  3. 3 3
      assets/script/before/main/TouchHelper.ts
  4. 1 1
      assets/script/game/data/HttpData.ts
  5. 1 1
      assets/script/game/data/LoginData.ts
  6. 1 1
      assets/script/game/data/module/BlessingBagData.ts
  7. 1 1
      assets/script/game/data/module/GradeRewardData.ts
  8. 1 1
      assets/script/game/module/reward/Reward.ts
  9. 2 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js
  10. BIN
      build/jsb-link/assets/main/index.jsc
  11. 0 0
      build/jsb-link/assets/resources/config.json
  12. 0 0
      build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json
  13. 0 0
      build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json
  14. 1 1
      build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json
  15. 0 0
      build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json
  16. 0 0
      build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json
  17. 34 34
      build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas
  18. 244 244
      build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas
  19. 27 27
      build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas
  20. 62 62
      build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas
  21. 27 27
      build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas
  22. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  23. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  24. 65 74
      build/jsb-link/js backups (useful for debugging)/main.index.js
  25. 2 2
      packages-hot-update/cfg.json
  26. 1 1
      settings/project.json

+ 1 - 1
assets/script/before/data/GameConst.ts

@@ -107,7 +107,7 @@ export default class GameConst extends cc.Component {
                     GameConst.config_clockIn = (cc.resources.get(`game/config/clockIn`) as cc.JsonAsset).json;
                     GameConst.config_level = (cc.resources.get(`game/config/level`) as cc.JsonAsset).json;
                     GameConst.config_cashOut = (cc.resources.get(`game/config/cashOut`) as cc.JsonAsset).json;
-                    console.log("GameConst.config_common", GameConst.config_common);
+                    // console.log("GameConst.config_common", GameConst.config_common);
                     resolve(null);
                 });
             });

+ 0 - 1
assets/script/before/main/FactoryIcon.ts

@@ -145,7 +145,6 @@ export class FactoryIcon extends cc.Component {
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
 
-            console.log('-----');
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
             // if (flyRed) {

+ 3 - 3
assets/script/before/main/TouchHelper.ts

@@ -42,7 +42,7 @@ export class TouchHelper extends cc.Component {
                 if(this.isScaleAct)
                 {
                     cc.tween(this.node).to(0.1, {scale: 1}).start();
-                    console.log(`------end${this.name}`);
+                    // console.log(`------end${this.name}`);
                 }
                 
             } else {
@@ -63,7 +63,7 @@ export class TouchHelper extends cc.Component {
 
         if(this.isScaleAct && this.isMoved)
         {
-            console.log(`------move${this.name}`);
+            // console.log(`------move${this.name}`);
             cc.tween(this.node).to(0.1, {scale: 1}).start();
         }
     }
@@ -86,7 +86,7 @@ export class TouchHelper extends cc.Component {
         if(this.isScaleAct && this.isStart)
         {
             cc.tween(this.node).to(0.1, {scale: 1.1}).start();
-            console.log(`------start${this.name}`);
+            // console.log(`------start${this.name}`);
         }
     }
 

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 1;
 
     public getServerUrl(): string {
         switch (this.serverType) {

+ 1 - 1
assets/script/game/data/LoginData.ts

@@ -68,7 +68,7 @@ export class LoginData {
         let loginTicket = mk.storage.getStorage(StorageKey.loginTicket);
         this.loginTicket = loginTicket ? loginTicket : "";
 
-        console.log(`===[LoginData] uin =${uin} sessionKey = ${sessionKey}"`);
+        // console.log(`===[LoginData] uin =${uin} sessionKey = ${sessionKey}"`);
     }
 
     /**

+ 1 - 1
assets/script/game/data/module/BlessingBagData.ts

@@ -32,7 +32,7 @@ export class BlessingBagData extends Data {
     init() {
         this.isPlayAniUpdate = false;
         this.videoRbData = gData.gameData.playerProp.userTuCaoInfo;
-        console.log("福袋数据---------------->", this.videoRbData);
+        // console.log("福袋数据---------------->", this.videoRbData);
     }
 
     setAdData(data) {

+ 1 - 1
assets/script/game/data/module/GradeRewardData.ts

@@ -21,7 +21,7 @@ export class GradeRewardData extends Data {
         // gData.cashPro.openCashPro(0);
         this.cashId = id;
         let data = { id: this.cashId };
-        console.log(`农场等级提现数据=======>${this.cashId}`);
+        // console.log(`农场等级提现数据=======>${this.cashId}`);
         let response = await mk.http.sendData('farmGrade/farmGradeCash', data);
 
         mk.console.logSingle("农场等级提现数据=>", response);

+ 1 - 1
assets/script/game/module/reward/Reward.ts

@@ -112,7 +112,7 @@ export default class Reward extends cc.Component {
      * 点击获得奖励
      */
     private clickGetReward() {
-        cc.log('获取奖励:', gData.reward.data);
+        // cc.log('获取奖励:', gData.reward.data);
         let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);
         if (gData.reward.callback) {

+ 2 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js

@@ -100,6 +100,8 @@ var ATNativeJS = cc.Class({
      */
     onNativeAdClick: function (placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdClick(" + placementId + ", " + callbackInfo + ")");
+        if (this.proxy == null) return;
+        this.proxy.onNativeAdClick(placementId, callbackInfo);
     },
 
     /**

BIN
build/jsb-link/assets/main/index.jsc


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/config.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json


+ 1 - 1
build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json

@@ -1 +1 @@
-[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\r\nlight.png\r\nsize: 1382,1360\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\ndeng1\r\n  rotate: true\r\n  xy: 2, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng2\r\n  rotate: true\r\n  xy: 688, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\ndeng3\r\n  rotate: true\r\n  xy: 692, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng4\r\n  rotate: true\r\n  xy: 2, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\nlight.png\nsize: 1382,1360\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\ndeng1\n  rotate: true\n  xy: 2, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng2\n  rotate: true\n  xy: 688, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\ndeng3\n  rotate: true\n  xy: 692, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng4\n  rotate: true\n  xy: 2, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json


+ 34 - 34
build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas

@@ -1,34 +1,34 @@
-
-light.png
-size: 1382,1360
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-deng1
-  rotate: true
-  xy: 2, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng2
-  rotate: true
-  xy: 688, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
-deng3
-  rotate: true
-  xy: 692, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng4
-  rotate: true
-  xy: 2, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
+
+light.png
+size: 1382,1360
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+deng1
+  rotate: true
+  xy: 2, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng2
+  rotate: true
+  xy: 688, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1
+deng3
+  rotate: true
+  xy: 692, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng4
+  rotate: true
+  xy: 2, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1

+ 244 - 244
build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas

@@ -1,244 +1,244 @@
-
-pandan.png
-size: 1848,400
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-baoxiang
-  rotate: true
-  xy: 692, 162
-  size: 236, 191
-  orig: 236, 191
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 468, 147
-  size: 222, 251
-  orig: 222, 251
-  offset: 0, 0
-  index: -1
-ditan
-  rotate: false
-  xy: 1050, 2
-  size: 464, 164
-  orig: 464, 164
-  offset: 0, 0
-  index: -1
-dudou
-  rotate: true
-  xy: 1113, 238
-  size: 160, 129
-  orig: 162, 131
-  offset: 1, 1
-  index: -1
-erduo
-  rotate: true
-  xy: 310, 37
-  size: 361, 156
-  orig: 361, 156
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: true
-  xy: 566, 8
-  size: 137, 145
-  orig: 144, 154
-  offset: 5, 4
-  index: -1
-eye1-2
-  rotate: true
-  xy: 1244, 246
-  size: 152, 151
-  orig: 156, 158
-  offset: 2, 3
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1496, 169
-  size: 97, 110
-  orig: 99, 112
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: false
-  xy: 468, 37
-  size: 96, 108
-  orig: 98, 110
-  offset: 1, 1
-  index: -1
-eye2-3
-  rotate: false
-  xy: 1490, 268
-  size: 122, 130
-  orig: 124, 132
-  offset: 1, 1
-  index: -1
-eye3-1
-  rotate: false
-  xy: 1089, 171
-  size: 118, 59
-  orig: 120, 61
-  offset: 1, 1
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1209, 177
-  size: 101, 59
-  orig: 103, 61
-  offset: 1, 1
-  index: -1
-eye4-4
-  rotate: false
-  xy: 1516, 37
-  size: 122, 130
-  orig: 125, 132
-  offset: 2, 1
-  index: -1
-face
-  rotate: true
-  xy: 2, 21
-  size: 377, 306
-  orig: 377, 306
-  offset: 0, 0
-  index: -1
-jinbi
-  rotate: false
-  xy: 480, 12
-  size: 58, 23
-  orig: 59, 23
-  offset: 0, 0
-  index: -1
-jinbi1
-  rotate: false
-  xy: 1640, 113
-  size: 76, 55
-  orig: 76, 55
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: false
-  xy: 349, 10
-  size: 67, 25
-  orig: 70, 27
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 418, 12
-  size: 60, 23
-  orig: 62, 25
-  offset: 1, 1
-  index: -1
-naiping
-  rotate: false
-  xy: 833, 7
-  size: 215, 153
-  orig: 217, 155
-  offset: 1, 1
-  index: -1
-naizui
-  rotate: true
-  xy: 1608, 170
-  size: 96, 116
-  orig: 99, 118
-  offset: 1, 1
-  index: -1
-shou2
-  rotate: false
-  xy: 1397, 252
-  size: 91, 146
-  orig: 97, 148
-  offset: 1, 1
-  index: -1
-shou3
-  rotate: true
-  xy: 713, 6
-  size: 154, 118
-  orig: 156, 120
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 957, 168
-  size: 130, 60
-  orig: 133, 63
-  offset: 1, 2
-  index: -1
-tui1
-  rotate: false
-  xy: 1733, 65
-  size: 112, 96
-  orig: 114, 98
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: true
-  xy: 1614, 268
-  size: 130, 92
-  orig: 132, 94
-  offset: 1, 1
-  index: -1
-xing
-  rotate: true
-  xy: 310, 3
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
-youshou_1
-  rotate: false
-  xy: 957, 230
-  size: 77, 168
-  orig: 78, 174
-  offset: 0, 6
-  index: -1
-youshouzhang
-  rotate: true
-  xy: 1312, 168
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
-yy
-  rotate: true
-  xy: 885, 182
-  size: 216, 70
-  orig: 216, 70
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: true
-  xy: 1726, 163
-  size: 105, 120
-  orig: 115, 125
-  offset: 3, 4
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1640, 6
-  size: 105, 91
-  orig: 115, 96
-  offset: 3, 4
-  index: -1
-zui2-1
-  rotate: true
-  xy: 1708, 270
-  size: 128, 120
-  orig: 138, 125
-  offset: 5, 4
-  index: -1
-zuoshou_1
-  rotate: false
-  xy: 1036, 232
-  size: 75, 166
-  orig: 78, 174
-  offset: 3, 8
-  index: -1
-zuoshouzhang
-  rotate: true
-  xy: 1404, 174
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
+
+pandan.png
+size: 1848,400
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baoxiang
+  rotate: true
+  xy: 692, 162
+  size: 236, 191
+  orig: 236, 191
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 468, 147
+  size: 222, 251
+  orig: 222, 251
+  offset: 0, 0
+  index: -1
+ditan
+  rotate: false
+  xy: 1050, 2
+  size: 464, 164
+  orig: 464, 164
+  offset: 0, 0
+  index: -1
+dudou
+  rotate: true
+  xy: 1113, 238
+  size: 160, 129
+  orig: 162, 131
+  offset: 1, 1
+  index: -1
+erduo
+  rotate: true
+  xy: 310, 37
+  size: 361, 156
+  orig: 361, 156
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: true
+  xy: 566, 8
+  size: 137, 145
+  orig: 144, 154
+  offset: 5, 4
+  index: -1
+eye1-2
+  rotate: true
+  xy: 1244, 246
+  size: 152, 151
+  orig: 156, 158
+  offset: 2, 3
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1496, 169
+  size: 97, 110
+  orig: 99, 112
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: false
+  xy: 468, 37
+  size: 96, 108
+  orig: 98, 110
+  offset: 1, 1
+  index: -1
+eye2-3
+  rotate: false
+  xy: 1490, 268
+  size: 122, 130
+  orig: 124, 132
+  offset: 1, 1
+  index: -1
+eye3-1
+  rotate: false
+  xy: 1089, 171
+  size: 118, 59
+  orig: 120, 61
+  offset: 1, 1
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1209, 177
+  size: 101, 59
+  orig: 103, 61
+  offset: 1, 1
+  index: -1
+eye4-4
+  rotate: false
+  xy: 1516, 37
+  size: 122, 130
+  orig: 125, 132
+  offset: 2, 1
+  index: -1
+face
+  rotate: true
+  xy: 2, 21
+  size: 377, 306
+  orig: 377, 306
+  offset: 0, 0
+  index: -1
+jinbi
+  rotate: false
+  xy: 480, 12
+  size: 58, 23
+  orig: 59, 23
+  offset: 0, 0
+  index: -1
+jinbi1
+  rotate: false
+  xy: 1640, 113
+  size: 76, 55
+  orig: 76, 55
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: false
+  xy: 349, 10
+  size: 67, 25
+  orig: 70, 27
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 418, 12
+  size: 60, 23
+  orig: 62, 25
+  offset: 1, 1
+  index: -1
+naiping
+  rotate: false
+  xy: 833, 7
+  size: 215, 153
+  orig: 217, 155
+  offset: 1, 1
+  index: -1
+naizui
+  rotate: true
+  xy: 1608, 170
+  size: 96, 116
+  orig: 99, 118
+  offset: 1, 1
+  index: -1
+shou2
+  rotate: false
+  xy: 1397, 252
+  size: 91, 146
+  orig: 97, 148
+  offset: 1, 1
+  index: -1
+shou3
+  rotate: true
+  xy: 713, 6
+  size: 154, 118
+  orig: 156, 120
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 957, 168
+  size: 130, 60
+  orig: 133, 63
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: false
+  xy: 1733, 65
+  size: 112, 96
+  orig: 114, 98
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: true
+  xy: 1614, 268
+  size: 130, 92
+  orig: 132, 94
+  offset: 1, 1
+  index: -1
+xing
+  rotate: true
+  xy: 310, 3
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1
+youshou_1
+  rotate: false
+  xy: 957, 230
+  size: 77, 168
+  orig: 78, 174
+  offset: 0, 6
+  index: -1
+youshouzhang
+  rotate: true
+  xy: 1312, 168
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1
+yy
+  rotate: true
+  xy: 885, 182
+  size: 216, 70
+  orig: 216, 70
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: true
+  xy: 1726, 163
+  size: 105, 120
+  orig: 115, 125
+  offset: 3, 4
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1640, 6
+  size: 105, 91
+  orig: 115, 96
+  offset: 3, 4
+  index: -1
+zui2-1
+  rotate: true
+  xy: 1708, 270
+  size: 128, 120
+  orig: 138, 125
+  offset: 5, 4
+  index: -1
+zuoshou_1
+  rotate: false
+  xy: 1036, 232
+  size: 75, 166
+  orig: 78, 174
+  offset: 3, 8
+  index: -1
+zuoshouzhang
+  rotate: true
+  xy: 1404, 174
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

+ 62 - 62
build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas

@@ -1,62 +1,62 @@
-
-skeleton.png
-size: 1386,710
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-1
-  rotate: true
-  xy: 1051, 233
-  size: 136, 131
-  orig: 145, 141
-  offset: 7, 4
-  index: -1
-2
-  rotate: true
-  xy: 355, 4
-  size: 350, 349
-  orig: 359, 359
-  offset: 5, 5
-  index: -1
-3
-  rotate: true
-  xy: 1048, 371
-  size: 337, 336
-  orig: 347, 348
-  offset: 6, 5
-  index: -1
-4
-  rotate: true
-  xy: 707, 367
-  size: 341, 339
-  orig: 350, 349
-  offset: 6, 5
-  index: -1
-5
-  rotate: true
-  xy: 2, 2
-  size: 352, 351
-  orig: 361, 362
-  offset: 5, 5
-  index: -1
-6
-  rotate: false
-  xy: 2, 356
-  size: 352, 352
-  orig: 359, 362
-  offset: 3, 5
-  index: -1
-7
-  rotate: false
-  xy: 356, 359
-  size: 349, 349
-  orig: 359, 362
-  offset: 5, 7
-  index: -1
-8
-  rotate: false
-  xy: 706, 11
-  size: 343, 346
-  orig: 351, 357
-  offset: 4, 5
-  index: -1
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas

@@ -1,27 +1,27 @@
-
-guanghuan.png
-size: 445,248
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-button_lq
-  rotate: false
-  xy: 248, 42
-  size: 195, 204
-  orig: 195, 204
-  offset: 0, 0
-  index: -1
-button_tv
-  rotate: false
-  xy: 248, 11
-  size: 27, 29
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-huan
-  rotate: false
-  xy: 2, 2
-  size: 244, 244
-  orig: 244, 244
-  offset: 0, 0
-  index: -1
+
+guanghuan.png
+size: 445,248
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+button_lq
+  rotate: false
+  xy: 248, 42
+  size: 195, 204
+  orig: 195, 204
+  offset: 0, 0
+  index: -1
+button_tv
+  rotate: false
+  xy: 248, 11
+  size: 27, 29
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+huan
+  rotate: false
+  xy: 2, 2
+  size: 244, 244
+  orig: 244, 244
+  offset: 0, 0
+  index: -1

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
 RELEASE_STORE_PASSWORD=szmoka
 RELEASE_KEY_ALIAS=mokakey
 RELEASE_KEY_PASSWORD=szmoka

+ 65 - 74
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -895,8 +895,10 @@ mk.console.logSingle("banner  ", "onBannerAdShow");
 var o = JSON.parse(e);
 gData.adData.updateADLog(7, t, o);
 };
-e.prototype.onBannerAdClick = function() {
+e.prototype.onBannerAdClick = function(t, e) {
 mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.bannerAdType);
+var o = JSON.parse(e);
+gData.adData.updateADLog(55, t, o);
 };
 e.prototype.onBannerAdAutoRefresh = function() {
 mk.console.logSingle("banner  ", "onBannerAdAutoRefresh");
@@ -1295,8 +1297,15 @@ mk.data.sendDataEvent(s.DataEventId.interstitial2_init, mk.ad.interFullAdType);
 }
 gData.adData.updateADLog(a, t, n);
 };
-e.prototype.onInterstitialAdClick = function(t) {
-1 == this.checkPlacementIDType(t) ? mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interFullAdType) : mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interAdType);
+e.prototype.onInterstitialAdClick = function(t, e) {
+var o = this.checkPlacementIDType(t), n = JSON.parse(e);
+if (1 == o) {
+mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interFullAdType);
+gData.adData.updateADLog(56, t, n);
+} else {
+mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interAdType);
+gData.adData.updateADLog(52, t, n);
+}
 };
 e.prototype.onInterstitialAdClose = function(t, e) {
 var o = this.checkPlacementIDType(t);
@@ -1571,7 +1580,9 @@ null != this.proxy && this.proxy.onNativeAdLoadFail(t, e);
 onNativeAdShow: function(t, e) {
 null != this.proxy && this.proxy.onNativeAdShow(t, e);
 },
-onNativeAdClick: function() {},
+onNativeAdClick: function(t, e) {
+null != this.proxy && this.proxy.onNativeAdClick(t, e);
+},
 onNativeAdVideoStart: function() {},
 onNativeAdVideoEnd: function() {},
 onNativeAdCloseButtonTapped: function() {}
@@ -1684,7 +1695,10 @@ this.ifLoadShow = !1;
 var o = JSON.parse(e);
 gData.adData.updateADLog(3, t, o);
 };
-e.prototype.onNativeAdClick = function() {};
+e.prototype.onNativeAdClick = function(t, e) {
+var o = JSON.parse(e);
+gData.adData.updateADLog(53, t, o);
+};
 return e;
 }(r.zgSingleton);
 o.ATNative = s;
@@ -1876,8 +1890,10 @@ this.canGet = !1;
 this.reawardAdState = i.PlayEnd;
 this.loadAd();
 };
-e.prototype.onRewardedVideoAdPlayClicked = function() {
+e.prototype.onRewardedVideoAdPlayClicked = function(t, e) {
 mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.videoAdType);
+var o = JSON.parse(e);
+gData.adData.updateADLog(51, t, o);
 };
 e.prototype.onReward = function() {
 console.log("onReward  ");
@@ -4217,7 +4233,6 @@ configurable: !0
 e.prototype.init = function() {
 this.isPlayAniUpdate = !1;
 this.videoRbData = gData.gameData.playerProp.userTuCaoInfo;
-console.log("福袋数据----------------\x3e", this.videoRbData);
 };
 e.prototype.setAdData = function(e) {
 t.prototype.setAdData.call(this, e);
@@ -7594,25 +7609,25 @@ return;
 }
 this.listeners[t].push(new i(e, o));
 };
-t.prototype.remove = function(t, e, o) {
-var n = this.listeners[t];
-if (n) {
-for (var a = n.length, i = 0; i < a; i++) if (n[i].compare(o)) {
-n.splice(i, 1);
+t.prototype.remove = function(t, e) {
+var o = this.listeners[t];
+if (o) {
+for (var n = o.length, a = 0; a < n; a++) if (o[a].compare(e)) {
+o.splice(a, 1);
 break;
 }
-0 == n.length && delete this.listeners[t];
+0 == o.length && delete this.listeners[t];
 }
 };
 t.prototype.emit = function(t) {
 for (var e = [], o = 1; o < arguments.length; o++) e[o - 1] = arguments[o];
-var a = this.listeners[t];
-if (a) {
-for (var i = a.concat(), r = i.length, c = 0; c < r; c++) {
-var s = i[c];
-s.notify.apply(s, n(e, [ t ]));
+var n = this.listeners[t];
+if (n) {
+for (var a = n.concat(), i = a.length, r = 0; r < i; r++) {
+var c = a[r];
+c.notify.apply(c, e);
 }
-i = null;
+a = null;
 }
 };
 return t;
@@ -8124,7 +8139,6 @@ gData.gameData.addProductMakeTimesById(this.data.productID);
 gData.gameData.isProducting = !1;
 gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
-console.log("-----");
 return [ 4, gData.gameData.updateNewTaskProgress() ];
 
 case 1:
@@ -10451,9 +10465,7 @@ return [ 4, mk.http.sendData("redMoney/addRedMoneyByAnimal", t) ];
 
 case 1:
 if (0 != (e = r.sent()).errcode) return [ 2 ];
-o = e.data.redMoneyAddition;
-console.log("addCoinByFarmer===============>", o);
-if (o > 0) {
+if ((o = e.data.redMoneyAddition) > 0) {
 n = Math.floor(o / 2);
 a = o % 2;
 if (n > 0) for (i = 0; 2 != i; ++i) mk.fly2.PlayCoinAnim(1, 1, this.fly_node, "", null, -1, n);
@@ -11818,7 +11830,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), N = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), B = t("./module/LineUpUIData"), L = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), N = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), B = function() {
 function t() {
 this.init();
 }
@@ -11857,7 +11869,7 @@ this.farmSystem = new R.FarmSystem();
 this.farmMapData = new M.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
 this.walletCashOutData = new E.WalletCashOutData();
-this.lineUpUIData = new B.LineUpUIData();
+this.lineUpUIData = new L.LineUpUIData();
 this.moduleData = new Map();
 this.moduleData.set(n.moreGame, this.moreGame);
 this.moduleData.set(n.turnable, this.turnable);
@@ -11878,7 +11890,7 @@ t[t.sign = 6] = "sign";
 t[t.cashNormal = 7] = "cashNormal";
 t[t.redBagCash = 8] = "redBagCash";
 })(n = o.Fun || (o.Fun = {}));
-window.gData = new L();
+window.gData = new B();
 cc._RF.pop();
 }, {
 "../../before/main/FactorySystem": "FactorySystem",
@@ -11956,7 +11968,6 @@ o.config_common = cc.resources.get("game/config/common").json;
 o.config_clockIn = cc.resources.get("game/config/clockIn").json;
 o.config_level = cc.resources.get("game/config/level").json;
 o.config_cashOut = cc.resources.get("game/config/cashOut").json;
-console.log("GameConst.config_common", o.config_common);
 t(null);
 });
 });
@@ -13069,7 +13080,7 @@ set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
 gData.gameData.init_wallet_redMoney = !0;
-mk.ui.invokeRefreshEventByName("refreshCoin");
+mk.event.emit("refreshCoin");
 mk.data.setTAEventUser(0, "current_redmoney_stock", this._redMoney);
 },
 enumerable: !1,
@@ -13153,6 +13164,7 @@ t.UPDATE_CashNum = "UPDATE_CashNum";
 })(o.EVENT_TYPE || (o.EVENT_TYPE = {}));
 (function(t) {
 t.guide = "guide";
+t.guideSkip = "guideSkip";
 t.button_click = "button_click";
 t.video_init = "video_init";
 t.video_end = "video_end";
@@ -14270,7 +14282,6 @@ this.cashId = t;
 e = {
 id: this.cashId
 };
-console.log("农场等级提现数据=======>" + this.cashId);
 return [ 4, mk.http.sendData("farmGrade/farmGradeCash", e) ];
 
 case 1:
@@ -15151,7 +15162,7 @@ return t.x >= o.x - this.node.width / 2 && t.x <= o.x + this.node.width / 2 && t
 };
 e.prototype.onDestroy = function() {
 this._eventManager.removeListener(this._touchListener, this.node);
-mk.event.remove("close-panel", this.onClosePanel, this);
+mk.event.remove("close-panel", this);
 };
 return i([ c ], e);
 }(cc.Component));
@@ -15518,6 +15529,7 @@ mk.ui.closePanel(this.node.name);
 e.prototype.clickSkip = function() {
 mk.audio.playEffect("button");
 mk.data.sendXYEvent("guide", "skip_" + mk.guide.crtGuideID);
+mk.data.sendDataEvent(s.DataEventId.guideSkip, "新手引导第" + mk.guide.crtGuideID + "步跳过");
 this.close();
 };
 e.prototype.onDestroy = function() {
@@ -16968,6 +16980,7 @@ return r;
 t.updateSplashAdLog = function(t) {
 var e = t.split("#"), o = JSON.parse(e[1]);
 gData.adData.updateADLog(6, e[0], o);
+this.splashADid = e[0];
 var n = mk.storage.getStorage("ad_openEcpm");
 n ? n++ : n = 1;
 mk.storage.setStorage("ad_openEcpm", n);
@@ -16975,6 +16988,7 @@ n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad
 };
 t.clickSplash = function() {
 mk.data.sendDataEvent(a.DataEventId.Ad_click, "splash_click");
+gData.adData.updateADLog(54, this.splashADid);
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -17003,10 +17017,20 @@ cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH_JS
 t.ysdkAuthSuccess = function() {
 gData.loginData.passAnti = !0;
 };
+t.updateActivateLog = function(t) {
+console.log("test>>>  updateActivateLog ", t);
+var e = {
+appId: gData.appData.appId,
+uin: gData.loginData.uin,
+sessionDuration: t
+};
+mk.http.sendData("activateLog", e);
+};
 t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 t._JSB_ANDROID_PATH_JSDK = "org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr";
 t.callBack = null;
+t.splashADid = "";
 return t;
 }();
 o.default = i;
@@ -17636,7 +17660,6 @@ var e = mk.storage.getStorage(i.StorageKey.sessionKey);
 this.sessionKey = e || "";
 var o = mk.storage.getStorage(i.StorageKey.loginTicket);
 this.loginTicket = o || "";
-console.log("===[LoginData] uin =" + t + " sessionKey = " + e + '"');
 };
 t.prototype.login = function() {
 return n(this, void 0, void 0, function() {
@@ -20459,7 +20482,7 @@ this.showElectUI();
 }
 this.showChangePart();
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
+mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 };
 e.prototype.showElectUI = function() {
 this.sendRecommendList();
@@ -20489,7 +20512,7 @@ gData.adData.checkPopInter(u.InterAdType.interstitial1_click_1);
 this.showNativeAd ? mk.ad.showNative() : mk.ad.showBanner(u.BannerAdType.banner_click_3);
 };
 e.prototype.onDisable = function() {
-mk.ui.removeRefreshEvent(this);
+mk.event.remove("refreshCoin", this);
 this.showNativeAd ? mk.ad.destroyNativeAd() : mk.ad.destoryBanner();
 };
 e.prototype.initCashOutStyle = function(t) {
@@ -23555,7 +23578,7 @@ this.initTaskProgressUI();
 this.showChangePart();
 }
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
+mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 }
 };
 e.prototype.showNewTaskUI = function() {
@@ -23570,7 +23593,7 @@ e.prototype.onEnable = function() {
 mk.ad.showNative();
 };
 e.prototype.onDisable = function() {
-mk.ui.removeRefreshEvent(this);
+mk.event.remove("refreshCoin", this);
 mk.ad.destroyNativeAd();
 };
 e.prototype.update = function(t) {
@@ -24324,7 +24347,6 @@ return [ 2 ];
 });
 };
 e.prototype.clickGetReward = function() {
-cc.log("获取奖励:", gData.reward.data);
 var t = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
 gData.reward.flyCoinAnim(t);
 if (gData.reward.callback) {
@@ -26058,13 +26080,13 @@ return e;
 e.prototype.start = function() {
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
 this.lbl_remainTimes.string = "今日剩余次数:" + gData.gameData.playerProp.speedUpLeftTimes;
-mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
+mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 };
 e.prototype.onEnable = function() {
 mk.ad.showBanner(s.BannerAdType.banner_click_5);
 };
 e.prototype.onDisable = function() {
-mk.ui.removeRefreshEvent(this);
+mk.event.remove("refreshCoin", this);
 mk.ad.destoryBanner();
 };
 e.prototype.update = function() {
@@ -27780,12 +27802,9 @@ this.onInPolygon && this.onInPolygon.emit([]);
 this.onTouchTap && this.onTouchTap.emit([]);
 }
 mk.audio.playEffect("button");
-if (this.isScaleAct) {
-cc.tween(this.node).to(.1, {
+this.isScaleAct && cc.tween(this.node).to(.1, {
 scale: 1
 }).start();
-console.log("------end" + this.name);
-}
 } else this.canTouch && this.onOutPolygon && this.onOutPolygon.emit([]);
 this.isStart = !1;
 this.isMoved = !1;
@@ -27793,13 +27812,10 @@ this.isMoved = !1;
 e.prototype.onTouchMove = function(t) {
 if (t.getTouches().length > 1) this.isMoved = !0; else {
 this.isMoved = cc.Vec2.distance(t.getStartLocation(), t.getLocation()) > 20;
-if (this.isScaleAct && this.isMoved) {
-console.log("------move" + this.name);
-cc.tween(this.node).to(.1, {
+this.isScaleAct && this.isMoved && cc.tween(this.node).to(.1, {
 scale: 1
 }).start();
 }
-}
 };
 e.prototype.onTouchCancel = function() {
 this.isMoved = !1;
@@ -27810,12 +27826,9 @@ if (this.canTouch && this.needPolygon && this.points.length >= 3) {
 var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
 this.isStart = cc.Intersection.pointInPolygon(o, this.points);
 }
-if (this.isScaleAct && this.isStart) {
-cc.tween(this.node).to(.1, {
+this.isScaleAct && this.isStart && cc.tween(this.node).to(.1, {
 scale: 1.1
 }).start();
-console.log("------start" + this.name);
-}
 };
 e.prototype.pointInPoly = function(t, e) {
 for (var o = !1, n = -1, a = e.length, i = a - 1; ++n < a; i = n) (e[n].y <= t.y && t.y < e[i].y || e[i].y <= t.y && t.y < e[n].y) && t.x < (e[i].x - e[n].x) * (t.y - e[n].y) / (e[i].y - e[n].y) + e[n].x && (o = !o);
@@ -28304,7 +28317,7 @@ e.prototype.onLoad = function() {};
 e.prototype.start = function() {
 mk.ad.showBanner(r.BannerAdType.banner_click_9);
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
+mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 };
 e.prototype.update = function() {
 gData.reward.add_redbag_value && this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
@@ -28331,7 +28344,7 @@ gData.reward.addReward();
 mk.ui.closePanel(this.node.name);
 };
 e.prototype.onDisable = function() {
-mk.ui.removeRefreshEvent(this);
+mk.event.remove("refreshCoin", this);
 };
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("button");
@@ -29106,12 +29119,10 @@ e.isPanelOpeningArr = [];
 e.isPanelClosingArr = [];
 e.curOnPanelDic = {};
 e.lastOpenPanelName = "";
-e.registerCallBack = new Map();
 return e;
 }
 e.prototype.onLoad = function() {
 mk.ui = this;
-this.registerCallBack.clear();
 };
 e.prototype.start = function() {
 this.panelParent || (this.panelParent = this.node);
@@ -29201,26 +29212,6 @@ mk.event.emit("close-panel", e);
 mk.ad.destroyNativeAd();
 mk.ad.destoryBanner();
 };
-e.prototype.registerRefreshEvent = function(t, e, o) {
-void 0 === e && (e = null);
-void 0 === o && (o = "default");
-var n = this.registerCallBack.get(t);
-if (n) n.set(o, e); else {
-var a = new Map();
-a.set(o, e);
-this.registerCallBack.set(t, a);
-}
-};
-e.prototype.invokeRefreshEventByName = function(t) {
-this.registerCallBack.forEach(function(e) {
-e.forEach(function(e, o) {
-o === t && e && e();
-});
-});
-};
-e.prototype.removeRefreshEvent = function(t) {
-this.registerCallBack.get(t) && this.registerCallBack.delete(t);
-};
 return i([ s ], e);
 }(cc.Component));
 o.default = l;

+ 2 - 2
packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1632537051370,
-    "genTime": 1632537051370,
+    "buildTime": 1633661741674,
+    "genTime": 1633661741674,
     "genVersion": null
 }

+ 1 - 1
settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1632386277717,
+  "last-module-event-record-time": 1633658448730,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff