Merge remote-tracking branch 'origin/YuYang'

# Conflicts:
#	FastMail/Assets/Res/Prefabs/Levels/Level4.prefab

FastMail/Assets/Res/Prefabs/Levels/Level0.prefab.meta

+fileFormatVersion: 2
+guid: 17d47d2f5e5b83844b03238035998518
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FastMail/Assets/Res/Prefabs/Levels/Level1.prefab

@@ -3083,7 +3083,7 @@ MonoBehaviour:
   m_chainView: {fileID: 7145541500330870658}
   m_chainRopeView: {fileID: 7664046066075846766}
   m_camera: {fileID: 7986871153003141345}
-  curLevelIndex: 0
+  curLevelIndex: 1
 --- !u!1 &7986871152908044844
 GameObject:
   m_ObjectHideFlags: 0
@@ -4498,6 +4498,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 9d6d5511605a9cc4184d2126e65b1177,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9d6d5511605a9cc4184d2126e65b1177, type: 3}
 --- !u!1 &8282211230460351664 stripped
@@ -4673,6 +4678,11 @@ PrefabInstance:
       propertyPath: InitialModule.startRotation.scalar
       value: 0.5235988
       objectReference: {fileID: 0}
+    - target: {fileID: 7121262441108316557, guid: b707501011ea5dd42acc6e60ba1b8529,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b707501011ea5dd42acc6e60ba1b8529, type: 3}
 --- !u!4 &7946386296471052540 stripped
@@ -4862,6 +4872,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 727b28d66b296ba47a18a7c26c1f706c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 727b28d66b296ba47a18a7c26c1f706c, type: 3}
 --- !u!4 &7244918343555851535 stripped
@@ -4968,6 +4983,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 59e0eb2ac19443540bf81ae185d209ea,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 59e0eb2ac19443540bf81ae185d209ea, type: 3}
 --- !u!1 &6319916742480985844 stripped
@@ -5754,6 +5774,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 987aff54fc2ea064aadc1c6fdbead984,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 987aff54fc2ea064aadc1c6fdbead984, type: 3}
 --- !u!1 &1749878608012779802 stripped

FastMail/Assets/Res/Prefabs/Levels/Level2.prefab

@@ -3867,7 +3867,7 @@ MonoBehaviour:
   m_chainView: {fileID: 3576024121070009821}
   m_chainRopeView: {fileID: 2049624131444570296}
   m_camera: {fileID: 4349797880467464894}
-  curLevelIndex: 1
+  curLevelIndex: 2
 --- !u!1 &4349797880296187457
 GameObject:
   m_ObjectHideFlags: 0
@@ -10536,6 +10536,11 @@ PrefabInstance:
       propertyPath: InitialModule.startRotation.scalar
       value: -0.5235988
       objectReference: {fileID: 0}
+    - target: {fileID: 7121262441108316557, guid: b707501011ea5dd42acc6e60ba1b8529,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b707501011ea5dd42acc6e60ba1b8529, type: 3}
 --- !u!4 &2919671472974122548 stripped

FastMail/Assets/Res/Prefabs/Levels/Level3.prefab

@@ -4418,7 +4418,7 @@ MonoBehaviour:
   m_chainView: {fileID: 6218358964733746787}
   m_chainRopeView: {fileID: 7504524184384456608}
   m_camera: {fileID: 6607075690364502272}
-  curLevelIndex: 2
+  curLevelIndex: 3
 --- !u!1 &6607075691123181055
 GameObject:
   m_ObjectHideFlags: 0
@@ -7128,17 +7128,17 @@ PrefabInstance:
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.7
+      value: -0.58
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.44
+      value: 3.38
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.12
+      value: -0.24
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
@@ -7200,6 +7200,11 @@ PrefabInstance:
       propertyPath: InitialModule.startRotation.scalar
       value: -0.5235988
       objectReference: {fileID: 0}
+    - target: {fileID: 7121262441108316557, guid: b707501011ea5dd42acc6e60ba1b8529,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b707501011ea5dd42acc6e60ba1b8529, type: 3}
 --- !u!4 &9182624735956429192 stripped

FastMail/Assets/Res/Prefabs/Levels/Level5.prefab

@@ -2583,7 +2583,7 @@ MonoBehaviour:
   m_chainView: {fileID: 4691668142717322079}
   m_chainRopeView: {fileID: 3536514207781816801}
   m_camera: {fileID: 5539752502787267644}
-  curLevelIndex: 4
+  curLevelIndex: 5
 --- !u!1 &5539752501101603530
 GameObject:
   m_ObjectHideFlags: 0
@@ -6288,7 +6288,7 @@ PrefabInstance:
     - target: {fileID: 7121262441108316557, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: InitialModule.startSize.scalar
-      value: 1.8
+      value: 2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b707501011ea5dd42acc6e60ba1b8529, type: 3}

FastMail/Assets/Res/Prefabs/Levels/Level6.prefab

@@ -2371,7 +2371,7 @@ MonoBehaviour:
   m_chainView: {fileID: 4056743025610386812}
   m_chainRopeView: {fileID: 1048530987113104743}
   m_camera: {fileID: 3868999536346493471}
-  curLevelIndex: 5
+  curLevelIndex: 6
 --- !u!1 &3868999535982436562
 GameObject:
   m_ObjectHideFlags: 0
@@ -6597,17 +6597,17 @@ PrefabInstance:
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.35
+      value: 0.24
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 3.61
+      value: 4.85
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 1.38
+      value: -0.68
       objectReference: {fileID: 0}
     - target: {fileID: 6945449025624878403, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}