Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2

# Conflicts:
#	Assets/_Game/Scenes/Persistent.unity

ProjectSettings/EditorBuildSettings.asset

@@ -8,12 +8,15 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/SampleScene.unity
     guid: 8c9cfa26abfee488c85f1582747f6a02
+  - enabled: 0
+    path: Assets/_Game/Scenes/Persistent.unity
+    guid: 6372e5b8e07d7ae4eb37a184fc8e912d
+  - enabled: 0
+    path: Assets/_Game/Scenes/Testings/MainMenu.unity
+    guid: 2a1ec0c1f9a64054f95911d1cda97f6e
   - enabled: 1
     path: Assets/_Game/Scenes/Testings/TestRoomA.unity
     guid: f11781b557031114087be5fab27f8dd4
-  - enabled: 1
-    path: Assets/_Game/Scenes/Persistent.unity
-    guid: 6372e5b8e07d7ae4eb37a184fc8e912d
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: 5afba7e2911543d418af812de1160fb1, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 6d0341a640ba64043a8cd70f771b962d, type: 3}

ProjectSettings/Physics2DSettings.asset

@@ -45,4 +45,4 @@ Physics2DSettings:
   m_ReuseCollisionCallbacks: 1
   m_AutoSyncTransforms: 0
   m_GizmoOptions: 10
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffbffffffffffffffffffffffff7ebfffffff0ffff7ffdffff7fdeffff3fffffff7fbfffffbfffffffffbdffffffd7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffbffffffffffffffffffffffff7ebfffffff0ffff7fffffff7fdfffff3fffffff7fbfffffbffffef7ffbdffffff57ffdfffbffeffff6fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffffffefffffffffffffffbffffdffffffffffffffff

ProjectSettings/TagManager.asset

@@ -8,35 +8,35 @@ TagManager:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - Player
+  - 
   - Water
   - UI
+  - Spike
+  - MoveingStand
+  - Platform
+  - Player
+  - Volume
+  - OneWayPlatform
+  - EnemyProjectile
   - Enemy
-  - Ground
   - PlayerHitBox
   - PlayerHurtBox
-  - EnemyHitBox
-  - EnemyHurtBox
-  - TriggerZone
   - PlayerProjectile
-  - EnemyProjectile
-  - Spike
+  - MovingObject
+  - MovingPlatform
+  - Foreground
+  - MovingOneWayPlatform
+  - NoCollision
+  - Background
   - Wall
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
+  - TriggerZone
+  - EnemyHitBox
+  - MidHeightOneWayPlatform
+  - EnemyHurtBox
+  - PhantomBody
+  - HazardHitBox
+  - Light
+  - ForceZone
   m_SortingLayers:
   - name: FarBehind
     uniqueID: 2674791413