gdl_123 vor 7 Monaten
Ursprung
Commit
4e5fd6b8f4

Datei-Diff unterdrückt, da er zu groß ist
+ 195 - 195
Assets/Content/Config/LanguagePackage_cn.csv


+ 2 - 1
Assets/Editor/CsvToLua/CsvToLua.cs

@@ -778,6 +778,7 @@ return aaa";
             string key = item.Substring(0,off);
             if (!cfgmap.ContainsKey(key))
             {
+                Debug.Log($"不包含:{key}   off = {off}");
                 oldLg.Add(item);
             }
             else
@@ -788,7 +789,7 @@ return aaa";
         }
 
 
-        string data = FileHelper.CatStringArray(oldLg);
+        string data = FileHelper.CatStringArray(oldLg,"\r\n");
         FileHelper.WirteStringToFile(outputPath, data);
     }
 

+ 5 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://165.154.215.99:81//',
+	SERVERLIST_URL = 'http://165.154.215.99:81//serverlist',
+	NOTIFY_URL = 'http://165.154.215.99:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://165.154.215.99:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.215.99:81//vipService',
 }
 
 return PlatformPack

+ 2 - 1
Assets/Src/Core/DownLoad/FileHelper.cs

@@ -464,12 +464,13 @@ public class FileHelper
     }
 
 
-    public static string CatStringArray(IEnumerable<string> datas)
+    public static string CatStringArray(IEnumerable<string> datas,string catstr)
     {
         StringBuilder stringBuilder = new StringBuilder();
         foreach (var item in datas)
         {
             stringBuilder.Append(item);
+            stringBuilder.Append(catstr);
         }
 
         return stringBuilder.ToString();

+ 1 - 1
Build/BuildDependenceResource/CurPackEnv.ini

@@ -1 +1 @@
-{"m_ChannelUniqueId":"12002022","m_BuildClassName":"Pack.PackPlatformAndroid"}
+{"m_ChannelUniqueId":"12002023","m_BuildClassName":"Pack.PackPlatformAndroid"}

Datei-Diff unterdrückt, da er zu groß ist
+ 4741 - 0
Build/NewCfg/Language_merge.csv


Datei-Diff unterdrückt, da er zu groß ist
+ 2 - 4
Build/NewCfg/ROLanguagePackage_cn.csv


+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 1.0.0.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -159,7 +159,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.xjro.rutest
+    Android: com.xjroapp.ru
     WebGL: com.wt.no.sdk.test
     iPhone: com.cxzusgame.ios
   buildNumber:
@@ -167,7 +167,7 @@ PlayerSettings:
     iPhone: 0.1.0.0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1000006
+  AndroidBundleVersionCode: 1000000
   AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 36
   AndroidPreferredInstallLocation: 1
@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.