更新toponsdk到5.7.75

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -291,9 +291,9 @@
     <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.15.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.400.1270.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/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" />
@@ -310,16 +310,18 @@
     <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.3.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.3.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/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" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/ysdk/ysdkshell.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/ysdk/YSDK_Android_1.8.1_79033d3d.aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
@@ -327,6 +329,7 @@
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -54,10 +54,17 @@
             </intent-filter>
         </activity>
 
+        <!-- TODO GAME SDK接入YSDK初始化配置 START -->
+        <!-- TODO android:value 要修改为游戏自身的MainActivity的完整路径，如YSDKDEMO的MainAcitiviy路径为com.tencent.tmgp.yybtestsdk.MainActivity -->
+        <!-- 如果AndroidManifest.xml配置MainActivity无效，可手动在LaunchActivity的onCreate()中调用YSDKApi.setMainActivity()接口设置游戏的MainActivity
+             示例：YSDKApi.setMainActivity("com.tencent.tmgp.yybtestsdk.MainActivity"); -->
+        <!-- TODO 此处涉及到游客模式弹窗、悬浮球、宝券等弹窗的实现，要修改为玩家玩游戏的activity -->
         <meta-data
             android:name="org.cocos2dx.javascript.AppActivity"
             android:value="${applicationId}.AppActivity" />
 
+        <!-- TODO GAME SDK接入YSDK初始化配置 END -->
+
         <activity
             android:name="com.aries.kxnly.mz.wxapi.WXEntryActivity"
             android:label="@string/app_name"
@@ -67,33 +74,6 @@
             android:launchMode="singleTask">
         </activity>
 
-<!--        &lt;!&ndash; TODO GAME SDK 微信接入配置 START &ndash;&gt;-->
-<!--        <activity-->
-<!--            android:name="com.tencent.ysdk.module.user.impl.wx.YSDKWXEntryActivity"-->
-<!--            android:configChanges="orientation|screenSize|keyboardHidden"-->
-<!--            android:excludeFromRecents="true"-->
-<!--            android:exported="true"-->
-<!--            android:label="WXEntryActivity"-->
-<!--            android:launchMode="singleTop"-->
-<!--            android:taskAffinity="${applicationId}.diff"-->
-<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar">-->
-<!--            &lt;!&ndash; TODO GAME android:taskAffinity这里为游戏微信登录的配置，游戏需要修改为自己的包名加.diff &ndash;&gt;-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.VIEW" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--                &lt;!&ndash; TODO GAME android:scheme这里为游戏微信登录的配置，游戏需要修改为自己的微信appid &ndash;&gt;-->
-<!--                <data android:scheme="wx3c0cc2f730c5ad5a" />-->
-<!--            </intent-filter>-->
-<!--        </activity>-->
-<!--        &lt;!&ndash; TODO GAME "${applicationId}.wxapi.WXEntryActivity，此处的${applicationId}需要修改为游戏自己的包名 &ndash;&gt;-->
-<!--        <activity-alias-->
-<!--            android:name="${applicationId}.wxapi.WXEntryActivity"-->
-<!--            android:exported="true"-->
-<!--            android:targetActivity="com.tencent.ysdk.module.user.impl.wx.YSDKWXEntryActivity" />-->
-<!--        &lt;!&ndash; TODO GAME 1.4.1之后版本支持微信扫码登录，低于此版本升级的YSDK务必增加此处Activity用于二维码展示 &ndash;&gt;-->
-<!--        <activity android:name="com.tencent.ysdk.module.user.impl.wx.qrcode.QRActivity">-->
-
-<!--        </activity>-->
 
         <!-- 聚合SDK -->
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>

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

@@ -165,7 +165,7 @@ dependencies {
     implementation project(':libcocos2dx')
 
     //微信SDK(自动集成)
-    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+//    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
 
     //聚合SDK(手动导入SDK包)
     api 'androidx.appcompat:appcompat:1.0.0' //Gradle中要补充Support v7插件的引入，否则会集成失败
@@ -187,7 +187,7 @@ dependencies {
     //阿里风控
     api fileTree(include: ['*.jar','*.aar'], dir: 'libs/aliRisk')
 
-//    //ysdk
-//    implementation fileTree(dir: 'libs/ysdk', include: ['*.jar',    '*.aar'])
-//    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    //ysdk
+    implementation fileTree(dir: 'libs/ysdk', include: ['*.jar', '*.aar'])
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"EasyEliminate-release.apk","fullName":"release","baseName":"release"},"path":"EasyEliminate-release.apk","properties":{}}]

build/jsb-link/frameworks/runtime-src/proj.android-studio/res/drawable/actionbar_back_selector.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@android:color/transparent"> <!-- pressed -->
+    </item>
+
+    <item android:drawable="@drawable/ic_action_back"></item>
+
+</selector>

build/jsb-link/frameworks/runtime-src/proj.android-studio/res/drawable/apptheme_btn_default_holo_light.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/apptheme_btn_default_normal_holo_light" />
+    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/apptheme_btn_default_disabled_holo_light" />
+    <item android:state_pressed="true" android:drawable="@drawable/apptheme_btn_default_pressed_holo_light" />
+    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/apptheme_btn_default_focused_holo_light" />
+    <item android:state_enabled="true" android:drawable="@drawable/apptheme_btn_default_normal_holo_light" />
+    <item android:state_focused="true" android:drawable="@drawable/apptheme_btn_default_disabled_focused_holo_light" />
+    <item android:drawable="@drawable/apptheme_btn_default_disabled_holo_light" />
+</selector>

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

