升级topon sdk 到 5.7.65

assets/script/game/data/GameData.ts

@@ -139,7 +139,7 @@ export class GameData {
         //当前版本号
         mk.data.setTAEventUserStr(0, 'now_app_id', gData.appData.appVersion);
         //渠道号
-        mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.tfChannel);
+        mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.umengChannel);
     }
 
     /**

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

@@ -23,6 +23,8 @@ export default class Login extends cc.Component {
     /** 热更脚本（onLoad应先于Login） */
     public hotUpdatePanel: HotUpdatePanel = null;
 
+    private hasDeviceBackInit = false;
+
     onLoad() {
         this.setProgress(0);
     }
@@ -44,8 +46,12 @@ export default class Login extends cc.Component {
     }
 
     update() {
-        if (gData.appData.getDeviceInfoCompelete) {
-            gData.appData.getDeviceInfoCompelete = false;
+        if (!gData.appData.getDeviceInfoCompelete) {
+            return
+        }
+
+        if (!this.hasDeviceBackInit) {
+            this.hasDeviceBackInit = true;
             this.getDeviceInfoBack();
         }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -138,7 +138,7 @@ export default class ATInterstitial extends zgSingleton {
             id = 11
         }
         else if (type == 1) {
-            mk.tip.pop('拉取全屏视频失败，请稍后再试');
+            // mk.tip.pop('拉取全屏视频失败，请稍后再试');
             id = 10
         }
         gData.adData.updateADLog(id, placementId);

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

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/source/buildConfig/debug" 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/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/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/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" />
@@ -283,19 +283,17 @@
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_core.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_interstitial.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_native.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_baidu.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_gdt.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_kuaishou.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_pangle_china.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_sigmob.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_rewardvideo.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_splash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.1.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.351.1221.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.9-publishRelease-4ea04e00c.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.5.0.8.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.390.1260.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.13-publishRelease-c0f57ba52.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.8.0.6.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-2.25.2.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.3.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/thinkingdata/ThinkingSDK.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />

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

@@ -5,7 +5,7 @@ KS_AID="67132";        //快手appid
 KS_ANAME="EasyEliminate";      //快手appname
 KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="60c17c51e044530ff09f30a3"; //友盟appid
-UM_CHANNEL="ttaxx_juliang"; //友盟渠道
+UM_CHANNEL="qsllx_zhubao_juliang"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -19,6 +19,7 @@ import com.anythink.core.api.ATMediationRequestInfo;
 import com.anythink.core.api.AdError;
 import com.anythink.splashad.api.ATSplashAd;
 import com.anythink.splashad.api.ATSplashAdListener;
+import com.anythink.splashad.api.IATSplashEyeAd;
 import com.aries.qsllx.mz.BuildConfig;
 import com.aries.qsllx.mz.R;
 
@@ -141,8 +142,8 @@ public class SplashAdShowActivity extends FragmentActivity implements ATSplashAd
     }
 
     @Override
-//  public void onAdDismiss(ATAdInfo atAdInfo, IATSplashEyeAd splashEyeAd) {//v5.7.47开始，请使用此回调
-    public void onAdDismiss(ATAdInfo atAdInfo) {//低于v5.7.47，请使用此回调
+  public void onAdDismiss(ATAdInfo atAdInfo, IATSplashEyeAd splashEyeAd) {//v5.7.47开始，请使用此回调
+//    public void onAdDismiss(ATAdInfo atAdInfo) {//低于v5.7.47，请使用此回调
         jumpToMainActivity();
     }
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -2,6 +2,8 @@ package org.cocos2dx.javascript.thirdSdk.thinkingdata;
 
 import android.util.Log;
 
+import com.aries.qsllx.mz.BuildConfig;
+
 import org.cocos2dx.javascript.AppActivity;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -44,6 +46,17 @@ public class TDSDKMgr {
         TDSDKMgr.getInstance().setTAEventRegister();
     }
 
+    public void sendSuperRole(){
+        try {
+            JSONObject superProperties = new JSONObject();
+            superProperties.put("device_id", TDInstance.getDeviceId());
+
+            TDInstance.setSuperProperties(superProperties);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void setTAEvent(String eventID, String des) {
         if (this.TDInstance == null) {
             return;
@@ -115,6 +128,8 @@ public class TDSDKMgr {
                 e.printStackTrace();
             }
         }
+
+        this.sendSuperRole();
     }
 
     /**

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

@@ -660,12 +660,20 @@ if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_fullinter_placementId;
 if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_fullinter_placementId;
 }
 };
+e.prototype.checkPlacementIDType = function(t) {
+if (cc.sys.os === cc.sys.OS_IOS) {
+if (t == c.default.topon_inter_placementId) return 0;
+if (t == c.default.topon_fullinter_placementId) return 1;
+} else if (cc.sys.os === cc.sys.OS_ANDROID) {
+if (t == c.default.topon_inter_placementId) return 0;
+if (t == c.default.topon_fullinter_placementId) return 1;
+}
+};
 e.prototype.hasAdReady = function() {
 return this.ATInterstitialJS.hasAdReady();
 };
 e.prototype.loadInter = function(t, e) {
 void 0 === e && (e = !1);
-this.interAdType = t;
 this.ifLoadShow = e;
 this.interAdState = a.Loading;
 this.ATInterstitialJS.loadInter(t);
@@ -679,31 +687,33 @@ this.ATInterstitialJS.showInter(t);
 } else this.interAdState == a.Loading ? this.ifLoadShow = !0 : this.loadInter(t, !0);
 }
 };
-e.prototype.onInterstitialAdLoaded = function() {
+e.prototype.onInterstitialAdLoaded = function(t) {
 this.interAdState = a.LoadSuccess;
-this.ifLoadShow && this.showInter(this.interAdType);
+if (this.ifLoadShow) {
+var e = this.checkPlacementIDType(t);
+this.showInter(e);
+}
 };
 e.prototype.onInterstitialAdLoadFail = function(t) {
 this.interAdState = a.LoadFail;
-if (1 == this.interAdType) {
-mk.tip.pop("拉取全屏视频失败，请稍后再试");
-gData.adData.updateADLog(10, t);
-} else 0 == this.interAdType && gData.adData.updateADLog(11, t);
+var e = 11, n = this.checkPlacementIDType(t);
+0 == n ? e = 11 : 1 == n && (e = 10);
+gData.adData.updateADLog(e, t);
 };
 e.prototype.onInterstitialAdShow = function(t, e) {
 this.interAdState = a.Show;
-var n = JSON.parse(e), o = 2;
-0 == this.interAdType ? o = 2 : 1 == this.interAdType && (o = 9);
+var n = JSON.parse(e), o = 2, i = this.checkPlacementIDType(t);
+0 == i ? o = 2 : 1 == i && (o = 9);
 gData.adData.updateADLog(o, t, n);
 };
 e.prototype.onInterstitialAdClick = function() {};
 e.prototype.onInterstitialAdClose = function(t, e) {
 this.interAdState = a.Close;
-this.loadInter(this.interAdType);
-if (1 == this.interAdType) {
+if (1 == this.checkPlacementIDType(t)) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(8, t, n);
-}
+this.loadInter(1);
+} else this.loadInter(0);
 };
 return e;
 }(r.zgSingleton);
@@ -7565,7 +7575,7 @@ mk.data.setTAEventUserStr(0, "xy_uid", gData.loginData.uin);
 mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
 }
 mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
-mk.data.setTAEventUserStr(0, "channel_id", gData.appData.tfChannel);
+mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
 };
 t.prototype.setProp = function(t, e) {
 return o(this, void 0, void 0, function() {
@@ -11212,7 +11222,7 @@ value: !0
 n.LogTagColor = void 0;
 var i, a = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -11827,6 +11837,7 @@ e.lbl_server = null;
 e.lbl_privacy = null;
 e.process = 0;
 e.hotUpdatePanel = null;
+e.hasDeviceBackInit = !1;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -11840,7 +11851,8 @@ this.init();
 };
 e.prototype.update = function() {
 if (gData.appData.getDeviceInfoCompelete) {
-gData.appData.getDeviceInfoCompelete = !1;
+if (!this.hasDeviceBackInit) {
+this.hasDeviceBackInit = !0;
 this.getDeviceInfoBack();
 }
 if (gData.appData.updateState == p.UpdateState.ForceUpdateFinish) {
@@ -11874,6 +11886,7 @@ gData.gameData.dataFinish = !1;
 this.lbl_progress.string = "正在更新中,请耐心等待";
 this.bar.setProgress(gData.appData.updatePercent);
 }
+}
 };
 e.prototype.setProgress = function(t) {
 this.bar.setProgress(t);

packages-hot-update/cfg.json

@@ -13,7 +13,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/"
     ],
-    "buildTime": 1628841361337,
-    "genTime": 1628841361337,
+    "buildTime": 1629102868391,
+    "genTime": 1629102868391,
     "genVersion": null
 }