Przeglądaj źródła

[FC][V2.0.0]同盾数盟

fengcong 4 lat temu
rodzic
commit
630419c974

+ 3 - 1
assets/script/game/data/LoginData.ts

@@ -139,7 +139,9 @@ export class LoginData {
             "idfa": gData.appData.machineInfo.idfa,
             "imei": gData.appData.machineInfo.imei,
             "mac": gData.appData.machineInfo.mac,
-            "oaid": gData.appData.machineInfo.oaid
+            "oaid": gData.appData.machineInfo.oaid,
+            "szlm_did": mk.shuzilmM.szlm_did,
+            "black_box": mk.tongdunM.tdEquipID
         }
 
         // mk.console.logSingle('wxlogin aa >>  ', aa);

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


Plik diff jest za duży
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1746423203/proj.android-studio.libcocos2dx.iml

@@ -42,7 +42,7 @@
       <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />

+ 5 - 20
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/proj.android-studio.EasyEliminate.iml

@@ -66,7 +66,7 @@
     <content url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x">
       <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x" type="native-Source-root" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
@@ -89,31 +89,16 @@
     <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_mintegral_china.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.16.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.410.1280.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.15-publishRelease-4533d8764.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_chinasame.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitial.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitialvideo.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbanner.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbid.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbjscommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnative.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnativeadvanced.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbsplash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_nativeex.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_playercommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_reward.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videocommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videojs.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.0.6.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.420.1290.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.16.2-publishRelease-8e10f0818.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.1.1.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-3.3.4.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.4.1.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" />

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

@@ -12553,7 +12553,9 @@ versioncfg: gData.appData.version,
 idfa: gData.appData.machineInfo.idfa,
 imei: gData.appData.machineInfo.imei,
 mac: gData.appData.machineInfo.mac,
-oaid: gData.appData.machineInfo.oaid
+oaid: gData.appData.machineInfo.oaid,
+szlm_did: mk.shuzilmM.szlm_did,
+black_box: mk.tongdunM.tdEquipID
 };
 if (null != gData.wechatData.code) {
 o = mk.encrypt.encrypt(JSON.stringify(e), this.sessionKey, gData.appData.appId);

+ 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": 1638266066497,
-    "genTime": 1638266066497,
+    "buildTime": 1638276307585,
+    "genTime": 1638276307585,
     "genVersion": null
 }

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików