kaka 4 лет назад
Родитель
Сommit
e7bbfa778f

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

@@ -111,16 +111,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
+                }
             }
         }
 

+ 1 - 1
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -87,7 +87,6 @@ export class ATRewardVideo extends zgSingleton {
         }
 
         let adStatus = this.checkAdStatus()
-        console.log('savePreLoadEcpm  0000 ', typeof adStatus)
         let json = JSON.parse(adStatus)
         let adInfo = JSON.parse(json.adInfo)
         let data = {
@@ -95,6 +94,7 @@ export class ATRewardVideo extends zgSingleton {
             adsource_id: adInfo.adsource_id,
             adsource_price: adInfo.adsource_price
         }
+        console.log('savePreLoadEcpm  data ', data)
 
         gData.adData.savePreLoadEcpm(data);
     }

+ 4 - 2
assets/script/mk/system/JsbSystem.ts

@@ -147,8 +147,10 @@ export default class JsbSystem {
         }
 
         if (CC_DEBUG) {
-            gData.appData.appId = "wx3c0cc2f730c5ad5a";
-            gData.appData.version = "1.0.0";
+            // gData.appData.appId = "wx3c0cc2f730c5ad5a";
+            // gData.appData.version = "1.0.0";
+            gData.appData.appId = "wx667751c00aad1686";
+            gData.appData.version = "1.1.1";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

BIN
build/jsb-link/assets/main/index.jsc


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.json


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

@@ -36,13 +36,14 @@ public class YSDKCallback implements UserListener, AntiAddictListener {
                 break;
             case eFlag.Login_NeedRegisterRealName:
                 // 未实名认证,需要进行实名认证
+
                 break;
             case eFlag.Login_User_Logout:
                 // 用户手动退出登录(用于用户游客体验模式下,提醒用户退出登录完成实名认证
+                YSDKMgr.showRealNameAlertDialog();
                 break;
             default:
                 // 显示登录界面
-                ThirdSdkMgr.ysdkAuthSuccess();
                 break;
         }
     }
@@ -106,6 +107,7 @@ public class YSDKCallback implements UserListener, AntiAddictListener {
                 case AntiAddictRet.RULE_GUEST:
                 default:
                     //处理防沉迷
+                    YSDKMgr.limitNotify(ret);
                     break;
             }
         }
@@ -125,6 +127,7 @@ public class YSDKCallback implements UserListener, AntiAddictListener {
                 case AntiAddictRet.RULE_GUEST:
                 default:
                     //处理防沉迷
+                    YSDKMgr.limitNotify(ret);
                     break;
             }
 

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

@@ -151,6 +151,7 @@ public class YSDKMgr {
                                     // 强制用户下线
                                     mAntiAddictExecuteState = false;
                                     //这边自定义处理逻辑
+                                    System.exit(0);
                                 }
                             });
                     builder.setCancelable(false);

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

@@ -1834,13 +1834,12 @@ if (this.ifLoadShow) {
 this.ifLoadShow = !1;
 this.showAd();
 }
-var t = this.checkAdStatus();
-console.log("savePreLoadEcpm  0000 ", typeof t);
-var e = JSON.parse(t), o = JSON.parse(e.adInfo), n = {
+var t = this.checkAdStatus(), e = JSON.parse(t), o = JSON.parse(e.adInfo), n = {
 network_placement_id: o.network_placement_id,
 adsource_id: o.adsource_id,
 adsource_price: o.adsource_price
 };
+console.log("savePreLoadEcpm  data ", n);
 gData.adData.savePreLoadEcpm(n);
 };
 e.prototype.onRewardedVideoAdFailed = function() {

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

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnly/baseRemote/"
     ],
-    "buildTime": 1632399523716,
-    "genTime": 1632399523716,
+    "buildTime": 1632445621265,
+    "genTime": 1632445621265,
     "genVersion": null
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов