Procházet zdrojové kódy

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

lzx před 2 dny
rodič
revize
19b1581adb

+ 199 - 216
Assets/Art/ArtHero/FaBao/fb_3203.prefab

@@ -104,20 +104,20 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 6167182127912747030}
   - {fileID: 6167182127912747030}
-  - {fileID: 1422408162058503474}
   - {fileID: 8248306855588452684}
   - {fileID: 8248306855588452684}
   - {fileID: 1262303727023108938}
   - {fileID: 1262303727023108938}
-  - {fileID: 6444025938480056099}
-  - {fileID: 9222447253558614804}
-  - {fileID: 5984989182889395050}
+  - {fileID: 1313368845844243733}
   - {fileID: 3272509563456130745}
   - {fileID: 3272509563456130745}
   - {fileID: 5217952482386490718}
   - {fileID: 5217952482386490718}
-  - {fileID: 2594509393610661793}
   - {fileID: 2337709154295129054}
   - {fileID: 2337709154295129054}
   - {fileID: 3439168278863375725}
   - {fileID: 3439168278863375725}
   - {fileID: 3376848319288263805}
   - {fileID: 3376848319288263805}
   - {fileID: 9004835143992521985}
   - {fileID: 9004835143992521985}
   - {fileID: 8424881297796604634}
   - {fileID: 8424881297796604634}
+  - {fileID: 3038249720738569895}
+  - {fileID: 2876417936805177026}
+  - {fileID: 2435048093007467675}
+  - {fileID: 6924702741479945340}
   m_Father: {fileID: 2985089190953661432}
   m_Father: {fileID: 2985089190953661432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3950001239379594516
 --- !u!1 &3950001239379594516
@@ -149,7 +149,7 @@ Transform:
   m_GameObject: {fileID: 3950001239379594516}
   m_GameObject: {fileID: 3950001239379594516}
   serializedVersion: 2
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -1.69, y: 1.9, z: -0.15}
+  m_LocalPosition: {x: -1.69, y: 3.49, z: 0.27}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_ConstrainProportionsScale: 1
   m_Children:
   m_Children:
@@ -443,34 +443,37 @@ PlayableDirector:
     value: {fileID: 0}
     value: {fileID: 0}
   - key: {fileID: 7513549724179277356, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
   - key: {fileID: 7513549724179277356, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
     value: {fileID: 8703340348278963253}
     value: {fileID: 8703340348278963253}
-  - key: {fileID: 9066145812921407553, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 0}
     value: {fileID: 0}
-  - key: {fileID: -7958483076089108760, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 8703340348278963253}
     value: {fileID: 8703340348278963253}
-  - key: {fileID: 309748738877711074, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 0}
     value: {fileID: 0}
-  - key: {fileID: 5946645958756819507, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 8703340348278963253}
     value: {fileID: 8703340348278963253}
-  - key: {fileID: -4871653596235199416, guid: 921b48cab199bea479a3026f15499bbb, type: 2}
+  - key: {fileID: 0}
+    value: {fileID: 0}
+  - key: {fileID: 0}
     value: {fileID: 0}
     value: {fileID: 0}
   m_ExposedReferences:
   m_ExposedReferences:
     m_References:
     m_References:
     - 2bdb806feda1b7644a5b5af47e81a6c0: {fileID: 7923794318655886540}
     - 2bdb806feda1b7644a5b5af47e81a6c0: {fileID: 7923794318655886540}
-    - d4fc1ec3b24009c4f96fe610eb65b484: {fileID: 2835347942718417405}
-    - 7bbfbdabf79b23649bf2ea641db23905: {fileID: 8034717387539671585}
+    - d4fc1ec3b24009c4f96fe610eb65b484: {fileID: 8573732034427325729}
+    - 7bbfbdabf79b23649bf2ea641db23905: {fileID: 534787073997712303}
     - 602bca6a965c6e34591d1bca04dd4a65: {fileID: 526696554921161683}
     - 602bca6a965c6e34591d1bca04dd4a65: {fileID: 526696554921161683}
     - 510073d11a064b44b81d5efc39bc6cae: {fileID: 7542115083121209796}
     - 510073d11a064b44b81d5efc39bc6cae: {fileID: 7542115083121209796}
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 5680910583389413149}
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 5680910583389413149}
     - 5aaade8730dc32949a07dbdd56e87565: {fileID: 3875966457541859775}
     - 5aaade8730dc32949a07dbdd56e87565: {fileID: 3875966457541859775}
     - e09eb03a40934fc4aad0c938c961932f: {fileID: 3875966457541859775}
     - e09eb03a40934fc4aad0c938c961932f: {fileID: 3875966457541859775}
     - 2ecb826e4625459428c45aa1b78005ef: {fileID: 7713880349391792818}
     - 2ecb826e4625459428c45aa1b78005ef: {fileID: 7713880349391792818}
+    - e0e0edb8bb3a89a43bf3404c7304f8f3: {fileID: 5637145602690516951}
     - 2970d7955fe85ca4a901875300e566b2: {fileID: 5637145602690516951}
     - 2970d7955fe85ca4a901875300e566b2: {fileID: 5637145602690516951}
     - 23d78beed6bb3364b93e6b017db41910: {fileID: 2190314253639333730}
     - 23d78beed6bb3364b93e6b017db41910: {fileID: 2190314253639333730}
-    - 8e45c6601e86261469d4da532a6c0453: {fileID: 5029229222717414428}
+    - 8e45c6601e86261469d4da532a6c0453: {fileID: 4802120300277765731}
     - 97d69c4843153cd46ac2896f8761eff8: {fileID: 7713880349391792818}
     - 97d69c4843153cd46ac2896f8761eff8: {fileID: 7713880349391792818}
-    - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 5849730948900096966}
+    - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 2426898468098133640}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 2347484690563438772}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 2347484690563438772}
-    - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 5029229222717414428}
+    - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 0}
 --- !u!1 &5366879697231755413
 --- !u!1 &5366879697231755413
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -792,7 +795,7 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 771732347823712355, guid: 606c22d91be554f4bbd7217954e40c6e, type: 3}
   m_CorrespondingSourceObject: {fileID: 771732347823712355, guid: 606c22d91be554f4bbd7217954e40c6e, type: 3}
   m_PrefabInstance: {fileID: 2623707272269311006}
   m_PrefabInstance: {fileID: 2623707272269311006}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &2960652791598373735
+--- !u!1001 &2837033243165856035
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   serializedVersion: 2
   serializedVersion: 2
@@ -800,66 +803,66 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 3553380914892672351, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+      propertyPath: m_Name
+      value: fx_fb_base_hit
+      objectReference: {fileID: 0}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
-      value: -1.08
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: -1.86
+      value: -1.97
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: -0.65
+      value: -1.83
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7434721739822292144, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
-      propertyPath: m_Name
-      value: fx_fb_3203_sk1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
---- !u!1 &5637145602690516951 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7434721739822292144, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
-  m_PrefabInstance: {fileID: 2960652791598373735}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &8424881297796604634 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+--- !u!4 &3272509563456130745 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
-  m_PrefabInstance: {fileID: 2960652791598373735}
+  m_CorrespondingSourceObject: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+  m_PrefabInstance: {fileID: 2837033243165856035}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &3934194064308022395
+--- !u!1 &5680910583389413149 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3553380914892672351, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+  m_PrefabInstance: {fileID: 2837033243165856035}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2960652791598373735
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   serializedVersion: 2
   serializedVersion: 2
@@ -867,88 +870,64 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 12.65
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -3.3
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -0.78
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4629978649193592085, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: randomSeed
-      value: 2612
-      objectReference: {fileID: 0}
-    - target: {fileID: 4629978649193592085, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5224614398699648473, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: randomSeed
-      value: 2612
-      objectReference: {fileID: 0}
-    - target: {fileID: 5224614398699648473, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7569439000722678023, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: randomSeed
-      value: 2612
-      objectReference: {fileID: 0}
-    - target: {fileID: 7569439000722678023, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8309838391102566503, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
+    - target: {fileID: 7434721739822292144, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx_fb_show_mu_bd
+      value: fx_fb_3203_sk1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
---- !u!4 &2594509393610661793 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1339992568986104794, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-  m_PrefabInstance: {fileID: 3934194064308022395}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5029229222717414428 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+--- !u!1 &5637145602690516951 stripped
 GameObject:
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 8309838391102566503, guid: 4533560e767e8184185e2c41e20d320f, type: 3}
-  m_PrefabInstance: {fileID: 3934194064308022395}
+  m_CorrespondingSourceObject: {fileID: 7434721739822292144, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+  m_PrefabInstance: {fileID: 2960652791598373735}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8424881297796604634 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6772686926542731709, guid: d15322c9c5facf14bae3d1c64a1fae7f, type: 3}
+  m_PrefabInstance: {fileID: 2960652791598373735}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4048253009893834145
 --- !u!1001 &4048253009893834145
 PrefabInstance:
 PrefabInstance:
@@ -1017,7 +996,7 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5801956956582087781, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
   m_CorrespondingSourceObject: {fileID: 5801956956582087781, guid: 410302bdfb343dc4c9692efdfaff21e3, type: 3}
   m_PrefabInstance: {fileID: 4048253009893834145}
   m_PrefabInstance: {fileID: 4048253009893834145}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &4396068875565960326
+--- !u!1001 &4293379539139837126
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   serializedVersion: 2
   serializedVersion: 2
@@ -1025,47 +1004,47 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 2130776270868386866, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 1890164657825641038, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx_fb_duipin_dian
+      value: fx fb_die_shui
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
-      value: 0.34
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: 0.015
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: 0.277
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+    - target: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
@@ -1073,18 +1052,18 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
---- !u!1 &2347484690563438772 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
+--- !u!1 &2426898468098133640 stripped
 GameObject:
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 2130776270868386866, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
-  m_PrefabInstance: {fileID: 4396068875565960326}
+  m_CorrespondingSourceObject: {fileID: 1890164657825641038, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
+  m_PrefabInstance: {fileID: 4293379539139837126}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &8248306855588452684 stripped
+--- !u!4 &2876417936805177026 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
-  m_PrefabInstance: {fileID: 4396068875565960326}
+  m_CorrespondingSourceObject: {fileID: 2053134753469143556, guid: 8bcdab537ec920a48a9b59e671ec60e6, type: 3}
+  m_PrefabInstance: {fileID: 4293379539139837126}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &4517804201602692157
+--- !u!1001 &4396068875565960326
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   serializedVersion: 2
   serializedVersion: 2
@@ -1092,47 +1071,47 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 2112785889275371680, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 2130776270868386866, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx_fb_bao
+      value: fx_fb_duipin_dian
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 0.34
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 0.015
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: 0.277
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+    - target: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
@@ -1140,11 +1119,16 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
---- !u!4 &5984989182889395050 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+--- !u!1 &2347484690563438772 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2130776270868386866, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+  m_PrefabInstance: {fileID: 4396068875565960326}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8248306855588452684 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
-  m_PrefabInstance: {fileID: 4517804201602692157}
+  m_CorrespondingSourceObject: {fileID: 5725806014943876554, guid: 882f3101e49779e4d8c159e54fb51ec5, type: 3}
+  m_PrefabInstance: {fileID: 4396068875565960326}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4557679105756735256
 --- !u!1001 &4557679105756735256
 PrefabInstance:
 PrefabInstance:
@@ -1221,47 +1205,47 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 3176090894882941812, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 4970077541935606522, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx_fb_tw_mu
+      value: fx_fb_tw_shui
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+    - target: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
@@ -1269,18 +1253,18 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
---- !u!1 &8034717387539671585 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
+--- !u!1 &534787073997712303 stripped
 GameObject:
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 3176090894882941812, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+  m_CorrespondingSourceObject: {fileID: 4970077541935606522, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
   m_PrefabInstance: {fileID: 4869148982714909013}
   m_PrefabInstance: {fileID: 4869148982714909013}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &9222447253558614804 stripped
+--- !u!4 &2435048093007467675 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4354426521206528577, guid: f3d1b330821c9f24ba9a69360b9c1602, type: 3}
+  m_CorrespondingSourceObject: {fileID: 7086896035223475662, guid: 3c576e58313c84c4da75c3b55c154b8c, type: 3}
   m_PrefabInstance: {fileID: 4869148982714909013}
   m_PrefabInstance: {fileID: 4869148982714909013}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &4997123380234935212
+--- !u!1001 &5081135098230334233
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   serializedVersion: 2
   serializedVersion: 2
@@ -1288,47 +1272,47 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 1474702872514875498, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 299312950906615162, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx fb_die_mu
+      value: fx_fb_show_shui_bd
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
+    - target: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
@@ -1336,16 +1320,16 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
---- !u!1 &5849730948900096966 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
+--- !u!1 &4802120300277765731 stripped
 GameObject:
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 1474702872514875498, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
-  m_PrefabInstance: {fileID: 4997123380234935212}
+  m_CorrespondingSourceObject: {fileID: 299312950906615162, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
+  m_PrefabInstance: {fileID: 5081135098230334233}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &6444025938480056099 stripped
+--- !u!4 &6924702741479945340 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 2032423398070688911, guid: 3a22d8be8349a4046bce2624400b49fa, type: 3}
-  m_PrefabInstance: {fileID: 4997123380234935212}
+  m_CorrespondingSourceObject: {fileID: 2781725965445502821, guid: 7fb67cb81bc82b24f9b4428c08c11af5, type: 3}
+  m_PrefabInstance: {fileID: 5081135098230334233}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5242522011375215257
 --- !u!1001 &5242522011375215257
 PrefabInstance:
 PrefabInstance:
@@ -1627,63 +1611,67 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 3020772580403564191, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
+      propertyPath: m_Name
+      value: fx_fb_jihuo_shui
+      objectReference: {fileID: 0}
+    - target: {fileID: 3020772580403564191, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
-      value: 1.39
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: -0.21
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: 0.1
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+    - target: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 8669111087100193347, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
-      propertyPath: m_Name
-      value: fx_fb_jihuo_mu
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
---- !u!4 &1422408162058503474 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
+--- !u!4 &3038249720738569895 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5524399261116089996, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+  m_CorrespondingSourceObject: {fileID: 8448184943645891865, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
   m_PrefabInstance: {fileID: 6852213038370276286}
   m_PrefabInstance: {fileID: 6852213038370276286}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &2835347942718417405 stripped
+--- !u!1 &8573732034427325729 stripped
 GameObject:
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 8669111087100193347, guid: 7b1444955589f4445b5b67d39a1dc123, type: 3}
+  m_CorrespondingSourceObject: {fileID: 3020772580403564191, guid: 75b9786ab4c48ec4baf4cc844012ee25, type: 3}
   m_PrefabInstance: {fileID: 6852213038370276286}
   m_PrefabInstance: {fileID: 6852213038370276286}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6874505351339865123
 --- !u!1001 &6874505351339865123
@@ -1761,47 +1749,47 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 5309717009326907830}
     m_TransformParent: {fileID: 5309717009326907830}
     m_Modifications:
     m_Modifications:
-    - target: {fileID: 3553380914892672351, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 2112785889275371680, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
-      value: fx_fb_base_hit
+      value: fx_fb_bao
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalPosition.y
       propertyPath: m_LocalPosition.y
-      value: -1.97
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalPosition.z
       propertyPath: m_LocalPosition.z
-      value: -1.83
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalRotation.w
       propertyPath: m_LocalRotation.w
       value: 1
       value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalRotation.x
       propertyPath: m_LocalRotation.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalRotation.y
       propertyPath: m_LocalRotation.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalRotation.z
       propertyPath: m_LocalRotation.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
-    - target: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+    - target: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
@@ -1809,14 +1797,9 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
---- !u!4 &3272509563456130745 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
+--- !u!4 &1313368845844243733 stripped
 Transform:
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5975371885324885243, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
-  m_PrefabInstance: {fileID: 9189176186460852802}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5680910583389413149 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3553380914892672351, guid: 8a03e484ed5cd704b85fda65c6917702, type: 3}
+  m_CorrespondingSourceObject: {fileID: 7907341347909416791, guid: 059a0f2c94a45e54588d91e63306104e, type: 3}
   m_PrefabInstance: {fileID: 9189176186460852802}
   m_PrefabInstance: {fileID: 9189176186460852802}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 202 - 698
Assets/Art/HeroTimeLine/fb_3203.playable


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 19584 - 31
Assets/Art/VFX/FXPrefabs/fx_fb_3203_sk1.prefab


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 558 - 184
Assets/Art/cs3.scene


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3202_TD.txt


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Res/TimeLineAssets/fb_3203_TD.txt


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů