1

assets/script/before/view/uiItem/PlantItem.ts

@@ -98,6 +98,7 @@ export default class PlantItem extends cc.Component {
     }
 
     clickMake() {
+        mk.audio.playEffect('button');
         if (gData.gameData.leftTimes <= 0) {
             mk.ui.openPanel('module/speedUpUI/productReward');
             return;
@@ -116,7 +117,7 @@ export default class PlantItem extends cc.Component {
         else {
             gData.factorySystem.make(this.data.picture);
         }
-        gData.gameData.updateNewTaskProgress();
+        gData.gameData.updateNewTaskProgress(true);
     }
 
     getDesByType() {

assets/script/game/data/GameData.ts

@@ -500,7 +500,7 @@ export class GameData {
         return flyRed;
     }
 
-    public async updateNewTaskProgress() {
+    public async updateNewTaskProgress(isNeedRefresh = false) {
 
         // if (gData.gameData.init_redBagTask) {
         //     return;
@@ -524,7 +524,11 @@ export class GameData {
         if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
             mk.guide.open(5);
         }
-        //gData.gameData.init_task = true;
+        if(isNeedRefresh)
+        {
+            gData.gameData.init_task = true;
+        }
+        
     }
 
     public setFarmDataMap(id, data, sendToServer = true) {

assets/script/game/game/Game.ts

@@ -189,7 +189,7 @@ export default class Game extends cc.Component {
                 this.lbl_task.string = `<b><color=#8D4D32>点击领取任务!</c></b>`
                 this.node_hand.active = true;
             } else {
-                this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#7EB80E>(${com}/${count})</color></b>`
+                this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#D73D25>(${com}/${count})</color></b>`
                 if (com >= count) {
                     this.node_hand.active = true;
                 } else {
@@ -224,7 +224,7 @@ export default class Game extends cc.Component {
             //     this.node_hand.active = true;
             // }else
             {
-                this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#7EB80E>(${com}/${count})</color></b>`
+                this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#D73D25>(${com}/${count})</color></b>`
                 if (com >= count) {
                     this.node_hand.active = true;
                 } else {

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -38,7 +38,7 @@ export default class NewOpenRedBag extends cc.Component {
 
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
         
-        mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
+        mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
     }
     
 
@@ -74,7 +74,7 @@ export default class NewOpenRedBag extends cc.Component {
     }
 
     onDisable() {
-        mk.ui.removeRefreshEvent(this.node);
+        mk.ui.removeRefreshEvent(this);
         mk.ad.destoryBanner();
     }
 

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -69,7 +69,7 @@ export default class RedBagTask extends cc.Component {
 
 
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-        mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
+        mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
 
     }
 
@@ -89,7 +89,7 @@ export default class RedBagTask extends cc.Component {
     }
 
     onDisable() {
-        mk.ui.removeRefreshEvent(this.node);
+        mk.ui.removeRefreshEvent(this);
         mk.ad.destoryBanner();
         mk.guide.open(3);
     }

assets/script/game/module/reward/Reward.ts

@@ -51,7 +51,7 @@ export default class Reward extends cc.Component {
         mk.audio.playEffect("congratulations");
         // gData.gameData.playerProp.redMoney = 1500;// 测试数据
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-        mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
+        mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
     }
 
     onEnable() {
@@ -61,7 +61,7 @@ export default class Reward extends cc.Component {
     }
 
     onDisable() {
-        mk.ui.removeRefreshEvent(this.node);
+        mk.ui.removeRefreshEvent(this);
         mk.ad.destoryBanner();
     }
 
@@ -158,7 +158,6 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         cc.log('获取奖励：', gData.reward.data);
-        mk.audio.playEffect('redmoney');
         let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);
         if (gData.reward.callback) {

assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -22,7 +22,7 @@ export default class SpeedUpUI extends cc.Component {
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
         this.lbl_remainTimes.string = `今日剩余次数：${gData.gameData.playerProp.speedUpLeftTimes}`;
 
-        mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
+        mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
     }
 
     onEnable() {
@@ -30,7 +30,7 @@ export default class SpeedUpUI extends cc.Component {
     }
 
     onDisable() {
-        mk.ui.removeRefreshEvent(this.node);
+        mk.ui.removeRefreshEvent(this);
         mk.ad.destoryBanner();
     }
 

assets/script/game/module/turntable/Turnablerule.ts

@@ -25,7 +25,7 @@ export default class Turnablerule extends cc.Component {
         mk.ad.showBanner(BannerAdType.banner_click_9);
 
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-        mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
+        mk.ui.registerRefreshEvent(this, this.initCashOutStyle.bind(this), "refreshCoin");
     }
 
     update(dt) {
@@ -72,7 +72,7 @@ export default class Turnablerule extends cc.Component {
     }
 
     onDisable(){
-        mk.ui.removeRefreshEvent(this.node);
+        mk.ui.removeRefreshEvent(this);
     }
     private onClickClose() {
         mk.audio.playEffect("closeButton");

assets/script/mk/system/UISystem.ts

@@ -180,16 +180,16 @@ export default class UISystem extends cc.Component {
         mk.ad.destoryBanner()
     }
 
-    registerRefreshEvent(obj: cc.Node, callBack: Function = null, name: string = "default")
+    registerRefreshEvent(target:any, callBack: Function = null, name: string = "default")
     {
-        let value = this.registerCallBack.get(obj);
+        let value = this.registerCallBack.get(target);
         if(value)
         {
             value.set(name, callBack);
         }else{
             let m = new Map<string, Function>();
             m.set(name, callBack);
-            this.registerCallBack.set(obj, m);
+            this.registerCallBack.set(target, m);
         }
     }
 
@@ -205,12 +205,12 @@ export default class UISystem extends cc.Component {
         });
     }
 
-    removeRefreshEvent(obj:cc.Node)
+    removeRefreshEvent(target: any)
     {
-        let value = this.registerCallBack.get(obj);
+        let value = this.registerCallBack.get(target);
         if(value)
         {
-            this.registerCallBack.delete(obj);
+            this.registerCallBack.delete(target);
         }
     }
 }

build/jsb-link/assets/resources/import/15/15461fb2-4ab7-47ef-888b-2cc5bbbd5ab1.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy","53/2+k65pLBpO6oPUk2TQq","a1QszCscdPqoTGBNwulW/n"],["node","_spriteFrame","_defaultClip","root","data"],[["cc.Node",["_name","_prefab","_children","_components","_contentSize","_trs","_parent"],2,4,2,9,5,7,1],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.Animation",["playOnLoad","node","_clips","_defaultClip"],2,1,3,6],["cc.Label",["_string","_fontSize","_N$horizontalAlign","_N$verticalAlign","node","_materials"],-1,1,3],["cc.Widget",["_alignFlags","_originalWidth","_originalHeight","node"],0,1],["58495/rJOBNGoxELFSp8G2a",["node"],3,1]],[[1,0,1,2],[0,0,6,3,1,4,5,2],[2,0,2],[0,0,2,3,1,4,5,2],[0,0,6,2,1,2],[3,0,1,2,1],[4,0,1,2,3,2],[1,1,1],[5,0,1,2,3,4,5,5],[6,0,1,2,3,4],[7,0,1]],[[2,"NetDisConnect"],[3,"NetDisConnect",[-4],[[9,45,750,1334,-2],[10,-3]],[7,-1],[5,750,1334],[375,667,0,0,0,0,1,1,1,1]],[4,"显示节点",1,[-5,-6],[0,"1dJjSwFMdAXbmC/yHCmWqE",1]],[1,"qk_game_load01",2,[[5,-7,[0],1],[6,true,-8,[3],2]],[0,"7eCg0p3uJK8atow030nz2R",1],[5,45,45],[0,82.511,0,0,0,0,1,3,3,1]],[1,"文本",2,[[8,"连接断开，请检查网络",32,1,1,-9,[4]]],[0,"81tu4L1JdKpYymiyRwiAQ+",1],[5,320,50.4],[0,-46.625,0,0,0,0,1,1,1,1]]],0,[0,3,1,0,0,1,0,0,1,0,-1,2,0,-1,3,0,-2,4,0,0,3,0,0,3,0,0,4,0,4,1,9],[0,0,0,0,0],[-1,1,2,-1,-1],[0,2,1,1,0]]
+[1,["ecpdLyjvZBwrvm+cedCcQy","53/2+k65pLBpO6oPUk2TQq","a1QszCscdPqoTGBNwulW/n"],["node","_spriteFrame","_defaultClip","root","data"],[["cc.Node",["_name","_prefab","_children","_components","_contentSize","_trs","_parent"],2,4,2,9,5,7,1],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.Animation",["playOnLoad","node","_clips","_defaultClip"],2,1,3,6],["cc.Label",["_string","_fontSize","_N$horizontalAlign","_N$verticalAlign","node","_materials"],-1,1,3],["cc.Widget",["_alignFlags","_originalWidth","_originalHeight","node"],0,1],["58495/rJOBNGoxELFSp8G2a",["node"],3,1]],[[1,0,1,2],[0,0,6,3,1,4,5,2],[2,0,2],[0,0,2,3,1,4,5,2],[0,0,6,2,1,2],[3,0,1,2,1],[4,0,1,2,3,2],[1,1,1],[5,0,1,2,3,4,5,5],[6,0,1,2,3,4],[7,0,1]],[[2,"NetDisConnect"],[3,"NetDisConnect",[-4],[[9,45,750,1334,-2],[10,-3]],[7,-1],[5,750,1334],[375,667,0,0,0,0,1,1,1,1]],[4,"显示节点",1,[-5,-6],[0,"1dJjSwFMdAXbmC/yHCmWqE",1]],[1,"qk_game_load01",2,[[5,-7,[0],1],[6,true,-8,[3],2]],[0,"7eCg0p3uJK8atow030nz2R",1],[5,45,45],[0,34.437,0,0,0,0,1,2,2,1]],[1,"文本",2,[[8,"连接断开，请检查网络",32,1,1,-9,[4]]],[0,"81tu4L1JdKpYymiyRwiAQ+",1],[5,320,50.4],[0,-46.625,0,0,0,0,1,1,1,1]]],0,[0,3,1,0,0,1,0,0,1,0,-1,2,0,-1,3,0,-2,4,0,0,3,0,0,3,0,0,4,0,4,1,9],[0,0,0,0,0],[-1,1,2,-1,-1],[0,2,1,1,0]]

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","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","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":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":"::::-600:","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],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":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":"::::-600:","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/2d/2d4a6cbe-e0a9-4434-b83e-eba0a0bb6515.json

@@ -0,0 +1 @@
+[1,["f1A2/AATxMOocujYEKeIR0"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"currency_tc_tit","rect":[0,0,548,127],"offset":[0,0],"originalSize":[548,127],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/b5/b5f7d92a-0365-4eec-9332-7b05430c5c0f.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/e6/e691e6d4-c3d6-4307-b075-ddd343cebbbf.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/f1/f1036fc0-013c-4c3a-872e-8d810a788474.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/f1/f16f2ae6-2c4c-4899-99b9-5af74db5a6fe.json

@@ -0,0 +1 @@
+[1,["b599kqA2VO7JMyewVDDFwP"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"giftbg","rect":[0,0,177,183],"offset":[0,0],"originalSize":[177,183],"capInsets":[40,40,40,40]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/fe/fe828bc9-918e-4de0-a543-38c90903f6ee.json

@@ -0,0 +1 @@
+[1,["e6kebUw9ZDB7B13dNDzru/"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"jiasu_btn","rect":[0,0,366,127],"offset":[0,0],"originalSize":[366,127],"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": 1631513124508,
-    "genTime": 1631513124508,
+    "buildTime": 1631521733511,
+    "genTime": 1631521733511,
     "genVersion": null
 }