修复进游戏loading不关闭

assets/script/game/game/Game.ts

@@ -71,7 +71,9 @@ export default class Game extends cc.Component {
 
     onLoad() {
         gData.gameData.gameStyle = this;
-        mk.ui.closePanel("login");
+        mk.ui.closePanel("login", () => {
+            mk.ui.closePanel("agreementTip");
+        });
         this.span = gData.gameData.ProductionRecovery * 60 * 1000;
         gData.gameData.checkGradeUpUnLock();
         this.loadMain();
@@ -398,11 +400,10 @@ export default class Game extends cc.Component {
         })
     }
 
-    public registerCallBack()
-    {
+    public registerCallBack() {
         console.log('cocos keyDown');
         JsbSystem.callBack = null;
-        JsbSystem.callBack = ()=>{
+        JsbSystem.callBack = () => {
 
             mk.ui.openPanel('module/speedUpUI/productReward2');
         }

assets/script/game/module/agreementTip/agreementTip.ts

@@ -32,7 +32,6 @@ export default class agreementTip extends cc.Component {
     }
 
     private clickAgree() {
-        mk.ui.closePanel(this.node.name);
         let node = cc.find('Canvas/主界面层');
         mk.ui.openPanel("game/prefab/game", OpenActionType.normal, node);
     }

build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json

@@ -1 +1 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":1,"tr_num":null,"tr_form":2,"dialog":"欢迎来到轻松连连消","display_rect":"","click_rect":"all","finger":"","lag_next":0},{"id":"1_2","trigger":1,"tr_num":null,"tr_form":2,"dialog":"点击“开始游戏”，让我来介绍一下","display_rect":"","click_rect":"界面层/game/开始按钮","finger":"50:20","lag_next":0},{"id":"1_3","trigger":1,"tr_num":null,"tr_form":1,"dialog":"点击这两个动物即可消除哦","display_rect":"-300:100:100:500","click_rect":"event","finger":"50:20","lag_next":1},{"id":"1_4","trigger":1,"tr_num":null,"tr_form":1,"dialog":"消除可获得大量进度哦","display_rect":"300:100:100:500","click_rect":"event","finger":"50:20","lag_next":2},{"id":"1_5","trigger":1,"tr_num":null,"tr_form":1,"dialog":"进度攒满即可通关","display_rect":"100:100:100:500","click_rect":"event","finger":"50:20","lag_next":0},{"id":"1_6","trigger":1,"tr_num":null,"tr_form":1,"dialog":"继续点击消除吧","display_rect":"200:100:100:500","click_rect":"event","finger":"50:20","lag_next":0},{"id":"2_1","trigger":1,"tr_num":null,"tr_form":1,"dialog":"点击领取红包币","display_rect":"300:100:100:500","click_rect":"event","finger":"50:20","lag_next":0},{"id":"2_2","trigger":1,"tr_num":null,"tr_form":1,"dialog":"红包币可用于提现","display_rect":"200:100:100:500","click_rect":"event","finger":"50:20","lag_next":0},{"id":"3_1","trigger":1,"tr_num":null,"tr_form":2,"dialog":"达到提现条件啦！","display_rect":"100:100:100:500","click_rect":"event","finger":"50:20","lag_next":0},{"id":"3_2","trigger":1,"tr_num":null,"tr_form":1,"dialog":"点击即可提现","display_rect":"300:100:100:500","click_rect":"event","finger":"50:20","lag_next":0}]]],0,0,[],[],[]]
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"1_3","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"0:107:588:850","clickRect":"event","finger":"100:-350","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/55/5544bb48-4665-4fec-b712-9b6d43719f5c.json

@@ -0,0 +1 @@
+[1,["3fbza91/9AJb0Y6XzKo/8j"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg1","rect":[0,18,750,176],"offset":[0,-9],"originalSize":[750,194],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/77/7703cd1c-b1a7-4207-8d63-ca26e03de71b.json

@@ -1 +1 @@
-[1,["91YGbCPolDTr60fBkajsm9"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hand1","rect":[0,0,93,111],"offset":[0,0],"originalSize":[93,111],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["91YGbCPolDTr60fBkajsm9"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hand1","rect":[13,20,137,136],"offset":[-0.5,-2.5],"originalSize":[164,171],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/83/83b7eeb0-b60b-4e20-82d4-42a63882d451.json

@@ -1 +1 @@
-[1,["2djTD3K3JMm6zKyvKQCf3K"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,718,176],"offset":[0,0],"originalSize":[718,176],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["2djTD3K3JMm6zKyvKQCf3K"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[18,3,432,129],"offset":[3.5,0],"originalSize":[461,135],"capInsets":[114.5,69,82.5,48]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/aa/aacede80-180e-48f6-ab8a-009c9f626349.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/c5/c534a35a-73aa-40ef-92eb-f7d632dde418.json

@@ -1 +0,0 @@
-[1,["7cLQpTl19MU6FWt6oX5Msz"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"head","rect":[0,0,128,127],"offset":[0,0],"originalSize":[128,127],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/cf/cff81677-0727-4cd3-869c-39b593e999f2.json

@@ -1 +1 @@
-[1,["57kWj+vHtIO4a6Uae0SY+E"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"panda","rect":[0,0,190,264],"offset":[0,0],"originalSize":[190,264],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["57kWj+vHtIO4a6Uae0SY+E"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"panda","rect":[0,0,201,230],"offset":[-0.5,0],"originalSize":[202,230],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/e3/e321eb57-ae0f-430b-b6e7-6838cc0fbc50.json

@@ -0,0 +1 @@
+[1,["aazt6AGA5I9quKAJyfYmNJ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"btnSkip","rect":[0,0,177,56],"offset":[0,0],"originalSize":[177,56],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1630750135945,
-    "genTime": 1630750135945,
+    "buildTime": 1630924532136,
+    "genTime": 1630924532136,
     "genVersion": null
 }