kaka 4 年之前
父節點
當前提交
01920f49cc

文件差異過大導致無法顯示
+ 0 - 0
assets/resources/module/login/hot/project.manifest


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

@@ -1,3 +1,4 @@
+import { DataEventId } from "../../../../../game/data/GameData";
 import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 

二進制
build/jsb-link/assets/main/index.jsc


文件差異過大導致無法顯示
+ 0 - 0
build/jsb-link/assets/resources/config.json


文件差異過大導致無法顯示
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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


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

+ 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/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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/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/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" />

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

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wx567b90447250bb4b"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u8f7b\u677e\u8fde\u8fde\u6d88
 PACKAGE_NAME=com.aries.qsllx.jsb
-VERSION_NAME=15.2.1
+VERSION_NAME=20.3.1
 VERSION_CODE=2
 TOPON="a61122520bc85e,66b742dd0e502b64d783d9c66a9d30c4,b61122545c7f0a,b61122558edd77,b6112259a01d73,b611225775fc83,b61122587984dd,b611225685f436"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏
-APP_CONFIG_CODE="15.2.1"
+APP_CONFIG_CODE="20.3.1"

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

@@ -413,7 +413,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.BannerAdState = void 0;
-var i, r = t("../../zgSingleton"), c = t("./ATSDKMgr"), s = function(t) {
+var i, r = t("../../../../../game/data/GameData"), c = t("../../zgSingleton"), s = t("./ATSDKMgr"), l = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -429,7 +429,7 @@ this.ATBannerJS.init();
 this.bannerAdState == i.Unload && this.loadBanner();
 };
 e.prototype.placementID = function() {
-return cc.sys.os === cc.sys.OS_IOS ? c.default.topon_banner_placementId : cc.sys.os === cc.sys.OS_ANDROID ? c.default.topon_banner_placementId : void 0;
+return cc.sys.os === cc.sys.OS_IOS ? s.default.topon_banner_placementId : cc.sys.os === cc.sys.OS_ANDROID ? s.default.topon_banner_placementId : void 0;
 };
 e.prototype.hasAdReady = function() {
 return this.ATBannerJS.hasAdReady();
@@ -466,14 +466,14 @@ gData.adData.updateADLog(7, t, n);
 e.prototype.onBannerAdClick = function(t, e) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(55, t, n);
-mk.data.sendDataEvent(DataEventId.ad_click, "banner点击");
+mk.data.sendDataEvent(r.DataEventId.ad_click, "banner点击");
 };
 e.prototype.onBannerAdAutoRefresh = function() {};
 e.prototype.onBannerAdAutoRefreshFail = function() {};
 e.prototype.onBannerAdCloseButtonTapped = function() {};
 return e;
-}(r.zgSingleton);
-n.default = s;
+}(c.zgSingleton);
+n.default = l;
 (function(t) {
 t[t.Unload = 0] = "Unload";
 t[t.Loading = 1] = "Loading";
@@ -484,6 +484,7 @@ t[t.Close = 5] = "Close";
 })(i = n.BannerAdState || (n.BannerAdState = {}));
 cc._RF.pop();
 }, {
+"../../../../../game/data/GameData": "GameData",
 "../../zgSingleton": "zgSingleton",
 "./ATSDKMgr": "ATSDKMgr"
 } ],

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

@@ -19,7 +19,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote2/"
     ],
-    "buildTime": 1631518378642,
-    "genTime": 1631518378642,
+    "buildTime": 1631526588258,
+    "genTime": 1631526588258,
     "genVersion": null
 }

文件差異過大導致無法顯示
+ 0 - 0
packages-hot-update/manifest/project.manifest


二進制
packages-hot-update/versions/ver_1_0.4.zip


部分文件因文件數量過多而無法顯示