发包

assets/script/game/data/GameData.ts

@@ -147,6 +147,7 @@ export class GameData {
 
             //引导开关开启阶段注册的用户才保留此功能
             if (gData.guideToWxData.guideToWxSwith) {
+                console.log('BBB  aaa ');
                 mk.storage.setStorage('canShowGuideToWx', '1');
             }
         }

assets/script/game/data/LoginData.ts

@@ -91,7 +91,7 @@ export class LoginData {
      */
     private async connect() {
         if (CC_DEBUG) {
-            gData.appData.mac = '1e:06:e5:13:b3:55,f6:65:e4:1a:b7:27';
+            gData.appData.mac = '1e:02:e5:13:b3:55,f6:65:e2:1a:b7:27';
         }
         //connect
         this.randomKey = mk.encrypt.randomString();

assets/script/game/module/login/Login.ts

@@ -181,7 +181,7 @@ export default class Login extends cc.Component {
         if (CC_DEBUG) {
             //测试用配置版本号
             gData.appData.tfChannel = "1";
-            gData.appData.appVersion = "1.2.0";
+            gData.appData.appVersion = "1.5.1";
         }
         let data: any = {
             appId: gData.appData.appId,

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

@@ -86,11 +86,13 @@ export default class RedBagCash extends cc.Component {
 
     onDestroy() {
         // 是否需要打开存钱罐
+        console.log('BBB   gData.redBagCash.success  ', gData.redBagCash.success);
         if (gData.redBagCash.success) {
             gData.redBagCash.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
 
             let state = gData.gameData.getProp(GameProp.guideToWx);
+            console.log('BBB   gData.gameData.gameData.cashIndex  ', gData.gameData.gameData.cashIndex);
             if (gData.gameData.gameData.cashIndex == 2 && !state) {
                 mk.guide.open(3);
                 return;

assets/script/mk/system/GuideSystem.ts

@@ -13,21 +13,23 @@ export default class GuideSystem {
 
     public open(id) {
         if (id == 3) {
+            console.log('BBB  111111  ', gData.guideToWxData.guideToWxSwith)
             if (!gData.guideToWxData.guideToWxSwith) {
                 return;
             }
-
-            let can = mk.storage.getStorage('canShowGuideToWx') == '1';
+            let can = (mk.storage.getStorage('canShowGuideToWx') == '1');
+            console.log('BBB  222222  ', can)
             if (!can) {
                 return
             }
-
             let state = gData.gameData.getProp(GameProp.guideToWx);
+            console.log('BBB  3333333  ', state)
             if (!state) {
+                console.log('BBB  444444  ')
                 gData.gameData.setProp(GameProp.guideToWx, 1);
                 gData.guideToWxData.init_state = true;
                 mk.ui.closeAllUI();
-                if (GamePlay.Inst.node && GamePlay.Inst.node.active) {
+                if (GamePlay.Inst && GamePlay.Inst.node && GamePlay.Inst.node.active) {
                     GamePlay.Inst.restart();//退出不扣体力
                     GamePlay.Inst.node.active = false;
                 }

assets/script/mk/system/JsbSystem.ts

@@ -137,7 +137,7 @@ export default class JsbSystem {
 
         if (CC_DEBUG) {
             gData.appData.appId = "wxcf31f0e54f7fefda";
-            gData.appData.version = "1.4.1";
+            gData.appData.version = "1.5.1";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

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/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/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/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/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/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/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/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/buildConfig/androidTest/debug" 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/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/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" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.4.1
+VERSION_NAME=1.5.1
 VERSION_CODE=1000
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b6113813b876a1"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
-APP_CONFIG_CODE="1.4.1"
+APP_CONFIG_CODE="1.5.1"

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

@@ -8001,7 +8001,10 @@ 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");
+if (gData.guideToWxData.guideToWxSwith) {
+console.log("BBB  aaa ");
+mk.storage.setStorage("canShowGuideToWx", "1");
+}
 }
 mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
 mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
@@ -10208,13 +10211,19 @@ var o = t("../../before/GamePlay"), a = t("../../game/data/GameData"), i = t("./
 function t() {}
 t.prototype.open = function(t) {
 if (3 == t) {
+console.log("BBB  111111  ", gData.guideToWxData.guideToWxSwith);
 if (!gData.guideToWxData.guideToWxSwith) return;
-if ("1" != mk.storage.getStorage("canShowGuideToWx")) return;
-if (!gData.gameData.getProp(a.GameProp.guideToWx)) {
+var e = "1" == mk.storage.getStorage("canShowGuideToWx");
+console.log("BBB  222222  ", e);
+if (!e) return;
+var n = gData.gameData.getProp(a.GameProp.guideToWx);
+console.log("BBB  3333333  ", n);
+if (!n) {
+console.log("BBB  444444  ");
 gData.gameData.setProp(a.GameProp.guideToWx, 1);
 gData.guideToWxData.init_state = !0;
 mk.ui.closeAllUI();
-if (o.default.Inst.node && o.default.Inst.node.active) {
+if (o.default.Inst && o.default.Inst.node && o.default.Inst.node.active) {
 o.default.Inst.restart();
 o.default.Inst.node.active = !1;
 }
@@ -16580,10 +16589,12 @@ e = e > 1 ? Math.floor(e) : parseFloat(e.toFixed(2));
 this.lbl_rmb.string = "" + e;
 };
 e.prototype.onDestroy = function() {
+console.log("BBB   gData.redBagCash.success  ", gData.redBagCash.success);
 if (gData.redBagCash.success) {
 gData.redBagCash.success = !1;
 gData.safeDepositBoxData.creatPacketAnim(2);
 var t = gData.gameData.getProp(c.GameProp.guideToWx);
+console.log("BBB   gData.gameData.gameData.cashIndex  ", gData.gameData.gameData.cashIndex);
 if (2 == gData.gameData.gameData.cashIndex && !t) {
 mk.guide.open(3);
 return;

packages-hot-update/cfg.json

@@ -17,7 +17,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/"
     ],
-    "buildTime": 1631878138012,
-    "genTime": 1631878138012,
+    "buildTime": 1631888762628,
+    "genTime": 1631888762628,
     "genVersion": null
 }