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

Assets/Art/ArtHero/FaBao/fb_3203.prefab

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

Assets/Art/UIAssets/icon/icon_tx1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -55,9 +55,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Res/Config/DropConfig.json

@@ -1219,7 +1219,7 @@
       ],
       "dropType": 2,
       "showItemId": [
-        1001
+        10001
       ]
     },
     {
@@ -1231,7 +1231,7 @@
       ],
       "dropType": 2,
       "showItemId": [
-        1002
+        12001
       ]
     }
   ]

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -796,6 +796,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5221273778027939417}
   - {fileID: 311482651042689352}
   - {fileID: 3275273584098972649}
   - {fileID: 5263293711959085783}
@@ -1124,7 +1125,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 357.7, y: -168.041}
+  m_AnchoredPosition: {x: 357.7, y: -368.04102}
   m_SizeDelta: {x: 685, y: 336.082}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6945069562181101411
@@ -1672,6 +1673,94 @@ MonoBehaviour:
     m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
     m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
   isLoop: 0
+--- !u!1 &6684017674125835796
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5221273778027939417}
+  - component: {fileID: 2437030225407380323}
+  - component: {fileID: 1863055643468538448}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5221273778027939417
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6684017674125835796}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1803833552231621266}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2437030225407380323
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6684017674125835796}
+  m_CullTransparentMesh: 1
+--- !u!114 &1863055643468538448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6684017674125835796}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7335765504538105348
 GameObject:
   m_ObjectHideFlags: 0
@@ -2007,7 +2096,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 88}
-  m_SizeDelta: {x: 715.4, y: 336.082}
+  m_SizeDelta: {x: 715.4, y: 536.08203}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &7792863436289110911
 MonoBehaviour:
@@ -2016,7 +2105,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8841265337799555239}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -2042,7 +2131,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8841265337799555239}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -2067,7 +2156,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5617782115550842872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2082,10 +2171,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -248, y: 217}
-  m_SizeDelta: {x: 150, y: 200}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 375, y: 2.7180176}
+  m_SizeDelta: {x: 304.0769, y: 405.4359}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7774198419232979247
 CanvasRenderer:
@@ -2115,7 +2204,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: b65e2e02a81385d4a9f5efd3ced646c7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2125,14 +2214,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tx116
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -613,7 +613,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2896655462721008753
 RectTransform:
   m_ObjectHideFlags: 0
@@ -654,7 +654,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &91101405434741666
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9083431920382656224}
+  - component: {fileID: 559704184537879476}
+  - component: {fileID: 180654846907958062}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9083431920382656224
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 91101405434741666}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2848902610725447080}
+  m_Father: {fileID: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -7.5, y: -230.4}
+  m_SizeDelta: {x: 599.2633, y: 69.5521}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &559704184537879476
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 91101405434741666}
+  m_CullTransparentMesh: 1
+--- !u!114 &180654846907958062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 91101405434741666}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9058824, g: 0.8745099, b: 0.8078432, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &367650205906546576
 GameObject:
   m_ObjectHideFlags: 0
@@ -253,11 +342,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 9083431920382656224}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -55, y: -234}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 488.9567, y: 51.4679}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9006840382129535295
@@ -486,6 +575,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3027682406220828786
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7367012747278795373}
+  - component: {fileID: 5239537915554494237}
+  - component: {fileID: 5977757692082168426}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7367012747278795373
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027682406220828786}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8806507328366746912}
+  m_Father: {fileID: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -8.3694, y: -60.776}
+  m_SizeDelta: {x: 599.2633, y: 69.5521}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5239537915554494237
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027682406220828786}
+  m_CullTransparentMesh: 1
+--- !u!114 &5977757692082168426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027682406220828786}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9058824, g: 0.8745099, b: 0.8078432, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3398005791740917807
 GameObject:
   m_ObjectHideFlags: 0
@@ -595,11 +773,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 7367012747278795373}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -55, y: -64}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 488.9567, y: 51.4679}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7803985942085729440
@@ -675,11 +853,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6738649132051544318}
+  - {fileID: 7367012747278795373}
   - {fileID: 4672021808672808400}
-  - {fileID: 2848902610725447080}
+  - {fileID: 9083431920382656224}
   - {fileID: 7822711560404703771}
-  - {fileID: 8806507328366746912}
   - {fileID: 1567392667895820747}
+  - {fileID: 6296970389002785038}
   - {fileID: 6108060668469187376}
   m_Father: {fileID: 7154777211442295581}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -957,14 +1136,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8809334176112050903}
   - {fileID: 8073423848255295774}
   m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -7.9971, y: -566}