@@ -12570,6 +12570,7 @@ this._farmData[n].state == s.Sick && a++;
 }
 this.RawInsectCurArr[0] = a;
 }
+this.setMaxProduct(10003, !0);
 };
 t.prototype.setProductMapFromJson = function() {
 for (var t = this.configs.Product, e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
@@ -12617,6 +12618,12 @@ this._productMakeTimesData.push(r);
 var c = t + 1, s = this.getProductMap(t), l = this.getProductMap(c);
 t == this.getMaxProduct(s.tab) && l && (gData.plantData.init_itemIndex = c);
 if (l && l.tab == s.tab && c > this.getMaxProduct(s.tab) && 1 == l.unlock && l.value <= e) {
+this._productMakeTimesMap.set(c, 0);
+r = {
+id: c,
+times: 0
+};
+this._productMakeTimesData.push(r);
 this.setMaxProduct(c);
 this.getProductMap(c + 1) && (gData.plantData.init_lock = c + 1);
 }
@@ -12648,7 +12655,7 @@ this._pastureData || (this._pastureData = []);
 var t = this._pastureData.length;
 if (t < 3) {
 for (var e = this.getProductArrByType(p.dw), o = e.length, n = 30001, a = null, r = 0; r < o; r++) {
-a = this.playerProp.gradeLevel < e[r].value ? {
+a = this.playerProp.completeFarmTaskTimes < e[r].value ? {
 id: n,
 state: l.Lock,
 productID: e[r].picture,
@@ -12696,17 +12703,20 @@ if (t < 6) {
 for (var e = 30004, o = null, n = null, a = 0; a < 6; a++) {
 n = this.getTabByConfigID(e);
 var r = this.getProductArrByType(n);
-o = this.playerProp.completeFarmTaskTimes < r[0].value ? {
+if (this.playerProp.completeFarmTaskTimes < r[0].value) o = {
 id: e,
 state: u.Lock,
 productID: 0,
 growSpan: 0
-} : {
+}; else {
+o = {
 id: e,
 state: u.Empty,
 productID: 0,
 growSpan: 0
 };
+this.setMaxProduct(r[0].picture, !0);
+}
 this._factoryData.push(o);
 this._factoryDataMap.set(e, o);
 e++;
@@ -12714,9 +12724,13 @@ e++;
 this.setProp(i.factoryData, this._factoryData);
 } else {
 var c = 0;
-for (a = 0; a < t; a++) {
+for (e = 30004, n = null, a = 0; a < t; a++) {
+n = this.getTabByConfigID(e);
+r = this.getProductArrByType(n);
 this._factoryDataMap.set(this._factoryData[a].id, this._factoryData[a]);
 this._factoryData[a].state == u.Sick && c++;
+this.playerProp.completeFarmTaskTimes >= r[0].value && this.setMaxProduct(r[0].picture, !0);
+e++;
 }
 this.RawInsectCurArr[2] = c;
 }
@@ -12817,7 +12831,6 @@ for (var t in p) {
 var e = p[t], o = this.getProductArrByType(e), n = o.length, a = null, r = !1;
 switch (e) {
 case p.nzw:
-this.setMaxProduct(10003, !0);
 break;
 
 case p.dw:
@@ -16895,6 +16908,9 @@ t.shareInviteUrl = function(t, e, o, n) {
 cc.sys.platform != cc.sys.WECHAT_GAME && (cc.sys.os == cc.sys.OS_ANDROID ? jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "shareInviteUrl", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", t, e, o, n) : (cc.sys.os, 
 cc.sys.OS_IOS));
 };
+t.initAndSetupCallback = function() {
+cc.sys.os == cc.sys.OS_ANDROID ? jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "initAndSetupCallback", "()V") : cc.sys.os == cc.sys.OS_IOS && jsb.reflection.callStaticMethod("GameConfig", "initAndSetupCallback:", "");
+};
 t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 t.callBack = null;
@@ -17945,14 +17961,11 @@ this.hasCheckPermission = !0;
 l.default.checkPermission();
 }
 if (gData.appData.getDeviceInfoCompelete) {
-if (gData.loginData.popIdentifySwitch) {
 if (!this.hasCheckAnti) {
 this.hasCheckAnti = !0;
 this.checkShowIdentification();
 }
-if (!gData.loginData.passAnti) return;
-}
-if (gData.loginData.loadResCompelete) {
+if (gData.loginData.passAnti) if (gData.loginData.loadResCompelete) {
 if (mk.aliRiskManager.getRiskCode) {
 mk.aliRiskManager.getRiskCode = !1;
 this.login();
@@ -18140,7 +18153,10 @@ return [ 2 ];
 });
 };
 e.prototype.checkShowIdentification = function() {
-1 == mk.storage.getStorage("identification") ? gData.loginData.passAnti = !0 : mk.ui.openPanel("module/certification/CertificationNode");
+if (1 == mk.storage.getStorage("identification")) {
+l.default.initAndSetupCallback();
+gData.loginData.passAnti = !0;
+} else l.default.initAndSetupCallback();
 };
 e.prototype.clickLogin = function() {
 var t = this;
@@ -21610,8 +21626,6 @@ return this.data.tab != l.ProductType.nzw ? [ 3, 2 ] : [ 4, gData.farmSystem.pla
 
 case 1:
 t = o.sent();
-gData.gameData.nextMake = null;
-gData.gameData.setNextProduct(!1);
 return [ 3, 4 ];
 
 case 2:

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631954037438,
-    "genTime": 1631954037438,
+    "buildTime": 1632361191272,
+    "genTime": 1632361191272,
     "genVersion": null
 }