Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/resources/data/guide_data.json

@@ -7,7 +7,7 @@
 		"dialogPos": ":0::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>",
+		"dialog": "<color=8A4312>欢迎来到<color=ff0000>《开心农乐园》</color></color>",
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "",
@@ -21,14 +21,70 @@
 		"dialogPos": ":200::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>",
+		"dialog": "<color=8A4312>点击<color=ff0000>生产</color>，种植农作物</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
-		"lagNext": "1"
+		"lagNext": "0"
+	},
+	{
+		"id": "1_3",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "1",
+		"dialogPos": ":200::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312><color=ff0000>倒计时</color>结束后收获农作物，\n获得<color=ff0000>红包币</color>！</color>",
+		"displayRect": "",
+		"clickRect": "all",
+		"finger": "",
+		"lagNext": "0"
 	},
 	{
-		"id": "4_1",
+		"id": "1_4",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "1",
+		"dialogPos": ":200::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>继续生产，完成<color=ff0000>任务</color>\n即可领取百元<color=ff0000>红包</color></color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
+		"finger": "100:20",
+		"lagNext": "0"
+	},
+	{
+		"id": "1_5",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "1",
+		"dialogPos": "300:::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>生产次数<color=ff0000>达到要求</color>，就可以<color=ff0000>提现</color>啦，加油！</color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
+		"finger": "100:20",
+		"lagNext": "0"
+	},
+	{
+		"id": "1_6",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "1",
+		"dialogPos": ":200::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>把农田全部种满，<color=ff0000>红包币</color>\n能提现，<color=ff0000>任务</color>也能<color=ff0000>提现</color>！</color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
+		"finger": "100:20",
+		"lagNext": "0"
+	},
+	{
+		"id": "2_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "3",
@@ -39,10 +95,10 @@
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "100:-280",
-		"lagNext": "1"
+		"lagNext": "0"
 	},
 	{
-		"id": "5_1",
+		"id": "3_1",
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "1",
@@ -53,6 +109,6 @@
 		"displayRect": "",
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
 		"finger": "100:20",
-		"lagNext": "1"
+		"lagNext": "0"
 	}
 ]

assets/script/game/data/GameData.ts

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

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

@@ -238,8 +238,15 @@ export default class Guide extends cc.Component {
                 this.node_person.active = true;
             }
 
-            this.rich_dialog.string = this.crtGuide.dialog;
-            this.rich_dialog1.string = this.crtGuide.dialog;
+            if (mk.guide.curDes != '') {
+                this.rich_dialog.string = mk.guide.curDes;
+                this.rich_dialog1.string = mk.guide.curDes;
+                mk.guide.curDes = '';
+            }
+            else {
+                this.rich_dialog.string = this.crtGuide.dialog;
+                this.rich_dialog1.string = this.crtGuide.dialog;
+            }
         }
     }
 

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

@@ -19,51 +19,46 @@ export default class ProductReward extends cc.Component {
     @property({ type: cc.Node, displayName: '未完成节点' })
     node_Uncomplete: cc.Node = null;
 
-    @property({type: cc.Node, displayName: '节点1'})
+    @property({ type: cc.Node, displayName: '节点1' })
     node_1: cc.Node = null;
-    @property({type: cc.Node, displayName: '节点2'})
+    @property({ type: cc.Node, displayName: '节点2' })
     node_2: cc.Node = null;
 
     onEnable() {
-        this.scheduleOnce(() => {
-            mk.guide.open(4);
-        }, 0.5)
-
         this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
 
         gData.gameData.init_productTask = false;
         if (gData.gameData.playerProp.userFarmTaskInfo) {
             let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
             let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-            if(count <= 10)
-            {
+            if (count <= 10) {
                 if (count > com) {
                     this.lbl_taskTimes.string = (count - com).toString();
                     this.node_Uncomplete.active = true;
                     this.node_complete.active = false;
-                    // this.node_Uncomplete.scale = 2;
-                    // let posY = this.node_Uncomplete.y;
-                    // this.node_Uncomplete.y = posY + 200;
-                    // cc.tween(this.node_Uncomplete).delay(0.2).to(0.4, {scale: 1, y: posY}).start();
+
+                    this.scheduleOnce(() => {
+                        mk.guide.curDes = `<color=8A4312>再<color=ff0000>生产${count - com}次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>`;
+                        mk.guide.open(2);
+                    }, 0.5)
                 } else {
                     this.node_Uncomplete.active = false;
                     this.node_complete.active = true;
                 }
-                
+
                 let per = com / count;
                 cc.tween(this.sp_taskProgress).delay(0.2).to(0.3, { fillRange: per }, {
                     onUpdate: () => {
                         let num = Math.round(this.sp_taskProgress.fillRange * count);
                         this.lbl_progress.string = `${num}/${count}`;
                     }
-                }).call(()=>{
+                }).call(() => {
                     this.lbl_progress.string = `${com}/${count}`;
                 }).start();
-            }else{
+            } else {
                 this.node_1.active = false;
                 this.node_2.active = false;
             }
-        
         }
     }
 
@@ -72,8 +67,7 @@ export default class ProductReward extends cc.Component {
             if (gData.gameData.playerProp.userFarmTaskInfo) {
                 let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
                 let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-                if(count <= 10)
-                {
+                if (count <= 10) {
                     if (count > com) {
                         this.lbl_taskTimes.string = (count - com).toString();
                         this.node_Uncomplete.active = true;
@@ -84,7 +78,7 @@ export default class ProductReward extends cc.Component {
                     }
                     this.lbl_progress.string = `${com}/${count}`;
                     this.sp_taskProgress.fillRange = com / count;
-                }              
+                }
             }
 
             gData.gameData.init_productTask = false;

assets/script/mk/system/GuideSystem.ts

@@ -9,6 +9,7 @@ export default class GuideSystem {
 
     public crtGuideID: number;
     public ui: cc.Node;
+    public curDes = '';
 
     public open(id) {
         if (gData.gameData.configs.ServerConfig.NewUserGuide == '0') {

assets/script/mk/system/JsbSystem.ts

@@ -76,7 +76,7 @@ export default class JsbSystem {
     /** 获取手机授权 */
     public static checkPermission() {
         if (CC_DEBUG) {
-            gData.appData.mac = '73:16:ec:c3:d3:55,86:46:dc:dd:b7:37';
+            gData.appData.mac = '13:16:ec:c3:d3:55,16:46:dc:dd:b7:37';
             gData.appData.machineInfo.mac = gData.appData.mac;
             gData.appData.getDeviceInfoCompelete = true;
         }