Procházet zdrojové kódy

修复授权后提现界面列表刷新看不到列表问题

kaka před 4 roky
rodič
revize
de59836f9a

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

+ 2 - 2
assets/script/game/data/module/RedBagCashData.ts

@@ -27,7 +27,7 @@ export class RedBagCashData extends Data {
             this.c_data = gData.gameData.configs.CashCfg;
             this.sortList();
             this.initState();
-            this.init_list = true;
+            // this.init_list = true;
         }
     }
     /** 标志位:初始化列表 */
@@ -43,7 +43,7 @@ export class RedBagCashData extends Data {
     /** 提现进度 */
     set cash_bar(value: number) {
         this._cash_bar = value;
-        this.init_list = true;
+        // this.init_list = true;
     }
     get cash_bar() {
         return this._cash_bar;

+ 11 - 9
assets/script/game/module/login/Login.ts

@@ -73,16 +73,18 @@ export default class Login extends cc.Component {
             return;
         }
 
-        if (gData.loginData.popIdentifySwitch) {
-            if (!this.hasCheckAnti) {
-                this.hasCheckAnti = true
-                // this.checkShowIdentification()
-                JsbSystem.ysdkInit();
-                JsbSystem.autologin();
-            }
+        if (!CC_DEBUG) {
+            if (gData.loginData.popIdentifySwitch) {
+                if (!this.hasCheckAnti) {
+                    this.hasCheckAnti = true
+                    // this.checkShowIdentification()
+                    JsbSystem.ysdkInit();
+                    JsbSystem.autologin();
+                }
 
-            if (!gData.loginData.passAnti) {
-                return
+                if (!gData.loginData.passAnti) {
+                    return
+                }
             }
         }
 

+ 3 - 3
assets/script/game/module/redBagCash/RedBagCashItem.ts

@@ -35,9 +35,9 @@ export default class RedBagCashItem extends cc.Component {
      * 初始化数据
      */
     public async setItemData(item_data) {
-        if (this.item_data == null && item_data.index == 1) {
-            mk.event.register("event_guide", this.clickGuide.bind, this);
-        }
+        // if (this.item_data == null && item_data.index == 1) {
+        //     mk.event.register("event_guide", this.clickGuide.bind, this);
+        // }
         await this.initStyle(item_data);
     }
 

binární
build/jsb-link/assets/main/index.jsc


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 3 - 3
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" />

+ 3 - 3
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" />

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/mz/wxapi/WXEntryActivity.java

@@ -175,7 +175,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         WXMediaMessage msg = new WXMediaMessage();
         msg.mediaObject = imgObj;
 
-        Bitmap thumbBmp = Bitmap.createScaledBitmap(bmp, 90, 200, true);
+        Bitmap thumbBmp = Bitmap.createScaledBitmap(bmp, 45, 100, true);
         bmp.recycle();
         msg.thumbData = bmpToByteArray(thumbBmp, true);
 

+ 15 - 4
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr.java

@@ -45,7 +45,7 @@ public class YSDKMgr {
     {
         Log.d("==[YSDKMgr", "init: ");
         // TODO GAME 防沉迷调试的日志,上线前需要关闭
-        YSDKApi.setAntiAddictLogEnable(true);
+        YSDKApi.setAntiAddictLogEnable(false);
 
         // 初始化
         YSDKApi.init(autoLoginByYSDK);
@@ -104,6 +104,11 @@ public class YSDKMgr {
         });
     }
 
+    public static void userLogout(){
+        YSDKApi.logout();
+        System.exit(0);
+    }
+
     // 防沉迷指令执行状态
     public static boolean mAntiAddictExecuteState = false;
     public static void limitNotify(AntiAddictRet ret)
@@ -123,6 +128,10 @@ public class YSDKMgr {
                                                     int whichButton) {
                                     //设置防沉迷指令执行状态为false
                                     mAntiAddictExecuteState = false;
+
+                                    if(modal == 1) {
+                                        userLogout();
+                                    }
                                 }
                             });
                     builder.setCancelable(false);
@@ -145,7 +154,9 @@ public class YSDKMgr {
                                     // 强制用户下线
                                     mAntiAddictExecuteState = false;
                                     //这边自定义处理逻辑
-                                    System.exit(0);
+                                    if(modal == 1) {
+                                        userLogout();
+                                    }
                                 }
                             });
                     builder.setCancelable(false);
@@ -175,8 +186,8 @@ public class YSDKMgr {
                     closeButton.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            if (modal == 1) {
-                                //这边自定义处理逻辑
+                            if(modal == 1) {
+                                userLogout();
                             }
                             popupWindow.dismiss();
                             mAntiAddictExecuteState = false;

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

@@ -11571,7 +11571,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, a = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -16169,7 +16169,6 @@ for (var e in t) t[e] = parseInt(t[e]);
 this.c_data = gData.gameData.configs.CashCfg;
 this.sortList();
 this.initState();
-this.init_list = !0;
 }
 };
 Object.defineProperty(e.prototype, "cash_bar", {
@@ -16178,7 +16177,6 @@ return this._cash_bar;
 },
 set: function(t) {
 this._cash_bar = t;
-this.init_list = !0;
 },
 enumerable: !1,
 configurable: !0
@@ -16452,7 +16450,6 @@ return r(this, void 0, void 0, function() {
 return c(this, function(e) {
 switch (e.label) {
 case 0:
-null == this.item_data && 1 == t.index && mk.event.register("event_guide", this.clickGuide.bind, this);
 return [ 4, this.initStyle(t) ];
 
 case 1:

+ 2 - 2
packages-hot-update/cfg.json

@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/"
     ],
-    "buildTime": 1632452618689,
-    "genTime": 1632452618689,
+    "buildTime": 1632459364921,
+    "genTime": 1632459364921,
     "genVersion": null
 }

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů