浏览代码

修改bug

DESKTOP-BGJIU14\ck 5 天之前
父节点
当前提交
a8f6ece96e

+ 41 - 24
Assets/Art/Environment/Mountain010.prefab

@@ -9,9 +9,6 @@ GameObject:
   serializedVersion: 7
   serializedVersion: 7
   m_Component:
   m_Component:
   - component: {fileID: 8909352204525286337}
   - component: {fileID: 8909352204525286337}
-  - component: {fileID: 2068246416621670301}
-  - component: {fileID: 3660374313649103400}
-  - component: {fileID: 8479685889786791212}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Mountain010
   m_Name: Mountain010
@@ -28,28 +25,63 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3683907582521372588}
   m_GameObject: {fileID: 3683907582521372588}
   serializedVersion: 2
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.17462842, z: -0, w: 0.9846344}
+  m_LocalRotation: {x: 0, y: -0.17462774, z: 0, w: 0.9846345}
   m_LocalPosition: {x: -37.3, y: -0.1, z: 31.9}
   m_LocalPosition: {x: -37.3, y: -0.1, z: 31.9}
   m_LocalScale: {x: 0.4593453, y: 0.4593453, z: 0.4593453}
   m_LocalScale: {x: 0.4593453, y: 0.4593453, z: 0.4593453}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6160607818222336233}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: -20.114, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: -20.114, z: 0}
---- !u!33 &2068246416621670301
+--- !u!1 &9199455106843585400
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6160607818222336233}
+  - component: {fileID: 4184708956986779086}
+  - component: {fileID: 6289977199233966943}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Mountain010 (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6160607818222336233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9199455106843585400}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -14.11, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8909352204525286337}
+  m_LocalEulerAnglesHint: {x: 0, y: -20.114, z: 0}
+--- !u!33 &4184708956986779086
 MeshFilter:
 MeshFilter:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
+  m_GameObject: {fileID: 9199455106843585400}
   m_Mesh: {fileID: 4300000, guid: 5953a2cf6bd0f2e4eb4f51f546d07264, type: 3}
   m_Mesh: {fileID: 4300000, guid: 5953a2cf6bd0f2e4eb4f51f546d07264, type: 3}
---- !u!23 &3660374313649103400
+--- !u!23 &6289977199233966943
 MeshRenderer:
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
+  m_GameObject: {fileID: 9199455106843585400}
   m_Enabled: 1
   m_Enabled: 1
   m_CastShadows: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_ReceiveShadows: 1
@@ -88,18 +120,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!111 &8479685889786791212
-Animation:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Animation: {fileID: 0}
-  m_Animations: []
-  m_WrapMode: 0
-  m_PlayAutomatically: 1
-  m_AnimatePhysics: 0
-  m_CullingType: 0

+ 2 - 2
Assets/Res/UI/CombatPanel.prefab

@@ -947,7 +947,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4287798501111193387
 --- !u!224 &4287798501111193387
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1155,7 +1155,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5837590194851709526
 --- !u!224 &5837590194851709526
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []
   m_BuildTextureStacks: []