Merge branch 'final'

TheMatiaz0 · Feb 5, 2023 · 7db5147 · 7db5147
2 parents 8bd61f1 + 5748a1c
commit 7db5147
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 107 deletions.
diff --git a/Assets/Art/animation.meta → Assets/Art/backgrounds/animation.meta b/Assets/Art/animation.meta → Assets/Art/backgrounds/animation.meta
diff --git a/Assets/Art/animation/Idle.anim → Assets/Art/backgrounds/animation/Idle.anim b/Assets/Art/animation/Idle.anim → Assets/Art/backgrounds/animation/Idle.anim
diff --git a/Assets/Art/animation/Idle.anim.meta → .../Art/backgrounds/animation/Idle.anim.meta b/Assets/Art/animation/Idle.anim.meta → .../Art/backgrounds/animation/Idle.anim.meta
diff --git a/...animation/PlayerAnimController.controller → ...animation/PlayerAnimController.controller b/...animation/PlayerAnimController.controller → ...animation/PlayerAnimController.controller
diff --git a/...tion/PlayerAnimController.controller.meta → ...tion/PlayerAnimController.controller.meta b/...tion/PlayerAnimController.controller.meta → ...tion/PlayerAnimController.controller.meta
diff --git a/Assets/Art/animation/Walk.anim → Assets/Art/backgrounds/animation/Walk.anim b/Assets/Art/animation/Walk.anim → Assets/Art/backgrounds/animation/Walk.anim
diff --git a/Assets/Art/animation/Walk.anim.meta → .../Art/backgrounds/animation/Walk.anim.meta b/Assets/Art/animation/Walk.anim.meta → .../Art/backgrounds/animation/Walk.anim.meta
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
@@ -724,15 +724,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.x
-      value: 0.23734154
+      value: 0.14175108
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.y
       value: 2.156962
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.x
-      value: -0.023544304
+      value: 0.02425092
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.y
@@ -3349,6 +3349,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 34272142034632661, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
+      propertyPath: interval
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 34272142034632661, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
       propertyPath: spawns.Array.size
       value: 1
@@ -3747,15 +3751,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.x
-      value: 0.24715166
+      value: 0.10671578
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.y
       value: 2.1569614
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.x
-      value: 0.07357583
+      value: 0.0033578873
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.y
@@ -4036,19 +4040,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.x
-      value: 0.42678943
+      value: 0.19650474
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.y
-      value: 3.5366917
+      value: 2.4705586
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.x
-      value: 0.11249183
+      value: 0.22763418
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.y
-      value: 0.76834583
+      value: 1.3014123
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -5465,15 +5469,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.x
-      value: 0.37588656
+      value: 0.19037943
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.y
       value: 2.2471495
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.x
-      value: 0.13794327
+      value: 0.23069683
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.y
@@ -6006,96 +6010,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 5995649747881170106, guid: 906b9a04aa5c44f33a82febc7e308abd, type: 3}
   m_PrefabInstance: {fileID: 1428764193}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1446780888
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1908558646}
-    m_Modifications:
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_RootOrder
-      value: -1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 29.875082
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 6.731654
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4938008071117187855, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Name
-      value: AI_TriggerJump_11
-      objectReference: {fileID: 0}
-    - target: {fileID: 4938008071117187855, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Layer
-      value: 12
-      objectReference: {fileID: 0}
-    - target: {fileID: 4938008071117187855, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_TagString
-      value: Trigger
-      objectReference: {fileID: 0}
-    - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Size.x
-      value: 0.70853734
-      objectReference: {fileID: 0}
-    - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Size.y
-      value: 2.4566588
-      objectReference: {fileID: 0}
-    - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Offset.x
-      value: 0.2533658
-      objectReference: {fileID: 0}
-    - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-      propertyPath: m_Offset.y
-      value: 1.0266144
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
---- !u!4 &1446780889 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2958906724017877100, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
-  m_PrefabInstance: {fileID: 1446780888}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1454257121
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6290,7 +6204,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 34272142034632661, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
       propertyPath: interval
-      value: 10
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 34272142034632663, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
       propertyPath: m_Name
@@ -7790,6 +7704,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 34272142034632661, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
+      propertyPath: interval
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 34272142034632661, guid: 755c4f67e5a0efa4e8aafe0a7d7fa826, type: 3}
       propertyPath: spawns.Array.data[0]
       value: 
@@ -7931,7 +7849,6 @@ Transform:
   - {fileID: 93608383}
   - {fileID: 1258788977}
   - {fileID: 962626151}
-  - {fileID: 1446780889}
   m_Father: {fileID: 1291293776}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8871,7 +8788,7 @@ MonoBehaviour:
   interval: 6
   EnemyLimit: 6
   EnemyLow: 3
-  Increments: 1
+  Increments: 2
 --- !u!1001 &2062683766
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8938,19 +8855,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.x
-      value: 0.14512648
+      value: 0.08946246
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Size.y
-      value: 2.82405
+      value: 1.1541305
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.x
-      value: 0.022563227
+      value: -0.0052687824
       objectReference: {fileID: 0}
     - target: {fileID: 7944816411881753978, guid: 2bae62c2b36ff8a44b8dbd160aa6d867, type: 3}
       propertyPath: m_Offset.y
-      value: 0.41202497
+      value: -0.42293477
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []