发包

assets/resources/data/guide_data.json

@@ -150,7 +150,7 @@
 		"dialog": "<color=476175>点击即可提现！</color>",
 		"displayRect": "",
 		"clickRect": "界面层/game/功能按钮/右侧按钮/引导到微信",
-		"finger": "0:0",
+		"finger": "50:20",
 		"lagNext": "1"
 	},
 	{

assets/resources/module/guideToWx/texture/加我送钱icon.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 106,
-  "height": 93,
+  "width": 117,
+  "height": 109,
   "platformSettings": {},
   "subMetas": {
     "加我送钱icon": {
@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "trimX": 5,
+      "trimY": 3,
       "width": 106,
-      "height": 93,
-      "rawWidth": 106,
-      "rawHeight": 93,
+      "height": 103,
+      "rawWidth": 117,
+      "rawHeight": 109,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/version.manifest"}

assets/script/game/data/GameData.ts

@@ -102,8 +102,7 @@ export class GameData {
         gData.loginData.popIdentifySwitch = this.configs.ServerConfig.popIdentifySwitch == '1';
         gData.guideToWxData.guideToWxSwith = this.configs.ServerConfig.guideToWxSwith == '1';
         gData.guideToWxData.money = this.configs.ServerConfig.addfriendmoney;
-        gData.guideToWxData.ghId = this.configs.ServerConfig.ghId;
-        gData.guideToWxData.ghIdPath = this.configs.ServerConfig.ghIdPath;
+        gData.guideToWxData.setGhId();
     }
 
     /**
@@ -145,6 +144,11 @@ export class GameData {
             mk.data.setTAEventUserStr(0, 'xy_uid', gData.loginData.uin);
             //注册时版本号
             mk.data.setTAEventUserStr(0, 'regtime_app_id', gData.appData.appVersion);
+
+            //引导开关开启阶段注册的用户才保留此功能
+            if (gData.guideToWxData.guideToWxSwith) {
+                mk.storage.setStorage('canShowGuideToWx', '1');
+            }
         }
 
         //当前版本号

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

@@ -1,3 +1,5 @@
+import Util from "../../../before/util/Util";
+
 /** 引导到微信数据类 */
 const { ccclass } = cc._decorator;
 
@@ -20,6 +22,40 @@ export default class GuideToWxData {
             mk.ui.openPanel('module/guideToWx/guideToWx');
         }
     }
+
+    setGhId() {
+        let arr = gData.gameData.configs.ServerConfig.ghId.split(';');
+        let localId = mk.storage.getStorage('ghId');
+        let len = arr.length;
+        let ghArr = null;
+        if (!localId) {
+            let index = Util.rnd(0, len - 1);
+            ghArr = arr[index].split(',');
+            gData.guideToWxData.ghId = ghArr[0];
+            gData.guideToWxData.ghIdPath = ghArr[1];
+            mk.storage.setStorage('ghId', gData.guideToWxData.ghId);
+        }
+        else {
+            let has = false;
+            for (let i = 0; i < len; i++) {
+                ghArr = arr[i].split(',');
+                if (ghArr[0] == localId) {
+                    gData.guideToWxData.ghId = ghArr[0];
+                    gData.guideToWxData.ghIdPath = ghArr[1];
+                    has = true;
+                    break;
+                }
+            }
+
+            if (!has) {
+                let index = Util.rnd(0, len - 1);
+                ghArr = arr[index].split(',');
+                gData.guideToWxData.ghId = ghArr[0];
+                gData.guideToWxData.ghIdPath = ghArr[1];
+                mk.storage.setStorage('ghId', gData.guideToWxData.ghId);
+            }
+        }
+    }
 }
 
 export enum GuideState {

assets/script/game/game/FunBtns.ts

@@ -33,7 +33,7 @@ export default class FunBtns extends cc.Component {
         gData.gameData.funBtns = this;
     }
 
-    start() {
+    onEnable() {
         this.init()
     }
 

assets/script/game/game/Game.ts

@@ -72,9 +72,6 @@ export default class Game extends cc.Component {
         this.runGuideWeak();
 
         mk.guide.open(1);
-        // //test
-        // gData.gameData.setProp(GameProp.guideID, 1);
-        // mk.guide.open(3);
 
 
         // // 测试代码
@@ -296,6 +293,7 @@ export default class Game extends cc.Component {
         if (!state) {
             mk.storage.setStorage('onClickGuideToWx', 1);
             mk.data.sendDataEvent(DataEventId.button_click, "加我送钱icon");
+            mk.data.sendXYEvent('onClickGuideToWx', '加我送钱');
         }
     }
 }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -357,12 +357,6 @@ export default class BlessingBag extends cc.Component {
 
     /** 点击关闭 */
     onClickClose() {
-        if (this.isSuccess) {
-            this.isSuccess = false;
-            mk.guide.open(3);
-        }
-        else {
-            mk.ad.checkShowInterByChance();
-        }
+        mk.ad.checkShowInterByChance();
     }
 }

assets/script/game/module/cashPro/CashPro.ts

@@ -136,7 +136,6 @@ export default class CashPro extends cc.Component {
             this.success = false;
             gData.safeDepositBoxData.creatPacketAnim(1);
             mk.ui.closeAllUI();
-            mk.guide.open(3);
         }
     }
 }

assets/script/game/module/guideToWx/GuideToWx.ts

@@ -199,6 +199,13 @@ export default class GuideToWx extends cc.Component {
             this.lastTimeSpan = Date.now();
             mk.console.logSingle('GuideToWx lastTimeSpan  ', this.lastTimeSpan);
             JsbSystem.WXLaunchMiniProgram(gData.guideToWxData.ghId, gData.guideToWxData.ghIdPath);
+
+            let value = mk.storage.getStorage('addServer')
+            if (!value) {
+                mk.storage.setStorage('addServer', 1);
+                mk.data.sendDataEvent(DataEventId.guideToWx, `添加客服`);
+                mk.data.sendXYEvent('addService', '添加客服');
+            }
         }
         else if (gData.guideToWxData.guideState == GuideState.canGetMoney) {
             let response = await mk.http.sendData('customerServiceCash', {});

assets/script/game/module/pigBank/PigBank.ts

@@ -135,7 +135,6 @@ export default class PigBank extends cc.Component {
         if (gData.pigbank.success) {
             gData.pigbank.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
-            mk.guide.open(3);
         }
     }
 }

assets/script/game/module/redBagCash/RedBagCash.ts

@@ -91,7 +91,7 @@ export default class RedBagCash extends cc.Component {
             gData.safeDepositBoxData.creatPacketAnim(2);
 
             let state = gData.gameData.getProp(GameProp.guideToWx);
-            if (!state) {
+            if (gData.gameData.gameData.cashIndex == 2 && !state) {
                 mk.guide.open(3);
                 return;
             }

assets/script/game/module/safeDepositBox/MoneySaveItem.ts

@@ -34,7 +34,14 @@ export default class MoneySaveItem extends cc.Component {
 
     nodePos = [cc.v3(54, -63), cc.v3(313, 57), cc.v3(572, -67), cc.v3(862, -67)]
 
+    hasClick = false;
+
     init(data, tixian, callback: Function, index) {
+        if (this.hasClick) {
+            return
+        }
+
+        this.hasClick = true;
         this.callback = callback
         this.tixian = tixian
         this.data = data
@@ -107,6 +114,7 @@ export default class MoneySaveItem extends cc.Component {
         this.node.getChildByName("Hand").active = false
         if (this.callback) {
             this.callback(this.data, this.node)
+            this.hasClick = false;
         }
     }
 }

assets/script/game/module/sign/Sign.ts

@@ -132,7 +132,6 @@ export default class Sign extends cc.Component {
         if (gData.sign.success) {
             gData.sign.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
-            showGuide = mk.guide.open(3);
         }
 
         if (!showGuide) {

assets/script/mk/system/GuideSystem.ts

@@ -17,6 +17,11 @@ export default class GuideSystem {
                 return;
             }
 
+            let can = mk.storage.getStorage('canShowGuideToWx') == '1';
+            if (!can) {
+                return
+            }
+
             let state = gData.gameData.getProp(GameProp.guideToWx);
             if (!state) {
                 gData.gameData.setProp(GameProp.guideToWx, 1);

build/jsb-link/assets/resources/import/d8/d8e27dcf-f1ab-491f-9936-9115de704fd8.json

@@ -1 +1 @@
-[1,["eccMVhxI1CObDxDZn5374P"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"加我送钱icon","rect":[0,0,106,93],"offset":[0,0],"originalSize":[106,93],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["eccMVhxI1CObDxDZn5374P"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"加我送钱icon","rect":[5,3,106,103],"offset":[-0.5,0],"originalSize":[117,109],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/version.manifest"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -299,7 +299,7 @@
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -25,6 +25,7 @@
 
     <application
         android:name="org.cocos2dx.javascript.thirdSdk.umeng.MyApplication"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:usesCleartextTraffic="true"

build/jsb-link/frameworks/runtime-src/proj.android-studio/res/xml/network_security_config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>

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

@@ -3962,10 +3962,7 @@ console.log("--\x3eInput：", this.inputBox.string);
 gData.blessingBag.adsource_id_value = this.inputBox.string;
 };
 e.prototype.onClickClose = function() {
-if (this.isSuccess) {
-this.isSuccess = !1;
-mk.guide.open(3);
-} else mk.ad.checkShowInterByChance();
+mk.ad.checkShowInterByChance();
 };
 i([ f(cc.Label) ], e.prototype, "txtBigNum", void 0);
 i([ f(cc.Label) ], e.prototype, "txtAddEft", void 0);
@@ -5515,7 +5512,6 @@ if (this.success) {
 this.success = !1;
 gData.safeDepositBoxData.creatPacketAnim(1);
 mk.ui.closeAllUI();
-mk.guide.open(3);
 }
 };
 i([ s(cc.Node) ], e.prototype, "loadPart", void 0);
@@ -7544,7 +7540,7 @@ return e;
 e.prototype.onLoad = function() {
 gData.gameData.funBtns = this;
 };
-e.prototype.start = function() {
+e.prototype.onEnable = function() {
 this.init();
 };
 e.prototype.init = function() {
@@ -7975,8 +7971,7 @@ gData.safeDepositBoxData.richBankConfig = this.configs.RichBankTaskCfg;
 gData.loginData.popIdentifySwitch = "1" == this.configs.ServerConfig.popIdentifySwitch;
 gData.guideToWxData.guideToWxSwith = "1" == this.configs.ServerConfig.guideToWxSwith;
 gData.guideToWxData.money = this.configs.ServerConfig.addfriendmoney;
-gData.guideToWxData.ghId = this.configs.ServerConfig.ghId;
-gData.guideToWxData.ghIdPath = this.configs.ServerConfig.ghIdPath;
+gData.guideToWxData.setGhId();
 };
 t.prototype.initPlayerProp = function(t) {
 this.gameData = new c();
@@ -8006,6 +8001,7 @@ mk.data.setTAEventRegister();
 mk.data.sendDataEvent("ABTest", "触发" + this.gameData.groupCode + "方案");
 mk.data.setTAEventUserStr(0, "xy_uid", gData.loginData.uin);
 mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
+gData.guideToWxData.guideToWxSwith && mk.storage.setStorage("canShowGuideToWx", "1");
 }
 mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
 mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
@@ -9663,6 +9659,7 @@ e.prototype.onClickGuideToWx = function() {
 if (!mk.storage.getStorage("onClickGuideToWx")) {
 mk.storage.setStorage("onClickGuideToWx", 1);
 mk.data.sendDataEvent(u.DataEventId.button_click, "加我送钱icon");
+mk.data.sendXYEvent("onClickGuideToWx", "加我送钱");
 }
 };
 i([ f({
@@ -10212,6 +10209,7 @@ function t() {}
 t.prototype.open = function(t) {
 if (3 == t) {
 if (!gData.guideToWxData.guideToWxSwith) return;
+if ("1" != mk.storage.getStorage("canShowGuideToWx")) return;
 if (!gData.gameData.getProp(a.GameProp.guideToWx)) {
 gData.gameData.setProp(a.GameProp.guideToWx, 1);
 gData.guideToWxData.init_state = !0;
@@ -10275,7 +10273,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.GuideState = void 0;
-var a, i = cc._decorator.ccclass, r = function() {
+var a, i = t("../../../before/util/Util"), r = cc._decorator.ccclass, c = function() {
 function t() {
 this.guideToWxSwith = !1;
 this.guideState = a.none;
@@ -10287,9 +10285,31 @@ this.init_state = !1;
 t.prototype.checkPop = function() {
 this.guideToWxSwith && this.guideState < a.gotMoney && mk.ui.openPanel("module/guideToWx/guideToWx");
 };
-return o([ i ], t);
+t.prototype.setGhId = function() {
+var t = gData.gameData.configs.ServerConfig.ghId.split(";"), e = mk.storage.getStorage("ghId"), n = t.length, o = null;
+if (e) {
+for (var a = !1, r = 0; r < n; r++) if ((o = t[r].split(","))[0] == e) {
+gData.guideToWxData.ghId = o[0];
+gData.guideToWxData.ghIdPath = o[1];
+a = !0;
+break;
+}
+if (!a) {
+o = t[i.default.rnd(0, n - 1)].split(",");
+gData.guideToWxData.ghId = o[0];
+gData.guideToWxData.ghIdPath = o[1];
+mk.storage.setStorage("ghId", gData.guideToWxData.ghId);
+}
+} else {
+o = t[i.default.rnd(0, n - 1)].split(",");
+gData.guideToWxData.ghId = o[0];
+gData.guideToWxData.ghIdPath = o[1];
+mk.storage.setStorage("ghId", gData.guideToWxData.ghId);
+}
+};
+return o([ r ], t);
 }();
-n.default = r;
+n.default = c;
 (function(t) {
 t[t.none = 0] = "none";
 t[t.addService = 1] = "addService";
@@ -10299,7 +10319,9 @@ t[t.canGetMoney = 4] = "canGetMoney";
 t[t.gotMoney = 5] = "gotMoney";
 })(a = n.GuideState || (n.GuideState = {}));
 cc._RF.pop();
-}, {} ],
+}, {
+"../../../before/util/Util": "Util"
+} ],
 GuideToWx: [ function(t, e, n) {
 "use strict";
 cc._RF.push(e, "af1f2INZbBBKrxGtge7v0v1", "GuideToWx");
@@ -10628,6 +10650,11 @@ if (gData.guideToWxData.guideState != u.GuideState.none && gData.guideToWxData.g
 this.lastTimeSpan = Date.now();
 mk.console.logSingle("GuideToWx lastTimeSpan  ", this.lastTimeSpan);
 s.default.WXLaunchMiniProgram(gData.guideToWxData.ghId, gData.guideToWxData.ghIdPath);
+if (!mk.storage.getStorage("addServer")) {
+mk.storage.setStorage("addServer", 1);
+mk.data.sendDataEvent(l.DataEventId.guideToWx, "添加客服");
+mk.data.sendXYEvent("addService", "添加客服");
+}
 return [ 3, 4 ];
 
 case 1:
@@ -13480,10 +13507,13 @@ e.sourceType = null;
 e.yuanlabel = null;
 e.callback = null;
 e.nodePos = [ cc.v3(54, -63), cc.v3(313, 57), cc.v3(572, -67), cc.v3(862, -67) ];
+e.hasClick = !1;
 return e;
 }
 e.prototype.init = function(t, e, n, o) {
 var a = this;
+if (!this.hasClick) {
+this.hasClick = !0;
 this.callback = n;
 this.tixian = e;
 this.data = t;
@@ -13531,11 +13561,15 @@ var s = Math.random();
 this.scheduleOnce(function() {
 a.node.runAction(cc.repeatForever(cc.sequence(cc.moveTo(1.5, cc.v2(a.node.x, c - 5)), cc.moveTo(1.2, cc.v2(a.node.x, a.node.y + 5)))));
 }, s);
+}
 };
 e.prototype.clickAdd = function() {
 this.unscheduleAllCallbacks();
 this.node.getChildByName("Hand").active = !1;
-this.callback && this.callback(this.data, this.node);
+if (this.callback) {
+this.callback(this.data, this.node);
+this.hasClick = !1;
+}
 };
 i([ s(cc.Label) ], e.prototype, "labDes", void 0);
 i([ s(cc.Label) ], e.prototype, "labTime", void 0);
@@ -15345,7 +15379,6 @@ e.prototype.onDisable = function() {
 if (gData.pigbank.success) {
 gData.pigbank.success = !1;
 gData.safeDepositBoxData.creatPacketAnim(2);
-mk.guide.open(3);
 }
 };
 i([ d({
@@ -16550,7 +16583,8 @@ e.prototype.onDestroy = function() {
 if (gData.redBagCash.success) {
 gData.redBagCash.success = !1;
 gData.safeDepositBoxData.creatPacketAnim(2);
-if (!gData.gameData.getProp(c.GameProp.guideToWx)) {
+var t = gData.gameData.getProp(c.GameProp.guideToWx);
+if (2 == gData.gameData.gameData.cashIndex && !t) {
 mk.guide.open(3);
 return;
 }
@@ -20735,13 +20769,11 @@ mk.ad.destroyNativeAd();
 mk.ad.checkShowInterByChance();
 };
 e.prototype.onDisable = function() {
-var t = !1;
 if (gData.sign.success) {
 gData.sign.success = !1;
 gData.safeDepositBoxData.creatPacketAnim(2);
-t = mk.guide.open(3);
 }
-if (!t && 1 === gData.gameData.getProp(u.GameProp.isAutoOpenPanel)) {
+if (1 === gData.gameData.getProp(u.GameProp.isAutoOpenPanel)) {
 gData.guideToWxData.checkPop();
 gData.gameData.setProp(u.GameProp.isAutoOpenPanel, 2);
 }

packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
-    "version": "1.0.5",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/",
+    "version": "1.0.6",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
     "resourceRootDir": "D:\\copy\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -14,9 +14,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/"
     ],
-    "buildTime": 1631368862997,
-    "genTime": 1631368862997,
+    "buildTime": 1631878138012,
+    "genTime": 1631878138012,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/version.manifest"}

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1631175182191,
+  "last-module-event-record-time": 1631870543605,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }