更换服务器

TastSong · Feb 17, 2023 · 3c5f31b · 3c5f31b
1 parent 17b0c8c
commit 3c5f31b
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 14 deletions.
diff --git a/CrazyCarClient/Assets/AddressableAssetsData/link.xml b/CrazyCarClient/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,36 @@
+<linker>
+  <assembly fullname="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="EquipResource" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Flare" preserve="all" />
+    <type fullname="UnityEngine.GameObject" preserve="all" />
+    <type fullname="UnityEngine.Light" preserve="all" />
+    <type fullname="UnityEngine.Material" preserve="all" />
+    <type fullname="UnityEngine.Mesh" preserve="all" />
+    <type fullname="UnityEngine.MeshFilter" preserve="all" />
+    <type fullname="UnityEngine.MeshRenderer" preserve="all" />
+    <type fullname="UnityEngine.Object" preserve="all" />
+    <type fullname="UnityEngine.Shader" preserve="all" />
+    <type fullname="UnityEngine.Sprite" preserve="all" />
+    <type fullname="UnityEngine.Texture2D" preserve="all" />
+    <type fullname="UnityEngine.Transform" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.ParticleSystemModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.ParticleSystem" preserve="all" />
+    <type fullname="UnityEngine.ParticleSystemRenderer" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.MeshCollider" preserve="all" />
+  </assembly>
+</linker>
diff --git a/CrazyCarClient/Assets/AddressableAssetsData/link.xml.meta b/CrazyCarClient/Assets/AddressableAssetsData/link.xml.meta
diff --git a/CrazyCarClient/Assets/Plugins/Ready Player Me/Examples/RPM_Vuplex_Example.unitypackage.meta b/CrazyCarClient/Assets/Plugins/Ready Player Me/Examples/RPM_Vuplex_Example.unitypackage.meta
diff --git a/...rClient/Assets/Plugins/Simple Spin Blur/RP Assets/HDRP Simple Spin Blur.unitypackage.meta b/...rClient/Assets/Plugins/Simple Spin Blur/RP Assets/HDRP Simple Spin Blur.unitypackage.meta
diff --git a/...arClient/Assets/Plugins/Simple Spin Blur/RP Assets/URP Simple Spin Blur.unitypackage.meta b/...arClient/Assets/Plugins/Simple Spin Blur/RP Assets/URP Simple Spin Blur.unitypackage.meta
diff --git a/CrazyCarClient/Assets/Scenes/Login.unity b/CrazyCarClient/Assets/Scenes/Login.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4439403, g: 0.4931519, b: 0.5722083, a: 1}
+  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -2075,7 +2075,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   serverType: 1
-  netType: 1
+  netType: 0
 --- !u!1 &1019334752
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/CrazyCarClient/Assets/Scripts/Utility/Util.cs b/CrazyCarClient/Assets/Scripts/Utility/Util.cs
@@ -68,9 +68,9 @@ public static string GetServerHost(ServerType serverType) {
                 case ServerType.Local:
                     return "localhost";
                 case ServerType.Remote:
-                    return "tastsong.xyz";
-                case ServerType.TestServer:
                     return "tastsong.top";
+                case ServerType.TestServer:
+                    return "tastsong.xyz";
                 default:
                     return "localhost";
             }
@@ -81,9 +81,9 @@ public static string GetServerHostIP(ServerType serverType) {
                 case ServerType.Local:
                     return "127.0.0.1";
                 case ServerType.Remote:
-                    return "139.9.103.145";
-                case ServerType.TestServer:
                     return "101.34.205.139";
+                case ServerType.TestServer:
+                    return "139.9.103.145";
                 default:
                     return "127.0.0.1";
             }

diff --git a/CrazyCarClient/Assets/StreamingAssets/Android/catalog_CrazyCar.hash b/CrazyCarClient/Assets/StreamingAssets/Android/catalog_CrazyCar.hash
@@ -1 +1 @@
-65dca6301d607531b4b70097a5b0d0e2
+be955ab0909ac5810dbbdda666c8c6c6
diff --git a/CrazyCarClient/Assets/StreamingAssets/Android/catalog_CrazyCar.json b/CrazyCarClient/Assets/StreamingAssets/Android/catalog_CrazyCar.json
diff --git a/CrazyCarClient/ProjectSettings/ProjectSettings.asset b/CrazyCarClient/ProjectSettings/ProjectSettings.asset
@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 9.0.0
+  bundleVersion: 9.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

diff --git a/CrazyCarDB/CrazyCar.sql b/CrazyCarDB/CrazyCar.sql
@@ -388,16 +388,16 @@ create table if not exists `forced_updating`(
    )engine = innodb default charset = utf8;
 insert into forced_updating ( platform, version, rule, updata_time, url)
 				   values
-				   ("Android", "9.0.0", 10000, 1633519472000, "https://www.pgyer.com/xlbk");
+				   ("Android", "9.1.0", 10000, 1633519472000, "https://www.pgyer.com/xlbk");
 insert into forced_updating ( platform, version, rule, updata_time, url)
 				   values
-				   ("ios", "9.0.0", 10000, 1633519472123, "https://www.pgyer.com/rRut");
+				   ("ios", "9.1.0", 10000, 1633519472123, "https://www.pgyer.com/rRut");
 insert into forced_updating ( platform, version, rule, updata_time, url)
 				   values
-				   ("WebGL", "9.0.0", 10000, 1633519472123, "https://www.pgyer.com/rRut");
+				   ("WebGL", "9.1.0", 10000, 1633519472123, "https://www.pgyer.com/rRut");
 insert into forced_updating ( platform, version, rule, updata_time, url)
 				   values
-				   ("PC", "9.0.0", 10000, 1633519472121, "https://github.com/TastSong/CrazyCar/releases/latest");    
+				   ("PC", "9.1.0", 10000, 1633519472121, "https://github.com/TastSong/CrazyCar/releases/latest");    
 insert into forced_updating ( platform, version, rule, updata_time, url)
 				   values
 				   ("Defeat", "0.0.0", 10000, 1633519472121, "https://github.com/TastSong/CrazyCar/releases/latest");                                         
@@ -624,7 +624,7 @@ create table if not exists `assets_updating`(
    )engine = innodb default charset = utf8;
 insert into assets_updating (id, is_on, updata_time, url)
 				   values
-				   (0, 1, 1633519472000, "http://139.9.103.145:8081/CrazyCarSpringBootServer/Addressable");                                     
+				   (0, 1, 1633519472000, "http://tastsong.top/CrazyCarSpringBootServer/Addressable");                                     
 update assets_updating
 set is_on = 0
 where id = 0;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		65dca6301d607531b4b70097a5b0d0e2
		be955ab0909ac5810dbbdda666c8c6c6