发包

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,7 +98,8 @@
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "13_0",
@@ -109,6 +115,24 @@
 		"clickRect": "主界面层/game/功能按钮/底部按钮/富翁银行",
 		"finger": "",
 		"lagNext": "0.2",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
+	},
+	{
+		"id": "14_0",
+		"trigger": "0",
+		"trNum": "0",
+		"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
       ]
     },

assets/resources/game/prefab/game.prefab

@@ -4010,8 +4010,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 60
+      "width": 340,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5971,7 +5971,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "35o8w903tAuIulRweVwJu2",
+    "fileId": "13H0fyB6RHHrwx+iULBn1P",
     "sync": false
   },
   {
@@ -6183,7 +6183,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "86DE0zHgpGaoMUtlAV1kZ8",
+    "fileId": "baKPVhUVNDKomVQ+VzK2P2",
     "sync": false
   },
   {
@@ -6292,7 +6292,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "c0AtsJdU1JeYkD/aipqRYU",
+    "fileId": "7ekbvmAyZG5oZEG2+fXWqb",
     "sync": false
   },
   {
@@ -14092,7 +14092,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "43mbwriuVNYYCTfX3EygIf",
+    "fileId": "33zz16IDxHVYZX4xuXOfTW",
     "sync": false
   },
   {

assets/resources/module/guide/guide.prefab

@@ -1612,7 +1612,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "5bOZw0rPtG6JPoObaga/v0",
+    "fileId": "58vP3SFFhIH649g3UOrzxx",
     "sync": false
   },
   {
@@ -1723,7 +1723,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "647dEku+VPH4WdDsmTpwJ6",
+    "fileId": "dfoUfhPpVDjY7SPa32qU0Z",
     "sync": false
   },
   {
@@ -2423,6 +2423,9 @@
     "rich_dialog1": {
       "__id__": 26
     },
+    "node_skip": {
+      "__id__": 52
+    },
     "_id": ""
   },
   {

assets/script/game/data/GameData.ts

@@ -2108,6 +2108,9 @@ class PlayerProp {
         gData.gameData.init_wallet_redMoney = true;
         mk.event.emit('refreshCoin');
 
+        if(this._redMoney >= 300000){
+            mk.guide.open(14);
+        }
         mk.data.setTAEventUser(0, 'current_redmoney_stock', this._redMoney);
     }
     get redMoney(): number {

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

@@ -176,6 +176,10 @@ export default class Game extends cc.Component {
         } else {
             mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
         }
+
+        setTimeout(() => {
+            mk.guide.open(14);
+        }, 3000);
     }
 
     start() {
@@ -1093,7 +1097,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) {
@@ -1123,11 +1127,16 @@ 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);
@@ -1142,11 +1151,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

@@ -272,6 +272,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 == 13) {
+        if (id == 14) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }

build/jsb-link/assets/resources/import/18/1896f4b5-a351-483a-841e-1b4f52337d72.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy","b4eBm1qexJFokJ20Ivebu3","5au/fBpD5KipaCIChRwFx+"],["node","_N$file","_spriteFrame","root","data"],[["cc.Node",["_name","_components","_prefab","_contentSize","_trs","_children","_parent","_anchorPoint"],2,9,4,5,7,2,1,5],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Label",["_string","_isSystemFontUsed","_N$horizontalAlign","_N$verticalAlign","node","_materials","_N$file"],-1,1,3,6],["cc.LabelOutline",["_width","node","_color"],2,1,5],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6]],[[2,0,2],[0,0,5,1,2,3,4,2],[0,0,6,1,2,3,7,4,2],[3,0,1,2,3,4,5,6,5],[4,0,1,2,2],[1,0,1,2],[1,1,1],[5,0,1,2,1]],[[0,"flyHb"],[1,"flyHb",[-3],[[7,-2,[2],3]],[6,-1],[5,64,71],[0,0,0,0,0,0,1,1.5,1.5,1]],[2,"New Label",1,[[3,"+2000",false,1,1,-4,[0],1],[4,2,-5,[4,4278867707]]],[5,"b0sGGQHgJKrrK5hTgE+6nG",1],[5,119.04,54.4],[0,0,0.5],[40.403000000000006,3.58,0,0,0,0,1,1.2,1.2,1]]],0,[0,3,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,4,1,5],[0,0,0,0],[-1,1,-1,2],[0,1,0,2]]
+[1,["ecpdLyjvZBwrvm+cedCcQy","b4eBm1qexJFokJ20Ivebu3","5au/fBpD5KipaCIChRwFx+"],["node","_N$file","_spriteFrame","root","data"],[["cc.Node",["_name","_components","_prefab","_contentSize","_trs","_children","_parent","_anchorPoint"],2,9,4,5,7,2,1,5],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Label",["_string","_isSystemFontUsed","_N$horizontalAlign","_N$verticalAlign","node","_materials","_N$file"],-1,1,3,6],["cc.LabelOutline",["_width","node","_color"],2,1,5],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6]],[[2,0,2],[0,0,5,1,2,3,4,2],[0,0,6,1,2,3,7,4,2],[3,0,1,2,3,4,5,6,5],[4,0,1,2,2],[1,0,1,2],[1,1,1],[5,0,1,2,1]],[[0,"flyHb"],[1,"flyHb",[-3],[[7,-2,[2],3]],[6,-1],[5,64,71],[0,0,0,0,0,0,1,1.2,1.2,1]],[2,"New Label",1,[[3,"+2000",false,1,1,-4,[0],1],[4,2,-5,[4,4278867707]]],[5,"b0sGGQHgJKrrK5hTgE+6nG",1],[5,119.04,54.4],[0,0,0.5],[40.403000000000006,3.58,0,0,0,0,1,1.2,1.2,1]]],0,[0,3,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,4,1,5],[0,0,0,0],[-1,1,-1,2],[0,1,0,2]]

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -15255,6 +15255,7 @@ this._redMoney = t;
 gData.gameData.init_coin = !0;
 gData.gameData.init_wallet_redMoney = !0;
 mk.event.emit("refreshCoin");
+this._redMoney >= 3e5 && mk.guide.open(14);
 mk.data.setTAEventUser(0, "current_redmoney_stock", this._redMoney);
 },
 enumerable: !1,
@@ -15860,6 +15861,9 @@ this.node_showCash.active = !1;
 this.node_showRedMoney.active = !0;
 }
 gData.gameData.playerProp.orderData ? this.initOrderUI() : mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
+setTimeout(function() {
+mk.guide.open(14);
+}, 3e3);
 };
 e.prototype.start = function() {
 this.initMusic();
@@ -16575,11 +16579,12 @@ this.getOrderReward();
 e.prototype.getIsCanGetOrderReward = function() {
 return !this.isGray;
 };
-e.prototype.getOrderReward = function() {
+e.prototype.getOrderReward = function(t) {
+void 0 === t && (t = !0);
 return r(this, void 0, void 0, function() {
-var t, e, a;
-return s(this, function(o) {
-switch (o.label) {
+var e, a, o;
+return s(this, function(n) {
+switch (n.label) {
 case 0:
 if (2 != gData.gameData.orderRewardType) return [ 3, 2 ];
 if (cc.sys.isNative && !gData.loginData.isAuth) {
@@ -16590,35 +16595,37 @@ return [ 2 ];
 return [ 4, mk.http.sendData("orderTask/receiveRewardCash", {}) ];
 
 case 1:
-if (0 != (e = o.sent()).errcode) {
-if (405 == e.errcode) {
+if (0 != (a = n.sent()).errcode) {
+if (405 == a.errcode) {
 mk.tip.pop("今日提现额度已到上限，请明天再提现");
 mk.data.sendDataEvent(d.DataEventId.cashLimit, "提现触发上限");
 }
 return [ 2, null ];
 }
-a = gData.gameData.playerProp.orderData.cashMoney;
-gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
+o = gData.gameData.playerProp.orderData.cashMoney;
+gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
 gData.safeDepositBoxData.setCashRecordDataLength();
 gData.cashPro.isOrderCashOut = !0;
 gData.cashPro.callBack = this.getRewardCallBack.bind(this);
-gData.receiptNotice.receip_rmb = a;
+gData.receiptNotice.receip_rmb = o;
 mk.ui.openPanel("module/newNotice/newNotice");
+if (t) {
 this.node_crop.forEach(function(t) {
 t.active = !1;
 });
 this.node_orderHbIcon.active = !1;
 this.node_getOrderReward.node.active = !1;
+} else this.showRefreshLogic();
 return [ 3, 4 ];
 
 case 2:
-t = {};
-return [ 4, mk.http.sendData("orderTask/receiveReward", t) ];
+e = {};
+return [ 4, mk.http.sendData("orderTask/receiveReward", e) ];
 
 case 3:
-if (0 != (e = o.sent()).errcode) return [ 2, null ];
-a = gData.gameData.playerProp.orderData.redMoneyAddition;
-gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
+if (0 != (a = n.sent()).errcode) return [ 2, null ];
+o = gData.gameData.playerProp.orderData.redMoneyAddition;
+gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
 gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
 gData.reward.adData = {
 videoRedMoney: {
@@ -16627,15 +16634,17 @@ videoRewardList: null
 };
 gData.reward.adData.videoRedMoney.videoRewardList = [ {
 rewardType: 1,
-rewardNum: a
+rewardNum: o
 } ];
 mk.ui.openPanel("module/reward/reward");
+if (t) {
 this.node_crop.forEach(function(t) {
 t.active = !1;
 });
 this.node_orderHbIcon.active = !1;
 this.node_getOrderReward.node.active = !1;
-o.label = 4;
+} else this.showRefreshLogic();
+n.label = 4;
 
 case 4:
 return [ 2 ];
@@ -17989,6 +17998,7 @@ r.finger = s.finger;
 r.lag_next = parseFloat(s.lagNext);
 r.display_type = parseInt(s.trNum);
 r.continue = s.continue;
+r.isShowSkip = s.isShowSkip;
 if (o != r.id) {
 this.data.set(o, a);
 a = [];
@@ -18043,7 +18053,7 @@ this.setGuideID(this.crtGuideID++);
 return !0;
 };
 t.prototype.setGuideID = function(t) {
-if (13 == t) {
+if (14 == t) {
 t = 9999;
 mk.data.sendXYEvent("guide_end", "新手引导结束");
 }
@@ -18079,6 +18089,7 @@ value: !0
 a.default = function() {
 this.display_type = 0;
 this.continue = null;
+this.isShowSkip = null;
 };
 cc._RF.pop();
 }, {} ],
@@ -18376,6 +18387,7 @@ e.node_head = null;
 e.node_person = null;
 e.rich_dialog = null;
 e.rich_dialog1 = null;
+e.node_skip = null;
 e.widgets = [ "top", "bottom", "left", "right", "verticalCenter", "horizontalCenter" ];
 return e;
 }
@@ -18395,6 +18407,7 @@ this.crtStep++;
 this.crtGuide = this.guides[this.crtStep];
 mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
 this.updateGuide();
+"true" == this.crtGuide.isShowSkip ? this.node_skip.active = !0 : this.node_skip.active = !1;
 mk.data.sendDataEvent(c.DataEventId.guide, "新手引导第" + gData.guideData.crtID + "_" + this.crtStep + "步完成");
 };
 e.prototype.updateGuide = function() {
@@ -18633,6 +18646,10 @@ i([ u({
 type: cc.RichText,
 displayName: "对话内容1"
 }) ], e.prototype, "rich_dialog1", void 0);
+i([ u({
+type: cc.Node,
+displayName: "对话内容1"
+}) ], e.prototype, "node_skip", void 0);
 return i([ p ], e);
 }(cc.Component);
 a.default = d;
@@ -26977,7 +26994,7 @@ mk.audio.playEffect("button");
 mk.ui.closePanel(this.node.name);
 };
 e.prototype.clickGetOrderRewardBtn = function() {
-gData.gameData.gameStyle.getOrderReward();
+gData.gameData.gameStyle.getOrderReward(!1);
 };
 i([ p({
 type: cc.Label,

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1639395909295,
-    "genTime": 1639395909295,
+    "buildTime": 1639400880637,
+    "genTime": 1639400880637,
     "genVersion": null
 }