Fix OBJLoader in runtime+0.4.5

yojohanshinwataikei · Jun 30, 2023 · 2d70191 · 2d70191
1 parent 1bcc759
commit 2d70191
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 8 deletions.
diff --git a/Assets/Materials/Player/TrackBorderLeft.mat b/Assets/Materials/Player/TrackBorderLeft.mat
@@ -68,7 +68,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.12737204
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackBorderRight.mat b/Assets/Materials/Player/TrackBorderRight.mat
@@ -68,7 +68,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.12737204
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Materials/Player/TrackMain.mat b/Assets/Materials/Player/TrackMain.mat
@@ -68,7 +68,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Phase: 0
+    - _Phase: 0.12737204
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Misc/BuildTimestamp.txt b/Assets/Misc/BuildTimestamp.txt
@@ -1 +1 @@
-638237382738413772
+638237422224889231
diff --git a/Assets/Misc/ChangeLog.txt b/Assets/Misc/ChangeLog.txt
@@ -1,3 +1,9 @@
+0.4.5
+
+- 修复了皮肤文件夹中的 OBJ 文件无法正确加载的问题
+
+---
+
 0.4.4
 
 - 支持轨道编号为 0 与 5 的 Tap 与 Hold

diff --git a/Assets/Scripts/Util/Loader/Loader.cs b/Assets/Scripts/Util/Loader/Loader.cs
@@ -210,8 +210,9 @@ public static Mesh LoadObjMesh(string path){
 				}
 				UnityEngine.Object.Destroy(obj);
 				return mesh;
-			}catch{
+			}catch(System.Exception ex){
 				Debug.LogWarning($"Can not load obj mesh, path: {path}");
+				Debug.LogException(ex);
 			}
 			return null;
 		}

diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 13
+  serializedVersion: 14
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -28,6 +28,7 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
+  m_VideoShadersIncludeMode: 2
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -38,7 +39,9 @@ GraphicsSettings:
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
+  m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
   m_CustomRenderPipeline: {fileID: 0}
@@ -62,5 +65,6 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0
-  m_AllowEnlightenSupportForUpgradedProject: 1
+  m_SRPDefaultSettings: {}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -147,7 +147,7 @@ PlayerSettings:
     16:10: 0
     16:9: 1
     Others: 0
-  bundleVersion: 0.4.4
+  bundleVersion: 0.4.5
   preloadedAssets:
   - {fileID: 4800000, guid: bb26ede1beb997943a7d6295fbf075d4, type: 3}
   - {fileID: 4800000, guid: 1e340182228616b4ca7dad1e80f4d319, type: 3}

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
@@ -260,6 +260,7 @@ QualitySettings:
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality:
     Android: 5
+    Server: 0
     Standalone: 5
     WebGL: 0
     iPhone: 5