合并修改bug

ColorlessWorld-2024-4-2/Assets/Image/MapUnityAnim/UpAndChange.anim

@@ -29,16 +29,16 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5
-        value: {x: 0, y: 0.2, z: 0}
-        inSlope: {x: 0, y: 1.0000001, z: 0}
-        outSlope: {x: 0, y: 1.0000001, z: 0}
+        value: {x: 0, y: -0.25, z: 0}
+        inSlope: {x: 0, y: 0.20000005, z: 0}
+        outSlope: {x: 0, y: 0.20000005, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1
-        value: {x: 0, y: 0.45, z: 0}
+        value: {x: 0, y: -0.2, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -180,16 +180,16 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 0.2
-        inSlope: 1.0000001
-        outSlope: 1.0000001
+        value: -0.25
+        inSlope: 0.20000005
+        outSlope: 0.20000005
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.45
+        value: -0.2
         inSlope: 0
         outSlope: 0
         tangentMode: 136

ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity

@@ -2622,7 +2622,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e5d3a36546c4fcc41832bd9e3d5f6eb5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  colorType: 0
+  colorType: 2
   layerMask:
     serializedVersion: 2
     m_Bits: 32
@@ -12407,7 +12407,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e5d3a36546c4fcc41832bd9e3d5f6eb5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  colorType: 0
+  colorType: 1
   layerMask:
     serializedVersion: 2
     m_Bits: 32

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -5358,12 +5358,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 329040648}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 348176937}
+  m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &329040650
 MonoBehaviour:
@@ -5980,7 +5980,7 @@ Transform:
   - {fileID: 1251297425}
   - {fileID: 1766672721}
   - {fileID: 430040821}
-  - {fileID: 329040649}
+  - {fileID: 1607756701}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &350066633
@@ -40473,6 +40473,7 @@ SceneRoots:
   - {fileID: 281408863}
   - {fileID: 1690695890}
   - {fileID: 515302569}
+  - {fileID: 329040649}
   - {fileID: 992566371}
   - {fileID: 395072433}
   - {fileID: 2068068679}