kaka hace 4 años
padre
commit
63aa3b0097

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 2 - 0
assets/script/game/data/LoginData.ts

@@ -253,6 +253,7 @@ export class LoginData {
         let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
             if (response.errcode == 403) {
+                console.log('block 403');
                 gData.warnTipData.setSolution(4);
             }
             return;
@@ -357,6 +358,7 @@ export class LoginData {
 
         console.log(`userChannel=========${index}`);
         console.log(`isMatched=========${this.isMatched}`);
+        console.log(`toponStr=========${this.toponStr}`);
         mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_qudaopipei', `${index}_${this.isMatched}`);
         if (isDoIdentify) {
 

+ 4 - 4
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js

@@ -52,7 +52,7 @@ var ATRewardVideoJS = cc.Class({
      * @param {*} placementId 广告位id
      */
     onRewardedVideoAdLoaded: function (placementId) {
-        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + placementId + ")");
+        console.log("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + placementId + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdLoaded(placementId);
     },
@@ -64,7 +64,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdFailed: function (placementId, errorInfo) {
-        ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        console.log("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdFailed(placementId, errorInfo);
     },
@@ -76,7 +76,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdPlayStart: function (placementId, callbackInfo) {
-        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
+        console.log("AnyThinkRewardedVideo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdPlayStart(placementId, callbackInfo);
     },
@@ -101,7 +101,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdPlayFailed: function (placementId, errorInfo, callbackInfo) {
-        // ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
+        console.log("===[AnyThinkRewardedVideo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdPlayFailed(placementId, errorInfo, callbackInfo);
     },

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

@@ -27,6 +27,9 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
     /**Topon 大插屏广告位 */
     public static topon_biginter_placementId = "b5f8fa77aa5262";
 
+    /**Topon 开屏广告位 */
+    public static topon_splash_placementId = "b60af42bba453f";
+
     /**初始化ATSDK */
     public async initSDK() {
         if (!cc.sys.isNative) {
@@ -79,7 +82,7 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
         ATSDKMgr.topon_rewardVideo_placementId = arr[2];
         ATSDKMgr.topon_inter_placementId = arr[3];
         ATSDKMgr.topon_native_placementId = arr[4];
-
+        ATSDKMgr.topon_splash_placementId = arr[5];
         ATSDKMgr.topon_banner_placementId = arr[6];
         if (arr[7]) {
             ATSDKMgr.topon_fullinter_placementId = arr[7];

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

@@ -1,4 +1,5 @@
 import { DataEventId } from "../../game/data/GameData";
+import ATSDKMgr from "../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr";
 
 /**
  * Jsb管理类(与安卓Java类或者IOS交互)
@@ -178,7 +179,7 @@ export default class JsbSystem {
     static showSplash() {
         // mk.data.sendDataEvent('slashAd', '开屏')
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            this.callStaticMethod(this._JSB_ANDROID_PATH, "showSplash", "()V");
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "showSplash", "(Ljava/lang/String;)V", ATSDKMgr.topon_splash_placementId);
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             jsb.reflection.callStaticMethod("GameConfig", "showSplash:", "");

+ 1 - 1
build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

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


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
build/jsb-link/assets/resources/config.json


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


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

@@ -1,4 +1,4 @@
-TF_CHANNEL="1";        //1 巨量 2 快手 3 广点通 5应用宝
+TF_CHANNEL="24";        //1 巨量 2 快手 3 广点通 5应用宝
 JL_AID="194376";       //巨量appid
 JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid

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

@@ -46,6 +46,8 @@ public class ThirdSdkMgr {
     //Cocos 对应与Java交互的脚本
     public static String cocosJsbMgrName = "window.JsbMgr.";
 
+    public static String splashID = "";
+
     //微信相关---------------------------------------------------------------------------------------
     /** 微信授权 */
     public static void WxAuth()
@@ -228,8 +230,9 @@ public class ThirdSdkMgr {
     }
 
     //显示开屏广告 ----------------------------------------------------------------------------------
-    public static void showSplash(){
+    public static void showSplash(String splash){
         Log.d("===[ThirdSdkMgr ","显示开屏广告");
+        ThirdSdkMgr.splashID = splash;
         ThirdSdkMgr.appActivity.startActivity(new Intent( ThirdSdkMgr.appActivity, SplashAdShowActivity.class));
     }
 

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

@@ -33,7 +33,8 @@ public class SplashAdShowActivity extends Activity implements ATSplashAdListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        unitId = BuildConfig.TOPON.split(",")[5];
+        unitId = ThirdSdkMgr.splashID;
+        Log.d("SplashAdShowActivity", "splashID: "+ThirdSdkMgr.splashID);
         setContentView(R.layout.splash_ad_show);
 
 //        String[] arr = BuildConfig.JL_TOPON.split(",");

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

@@ -1774,19 +1774,22 @@ checkAdStatus: function() {
 if (null != this.proxy) return ATRewardedVideoJSSDK.checkAdStatus(this.placementID());
 },
 onRewardedVideoAdLoaded: function(t) {
+console.log("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + t + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdLoaded(t);
 },
 onRewardedVideoAdFailed: function(t, e) {
-ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + t + ", " + e + ")");
+console.log("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + t + ", " + e + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdFailed(t, e);
 },
 onRewardedVideoAdPlayStart: function(t, e) {
+console.log("AnyThinkRewardedVideo::onRewardedVideoAdPlayStart(" + t + ", " + e + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdPlayStart(t, e);
 },
 onRewardedVideoAdPlayEnd: function(t, e) {
 null != this.proxy && this.proxy.onRewardedVideoAdPlayEnd(t, e);
 },
 onRewardedVideoAdPlayFailed: function(t, e, a) {
+console.log("===[AnyThinkRewardedVideo::onRewardedVideoAdPlayFailed(" + t + ", " + e + ", " + a + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdPlayFailed(t, e, a);
 },
 onRewardedVideoAdClosed: function(t, e) {
@@ -2378,6 +2381,7 @@ a.topon_android_appSecret = e[1];
 a.topon_rewardVideo_placementId = e[2];
 a.topon_inter_placementId = e[3];
 a.topon_native_placementId = e[4];
+a.topon_splash_placementId = e[5];
 a.topon_banner_placementId = e[6];
 e[7] && (a.topon_fullinter_placementId = e[7]);
 e[8] && (a.topon_biginter_placementId = e[8]);
@@ -2431,6 +2435,7 @@ e.topon_native_placementId = "b5f8fa77aa5262";
 e.topon_fullinter_placementId = "b6113813b876a1";
 e.topon_banner_placementId = "b5f8fa77aa5262";
 e.topon_biginter_placementId = "b5f8fa77aa5262";
+e.topon_splash_placementId = "b60af42bba453f";
 return a = i([ g ], e);
 }(p.zgSingleton));
 a.default = m;
@@ -18700,7 +18705,7 @@ return o;
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var n = t("../../game/data/GameData"), i = function() {
+var n = t("../../game/data/GameData"), i = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), r = function() {
 function t() {}
 t.isFileExist = function(t) {
 if (cc.sys.os == cc.sys.OS_WINDOWS) return !0;
@@ -18752,7 +18757,7 @@ cc.sys.os == cc.sys.OS_ANDROID ? t = this.callStaticMethod(this._JSB_ANDROID_PAT
 return t;
 };
 t.showSplash = function() {
-cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "showSplash", "()V") : cc.sys.os == cc.sys.OS_IOS && jsb.reflection.callStaticMethod("GameConfig", "showSplash:", "");
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "showSplash", "(Ljava/lang/String;)V", i.default.topon_splash_placementId) : cc.sys.os == cc.sys.OS_IOS && jsb.reflection.callStaticMethod("GameConfig", "showSplash:", "");
 };
 t.setClipboard = function(t) {
 if (cc.sys.os == cc.sys.OS_ANDROID) this.callStaticMethod(this._JSB_ANDROID_PATH, "setClipboard", "(Ljava/lang/String;)V", t); else if (cc.sys.os == cc.sys.OS_IOS) ; else if (cc.sys.isBrowser) {
@@ -18951,11 +18956,12 @@ t.singleClick = !0;
 t.splashADid = "";
 return t;
 }();
-a.default = i;
-window.JsbMgr = i;
+a.default = r;
+window.JsbMgr = r;
 cc._RF.pop();
 }, {
-"../../game/data/GameData": "GameData"
+"../../game/data/GameData": "GameData",
+"../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr": "ATSDKMgr"
 } ],
 LineUpUIData: [ function(t, e, a) {
 "use strict";
@@ -19763,7 +19769,10 @@ return [ 4, mk.http.sendRequest("checklogin", "POST", JSON.stringify(e)) ];
 
 case 1:
 if (0 != (a = n.sent()).errcode) {
-403 == a.errcode && gData.warnTipData.setSolution(4);
+if (403 == a.errcode) {
+console.log("block 403");
+gData.warnTipData.setSolution(4);
+}
 return [ 2 ];
 }
 o = null != gData.wechatData.code ? mk.encrypt.decrypt(a.encrypt, this.sessionKey, gData.appData.appId) : mk.encrypt.decrypt(a.encrypt, t, gData.appData.appId);
@@ -19872,6 +19881,7 @@ this.toponStr = a.data.strategyContent;
 mk.ad.init();
 console.log("userChannel=========" + o);
 console.log("isMatched=========" + this.isMatched);
+console.log("toponStr=========" + this.toponStr);
 mk.data.setTAEventUserStr(0, "kncdsf_zhubao_qudaopipei", o + "_" + this.isMatched);
 if (t) {
 switch (o) {

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

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1635995014972,
-    "genTime": 1635995014972,
+    "buildTime": 1636022874244,
+    "genTime": 1636022874244,
     "genVersion": null
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.4.zip


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio