引导修改

assets/resources/data/guide_data.json

@@ -105,7 +105,7 @@
 		"lagNext": "0"
 	},
 	{
-		"id": "2_1",
+		"id": "3_0",
 		"trigger": "1",
 		"trNum": "0",
 		"btnEnable": "1",
@@ -120,7 +120,7 @@
 		"lagNext": "0"
 	},
 	{
-		"id": "3_0",
+		"id": "4_0",
 		"trigger": "1",
 		"trNum": "0",
 		"btnEnable": "1",

assets/script/game/data/GameData.ts

@@ -564,8 +564,7 @@ export class GameData {
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
             mk.ui.closeAllUI();
-            mk.guide.curDes = '';
-            mk.guide.open(3);
+            mk.guide.open(4);
         }
         // if (isNeedRefresh) {
         //     gData.gameData.init_task = true;

assets/script/game/module/guide/Guide.ts

@@ -57,11 +57,6 @@ export default class Guide extends cc.Component {
     private nextStep() {
         this.crtStep++;
         this.crtGuide = this.guides[this.crtStep];
-        if (gData.guideData.crtID == 2 && this.crtStep == 1) {
-            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-            mk.guide.curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
-        }
         mk.data.sendDataEvent(DataEventId.guide, `新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
         this.updateGuide();
     }

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

@@ -97,6 +97,12 @@ export default class Reward extends cc.Component {
                 rewardNum = Math.round(rewardNum / 100);
                 this.lbl_des.string = '红包币'
             } else {
+
+                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+                let curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
+                mk.guide.open(3, curDes);
+
                 this.lbl_des.string = '生产次数'
             }
             this.lbl_reward_num.string = `+${rewardNum}`;

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

@@ -43,8 +43,8 @@ export default class ProductReward extends cc.Component {
 
                     isGuide = true;
                     this.scheduleOnce(() => {
-                        mk.guide.curDes = `<color=8A4312>再<color=ff0000>生产${count - com}次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>`;
-                        mk.guide.open(2);
+                        let curDes = `<color=8A4312>再<color=ff0000>生产${count - com}次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>`;
+                        mk.guide.open(2, curDes);
                     }, 0.5)
                 } else {
                     this.node_Uncomplete.active = false;
@@ -117,8 +117,7 @@ export default class ProductReward extends cc.Component {
                 mk.ui.openPanel('module/reward/reward');
 
                 let value = mk.storage.getStorage('guide_production');
-                if(!value)
-                {
+                if (!value) {
                     mk.storage.setStorage('guide_production', 1);
                     mk.data.sendXYEvent('guide_production', '首次领取生产次数');
                 }

assets/script/mk/system/GuideSystem.ts

@@ -11,11 +11,13 @@ export default class GuideSystem {
     public ui: cc.Node;
     public curDes = '';
 
-    public open(id) {
+    public open(id, curDes = '') {
         if (gData.gameData.configs.ServerConfig.NewUserGuide == '0') {
             return
         }
 
+        this.curDes = curDes;
+
         this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
         if (this.crtGuideID == undefined) {
             this.crtGuideID = 0;
@@ -43,7 +45,7 @@ export default class GuideSystem {
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        if (id == 5) {
+        if (id == 4) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }