发包

assets/resources/data/guide_data.json

@@ -13,7 +13,8 @@
 		"clickRect": "all",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_1",
@@ -29,7 +30,8 @@
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_2",
@@ -45,7 +47,8 @@
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_3",
@@ -61,7 +64,8 @@
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "11_0",
@@ -77,7 +81,8 @@
 		"clickRect": "all",
 		"finger": "100:-280",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "12_0",
@@ -93,22 +98,24 @@
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "13_0",
-		"trigger": "1",
+		"trigger": "0",
 		"trNum": "0",
-		"btnEnable": "0",
-		"trForm": "2",
-		"dialogPos": "",
-		"dialogPos1": "-40,-520",
-		"dialogAlignment": "1",
-		"dialog": "<color=8A4312>加油，红包就在眼前</color>",
-		"displayRect": "45:-30:600:600",
-		"clickRect": "event",
-		"finger": "50:20",
-		"lagNext": "2.5",
-		"continue": "false"
+		"btnEnable": "1",
+		"trForm": "1",
+		"dialogPos": "150:::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>点击<color=ff0000>提现</c>立即<color=ff0000>到账！</c></color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/node_ui/顶部个人信息/提现按钮",
+		"finger": "100:0",
+		"lagNext": "0.2",
+		"continue": "false",
+		"isShowSkip": "false"
 	}
 ]

assets/resources/game/prefab/flyHb.prefab

@@ -59,8 +59,8 @@
         0,
         0,
         1,
-        1.5,
-        1.5,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -107,7 +107,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 116.34,
+      "width": 119.04,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -164,8 +164,10 @@
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,

assets/resources/game/prefab/game.prefab

@@ -3596,8 +3596,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 60
+      "width": 340,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5557,7 +5557,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "aezC8kW65K37xsLDhnXTji",
+    "fileId": "668Q4fYr1HPY5m2kysY2rm",
     "sync": false
   },
   {
@@ -5769,7 +5769,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "d3UxaTDJJP35MXcX94jxbP",
+    "fileId": "0fRk90VqNEY6EqYwjNj9jF",
     "sync": false
   },
   {
@@ -5878,7 +5878,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "ccncM5H9xGCJsiqwGiRjx9",
+    "fileId": "b97tojV85CCqhXr9hACpsg",
     "sync": false
   },
   {
@@ -10237,8 +10237,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "订单提现",
-    "_N$string": "订单提现",
+    "_string": "订单领奖",
+    "_N$string": "订单领奖",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -13672,7 +13672,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "d2nhylrYNO+q8+bzp+Y7te",
+    "fileId": "1c73hlRD9C1Yil6W9ZEcMo",
     "sync": false
   },
   {

assets/resources/module/guide/guide.prefab

@@ -1612,7 +1612,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "06vwrc7BRFCpRVQIF5B61b",
+    "fileId": "36QFqXVA9Pbb5UcJ76zJCp",
     "sync": false
   },
   {
@@ -1723,7 +1723,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "b0Z4x2HX5Gp5rq/LwJ2GZR",
+    "fileId": "62sGF3/qhH96X7KUsmc5v/",
     "sync": false
   },
   {
@@ -2423,6 +2423,9 @@
     "rich_dialog1": {
       "__id__": 26
     },
+    "node_skip": {
+      "__id__": 52
+    },
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward.prefab

@@ -1040,6 +1040,9 @@
       },
       {
         "__id__": 31
+      },
+      {
+        "__id__": 34
       }
     ],
     "_active": true,
@@ -1064,7 +1067,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 385.28,
       "height": 50
     },
     "_anchorPoint": {
@@ -1076,7 +1079,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -70,
+        -1,
         53,
         0,
         0,
@@ -1140,7 +1143,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -79.245,
+        -127.63999999999999,
         0,
         0,
         0,
@@ -1248,7 +1251,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        12.999999999999996,
+        -35.39499999999998,
         -5,
         0,
         0,
@@ -1324,19 +1327,15 @@
     "_parent": {
       "__id__": 24
     },
-    "_children": [
-      {
-        "__id__": 32
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -1348,7 +1347,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 104,
+      "width": 52,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1360,7 +1359,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        92.245,
+        17.85000000000002,
         0,
         0,
         0,
@@ -1386,21 +1385,65 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "次，",
+    "_N$string": "次，",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
+    },
+    "fileId": "173fnhaXxM9pe1r/UbhHri",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
     "_name": "任务描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 31
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1424,7 +1467,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        122.895,
+        120.74500000000002,
         0,
         0,
         0,
@@ -1454,7 +1497,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1490,51 +1533,7 @@
     "asset": {
       "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
     },
-    "fileId": "f7Jr0yRdNNtb0Jxu6fTL43",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 31
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "次，立即",
-    "_N$string": "次，立即",
-    "_fontSize": 26,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 0,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
-    },
-    "fileId": "173fnhaXxM9pe1r/UbhHri",
+    "fileId": "8fAk6+RVJOtpn+IEpuKVut",
     "sync": false
   },
   {
@@ -1547,7 +1546,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 385.28,
       "height": 50
     },
     "_resize": 1,
@@ -2098,8 +2097,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "订单已完成，领取红包",
-    "_N$string": "订单已完成，领取红包",
+    "_string": "订单已完成，领取奖励",
+    "_N$string": "订单已完成，领取奖励",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -4136,6 +4135,9 @@
     "lbl_orderValue": {
       "__id__": 52
     },
+    "lbl_rewardDes": {
+      "__id__": 35
+    },
     "_id": ""
   },
   {

assets/script/before/main/FactoryIcon.ts

@@ -96,7 +96,11 @@ export class FactoryIcon extends cc.Component {
         this.showGroup.removeAllChildren();
     }
 
+    isCanTouch = true;
     public async onTouch() {
+        if(!this.isCanTouch){
+            return;
+        }
         switch (this.data.state) {
             case FactroyState.Lock:
                 let arr = gData.gameData.getProductArrByType(this.tab);
@@ -117,7 +121,11 @@ export class FactoryIcon extends cc.Component {
                 break;
             case FactroyState.Ripe:
                 gData.factorySystem.currSelectFactory = this;
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
+                this.isCanTouch = false;
+                setTimeout(()=>{
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case FactroyState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -207,7 +215,7 @@ export class FactoryIcon extends cc.Component {
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
         gData.factorySystem.currSelectFactory = this;
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
     }
 
     public canClearSick() {

assets/script/before/main/FarmIcon.ts

@@ -116,7 +116,11 @@ export class FarmIcon extends cc.Component {
         }
     }
 
+    isCanTouch = true
     public async onTouch() {
+        if (!this.isCanTouch) {
+            return;
+        }
         switch (this.data.state) {
             case FarmState.Lock:
                 mk.tip.pop(`点击拓建即可解锁农田`);
@@ -134,7 +138,11 @@ export class FarmIcon extends cc.Component {
                 break;
             case FarmState.Ripe:
                 gData.farmSystem.currSelectFarm = this;
-                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+                this.isCanTouch = false;
+                setTimeout(() => {
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case FarmState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -199,7 +207,15 @@ export class FarmIcon extends cc.Component {
             return flyRed;
         }
         else {
-            mk.tip.pop('农田已满，无法继续生产');
+            gData.gameData.setNextProduct(false);
+            if(gData.gameData.nextType == 0){
+                mk.tip.pop('农田已满，无法继续生产');
+                return false;
+            }else{
+               let flyRed =  await gData.gameData.makeProduct();
+               return flyRed;
+            }
+            //mk.tip.pop('农田已满，无法继续生产');
             return false;
         }
     }
@@ -247,8 +263,15 @@ export class FarmIcon extends cc.Component {
     }
 
     public canHarvest() {
+        if(!this.isCanTouch){
+            return;
+        }
         gData.farmSystem.currSelectFarm = this;
-        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
+        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+        this.isCanTouch = false;
+        setTimeout(() => {
+            this.isCanTouch = true;
+        }, 1000);
     }
 
     public canClearSick() {
@@ -260,7 +283,7 @@ export class FarmIcon extends cc.Component {
     public clickGuideBtn() {
         if (mk.guide.isGuiding()) {
             //gData.farmSystem.currSelectFarm = this;
-            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true, false, true);
+            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, 0, false, true);
         }
     }
 }

assets/script/before/main/PastureIcon.ts

@@ -146,7 +146,11 @@ export default class PastureIcon extends cc.Component {
         this.showGroup.removeAllChildren();
     }
 
+    isCanTouch = true;
     public async onTouch() {
+        if(!this.isCanTouch){
+            return;
+        }
         switch (this.data.state) {
             case PastureState.Lock:
                 let config = gData.gameData.getProductMap(this.data.productID);
@@ -178,7 +182,11 @@ export default class PastureIcon extends cc.Component {
                 mk.ui.openPanel('module/speedUpUI/speedUp');
                 break;
             case PastureState.Ripe:
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
+                this.isCanTouch = false;
+                setTimeout(()=>{
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case PastureState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -303,7 +311,7 @@ export default class PastureIcon extends cc.Component {
 
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
     }
 
     public canClearSick() {

assets/script/before/view/data/HarvestData.ts

@@ -20,17 +20,20 @@ export default class HarvestData extends Data {
     isMatchOrder = false;
     //是否是点击一键生产按钮
     isTouchBtn = false;
-    openPanel(configID, plantID, call, node, isCrops = false, isTouchBtn =false, isTeach = false) {
+    isCrops_ = 0;
+    //isCrops 0 农作物，1动物，2商品
+    openPanel(configID, plantID, call, node, isCrops = 0, isTouchBtn =false, isTeach = false) {
 
         this.configID = configID;
         this.plantID = plantID;
         this.call = call;
         this.node_fly = node;
         this.isTouchBtn = isTouchBtn;
+        this.isCrops_ = isCrops;
         this.config = gData.gameData.getProductMap(this.plantID);
         //this.judgeIsMatchOrder();
 
-        if(!isTeach && !isCrops)
+        if(!isTeach && isCrops != 0)
         {
             let isTeaching = mk.guide.isGuiding();
             let rand = Math.random();
@@ -70,6 +73,12 @@ export default class HarvestData extends Data {
         gData.reward.getReward(world_Pos);
         //mk.ui.openPanel('module/reward/reward');
         gData.harvestData.call = null;
+
+        if(this.isCrops_ == 1){
+            mk.data.sendDataEvent(DataEventId.button_click, "动物超级加倍收获");
+        }else if(this.isCrops_ == 2){
+            mk.data.sendDataEvent(DataEventId.button_click, "商品超级加倍收获");
+        }
     }
 
     async getNormalReward() {
@@ -142,6 +151,14 @@ export default class HarvestData extends Data {
                 mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
             }
         }
+
+        if(this.isCrops_ == 0){
+            mk.data.sendDataEvent(DataEventId.button_click, "农作物普通收获");
+        }else if(this.isCrops_ == 1){
+            mk.data.sendDataEvent(DataEventId.button_click, "动物普通收获");
+        }else if(this.isCrops_ == 2){
+            mk.data.sendDataEvent(DataEventId.button_click, "商品普通收获");
+        }
     }
 
     public judgeIsMatchOrder()

assets/script/before/view/ui/HarvestPanel.ts

@@ -48,6 +48,18 @@ export default class HarvestPanel extends cc.Component {
             let world_Pos = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
             gData.reward.getReward(world_Pos);
             //mk.ui.openPanel('module/reward/reward');
+
+            let str = "+" + response.data.redMoneyAddition / 100 + "";
+            let pos = mk.fly.node.convertToNodeSpaceAR(world_Pos);
+            let prefab = await mk.loader.load("game/prefab/flyHb", cc.Prefab);
+            let hand = cc.instantiate(prefab);
+            //hand.opacity = 0;
+            hand.zIndex = 1000;
+            hand.parent = mk.fly.node;
+            hand.setPosition(pos);
+            let lab_value = hand.getComponentInChildren(cc.Label);
+            lab_value.string = str;
+            cc.tween(hand).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).removeSelf().start();
         }
         mk.ui.closePanel('HarvestPanel');
     }

assets/script/game/data/GameData.ts

@@ -169,7 +169,7 @@ export class GameData {
             }
         }
 
-        this.uploadAverageEcpm();
+        await this.uploadAverageEcpm();
         gData.adData.initEcpmData();
 
         // data = {};
@@ -2084,6 +2084,13 @@ class PlayerProp {
         gData.gameData.init_wallet_redMoney = true;
         mk.event.emit('refreshCoin');
 
+        if(this._redMoney >= 300000){
+            let isHaveUI = mk.ui.isPopPanel();
+            if(!isHaveUI){
+                mk.guide.open(13);
+            }    
+        }
+
         mk.data.setTAEventUser(0, 'current_redmoney_stock', this._redMoney);
     }
     get redMoney(): number {

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) {

assets/script/game/data/LoginData.ts

@@ -201,6 +201,9 @@ export class LoginData {
                 //清除缓存
                 console.log('restart  errcode ', response.errcode)
                 this.reload();
+            }else if (response.errcode == 403) {
+                console.log('block 403');
+                gData.warnTipData.setSolution(4);
             }
             return;
         }

assets/script/game/data/module/GuideData.ts

@@ -45,6 +45,7 @@ export class GuideData {
             guide.lag_next = parseFloat(o.lagNext);
             guide.display_type = parseInt(o.trNum);
             guide.continue = o.continue;
+            guide.isShowSkip = o.isShowSkip;
             if (id != guide.id) {
                 this.data.set(id, arr);
                 arr = [];

assets/script/game/game/Game.ts

@@ -167,6 +167,10 @@ export default class Game extends cc.Component {
 
         this.initRefreshEvent();
 
+        if(gData.gameData.orderRewardType == 1){
+            this.node_showCash.active = false;
+            this.node_showRedMoney.active = true;
+        }
         if (gData.gameData.playerProp.orderData) {
             this.initOrderUI();
         } else {
@@ -596,6 +600,8 @@ export default class Game extends cc.Component {
 
             this.dpFlyRedAni();
         }
+
+        mk.data.sendDataEvent(DataEventId.button_click, "一键生产按钮");
     }
 
     public dpFlyRedAni(starPos: cc.Vec2 = null) {
@@ -999,8 +1005,6 @@ export default class Game extends cc.Component {
         if (data) {
             //红包币
             if(gData.gameData.orderRewardType == 1){
-                this.node_showCash.active = false;
-                this.node_showRedMoney.active = true;
                 this.lbl_orderRedMoney.string = data.redMoneyAddition/100 + ""; 
             }else{
                 this.lbl_addCash.string = (data.cashMoney / 100).toFixed(2);
@@ -1075,7 +1079,7 @@ export default class Game extends cc.Component {
         return !this.isGray;
     }
 
-    public async getOrderReward() {
+    public async getOrderReward(isGame = true) {
      //现金提现
      if (gData.gameData.orderRewardType == 2) {
         if (cc.sys.isNative) {
@@ -1103,11 +1107,15 @@ export default class Game extends cc.Component {
         gData.receiptNotice.receip_rmb = addMoney;
         mk.ui.openPanel('module/newNotice/newNotice');
 
-        this.node_crop.forEach((v) => {
-            v.active = false;
-        })
-        this.node_orderHbIcon.active = false;
-        this.node_getOrderReward.node.active = false;
+        if(isGame){
+            this.node_crop.forEach((v) => {
+                v.active = false;
+            })
+            this.node_orderHbIcon.active = false;
+            this.node_getOrderReward.node.active = false;
+        }else{
+            this.showRefreshLogic();
+        }
     } else {
         let data = {};
         let response = await mk.http.sendData('orderTask/receiveReward', data);
@@ -1122,11 +1130,15 @@ export default class Game extends cc.Component {
         gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney}]
         mk.ui.openPanel('module/reward/reward');
 
-        this.node_crop.forEach((v) => {
-            v.active = false;
-        })
-        this.node_orderHbIcon.active = false;
-        this.node_getOrderReward.node.active = false;
+        if(isGame){
+            this.node_crop.forEach((v) => {
+                v.active = false;
+            })
+            this.node_orderHbIcon.active = false;
+            this.node_getOrderReward.node.active = false;
+        }else{
+            this.showRefreshLogic();
+        }
     }
     }
 

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

@@ -28,6 +28,8 @@ export default class Guide extends cc.Component {
     rich_dialog: cc.RichText = null;
     @property({ type: cc.RichText, displayName: "对话内容1" })
     rich_dialog1: cc.RichText = null;
+    @property({ type: cc.Node, displayName: "对话内容1" })
+    node_skip: cc.Node = null;
 
 
     private guides: GuideVO[];
@@ -59,6 +61,11 @@ export default class Guide extends cc.Component {
         this.crtGuide = this.guides[this.crtStep];
         mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
         this.updateGuide();
+        if(this.crtGuide.isShowSkip == "true"){
+            this.node_skip.active = true;
+        }else{
+            this.node_skip.active = false;
+        }
         mk.data.sendDataEvent(DataEventId.guide, `新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
     }
 

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

@@ -31,4 +31,6 @@ export default class GuideVO {
     display_type: number = 0;
     /** 是否继续当前步骤 */
     continue: string = null;
+    /** 是否显示跳过按钮 */
+    isShowSkip: string = null;
 }

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

@@ -31,6 +31,9 @@ export default class ProductReward extends cc.Component {
     @property({ type: cc.Label, displayName: '订单提现金额' })
     lbl_orderValue: cc.Label = null;
 
+    @property({ type: cc.Label, displayName: '奖励类型描述' })
+    lbl_rewardDes: cc.Label = null;
+
     private btnCanClick = true;
 
     start(){
@@ -154,9 +157,13 @@ export default class ProductReward extends cc.Component {
                         }, 0.2)
                     }
 
+                    if(gData.gameData.orderRewardType == 1){
+                        this.lbl_rewardDes.string = `领取${data.redMoneyAddition/100}红包币`;
+                    }
+
                 } else {
-                    let v = gData.gameData.playerProp.orderData.cashMoney;
-                    this.lbl_orderValue.string = "订单已完成，可提现" + (v/100).toFixed(2) + "元";
+                    //let v = gData.gameData.playerProp.orderData.cashMoney;
+                    //this.lbl_orderValue.string = "订单已完成，可提现" + (v/100).toFixed(2) + "元";
                     this.sp_taskProgress.fillRange = 1;
                     this.lbl_progress.string = `${allCount}/${allCount}`;
                     this.node_Uncomplete.active = false;
@@ -260,6 +267,6 @@ export default class ProductReward extends cc.Component {
 
     private clickGetOrderRewardBtn()
     {
-        gData.gameData.gameStyle.getOrderReward();
+        gData.gameData.gameStyle.getOrderReward(false);
     }
 }

assets/script/mk/system/GuideSystem.ts

@@ -50,7 +50,7 @@ export default class GuideSystem {
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        if (id == 12) {
+        if (id == 13) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }

assets/script/mk/system/UISystem.ts

@@ -112,6 +112,20 @@ export default class UISystem extends cc.Component {
     }
 
     /**
+     * 获取当前是否有除主界面的其他界面打开
+     */
+     isPopPanel(except: string[] = ["game"]){
+        let count = 0;
+        for (let panelName in this.curOnPanelDic) {
+            if(except.indexOf(panelName) != -1){
+                continue;
+            }
+            ++count;
+        }
+        return count > 0;
+    }
+
+    /**
      * 关闭panel界面
      * @param panelName 通常使用this.node.name代替，界面名称，不是全路径
      * @param callBack  关闭之后回调

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号