_ Old_Version ()

Gongpai · Feb 27, 2023 · b3dda1e · b3dda1e
1 parent 258a3f7
commit b3dda1e
Show file tree

Hide file tree

Showing 2 changed files with 362 additions and 900 deletions.
diff --git a/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab b/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab
@@ -31,8 +31,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1793019610661123709}
+<<<<<<< Updated upstream
   m_LocalRotation: {x: 0, y: 0, z: -0.62942976, w: 0.7770574}
   m_LocalPosition: {x: 35.96713, y: 0.9942825, z: -0.9978251}
+=======
+  m_LocalRotation: {x: 0, y: 0, z: -0.9999989, w: 0.0014729057}
+  m_LocalPosition: {x: 17.207607, y: -0.43411243, z: -0.11047689}
+>>>>>>> Stashed changes
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []