Merge pull request #2 from nguyloc/Loc

fix
nguyloc · Jun 7, 2024 · 37c0ebf · 37c0ebf
2 parents 0e40322 + 1773d09
commit 37c0ebf
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 100 deletions.
diff --git a/Assets/Loc/Prefab/camera.prefab b/Assets/Loc/Prefab/camera.prefab
@@ -122,7 +122,7 @@ Transform:
   m_GameObject: {fileID: 2082080438534838628}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12.616486, y: 3.2550318, z: -9.325273}
+  m_LocalPosition: {x: 19.476484, y: 5.235032, z: -9.325273}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -340,7 +340,7 @@ Transform:
   m_GameObject: {fileID: 2960971055666089243}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12.616486, y: 3.2550318, z: -9.325273}
+  m_LocalPosition: {x: 19.476484, y: 5.235032, z: -9.325273}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -431,7 +431,7 @@ Transform:
   m_GameObject: {fileID: 3744122011685101157}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12.616486, y: 3.2550318, z: -9.325273}
+  m_LocalPosition: {x: 19.476484, y: 5.235032, z: -9.325273}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -472,7 +472,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 3
+  orthographic size: 6
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -615,15 +615,7 @@ MonoBehaviour:
       m_PostInfinity: 2
       m_RotationOrder: 4
   m_CustomBlends: {fileID: 11400000, guid: 82396c0c9935c1e4394ba6d54d2a78ad, type: 2}
-  m_ParentHash:
-  - m_Hash: 1432961145
-    m_ParentHash: 756556552
-  - m_Hash: -725336713
-    m_ParentHash: 756556552
-  - m_Hash: 256545655
-    m_ParentHash: 756556552
-  - m_Hash: -1752896643
-    m_ParentHash: 756556552
+  m_ParentHash: []
 --- !u!1 &7753832866756920834
 GameObject:
   m_ObjectHideFlags: 0
@@ -746,7 +738,7 @@ Transform:
   m_GameObject: {fileID: 9063832007989070606}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12.616486, y: 3.2550318, z: -9.325273}
+  m_LocalPosition: {x: 19.476484, y: 5.235032, z: -9.325273}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

diff --git a/Assets/Loc/Scene/Scene 1.unity b/Assets/Loc/Scene/Scene 1.unity
@@ -14241,18 +14241,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: camera
       objectReference: {fileID: 0}
-    - target: {fileID: 5175426722862019718, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: orthographic size
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 12.616486
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 3.2550318
-      objectReference: {fileID: 0}
     - target: {fileID: 6242263464634670252, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_BoundingShape2D
       value: 

diff --git a/Assets/Loc/Scene/Scene 3.unity b/Assets/Loc/Scene/Scene 3.unity
@@ -252,6 +252,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9cefbf5d4fc06e54a9e07976eb763407, type: 3}
+--- !u!95 &63333136 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 2965295693004696446, guid: 9cefbf5d4fc06e54a9e07976eb763407, type: 3}
+  m_PrefabInstance: {fileID: 63333135}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &73138025
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -21910,53 +21915,17 @@ PrefabInstance:
       propertyPath: m_Name
       value: camera
       objectReference: {fileID: 0}
-    - target: {fileID: 3684373580635113500, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 21.456484
-      objectReference: {fileID: 0}
-    - target: {fileID: 3684373580635113500, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 4.5750313
-      objectReference: {fileID: 0}
-    - target: {fileID: 4871361717997099425, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 21.456484
-      objectReference: {fileID: 0}
-    - target: {fileID: 4871361717997099425, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 4.5750313
-      objectReference: {fileID: 0}
-    - target: {fileID: 5175426722862019718, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: orthographic size
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 21.456484
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 4.5750313
-      objectReference: {fileID: 0}
-    - target: {fileID: 6167272334685107097, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 21.456484
-      objectReference: {fileID: 0}
-    - target: {fileID: 6167272334685107097, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 4.5750313
-      objectReference: {fileID: 0}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_Follow
       value: 
       objectReference: {fileID: 1648111682}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_ParentHash.Array.size
-      value: 0
-      objectReference: {fileID: 0}
+      propertyPath: m_AnimatedTarget
+      value: 
+      objectReference: {fileID: 63333136}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_ChildCameras.Array.size
-      value: 3
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6435110092427434755, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_LocalPosition.x

diff --git a/Assets/Loc/Scene/Scene 4.unity b/Assets/Loc/Scene/Scene 4.unity
@@ -2532,6 +2532,7 @@ GameObject:
   - component: {fileID: 1139504025}
   - component: {fileID: 1139504027}
   - component: {fileID: 1139504026}
+  - component: {fileID: 1139504028}
   m_Layer: 9
   m_Name: Background
   m_TagString: Untagged
@@ -3785,6 +3786,56 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!60 &1139504028
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1139504024}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.19212854, y: 6.105728}
+      - {x: -10.096538, y: 5.970953}
+      - {x: -9.965195, y: -4.859868}
+      - {x: 9.773071, y: -4.923909}
+      - {x: 9.840373, y: 5.9069138}
+  m_UseDelaunayMesh: 0
 --- !u!1 &1204877025
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Loc/Scene/Scene 5.unity b/Assets/Loc/Scene/Scene 5.unity
@@ -252,6 +252,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 73000549513165014, guid: 9cefbf5d4fc06e54a9e07976eb763407, type: 3}
   m_PrefabInstance: {fileID: 63333135}
   m_PrefabAsset: {fileID: 0}
+--- !u!95 &63333137 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 2965295693004696446, guid: 9cefbf5d4fc06e54a9e07976eb763407, type: 3}
+  m_PrefabInstance: {fileID: 63333135}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &73409568
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20161,54 +20166,66 @@ PrefabInstance:
       propertyPath: m_Name
       value: camera
       objectReference: {fileID: 0}
-    - target: {fileID: 3684373580635113500, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 19.476484
-      objectReference: {fileID: 0}
-    - target: {fileID: 3684373580635113500, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 5.235032
-      objectReference: {fileID: 0}
-    - target: {fileID: 4871361717997099425, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 19.476484
-      objectReference: {fileID: 0}
-    - target: {fileID: 4871361717997099425, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 5.235032
-      objectReference: {fileID: 0}
     - target: {fileID: 5175426722862019718, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: orthographic size
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 19.476484
-      objectReference: {fileID: 0}
-    - target: {fileID: 5730199893002398593, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 5.235032
-      objectReference: {fileID: 0}
-    - target: {fileID: 6167272334685107097, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 19.476484
-      objectReference: {fileID: 0}
-    - target: {fileID: 6167272334685107097, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 5.235032
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_Follow
       value: 
       objectReference: {fileID: 63333136}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_AnimatedTarget
+      value: 
+      objectReference: {fileID: 63333137}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_ParentHash.Array.size
-      value: 0
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_ChildCameras.Array.size
       value: 3
       objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[0].m_Hash
+      value: 1432961145
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[1].m_Hash
+      value: -725336713
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[2].m_Hash
+      value: 256545655
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[3].m_Hash
+      value: -1752896643
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[4].m_Hash
+      value: 1130333774
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[0].m_ParentHash
+      value: 756556552
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[1].m_ParentHash
+      value: 756556552
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[2].m_ParentHash
+      value: 756556552
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[3].m_ParentHash
+      value: 756556552
+      objectReference: {fileID: 0}
+    - target: {fileID: 6266503664619496869, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
+      propertyPath: m_ParentHash.Array.data[4].m_ParentHash
+      value: 756556552
+      objectReference: {fileID: 0}
     - target: {fileID: 6435110092427434755, guid: 21f14055eefb4134b824020a25f5b118, type: 3}
       propertyPath: m_LocalPosition.x
       value: -4.396485