-  m_SizeDelta: {x: 589.4222, y: 215.3082}
+  m_AnchoredPosition: {x: -7.9971, y: -585.019}
+  m_SizeDelta: {x: 589.4222, y: 253.3462}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6680631196129598971
 CanvasRenderer:
@@ -1213,7 +1391,7 @@ RectTransform:
   m_GameObject: {fileID: 6114928648539321970}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2940586768892950692}
@@ -1221,8 +1399,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.6362, y: -27.4281}
-  m_SizeDelta: {x: 556.4907, y: 126.178}
+  m_AnchoredPosition: {x: -47.5, y: -3.534}
+  m_SizeDelta: {x: 556.4907, y: 284.2773}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646367918689829722
 CanvasRenderer:
@@ -1372,6 +1550,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5BF9\u654C\u4EBA\u9020\u6210200%\u4F24\u5BB3\uFF0C\u670930%\u7684\u6982\u7387\u4F7F\u5176\u4E94\u884C\u6DF7\u4E71\uFF0C\u6301\u7EED1\u79D2\u3002"
+--- !u!1 &6333090277490579869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6296970389002785038}
+  - component: {fileID: 8593824072055605426}
+  - component: {fileID: 7499746621062327740}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6296970389002785038
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6333090277490579869}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8809334176112050903}
+  m_Father: {fileID: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -9.2, y: -388.7}
+  m_SizeDelta: {x: 599.2633, y: 69.5521}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8593824072055605426
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6333090277490579869}
+  m_CullTransparentMesh: 1
+--- !u!114 &7499746621062327740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6333090277490579869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9058824, g: 0.8745099, b: 0.8078432, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6766688874820868269
 GameObject:
   m_ObjectHideFlags: 0
@@ -1398,16 +1665,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6766688874820868269}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3562230635030506916}
+  m_Father: {fileID: 6296970389002785038}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 18.1, y: -15.4}
+  m_AnchoredPosition: {x: 0, y: -4.3}
   m_SizeDelta: {x: 488.9567, y: 43.492905}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &9184616767057802106

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -1,5 +1,136 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &17674188837841093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3387212356099446714}
+  - component: {fileID: 7386771212239786002}
+  - component: {fileID: 9178147150454144674}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3387212356099446714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 17674188837841093}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 2264, y: -1, z: -1090}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &7386771212239786002
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 17674188837841093}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 2048
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 8600000, guid: 7c104613c1a917040b2d76911cfd15d7, type: 2}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_enableGDRP: 1
+  m_backfaceCulling: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &9178147150454144674
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 17674188837841093}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 0
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
 --- !u!1 &320310589377205941
 GameObject:
   m_ObjectHideFlags: 0
@@ -401,7 +532,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
+    m_Top: 25
     m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 17.08
@@ -806,8 +937,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7.4873, y: 126.1155}
-  m_SizeDelta: {x: 664.9747, y: 873.769}
+  m_AnchoredPosition: {x: 165, y: -4.299999}
+  m_SizeDelta: {x: 240.451, y: 873.769}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5608414052690259127
 CanvasRenderer:
@@ -965,6 +1096,86 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5008248057540541071
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4230674668679273989}
+  - component: {fileID: 8170707317414517154}
+  - component: {fileID: 6598622436281157220}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4230674668679273989
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008248057540541071}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 175, y: 1252.7}
+  m_SizeDelta: {x: 160, y: 37.1651}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8170707317414517154
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008248057540541071}
+  m_CullTransparentMesh: 1
+--- !u!114 &6598622436281157220
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008248057540541071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 27
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5C5E\u6027\uFF1A"
 --- !u!1 &5584431613852898259
 GameObject:
   m_ObjectHideFlags: 0
@@ -1262,6 +1473,79 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5EFA\u7B51\u524D\u671F\u4E09\u5C42"
+--- !u!1 &8627860104567905175
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8585431063593195554}
+  - component: {fileID: 50251756342390870}
+  - component: {fileID: 2161228190077776003}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: HeroRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8585431063593195554
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8627860104567905175}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -155, y: 175}
+  m_SizeDelta: {x: 432.16, y: 477.9211}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &50251756342390870
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8627860104567905175}
+  m_CullTransparentMesh: 1
+--- !u!114 &2161228190077776003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8627860104567905175}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8600000, guid: 7c104613c1a917040b2d76911cfd15d7, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &8709778843362506203
 GameObject:
   m_ObjectHideFlags: 0
@@ -1379,13 +1663,16 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3387212356099446714}
   - {fileID: 8245128900902318849}
   - {fileID: 4014844787387584513}
   - {fileID: 8938579032391907015}
   - {fileID: 6686121261652367940}
   - {fileID: 2816985101069546935}
   - {fileID: 620873362179252296}
+  - {fileID: 4230674668679273989}
   - {fileID: 600135753646096457}
+  - {fileID: 8585431063593195554}
   - {fileID: 2863754501915732489}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1442,6 +1729,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: CameraRoot
+    gameObject: {fileID: 3387212356099446714}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &7912834985569492392
 PrefabInstance:
@@ -1463,6 +1755,10 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2963361265419753275, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1529,7 +1825,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -15.72165
+      value: -40.72165
       objectReference: {fileID: 0}
     - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1555,6 +1851,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 150.0857
       objectReference: {fileID: 0}
+    - target: {fileID: 6949391239389172941, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 95
+      objectReference: {fileID: 0}
+    - target: {fileID: 7394528043978614730, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 123.6
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Scripts/GameLogic/PlayerDataEditorWindow.cs → Assets/Scripts/GameUI/Editor/PlayerDataEditorWindow.cs

@@ -18,22 +18,23 @@ public class PlayerDataEditorWindow : EditorWindow
     [MenuItem("Tools/PlayerData 编辑器")]
     public static void ShowWindow()
     {
-        GetWindow<PlayerDataEditorWindow>(true,"PlayerData 编辑器");
+        GetWindow<PlayerDataEditorWindow>(true, "PlayerData 编辑器");
     }
 
     private void OnEnable()
     {
-    
         LoadPlayerData();
     }
 
+
+    private string targetFolder = "";
     private void OnGUI()
     {
         GUIStyle headerStyle = new GUIStyle(EditorStyles.boldLabel) { fontSize = 14, padding = new RectOffset(5, 5, 5, 5) };
         GUIStyle sectionStyle = new GUIStyle(EditorStyles.helpBox) { margin = new RectOffset(5, 5, 5, 5), padding = new RectOffset(10, 10, 10, 10) };
-    
+
         scrollPos = EditorGUILayout.BeginScrollView(scrollPos);
-      
+
         if (playerData == null)
         {
             EditorGUILayout.HelpBox("未加载 PlayerData！点击下方创建新数据。", MessageType.Warning);
@@ -41,15 +42,34 @@ public class PlayerDataEditorWindow : EditorWindow
             {
                 playerData = new AccountFileInfo.PlayerData();
             }
-    
+
             EditorGUILayout.EndScrollView();
             return;
         }
-    
+
         EditorGUILayout.LabelField("PlayerData 编辑器", headerStyle);
         EditorGUILayout.Space();
-    
+
         EditorGUILayout.BeginVertical(sectionStyle);
+
+        if (Application.isPlaying)
+        {
+            targetFolder = EditorGUILayout.TextField(targetFolder);
+            if (GUILayout.Button("添加事件", GUILayout.Height(30)))
+            {
+                if (int.TryParse(targetFolder, out int eventid))
+                {
+                    var eventList = EventSystemManager.Instance.AddEvent(eventid);
+                
+                    if (eventList != null)
+                    {
+                        AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+                        AccountFileInfo.Instance.SavePlayerData();
+                    }
+                }
+            }
+        }
+
         try
         {
             DrawFields(playerData, playerData.GetType(), "PlayerData.");
@@ -58,19 +78,22 @@ public class PlayerDataEditorWindow : EditorWindow
         {
             EditorGUILayout.HelpBox($"绘制字段时出错: {ex.Message}", MessageType.Error);
         }
-    
+
         EditorGUILayout.EndVertical();
-    
+
         EditorGUILayout.Space();
         EditorGUILayout.BeginHorizontal();
-        if (GUILayout.Button("保存 PlayerData", GUILayout.Height(30)))
+        if (!Application.isPlaying)
         {
-            if (EditorUtility.DisplayDialog("保存确认", $"确定要保存到 {Application.persistentDataPath + DataFilePath}？\n现有文件将被覆盖。", "确定", "取消"))
+            if (GUILayout.Button("保存 PlayerData", GUILayout.Height(30)))
             {
-                SavePlayerData();
+                if (EditorUtility.DisplayDialog("保存确认", $"确定要保存到 {Application.persistentDataPath + DataFilePath}？\n现有文件将被覆盖。", "确定", "取消"))
+                {
+                    SavePlayerData();
+                }
             }
         }
-    
+
         if (GUILayout.Button("加载 PlayerData", GUILayout.Height(30)))
         {
             if (EditorUtility.DisplayDialog("加载确认", $"确定要从 {Application.persistentDataPath + DataFilePath} 加载数据？\n当前编辑的数据将被覆盖。", "确定", "取消"))
@@ -78,9 +101,9 @@ public class PlayerDataEditorWindow : EditorWindow
                 LoadPlayerData();
             }
         }
-    
+
         EditorGUILayout.EndHorizontal();
-    
+
         EditorGUILayout.EndScrollView();
     }
 
@@ -289,9 +312,9 @@ public class PlayerDataEditorWindow : EditorWindow
     {
         if (!Application.isPlaying)
         {
-            if(playerData == null)
+            if (playerData == null)
                 playerData = new AccountFileInfo.PlayerData();
-            
+
             try
             {
                 string path = Application.persistentDataPath + DataFilePath;
@@ -316,7 +339,6 @@ public class PlayerDataEditorWindow : EditorWindow
         {
             playerData = AccountFileInfo.Instance.playerData;
         }
-       
     }
 }
 #endif

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -120,7 +120,7 @@ namespace Fort23.Mono
                 TipMessagePanel.OpenTipMessagePanel("神识值不够！");
                 return;
             }
-
+            EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -16,7 +16,7 @@ namespace Fort23.Mono
         private ShengShiEventWidgetType2 mainShengShiEventWidgetType2;
 
         private int saixuanType = 1;
-        
+
         bool isTriggerEvent = false;
 
 
@@ -93,11 +93,16 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
             }
 
-            if (mainShengShiEventWidgetType2 == null)
-                mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+
             AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
-            mainShengShiEventWidgetType2.OnClick = OnClick;
+            if (eventList != null)
+            {
+                if (mainShengShiEventWidgetType2 == null)
+                    mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+                mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
+                mainShengShiEventWidgetType2.OnClick = OnClick;
+            }
+
 
             shengShiEventWidgetTypeList.Clear();
 

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -1,7 +1,11 @@
 using System.Collections.Generic;
+using Animancer;
+using Animancer.TransitionLibraries;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Hero;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -10,6 +14,8 @@ namespace Fort23.Mono
     {
         List<BtnFaBaoWidget> btnFaBaoWidgets = new List<BtnFaBaoWidget>();
 
+        private GameObjectPool modelObj;
+
         private void Init()
         {
             isAddStack = true;
@@ -45,6 +51,52 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_Sentiment.onClick.AddListener(() => { SentimentPanel.OpenPanel(); });
         }
+        private async CTask CreatHero()
+        {
+            modelObj = await GObjectPool.Instance.FetchAsync<GameObjectPool>(PlayerManager.Instance.myHero.modelConfig.model + ".prefab", null);
+            modelObj.own.transform.parent = CameraRoot;
+            modelObj.own.transform.localEulerAngles = new Vector3(0, 180, 0);
+            modelObj.own.transform.localPosition = new Vector3(0, -132, 854);
+            modelObj.own.transform.localScale = Vector3.one * 330;
+            ChangeLayerRecursively(modelObj.own, LayerMask.NameToLayer("UiModle"));
+
+            var modelAnimComponent = modelObj.own.GetComponent<AnimancerComponent>();
+
+            int max = modelAnimComponent.Transitions.Library.Count;
+            for (int i = 0; i < max; i++)
+            {
+                if (modelAnimComponent.Transitions.Library.TryGetTransition(i,
+                        out TransitionModifierGroup transition))
+                {
+                    var modelIdleClip = transition.Transition as TransitionAsset;
+                    if (modelIdleClip != null && modelIdleClip.name == "idle")
+                    {
+                        modelAnimComponent.Play(modelIdleClip);
+                        break;
+                    }
+                }
+            }
+        }
+        
+        public void ChangeLayerRecursively(GameObject obj, int newLayer)
+        {
+            if (obj == null || obj.layer == newLayer) return;
+
+            // 修改当前对象的 Layer
+            obj.layer = newLayer;
+
+            // 遍历所有子对象，递归修改
+            foreach (Transform child in obj.transform)
+            {
+                ChangeLayerRecursively(child.gameObject, newLayer);
+            }
+        }
+
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            CreatHero();
+            return base.AsyncInit(uiData);
+        }
 
         public async void CustomInit()
         {
@@ -125,6 +177,8 @@ namespace Fort23.Mono
 
         public override void Close()
         {
+            UIManager.Instance.DormancyGComponent(modelObj);
+            modelObj = null;
             foreach (var btnFaBaoWidget in btnFaBaoWidgets)
             {
                 UIManager.Instance.DormancyGComponent(btnFaBaoWidget);

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanelData.cs

@@ -85,6 +85,17 @@ namespace Fort23.Mono
 	      return _Btn_Sentiment;
 	     }
 	   }
+	  private Transform _CameraRoot;
+	  public Transform CameraRoot
+	   {
+	   get{
+	      if (_CameraRoot == null)
+	       {
+	         _CameraRoot  = GetUIUnit<Transform>("CameraRoot"); 
+	       }
+	      return _CameraRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

XiuXianGame.sln.DotSettings.user

@@ -13,6 +13,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorGUILayout_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F36_003F62e71429_003FEditorGUILayout_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F3c_003F2c949974_003FEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>