fix(build): 修复安卓构建依赖并整理服务器配置

AssetsServer/GenConfig/conf.ini

@@ -4,7 +4,7 @@ ConfigPath=../config.json
 
 [Unity]
 K_Ver=0.0.1
-K_PlayFabe_Title=6DC6D
+K_PlayFab_Title=108EE8
 K_Static_Res_URL=https://n3af96.blob.core.windows.net/client
 K_Event_API_URL=https://n3backend.azurewebsites.net/event
 

AssetsServer/androidconfig.json

@@ -8,6 +8,7 @@
   "RTMHmacSecret": "7a1ba6bb85a4473d96fa4bf45b01f1dd",
   "CustomID": "{{input}}",
   "GM": "1",
+  "EventApiURL": "http://fishpro-game-test01-api.slg-test-bj.tuyougame.cn/",
   "FuncUrl": "http://62.234.191.215:7071",
   "FuncKey": "testKey",
   "Ver": "0.47.d7748ea"

AssetsServer/config.json

@@ -8,6 +8,7 @@
   "RTMHmacSecret": "7a1ba6bb85a4473d96fa4bf45b01f1dd",
   "CustomID": "{{input}}",
   "GM": "1",
+  "EventApiURL": "http://fishpro-game-test01-api.slg-test-bj.tuyougame.cn/",
   "FuncUrl": "http://62.234.191.215:7071",
   "FuncKey": "testKey",
   "Ver": "0.47.2f4aa9f"

Client/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -91,7 +91,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3d6eccb69e063c146a641bd5a7d173b2, type: 2}
   - {fileID: 11400000, guid: 38b112aa97ad6044781acbc6f439d4d7, type: 2}
   - {fileID: 11400000, guid: fe5a82082740016478c19cd356393dcb, type: 2}
-  - {fileID: 11400000, guid: 55d262d4724350a47910f45e3df02d88, type: 2}
   - {fileID: 11400000, guid: 6c36938b168c52b45ac08e17b4a81438, type: 2}
   - {fileID: 11400000, guid: 58d3e9279ba66aa498c73766fee507b7, type: 2}
   - {fileID: 11400000, guid: 321c4872f6ddb554ca9d64b65b640a24, type: 2}

Client/Assets/Plugins/Android/baseProjectTemplate.gradle

@@ -9,6 +9,17 @@ plugins {
     **BUILD_SCRIPT_DEPS**
 }
 
+// DataStore 1.1.7 在当前 AGP 下会选中 JVM 制品，显式使用包含 Android 类的同版本制品。
+allprojects {
+    configurations.configureEach {
+        resolutionStrategy.dependencySubstitution {
+            ['datastore', 'datastore-core', 'datastore-preferences', 'datastore-preferences-core'].each { artifact ->
+                substitute module("androidx.datastore:${artifact}") using module("androidx.datastore:${artifact}-android:1.1.7")
+            }
+        }
+    }
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

Client/Assets/Plugins/WaterCausticsModules/WaterCausticsEffect/Effect/Shaders/WaterCausticsEffectCommon.hlsl

@@ -244,6 +244,8 @@ half WCE_calcShadowIntensity(WCE_Lit lit, half dotLN, WCE_CommonData dt) {
 uint WCE_getMeshRendLayer() {
     #if defined(SHADERGRAPH_PREVIEW) || !defined(_LIGHT_LAYERS)
         return 255;
+    #elif UNITY_VERSION >= 202220
+        return GetMeshRenderingLayer();
     #else
         return GetMeshRenderingLightLayer();
     #endif

Client/Assets/Scripts/AOTScripts/GConfig.cs

@@ -12,7 +12,16 @@ using UnityEngine.Networking;
 
 public static class ConfigExtension
 {
-    private const string defaultconfig = "9Nf/P8vm2+7Ciph2jH1QnEaHCK3cAl7lNnCJc/uxSKGVqcJgWilN3VgaC/74coHRiRpxEelC2+ia7qcjnHhA3OQN82rcVJOP24pGKrSbSgOIGbH9cCEUhdYRo5vnVgLBqlTS/c/AajowTkN59O0AYxDC7J3jq6ptLXdmuG27JYS9NXOQDkgxpzEpG7JTtczHKxhWAv+9uSzbJRCs16KeusbJX1YtNZM8wjCD9esTv4zXXMIpZPlXb86NjHiI02TakAdHo0plO+Di9n5UCC8/4+QGoKNyQgtvIkzMyoGziO4DOLy/VkfITenFv/+9DY0LmpZGa7Cog89znaYyVMTiC/3R2IefXXh04+8uqmyzeVKqh0grcU9qmz485wCoUl/TM9F8+s1Jhp/eaB/E7luOjc57Kz0Eyw2Qko7Fo+lCaRJE1uex9fB46v0LhddSHCEWw8QERmqG9KcmvG4LsyafupA8kliDzj7a7XIzGrgnNnsMxLgeYsSbNiBvXXESeeNCoqiOQTTBpk/br0QuTHTG2DRxUZZ4KM3SKZtHEZ2bZV2FUS4azFpfDXUGoc86O+xz6hAIMbdKCHyqyEeKMmHIzQI9OlIaa3KGwk+w1eFDUuq4zyTh+qGuClZynanUkfNe8mTmFtBax2f3MJHjGpXJT0VdtY/R+5ZQO0nCU30THfnryG0GURsrv6MQYiQX5hsLqG9Z72ybbbbqIR2rvE2w13DM/tqTb4i/hN0+pbeTKkUpdNIWEsR94Q==";
+    private const string defaultconfig = @"{
+  ""EventApiURL"": ""http://fishpro-game-test01-api.slg-test-bj.tuyougame.cn/"",
+  ""PlayFabTitle"": ""108EE8"",
+  ""Google_Play_URL"": ""https://play.google.com/store/apps/details?id=com.arkgame.ft"",
+  ""APP_Store_URL"": ""https://apps.apple.com/us/app/id6505145935"",
+  ""HeartBeat"": 60,
+  ""RTMPid"": ""80000586"",
+  ""RTMServerEndpoint"": ""rtm-intl-frontgate.ilivedata.com:13321"",
+  ""RTMHmacSecret"": ""57047697437f4f2c97a835e8d9a53358""
+}";
 
     private static string RemoteConfigUrl { get; set; }
 
@@ -46,8 +55,7 @@ public static class ConfigExtension
 
         if (remoteConfig == null)
         {
-            var remoteConfigStr = Decrypt(defaultconfig);
+            remoteConfig = JSON.Parse(defaultconfig);
-            remoteConfig = JSON.Parse(remoteConfigStr);
             remoteConfig["Ver"] = VersionTool.FromLocal().ToVerString();
             isSuccessLoadRemoteConfigFile = false;
         }

Client/Assets/Scripts/Others/ZZTimeHelper.cs

@@ -101,7 +101,7 @@ public class ZZTimeHelper
             HttpClient client = new HttpClient();
             client.Timeout = TimeSpan.FromSeconds(5);
             IConfig config = GContext.container.Resolve<IConfig>();
-            string apiUrl = config.Get<string>(GConstant.K_Event_API_URL, "http://s101.local:18080/");
+            string apiUrl = config.Get<string>(GConstant.K_Event_API_URL, CustomServerMgr.DefaultApiUrl);
             string url = $"{apiUrl}account/svrtime";
             var svrTimeStr = await client.GetStringAsync(url);
             // var svrTimeStr = await client.GetStringAsync(timeUrl);

Client/Assets/StreamingAssets/debugconfig.json

@@ -1 +1,4 @@
-###
+{
+  "EventApiURL": "http://s101.local:18080/",
+  "AGG_SERVER": "https://128-hwsfsdk-sdk-test01.qijihdhk.com"
+}

Client/LocalPackages/PlayFabSDK/Shared/Public/Resources/PlayFabSharedSettings.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 093286084a3d1994a9c28281a1c38b1d, type: 3}
   m_Name: PlayFabSharedSettings
   m_EditorClassIdentifier: 
-  TitleId: 6DC6D
+  TitleId: 108EE8
   DeveloperSecretKey: P4Y6PXT3ZZTP6N1KPZPSF1DOKJAFYIRK7HMGNZNA687OPKW9Y9
   ProductionEnvironmentUrl: 
   RequestType: 0