Browse Source

优化场景碰撞,重打标签

灯芯 3 weeks ago
parent
commit
99b8a0f18c

+ 1 - 1
snipershooting/ShootSniper/Assets/Arts/DestructibleProps/Models/Bottle/Materials/WineBottle_01.mat

@@ -37,7 +37,7 @@ Material:
     - _ShadowFalloff: 0.02
     m_Colors:
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
   m_BuildTextureStacks: []

+ 13 - 3
snipershooting/ShootSniper/Assets/Arts/OldRes_PY/distance/distance/Materials/Distance_Marker_Albedo.mat

@@ -2,20 +2,28 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Distance_Marker_Albedo
   m_Shader: {fileID: 4800000, guid: 4e7a479053926419998871506c73a516, type: 3}
-  m_ShaderKeywords: GRAY_OFF METALLIC_OFF _FadeByHeight _FadeSurround
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - GRAY_OFF
+  - METALLIC_OFF
+  - _FadeByHeight
+  - _FadeSurround
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,6 +63,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -80,6 +89,7 @@ Material:
     - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _LightColor: {r: 0.9716981, g: 0.95260084, b: 0.8021093, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
+  m_BuildTextureStacks: []

+ 1 - 1
snipershooting/ShootSniper/Assets/Arts/OldRes_PY/jiazi/Materials/Metal_Shelf_Storage.mat

@@ -37,7 +37,7 @@ Material:
     - _ShadowFalloff: 0.02
     m_Colors:
     - _LightColor: {r: 0.9528302, g: 0.914908, b: 0.5887772, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
   m_BuildTextureStacks: []

+ 1 - 1
snipershooting/ShootSniper/Assets/Arts/OldRes_PY/target_circle/Materials/GenericMaterial_63.mat

@@ -87,7 +87,7 @@ Material:
     - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
   m_BuildTextureStacks: []

+ 1 - 1
snipershooting/ShootSniper/Assets/Arts/OldRes_PY/target_circle/Materials/Shelf_Metal_01.mat

@@ -37,7 +37,7 @@ Material:
     - _ShadowFalloff: 0.02
     m_Colors:
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
   m_BuildTextureStacks: []

+ 1 - 1
snipershooting/ShootSniper/Assets/Arts/OldRes_PY/zhuozi/WoodenTable.mat

@@ -88,7 +88,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _LightColor: {r: 0.9716981, g: 0.95260084, b: 0.8021093, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
   m_BuildTextureStacks: []

File diff suppressed because it is too large
+ 153 - 470
snipershooting/ShootSniper/Assets/Scenes/Bake_Industry zone.unity


+ 10 - 3
snipershooting/ShootSniper/Assets/ShootGame/ArtModels/Target_Physics/Materials/TargetBox.mat

@@ -2,20 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: TargetBox
   m_Shader: {fileID: 4800000, guid: 4e7a479053926419998871506c73a516, type: 3}
-  m_ShaderKeywords: _FadeByHeight
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _FadeByHeight
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,6 +60,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -80,6 +86,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
+  m_BuildTextureStacks: []

+ 13 - 3
snipershooting/ShootSniper/Assets/ShootGame/Models/character/nvzhushou/Materials/AliyaBody_Texture.mat

@@ -2,20 +2,28 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: AliyaBody_Texture
   m_Shader: {fileID: 4800000, guid: 4e7a479053926419998871506c73a516, type: 3}
-  m_ShaderKeywords: GRAY_OFF METALLIC_OFF _FadeByHeight _FadeSurround
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - GRAY_OFF
+  - METALLIC_OFF
+  - _FadeByHeight
+  - _FadeSurround
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,6 +63,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -80,6 +89,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
+  m_BuildTextureStacks: []

+ 1 - 1
snipershooting/ShootSniper/Assets/ShootGame/Models/character/nvzhushou/Materials/SportsGirl_Skin_03.mat

@@ -91,7 +91,7 @@ Material:
     - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}

Some files were not shown because too many files changed in this diff