add barrier

SantyWang · Jul 7, 2024 · 49f7ab9 · 49f7ab9
1 parent c8c1c54
commit 49f7ab9
Show file tree

Hide file tree

Showing 21 changed files with 754 additions and 4,121 deletions.
diff --git a/Assets/Materials/BarriersMain_M.mat b/Assets/Materials/BarriersMain_M.mat
@@ -8,18 +8,20 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BarriersMain_M
-  m_Shader: {fileID: 4800000, guid: 475c5a9b62d3bd8498b6cb13d85ebf07, type: 3}
+  m_Shader: {fileID: 4800000, guid: e8a820dc9aec7d946a12eaea41e5bffb, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
+  - _EMISSION
   m_InvalidKeywords:
   - CURVEDWORLD_BEND_ID_1
-  - CURVEDWORLD_BEND_TYPE_CLASSICRUNNER_X_POSITIVE
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
-  stringTagMap: {}
+  stringTagMap:
+    RenderType: CurvedWorld_Opaque
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
@@ -61,6 +63,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
     - _BlendOp: 0
@@ -99,7 +105,8 @@ Material:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
-    - _CurvedWorldBendSettings: {r: 0, g: 1, b: 0, a: 0}
+    - _CurvedWorldBendSettings: {r: 27, g: 1, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []
diff --git a/... Assets/Curved World/Example Scenes/Files/Materials/Bend_TwistedSpiral (Corridor)/Fog.mat b/... Assets/Curved World/Example Scenes/Files/Materials/Bend_TwistedSpiral (Corridor)/Fog.mat
@@ -2,28 +2,22 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 8
+  serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Fog
   m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _ALPHAPREMULTIPLY_ON
-  - _FADING_ON
-  m_InvalidKeywords: []
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _FADING_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
   disabledShaderPasses:
-  - GRABPASS
-  m_LockedProperties: 
+  - ALWAYS
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -63,7 +57,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -103,4 +96,3 @@ Material:
     - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0.02, b: 0, a: 0}
-  m_BuildTextureStacks: []
diff --git a/...ts/Curved World/Example Scenes/Files/Materials/Bend_TwsitedSpiral/SimpleTownLite_Road.mat b/...ts/Curved World/Example Scenes/Files/Materials/Bend_TwsitedSpiral/SimpleTownLite_Road.mat
@@ -2,28 +2,22 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 8
+  serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SimpleTownLite_Road
   m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
-  - CURVEDWORLD_NORMAL_TRANSFORMATION_ON
-  m_InvalidKeywords:
-  - CURVEDWORLD_BEND_ID_1
+  m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
+    CURVEDWORLD_NORMAL_TRANSFORMATION_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: CurvedWorld_Opaque
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -91,7 +85,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
     m_Floats:
     - CurvedWorld_Toggle: 0
     - CurvedWorld_Transform_Normal: 0
@@ -144,4 +137,3 @@ Material:
     - _V_CW_MainTex_Scroll: {r: 0, g: 0, b: 0, a: 0}
     - _V_CW_ReflectColor: {r: 1, g: 1, b: 1, a: 1}
     - _V_CW_Rim_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []
diff --git a/...ssets/Curved World/Example Scenes/Files/Materials/Bend_TwsitedSpiral/Vehicle_PizzaCar.mat b/...ssets/Curved World/Example Scenes/Files/Materials/Bend_TwsitedSpiral/Vehicle_PizzaCar.mat
@@ -2,27 +2,21 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 8
+  serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Vehicle_PizzaCar
   m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
-  m_InvalidKeywords:
-  - CURVEDWORLD_BEND_ID_1
+  m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: CurvedWorld_Opaque
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -90,7 +84,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
     m_Floats:
     - CurvedWorld_Toggle: 0
     - CurvedWorld_Transform_Normal: 0
@@ -143,4 +136,3 @@ Material:
     - _V_CW_MainTex_Scroll: {r: 0, g: 0, b: 0, a: 0}
     - _V_CW_ReflectColor: {r: 1, g: 1, b: 1, a: 1}
     - _V_CW_Rim_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []
diff --git a/... World/Example Scenes/Files/Unity Tanks/Materials/Bend_CylindricalRolloff/YellowLight.mat b/... World/Example Scenes/Files/Unity Tanks/Materials/Bend_CylindricalRolloff/YellowLight.mat
@@ -2,28 +2,22 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 8
+  serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: YellowLight
   m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - CURVEDWORLD_BEND_TYPE_CYLINDRICALROLLOFF_Z
-  - CURVEDWORLD_NORMAL_TRANSFORMATION_ON
-  m_InvalidKeywords:
-  - CURVEDWORLD_BEND_ID_1
+  m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_CYLINDRICALROLLOFF_Z
+    CURVEDWORLD_NORMAL_TRANSFORMATION_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: CurvedWorld_Opaque
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -67,7 +61,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
     m_Floats:
     - CurvedWorld_Transform_Normal: 0
     - _BumpScale: 1
@@ -95,4 +88,3 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
-  m_BuildTextureStacks: []
diff --git a/Assets/Plugins/Amazing Assets/Curved World/Scripts/CurvedWorldController.cs b/Assets/Plugins/Amazing Assets/Curved World/Scripts/CurvedWorldController.cs
@@ -267,16 +267,16 @@ void UpdateShaderDataDisabled()
                 Shader.SetGlobalVector(materialPropertyID_RotationAxis, Vector3.zero);
 
                 Shader.SetGlobalVector(materialPropertyID_BendSize, Vector3.zero);
-                //Shader.SetGlobalFloat(materialPropertyID_BendSize, 0);
+                Shader.SetGlobalFloat(materialPropertyID_BendSize, 0);
 
                 Shader.SetGlobalVector(materialPropertyID_BendOffset, Vector3.zero);
-                //Shader.SetGlobalFloat(materialPropertyID_BendOffset, 0);
+                Shader.SetGlobalFloat(materialPropertyID_BendOffset, 0);
 
                 Shader.SetGlobalVector(materialPropertyID_BendAngle, Vector2.zero);
-                //Shader.SetGlobalFloat(materialPropertyID_BendAngle, 0);
+                Shader.SetGlobalFloat(materialPropertyID_BendAngle, 0);
 
                 Shader.SetGlobalVector(materialPropertyID_BendMinimumRadius, Vector2.zero);
-                //Shader.SetGlobalFloat(materialPropertyID_BendMinimumRadius, 0);
+                Shader.SetGlobalFloat(materialPropertyID_BendMinimumRadius, 0);
 
                 Shader.SetGlobalFloat(materialPropertyID_BendRolloff, 10);
             }