Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/FX/Water_Ring_nor.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 571579974112634895}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0, z: 1.12}
+  m_LocalPosition: {x: 0, y: -0, z: 0.5}
   m_LocalScale: {x: 1, y: 2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -19546,7 +19546,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6136447149821739047}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0, z: 0.51}
+  m_LocalPosition: {x: 0, y: -0, z: 0.26}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

ActionTowerDefense/Assets/Resources/Prefab/ScenceInteraction/china_bridge.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 67758893}
   - component: {fileID: 67758894}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (4)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
   m_Component:
   - component: {fileID: 180347290}
   - component: {fileID: 180347291}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (6)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -178,7 +178,7 @@ GameObject:
   m_Component:
   - component: {fileID: 218690890}
   - component: {fileID: 218690891}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (7)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -262,7 +262,7 @@ GameObject:
   m_Component:
   - component: {fileID: 316026075}
   - component: {fileID: 316026076}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_stalk (3)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -346,7 +346,7 @@ GameObject:
   m_Component:
   - component: {fileID: 362163935}
   - component: {fileID: 362163936}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (28)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -430,7 +430,7 @@ GameObject:
   m_Component:
   - component: {fileID: 395357748}
   - component: {fileID: 395357749}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (23)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -514,7 +514,7 @@ GameObject:
   m_Component:
   - component: {fileID: 458942876}
   - component: {fileID: 458942877}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -598,7 +598,7 @@ GameObject:
   m_Component:
   - component: {fileID: 484904925}
   - component: {fileID: 484904926}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_stalk (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -682,7 +682,7 @@ GameObject:
   m_Component:
   - component: {fileID: 514139191}
   - component: {fileID: 514139192}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (8)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -766,7 +766,7 @@ GameObject:
   m_Component:
   - component: {fileID: 635939120}
   - component: {fileID: 635939121}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (10)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -850,7 +850,7 @@ GameObject:
   m_Component:
   - component: {fileID: 638362825}
   - component: {fileID: 638362826}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_stalk (5)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -934,7 +934,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1026623131}
   - component: {fileID: 1026623132}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (15)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1018,7 +1018,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1343946898}
   - component: {fileID: 1343946899}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (17)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1102,7 +1102,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1593459900}
   - component: {fileID: 1593459901}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (18)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1186,7 +1186,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1617979790}
   - component: {fileID: 1617979791}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (11)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1270,7 +1270,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1722615894}
   - component: {fileID: 1722615895}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (21)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1354,7 +1354,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1800933120}
   - component: {fileID: 1800933121}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (16)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1438,7 +1438,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1929969236}
   - component: {fileID: 1929969237}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (12)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1522,7 +1522,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1932909196}
   - component: {fileID: 1932909197}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (22)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1606,7 +1606,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1951346242}
   - component: {fileID: 1951346243}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf (25)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1690,7 +1690,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2703677642105673956}
   - component: {fileID: 6099504109543093997}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_stalk
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1774,7 +1774,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3278782057030407470}
   - component: {fileID: 2654216682245402520}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: bridgefront
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1927,7 +1927,7 @@ GameObject:
   m_Component:
   - component: {fileID: 462723073280710236}
   - component: {fileID: 9131084149255797119}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: bridge_behind
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2011,7 +2011,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8327192456594794326}
   - component: {fileID: 6282871931387668701}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Lotus_leaf
   m_TagString: Untagged
   m_Icon: {fileID: 0}