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

Assets/Art/HeroTimeLine/gf_1102_timeline.playable

@@ -71,7 +71,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0
+    m_Start: 0.21666666666666667
     m_ClipIn: 0
     m_Asset: {fileID: -620769377542017112}
     m_Duration: 1.6
@@ -296,6 +296,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -355,6 +357,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/HeroTimeLine/gf_1103_timeline.playable

@@ -15,7 +15,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e34e4626481e59049ad3b409a5bf9fb0
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 3480204404607475665, guid: 822c8e51bc5c0f34a8f0881cedc76e54, type: 3}
   updateParticle: 1
   particleRandomSeed: 5717
   updateDirector: 1
@@ -37,6 +37,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7255035198238635011
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -52,7 +54,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 96464e33dc97a5b4ca08520f4fd5dc1b
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
   updateParticle: 1
   particleRandomSeed: 3202
   updateDirector: 1
@@ -71,9 +73,11 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 1
+  roatIndex: 1
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -97,7 +101,6 @@ MonoBehaviour:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
   - {fileID: 5407991339139584327}
-  - {fileID: 6061407382484812371}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -323,7 +326,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e9be10d28379adf49ae0e4b85f170347
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 4172095099205432901, guid: b23232a05f682be40bf3a65455c9f7f3, type: 3}
   updateParticle: 1
   particleRandomSeed: 518
   updateDirector: 1
@@ -345,6 +348,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 1
+  roatIndex: 1
 --- !u!114 &5407991339139584327
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -455,7 +460,7 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
+  m_Parent: {fileID: 8849378030042438386}
   m_Children: []
   m_Clips:
   - m_Version: 1
@@ -696,6 +701,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 455171082174220382}
+  - {fileID: 6061407382484812371}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/HeroTimeLine/gf_1402_timeline.playable

@@ -158,7 +158,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: b135098b2b412304a8a5386b868bb20f
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 9011773141688868156, guid: 500e4162e3702284f86b9365528d8655, type: 3}
   updateParticle: 1
   particleRandomSeed: 5167
   updateDirector: 1
@@ -180,6 +180,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-3027029268403137025
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -195,7 +197,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 1dcba9b8a21b74748889abc96580cb19
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 7282454173369998372, guid: f8a61f0a77c6acb4fbc56399516655cb, type: 3}
   updateParticle: 1
   particleRandomSeed: 6098
   updateDirector: 1
@@ -217,6 +219,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-1961705670254758766
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -334,7 +338,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -463,6 +467,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf1103_sf.prefab

@@ -27,7 +27,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1745893356863579098}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0.9358445, w: 0.35241348}
   m_LocalPosition: {x: -0.998, y: -1.7600002, z: -1.186}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -35,7 +35,7 @@ Transform:
   - {fileID: 2151778121771675607}
   - {fileID: 8243156749990173179}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 138.73}
 --- !u!198 &6937384450666117639
 ParticleSystem:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9868,6 +9868,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1101_hit
@@ -9880,10 +9881,12 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 30
-  parabolaCurveType: 1
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
-  isUseX: 0
+  isUseX: 1
   BesselPath:
     isActive: 0
     controlPoints: []

Assets/Art/VFX/FXPrefabs/fx_gf_1102.prefab

@@ -24423,7 +24423,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  delayTime: 0
+  moveTarget: {fileID: 0}
+  delayTime: 0.75
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1102_hit
   hitAudioName: 
@@ -24435,6 +24436,8 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 

Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab

@@ -1,5 +1,40 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2345020058552568286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8368732458135709500}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8368732458135709500
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2345020058552568286}
+  serializedVersion: 2
+  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: 7359019252172593379}
+  - {fileID: 2205518357157729889}
+  - {fileID: 1524189644196614407}
+  m_Father: {fileID: 127005549176519968}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3433620202101111751
 GameObject:
   m_ObjectHideFlags: 0
@@ -26,12 +61,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3433620202101111751}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0.28}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!96 &8236048876126668317
 TrailRenderer:
@@ -177,9 +212,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7359019252172593379}
-  - {fileID: 2205518357157729889}
-  - {fileID: 1524189644196614407}
+  - {fileID: 8368732458135709500}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &5248323578188183229
@@ -5073,6 +5106,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1103_hit
@@ -5085,6 +5119,8 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 20
+  roatRoot: {fileID: 8368732458135709500}
+  raotIndex: 1
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
@@ -14953,12 +14989,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6042077122885001401}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: -0.15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!198 &3643551127382296177
 ParticleSystem:
@@ -29636,8 +29672,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8616464955476399753}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.017698}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.01769799}
   m_LocalScale: {x: 0.80805, y: 0.75, z: 0.7788}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -29645,5 +29681,5 @@ Transform:
   - {fileID: 1193821795372858093}
   - {fileID: 3811563905954814054}
   - {fileID: 4397787540378935157}
-  m_Father: {fileID: 127005549176519968}
+  m_Father: {fileID: 8368732458135709500}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Art/VFX/FXPrefabs/fx_gf_1402.prefab

@@ -58,12 +58,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 651555970202960780}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000073889126, y: 3.8859638e-10, z: 0.05252152, w: 0.9986198}
-  m_LocalPosition: {x: -0.41247374, y: 0.000000057220458, z: 0.00000005816877}
+  m_LocalRotation: {x: 0.7024371, y: -0.081130736, z: 0.702437, w: -0.08113072}
+  m_LocalPosition: {x: -0, y: 0.52727234, z: -2.9201818}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1810992592661290339}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &822950574649449611
 GameObject:
@@ -90,13 +90,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 822950574649449611}
   serializedVersion: 2
-  m_LocalRotation: {x: 2.858155e-15, y: -7.9768184e-15, z: -0.03157842, w: 0.9995013}
-  m_LocalPosition: {x: -0.4087349, y: -0.000000038146972, z: 0.000000056984245}
+  m_LocalRotation: {x: 0.70534396, y: 0.049899634, z: 0.70534384, w: 0.049899645}
+  m_LocalPosition: {x: -0, y: 0.44327462, z: -1.7351258}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6371397751334135514}
-  m_Father: {fileID: 8059291242587138979}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &893379813674700054
 GameObject:
@@ -123,13 +122,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 893379813674700054}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021701428, y: -0.000000003947506, z: -0.17896399, w: 0.98385566}
-  m_LocalPosition: {x: -0.3415143, y: -0.00000015258789, z: 0.000000040327485}
+  m_LocalRotation: {x: 0.7026539, y: 0.07923181, z: 0.7026537, w: 0.07923183}
+  m_LocalPosition: {x: 0, y: 0.618672, z: 1.6913452}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5753177128787202825}
-  m_Father: {fileID: 5308593044411586627}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &917305453943219417
 GameObject:
@@ -222,13 +220,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 996373573618100290}
   serializedVersion: 2
-  m_LocalRotation: {x: 2.8588838e-18, y: 7.216447e-15, z: -0.0003961622, w: 0.99999994}
-  m_LocalPosition: {x: -0.45860872, y: -0.000000076293944, z: 0.000000065157444}
+  m_LocalRotation: {x: 0.7065125, y: 0.028985776, z: 0.7065124, w: 0.028985761}
+  m_LocalPosition: {x: 0, y: 0.44327414, z: 0.5149405}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7001932010641342593}
-  m_Father: {fileID: 1369930539169240919}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1185931831778614166
 GameObject:
@@ -255,15 +252,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1185931831778614166}
   serializedVersion: 2
-  m_LocalRotation: {x: 6.786668e-16, y: -5.8912933e-15, z: -0.03563612, w: 0.99936485}
-  m_LocalPosition: {x: -0.36620957, y: -0.000000038146972, z: 0.000000051708803}
+  m_LocalRotation: {x: 0.7070961, y: -0.003906473, z: 0.707096, w: -0.0039064805}
+  m_LocalPosition: {x: -0, y: 0.47162116, z: -1.0069442}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7130618943804711774}
   - {fileID: 5414847214327984613}
-  - {fileID: 8059291242587138979}
-  m_Father: {fileID: 6536788840627830106}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1271666161672694679
 GameObject:
@@ -290,13 +286,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1271666161672694679}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000053614233, y: 2.0219097e-10, z: 0.03768448, w: 0.9992897}
-  m_LocalPosition: {x: -0.3748712, y: 0.0000009155273, z: 0.00000005342017}
+  m_LocalRotation: {x: 0.70652395, y: 0.028705865, z: 0.70652384, w: 0.028705873}
+  m_LocalPosition: {x: 0, y: 0.48047936, z: 0.97203743}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8346665726171099011}
-  m_Father: {fileID: 5753177128787202825}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1709593558099195867
 GameObject:
@@ -527,13 +522,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3362024747589173843}
   serializedVersion: 2
-  m_LocalRotation: {x: -7.784745e-16, y: 2.4796364e-15, z: -0.044553634, w: 0.999007}
-  m_LocalPosition: {x: -0.32071114, y: 0.0000058364867, z: 0.000000045168743}
+  m_LocalRotation: {x: 0.706568, y: 0.027601015, z: 0.7065679, w: 0.027601033}
+  m_LocalPosition: {x: -0, y: 0.4751588, z: -1.3276384}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5768878797721049762}
-  m_Father: {fileID: 6350026575152432370}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3374591378059146117
 GameObject:
@@ -560,13 +554,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3374591378059146117}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000002998117, y: 1.7443287e-10, z: 0.058082864, w: 0.99831176}
-  m_LocalPosition: {x: -0.4092929, y: -0.000000038146972, z: 0.000000057655324}
+  m_LocalRotation: {x: 0.7057287, y: -0.044125777, z: 0.7057286, w: -0.0441258}
+  m_LocalPosition: {x: -0, y: 0.39189517, z: -2.5306315}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 9011023807037736751}
-  m_Father: {fileID: 6371397751334135514}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3679154127480222834
 GameObject:
@@ -598,6 +591,19 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 6371039679233382136}
+  - {fileID: 5753177128787202825}
+  - {fileID: 7001932010641342593}
+  - {fileID: 6536788840627830106}
+  - {fileID: 8059291242587138979}
+  - {fileID: 5768878797721049762}
+  - {fileID: 1810992592661290339}
+  - {fileID: 9011023807037736751}
+  - {fileID: 6371397751334135514}
+  - {fileID: 6350026575152432370}
+  - {fileID: 4748928776387753978}
+  - {fileID: 8346665726171099011}
+  - {fileID: 1369930539169240919}
   - {fileID: 5308593044411586627}
   m_Father: {fileID: 4387452523578066488}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -643,6 +649,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5308593044411586627}
+  - component: {fileID: 6971341312603714882}
+  - component: {fileID: 6111142273816353237}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: tou
@@ -659,16 +667,63 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4483481881700473301}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7054896, y: -0.04779708, z: 0.70548946, w: -0.04779702}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0.7071068, w: 0}
   m_LocalPosition: {x: 0.0000000887227, y: 0.57260805, z: 2.0297387}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1348991281707882360}
-  - {fileID: 6371039679233382136}
   - {fileID: 1606387288634389678}
   m_Father: {fileID: 3352512095176084717}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 180}
+--- !u!65 &6971341312603714882
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4483481881700473301}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6111142273816353237
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4483481881700473301}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &4727674001059603539
 GameObject:
   m_ObjectHideFlags: 0
@@ -694,13 +749,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4727674001059603539}
   serializedVersion: 2
-  m_LocalRotation: {x: 5.925546e-10, y: 2.4829234e-12, z: 0.004196629, w: 0.99999124}
-  m_LocalPosition: {x: -0.38374, y: -0.0000004959106, z: 0.00000005418509}
+  m_LocalRotation: {x: 0.70650774, y: -0.029102152, z: 0.7065076, w: -0.029102156}
+  m_LocalPosition: {x: -0, y: 0.44150317, z: -0.6419766}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6350026575152432370}
-  m_Father: {fileID: 4748928776387753978}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5060102855404764636
 GameObject:
@@ -857,15 +911,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7041552679836848774}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000048466826, y: 1.6477714e-10, z: 0.03397916, w: 0.99942255}
-  m_LocalPosition: {x: -0.3580139, y: 0, z: 0.000000051132574}
+  m_LocalRotation: {x: 0.7049404, y: 0.05531047, z: 0.7049402, w: 0.055310477}
+  m_LocalPosition: {x: 0, y: 0.5389458, z: 1.3423214}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7357606729404232839}
   - {fileID: 5040298048690261420}
-  - {fileID: 1369930539169240919}
-  m_Father: {fileID: 6371039679233382136}
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7494193400016739585
 GameObject:
@@ -892,13 +945,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7494193400016739585}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000004901699, y: 1.7005078e-10, z: 0.034671184, w: 0.99939877}
-  m_LocalPosition: {x: -0.38622722, y: 0.0000023651123, z: 0.000000054667648}
+  m_LocalRotation: {x: 0.7066237, y: -0.026136965, z: 0.70662355, w: -0.026136968}
+  m_LocalPosition: {x: -0, y: 0.4131533, z: -0.25928235}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6536788840627830106}
-  m_Father: {fileID: 7001932010641342593}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7797750196052067437
 GameObject:
@@ -909,9 +961,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 4387452523578066488}
-  - component: {fileID: 6666299408506511735}
   - component: {fileID: 7256257004160465783}
-  - component: {fileID: 916268634625053519}
+  - component: {fileID: 677279902485292160}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1402
@@ -936,27 +987,6 @@ Transform:
   - {fileID: 3352512095176084717}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &6666299408506511735
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7797750196052067437}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.56, y: 0.73, z: 0.74}
-  m_Center: {x: 0, y: -0.011964202, z: -0.07578561}
 --- !u!114 &7256257004160465783
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -969,8 +999,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  moveTarget: {fileID: 4483481881700473301}
+  delayTime: 0
+  multipleTargetDelayTime: 0
   hitFxName: fx_gf_1402_hit
   hitAudioName: 
   extraMoveSpeed: 0
@@ -989,38 +1020,40 @@ MonoBehaviour:
     isActive: 0
     controlPoints:
     - {x: 0, y: 0, z: 0}
-    - {x: -1.7328203, y: 0.7749173, z: 1.4223565}
-    - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
-    - {x: 0, y: 0, z: 5}
+    - {x: -5.991778, y: 11.401026, z: 2.6156032}
+    - {x: 6.483411, y: -1.7293668, z: 6.2406206}
+    - {x: 0, y: 0, z: 22.48019}
     allDis: 0
   maxDis: 20
---- !u!54 &916268634625053519
-Rigidbody:
+--- !u!114 &677279902485292160
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7797750196052067437}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad68eeb04858bfe4a845d021e8d48077, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offRotation: {x: 0, y: -90, z: 180}
+  bodys:
+  - {fileID: 5308593044411586627}
+  - {fileID: 6371039679233382136}
+  - {fileID: 5753177128787202825}
+  - {fileID: 1369930539169240919}
+  - {fileID: 8346665726171099011}
+  - {fileID: 7001932010641342593}
+  - {fileID: 4748928776387753978}
+  - {fileID: 6536788840627830106}
+  - {fileID: 6350026575152432370}
+  - {fileID: 8059291242587138979}
+  - {fileID: 5768878797721049762}
+  - {fileID: 6371397751334135514}
+  - {fileID: 1810992592661290339}
+  - {fileID: 9011023807037736751}
+  bodyDis: []
 --- !u!1 &7801148123395841449
 GameObject:
   m_ObjectHideFlags: 0
@@ -1079,13 +1112,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8086327070934025245}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000060816348, y: 2.6348707e-10, z: 0.04328361, w: 0.99906284}
-  m_LocalPosition: {x: -0.38930967, y: -0.000000076293944, z: 0.000000055300205}
+  m_LocalRotation: {x: 0.707105, y: -0.00162179, z: 0.70710486, w: -0.00162179}
+  m_LocalPosition: {x: -0, y: 0.41138422, z: 0.1269393}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4748928776387753978}
-  m_Father: {fileID: 8346665726171099011}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8423421314582712413
 GameObject:
@@ -1112,13 +1144,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8423421314582712413}
   serializedVersion: 2
-  m_LocalRotation: {x: 3.6060577e-16, y: 7.058577e-15, z: 0.07488554, w: 0.99719214}
-  m_LocalPosition: {x: -0.39011472, y: -0.00000061035155, z: 0.00000005370188}
+  m_LocalRotation: {x: 0.7071002, y: -0.003060583, z: 0.7071001, w: -0.0030605756}
+  m_LocalPosition: {x: -0, y: 0.3883525, z: -2.1213546}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1810992592661290339}
-  m_Father: {fileID: 5768878797721049762}
+  m_Children: []
+  m_Father: {fileID: 3352512095176084717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8762305196601682268
 GameObject:

Assets/Art/VFX/vfx_wuqi/1402long/1402long.mat

@@ -117,7 +117,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
-    - _Diss_value: 0
+    - _Diss_value: -0.03
     - _DstBlend: 0
     - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1

Assets/Art/VFX/vfx_wuqi/1402long/long.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -1554127990298692436}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 390, y: 100, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Res/CombatScenes/CombatRoot.prefab

@@ -30,7 +30,7 @@ Transform:
   m_GameObject: {fileID: 65994213146227239}
   serializedVersion: 2
   m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078}
-  m_LocalPosition: {x: -0, y: -2, z: -0.7}
+  m_LocalPosition: {x: -0, y: -3, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Res/Config/ChanllegeTower.json.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Res/Config/TanxianConfig.json.meta
+guid: CHoe43z4By8MjB/HPLLpyUKShmzZz6ykoTWrbBDjjCktzXNcFEcX5rK87FEt
+========
 guid: Ci4cs3ykVnhUYUwrlH81IYlnA70qtTfrg817/ndH6eKmQIwy4KGbnAwLFN38
+>>>>>>>> b803d55feb70756034431e1de63b00a09af92353:Assets/Res/Config/ChanllegeTower.json.meta
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Res/Config/EventConfig.json

@@ -15,6 +15,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 3,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -41,6 +47,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -64,6 +76,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -84,6 +102,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 7,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -104,6 +128,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -121,6 +151,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -138,6 +174,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -155,6 +197,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -172,6 +220,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -189,6 +243,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -206,6 +266,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -223,6 +289,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -240,6 +312,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -257,6 +335,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -274,6 +358,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -291,6 +381,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -312,6 +408,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -333,6 +435,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -356,6 +464,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -377,6 +491,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -398,6 +518,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -421,6 +547,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -443,6 +575,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -455,11 +593,11 @@
         9025,
         9026
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 1,
       "EventTag": 3,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "EventConditionId": null,
       "PrizeIDs": [
         1001
@@ -480,9 +618,9 @@
       ],
       "EventTriggerType": 99,
       "EventTag": 3,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "EventConditionId": null,
       "PrizeIDs": [
         1001
@@ -510,6 +648,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 100,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 216,
       "EventConditionMessage": null,
       "LanID": [
         216
@@ -13,7 +13,7 @@
     },
     {
       "ID": 1001,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 177,
       "EventConditionMessage": null,
       "LanID": [
         177
@@ -32,7 +32,7 @@
     },
     {
       "ID": 1002,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 178,
       "EventConditionMessage": null,
       "LanID": [
         178
@@ -50,7 +50,7 @@
     },
     {
       "ID": 1003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 179,
       "EventConditionMessage": null,
       "LanID": [
         179
@@ -67,7 +67,7 @@
     },
     {
       "ID": 1004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 180,
       "EventConditionMessage": null,
       "LanID": [
         180
@@ -84,7 +84,7 @@
     },
     {
       "ID": 1005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 181,
       "EventConditionMessage": null,
       "LanID": [
         181
@@ -101,7 +101,7 @@
     },
     {
       "ID": 1010,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 182,
       "EventConditionMessage": null,
       "LanID": [
         182
@@ -120,7 +120,7 @@
     },
     {
       "ID": 1011,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 183,
       "EventConditionMessage": null,
       "LanID": [
         183
@@ -139,7 +139,7 @@
     },
     {
       "ID": 1012,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 184,
       "EventConditionMessage": null,
       "LanID": [
         184,
@@ -157,7 +157,7 @@
     },
     {
       "ID": 1014,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 185,
       "EventConditionMessage": null,
       "LanID": [
         185
@@ -175,7 +175,7 @@
     },
     {
       "ID": 1015,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 186,
       "EventConditionMessage": null,
       "LanID": [
         186,
@@ -193,7 +193,7 @@
     },
     {
       "ID": 1016,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 188,
       "EventConditionMessage": null,
       "LanID": [
         188
@@ -210,7 +210,7 @@
     },
     {
       "ID": 1020,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 190,
       "EventConditionMessage": null,
       "LanID": [
         190
@@ -229,7 +229,7 @@
     },
     {
       "ID": 1021,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 191,
       "EventConditionMessage": null,
       "LanID": [
         191
@@ -253,7 +253,7 @@
     },
     {
       "ID": 1022,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 192,
       "EventConditionMessage": null,
       "LanID": [
         192
@@ -270,7 +270,7 @@
     },
     {
       "ID": 1024,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 193,
       "EventConditionMessage": null,
       "LanID": [
         193,
@@ -295,7 +295,7 @@
     },
     {
       "ID": 1025,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 194,
       "EventConditionMessage": null,
       "LanID": [
         194,
@@ -313,7 +313,7 @@
     },
     {
       "ID": 1026,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 207,
       "EventConditionMessage": null,
       "LanID": [
         207
@@ -332,7 +332,7 @@
     },
     {
       "ID": 1030,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 221,
       "EventConditionMessage": null,
       "LanID": [
         221
@@ -349,7 +349,7 @@
     },
     {
       "ID": 1040,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 222,
       "EventConditionMessage": null,
       "LanID": [
         222
@@ -366,7 +366,7 @@
     },
     {
       "ID": 1050,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 223,
       "EventConditionMessage": null,
       "LanID": [
         223
@@ -385,7 +385,7 @@
     },
     {
       "ID": 1060,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 224,
       "EventConditionMessage": null,
       "LanID": [
         224
@@ -396,7 +396,7 @@
     },
     {
       "ID": 10001,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 208,
       "EventConditionMessage": null,
       "LanID": [
         208
@@ -414,7 +414,7 @@
     },
     {
       "ID": 10002,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 209,
       "EventConditionMessage": null,
       "LanID": [
         209
@@ -431,7 +431,7 @@
     },
     {
       "ID": 10003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 210,
       "EventConditionMessage": null,
       "LanID": [
         210,
@@ -450,7 +450,7 @@
     },
     {
       "ID": 10004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 212,
       "EventConditionMessage": null,
       "LanID": [
         212,
@@ -470,7 +470,7 @@
     },
     {
       "ID": 10005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 1901,
       "EventConditionMessage": null,
       "LanID": [
         1901
@@ -488,7 +488,7 @@
     },
     {
       "ID": 10006,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 1902,
       "EventConditionMessage": null,
       "LanID": [
         1902
@@ -557,7 +557,7 @@
     },
     {
       "ID": 9003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2036,
       "EventConditionMessage": null,
       "LanID": [
         2036
@@ -576,7 +576,7 @@
     },
     {
       "ID": 9004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2037,
       "EventConditionMessage": null,
       "LanID": [
         2037
@@ -594,7 +594,7 @@
     },
     {
       "ID": 9005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2038,
       "EventConditionMessage": null,
       "LanID": [
         2038
@@ -605,7 +605,7 @@
     },
     {
       "ID": 9006,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2039,
       "EventConditionMessage": null,
       "LanID": [
         2039
@@ -616,7 +616,7 @@
     },
     {
       "ID": 9007,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2040,
       "EventConditionMessage": null,
       "LanID": [
         2040

Assets/Res/Config/GameConstantConfig.json

@@ -34,7 +34,8 @@
       "DaoyouguajiDuration": [
         120,
         240
-      ]
+      ],
+      "RefreshRelevanceEventProbability": 50
     }
   ]
 }

Assets/Res/HeroAnimtion/Nanzhu.asset

@@ -28,6 +28,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-4718902783258376847
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack3_1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372176927883266
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372176927883266
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -45,6 +73,8 @@ MonoBehaviour:
     - {fileID: 5809678034847680219}
     - {fileID: 1485322484274848399}
     - {fileID: -6275841264099654957}
+    - {fileID: -4718902783258376847}
+    - {fileID: 4162791575905085679}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -73,6 +103,54 @@ MonoBehaviour:
     - _From: 0
       _To: 2
       _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 4
+      _Fade: 0
+    - _From: 1
+      _To: 4
+      _Fade: 0
+    - _From: 2
+      _To: 4
+      _Fade: 0
+    - _From: 3
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 3
+      _Fade: 0
+    - _From: 4
+      _To: 2
+      _Fade: 0
+    - _From: 4
+      _To: 1
+      _Fade: 0
+    - _From: 4
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1485322484274848399
@@ -103,6 +181,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 669eef23799d5b84ca0df43cd5aadfd5, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &4162791575905085679
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack5
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372176927883595
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372176927883595
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: da64dad2561f5ad40ad6a0ee04fd8862, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &5809678034847680219
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/TimeLineAssets/1102_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tiangangjianqijue\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tiangangjianqijue_sf\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3_1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0.2166667,\"endTime\":1.816667,\"continuedTime\":1.6,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102_sf\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1104_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jindao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1104_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jindao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1104_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1104_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1105_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1105_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_jinzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1105_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1105_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1201_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1201_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingzhui\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1201_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1201_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1204_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1204_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_shuiqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1204_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1204_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1205_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1205_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingdao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1205_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1205_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_bingdao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1205_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1205_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1301_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1301_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1301_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1304_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1304_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_zhuzi\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1304_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1304_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_zhuzi\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1304_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1304_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1305_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1305_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1305_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_muci\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1305_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1305_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1403_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1403_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_liaoyuanzhi\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1403_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1403_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":null,\"randomSeed\":0,\"locationType\":0,\"targetSpecialDotName\":null,\"hitPointGroupName\":null,\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403\",\"isActivity\":false,\"startTime\":0.3,\"endTime\":2.3,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1403\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1403_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1403_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1404_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1404_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huoqiu\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1404_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1404_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1405_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1405_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_huodao\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1405_fashe\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1405_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1501_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1501_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci\",\"randomSeed\":518,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci_chuxian\",\"randomSeed\":2432,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1501_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1501_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci\",\"randomSeed\":518,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_tuci_chuxian\",\"randomSeed\":2432,\"locationType\":2,\"targetSpecialDotName\":\"\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1501\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1501_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1504_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1504_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou_chuxian\",\"randomSeed\":2432,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1504_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1504_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_dashitou_chuxian\",\"randomSeed\":2432,\"locationType\":5,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1504\",\"isActivity\":false,\"startTime\":0.1,\"endTime\":2.1,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1504_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1505_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1505_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1505_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_tu_xiaoshitou\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1505\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1505_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/2008_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_boss01_sk1_jian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_boss01_sk1_jian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/gf_mozhan_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"gf_mozhan_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_mozhan\",\"randomSeed\":382,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.3166667,\"endTime\":1.316667,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"gf_mozhan_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"gf_mozhan_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_mozhan\",\"randomSeed\":382,\"locationType\":0,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":false,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"lieyanjian\",\"isActivity\":false,\"startTime\":0.3166667,\"endTime\":1.316667,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"gf_mozhan_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -33,8 +33,12 @@ RectTransform:
   m_Children:
   - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
-  - {fileID: 3581464887972855309}
   - {fileID: 9037408276187403176}
+  - {fileID: 3450703639607992522}
+  - {fileID: 3581464887972855309}
+  - {fileID: 1442258019244538206}
+  - {fileID: 3009876021119576725}
+  - {fileID: 1239183305622828816}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -60,11 +64,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 8488195482551738332}
     isAssetBundle: 0
@@ -80,8 +79,23 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ShengShiEventWidgetType2Root
+    gameObject: {fileID: 3450703639607992522}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ShenShi
+    gameObject: {fileID: 8570571649648203346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_DaoYou
+    gameObject: {fileID: 6979297239242806004}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   - key: Btn_Close
-    gameObject: {fileID: 3651346582420827263}
+    gameObject: {fileID: 442163555227076089}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -163,10 +177,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   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: 0, y: 46.5656}
-  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  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 &9156533754913033698
 CanvasRenderer:
@@ -206,14 +220,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_01
+  _icon_name: dec_diban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 3c03c9ef85decb2db50053e08067fb5c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -314,7 +328,7 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 444.0557, y: 143.8421}
+  sizeData: {x: 655, y: 260}
   isCustomizeHeight: 0
   posOff: {x: 13, y: 0}
   isDelay: 0
@@ -322,6 +336,86 @@ MonoBehaviour:
   isAdaptationWidth: 0
   layoutType: 0
   overflowDistance: 0
+--- !u!1 &2956971840661338161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1324601193716944019}
+  - component: {fileID: 7481924549330058311}
+  - component: {fileID: 722102803301892971}
+  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 &1324601193716944019
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  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: 3009876021119576725}
+  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 &7481924549330058311
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  m_CullTransparentMesh: 1
+--- !u!114 &722102803301892971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  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: 33
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9053\u53CB\u4E8B\u4EF6"
 --- !u!1 &3651587731235081858
 GameObject:
   m_ObjectHideFlags: 0
@@ -357,7 +451,7 @@ 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: -2.9302979, y: 367.5232}
+  m_AnchoredPosition: {x: -2.9302979, y: 702}
   m_SizeDelta: {x: 450.1394, y: 78.9535}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3637005864510300227
@@ -381,7 +475,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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
@@ -389,12 +483,12 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 34
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 44
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
-    m_MaxSize: 40
+    m_MaxSize: 44
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -439,8 +533,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: -2.147, y: -5.5664}
-  m_SizeDelta: {x: 471.58, y: 652.1576}
+  m_AnchoredPosition: {x: -1.5, y: -102.55858}
+  m_SizeDelta: {x: 663.9488, y: 925.5284}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -510,6 +604,202 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5889784868559573260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3450703639607992522}
+  - component: {fileID: 2699421981411980314}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiEventWidgetType2Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3450703639607992522
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5889784868559573260}
+  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: 8599819629026832582}
+  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: -2.147, y: 528}
+  m_SizeDelta: {x: 655, y: 250}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2699421981411980314
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5889784868559573260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &6833021426073465471
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1239183305622828816}
+  - component: {fileID: 7461148173800663615}
+  - component: {fileID: 3563681708230613544}
+  - component: {fileID: 442163555227076089}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1239183305622828816
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 37, y: 22}
+  m_SizeDelta: {x: 79, y: 84}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &7461148173800663615
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  m_CullTransparentMesh: 1
+--- !u!114 &3563681708230613544
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  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: 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_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: dec_fanhui2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &442163555227076089
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3563681708230613544}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6864546897549033815
 GameObject:
   m_ObjectHideFlags: 0
@@ -631,6 +921,354 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7098872407542959521
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1549299383501015935}
+  - component: {fileID: 7790443248632903804}
+  - component: {fileID: 8733058899712714278}
+  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 &1549299383501015935
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  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: 1442258019244538206}
+  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 &7790443248632903804
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  m_CullTransparentMesh: 1
+--- !u!114 &8733058899712714278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  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: 33
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u795E\u8BC6(2/10)"
+--- !u!1 &7244836889075663130
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3009876021119576725}
+  - component: {fileID: 7120957080262225261}
+  - component: {fileID: 7872949651746918913}
+  - component: {fileID: 6979297239242806004}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_DaoYou
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3009876021119576725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  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: 1324601193716944019}
+  m_Father: {fileID: 8599819629026832582}
+  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: 179, y: -642}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7120957080262225261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  m_CullTransparentMesh: 1
+--- !u!114 &7872949651746918913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  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: 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_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: btn_shengji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &6979297239242806004
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7872949651746918913}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &7638606920926905235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1442258019244538206}
+  - component: {fileID: 803569073275056124}
+  - component: {fileID: 501046924026959756}
+  - component: {fileID: 8570571649648203346}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_ShenShi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1442258019244538206
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  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: 1549299383501015935}
+  m_Father: {fileID: 8599819629026832582}
+  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: -170.15, y: -642}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &803569073275056124
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_CullTransparentMesh: 1
+--- !u!114 &501046924026959756
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  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: 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_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: btn_lingwu
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8570571649648203346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 501046924026959756}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -266,7 +266,7 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 444.0557, y: 143.8421}
+  sizeData: {x: 444.0557, y: 218}
   isCustomizeHeight: 0
   posOff: {x: 13, y: 0}
   isDelay: 0

Assets/Res/UI/DivineSence/ShengShiConditionWidget.prefab

@@ -0,0 +1,376 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4314931744859409028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2059370578134625917}
+  - component: {fileID: 8829860962623938134}
+  - component: {fileID: 418351672045357513}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2059370578134625917
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  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: 417798913070878350}
+  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 &8829860962623938134
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  m_CullTransparentMesh: 1
+--- !u!114 &418351672045357513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  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: 0.45098042, g: 0.43529415, b: 0.39607847, 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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9493\u9C7C\u7FC1"
+--- !u!1 &7999435953416995087
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5851165397762221054}
+  - component: {fileID: 974582271661454250}
+  - component: {fileID: 529387738808672660}
+  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 &5851165397762221054
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  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: 417798913070878350}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &974582271661454250
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  m_CullTransparentMesh: 1
+--- !u!114 &529387738808672660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  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: 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_Sprite: {fileID: 0}
+  m_Type: 1
+  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: dec_renwu_dise
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8904660351945015112
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 417798913070878350}
+  - component: {fileID: 4216496371977979539}
+  - component: {fileID: 2237901092907678635}
+  - component: {fileID: 4508944208514706016}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiConditionWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &417798913070878350
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  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: 5851165397762221054}
+  - {fileID: 2059370578134625917}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 217.8006, y: 27.5663}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &4216496371977979539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.3
+  isUpdate: 0
+  currTime: 0.30510476
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 0
+    allTargets:
+    - {fileID: 8904660351945015112}
+    TweenAssetInfo: {fileID: 11400000, guid: 45a33638e1bf2e040a04be1042aa2f06, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.3
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!114 &2237901092907678635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 4508944208514706016}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 529387738808672660}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 418351672045357513}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &4508944208514706016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Res/UI/DivineSence/ShengShiConditionWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cy9KtnypVy/fifv629zDp8HgurQpQXbzrif2VZ5shn39CbBzACjGeHmBl6YZ
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -1,5 +1,101 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &533257899024031940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2781605243884814213}
+  - component: {fileID: 6940629244054234312}
+  - component: {fileID: 3935838372477410148}
+  - component: {fileID: 7273584258005758506}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Eventcondition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2781605243884814213
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  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: 3764721290890148754}
+  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: -15.991, y: -70.2}
+  m_SizeDelta: {x: 629.59, y: 50.0941}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6940629244054234312
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  m_CullTransparentMesh: 1
+--- !u!114 &3935838372477410148
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  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: 0.7294118, g: 0.70980394, b: 0.70980394, 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: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &7273584258005758506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &869698564475441709
 GameObject:
   m_ObjectHideFlags: 0
@@ -36,8 +132,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: -0, y: 2.9}
-  m_SizeDelta: {x: 433.7711, y: 36.0552}
+  m_AnchoredPosition: {x: -15.9906, y: -9.3396}
+  m_SizeDelta: {x: 629.5898, y: 60.5345}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2062974483703860703
 CanvasRenderer:
@@ -60,7 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,9 +164,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -96,6 +192,227 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &1576553285643352763
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 145896444123704845}
+  - component: {fileID: 6941784822579017943}
+  - component: {fileID: 7607584696188344000}
+  - component: {fileID: 2765815625611829555}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &145896444123704845
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: -269.8, y: -126.69992}
+  m_SizeDelta: {x: 0, y: 86.8594}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6941784822579017943
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_CullTransparentMesh: 1
+--- !u!114 &7607584696188344000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 6.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2765815625611829555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &1773075558923197189
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7551747957602520090}
+  - component: {fileID: 8044263114105609004}
+  - component: {fileID: 1571941360682940458}
+  - component: {fileID: 8048933075909396369}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Go
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7551747957602520090
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  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: 1357364587688641971}
+  m_Father: {fileID: 3764721290890148754}
+  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: 240.7, y: -137.4}
+  m_SizeDelta: {x: 102.5871, y: 32.4386}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8044263114105609004
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_CullTransparentMesh: 1
+--- !u!114 &1571941360682940458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  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: 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_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: btn_shengji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8048933075909396369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1571941360682940458}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1904131733610652650
 GameObject:
   m_ObjectHideFlags: 0
@@ -130,49 +447,262 @@ RectTransform:
   - {fileID: 9098093879968300551}
   m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -165.22783, y: 10.86892}
-  m_SizeDelta: {x: 64.56799, y: 28.462402}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &5479443627435669674
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: -285.5, y: 22.6}
+  m_SizeDelta: {x: 68.4992, y: 42.713}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5479443627435669674
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904131733610652650}
+  m_CullTransparentMesh: 1
+--- !u!114 &5514984282659310211
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904131733610652650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9622642, g: 0.5582948, b: 0.5582948, 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
+--- !u!1 &2987942260868545690
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7325153162450915011}
+  - component: {fileID: 4485080243282319686}
+  - component: {fileID: 5018190062906650215}
+  - component: {fileID: 1530431928590719805}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_ZuiZhong
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7325153162450915011
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 241.05, y: -55.577}
+  m_SizeDelta: {x: 79.339, y: 79.3394}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &4485080243282319686
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_CullTransparentMesh: 1
+--- !u!114 &5018190062906650215
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  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: 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_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: dec_wenhao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1530431928590719805
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5018190062906650215}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3348088768749406642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1357364587688641971}
+  - component: {fileID: 570113842003181522}
+  - component: {fileID: 7694624349492924708}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1357364587688641971
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3348088768749406642}
+  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: 7551747957602520090}
+  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: 0.0007658005, y: 0}
+  m_SizeDelta: {x: 102.59, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &570113842003181522
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904131733610652650}
+  m_GameObject: {fileID: 3348088768749406642}
   m_CullTransparentMesh: 1
---- !u!114 &5514984282659310211
+--- !u!114 &7694624349492924708
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904131733610652650}
+  m_GameObject: {fileID: 3348088768749406642}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9622642, g: 0.5582948, b: 0.5582948, a: 1}
+  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_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
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u524D\u5F80"
 --- !u!1 &4038213450023413557
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,14 +737,20 @@ RectTransform:
   - {fileID: 1357522047238736597}
   - {fileID: 3650536308811846443}
   - {fileID: 712579681456886399}
+  - {fileID: 2781605243884814213}
   - {fileID: 6760469126628422357}
   - {fileID: 3042280114302172752}
+  - {fileID: 145896444123704845}
+  - {fileID: 7551747957602520090}
+  - {fileID: 7325153162450915011}
+  - {fileID: 8173313993394265504}
+  - {fileID: 6639653483637829207}
   m_Father: {fileID: 3370061335406075943}
   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: 0.0000052452087, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMax: {x: 0.509, y: 0.56666046}
+  m_AnchoredPosition: {x: 10, y: 35.5}
+  m_SizeDelta: {x: 96, y: 85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4166089039989576680
 CanvasRenderer:
@@ -260,8 +796,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: 37.3, y: 46.638}
-  m_SizeDelta: {x: 348.9613, y: 30}
+  m_AnchoredPosition: {x: -0.1495, y: 50.676}
+  m_SizeDelta: {x: 523.6624, y: 42.713}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6912937265734038597
 CanvasRenderer:
@@ -284,7 +820,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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
@@ -292,9 +828,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -355,8 +891,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 16.92102}
-  m_SizeDelta: {x: 444, y: 133.84}
+  m_AnchoredPosition: {x: -12.1711, y: 28.15601}
+  m_SizeDelta: {x: 655, y: 250}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2778409128145198339
 CanvasRenderer:
@@ -443,8 +979,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: 0.9154, y: 247.47897}
-  m_SizeDelta: {x: 444.0557, y: 133.8421}
+  m_AnchoredPosition: {x: 0.9154, y: 210.23947}
+  m_SizeDelta: {x: 655, y: 250}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3748703702239827202
 MonoBehaviour:
@@ -459,11 +995,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: myButton
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_EventDesc
     gameObject: {fileID: 690487615239233780}
     isAssetBundle: 0
@@ -479,6 +1010,36 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Eventcondition
+    gameObject: {fileID: 3935838372477410148}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 145896444123704845}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Go
+    gameObject: {fileID: 8048933075909396369}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ZuiZhong
+    gameObject: {fileID: 1530431928590719805}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ZuiZhongRoot
+    gameObject: {fileID: 8193172811373753691}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Marsk
+    gameObject: {fileID: 6639653483637829207}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:
@@ -516,7 +1077,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 168.92786, y: 13.821144}
+  m_AnchoredPosition: {x: 253.39993, y: 20.807}
   m_SizeDelta: {x: 36.4424, y: 35.969}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
@@ -557,7 +1118,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_close_01
+  _icon_name: dec_fanhui1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -744,8 +1305,8 @@ RectTransform:
   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: 46.637783}
-  m_SizeDelta: {x: 344, y: -59.433495}
+  m_AnchoredPosition: {x: -12.17, y: 52.255}
+  m_SizeDelta: {x: 553.1, y: -48.199}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8013943971233128026
 CanvasRenderer:
@@ -797,3 +1358,260 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7455267306585598975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1132527634272378842}
+  - component: {fileID: 6867107770330957799}
+  - component: {fileID: 521768857768353200}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1132527634272378842
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  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: 8173313993394265504}
+  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: 0, y: -2.3615}
+  m_SizeDelta: {x: 160, y: 46.8687}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6867107770330957799
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  m_CullTransparentMesh: 1
+--- !u!114 &521768857768353200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  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: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FFD\u8E2A\u4E2D"
+--- !u!1 &8193172811373753691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8173313993394265504}
+  - component: {fileID: 3700033355154013030}
+  - component: {fileID: 429128512067996824}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ZuiZhongRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8173313993394265504
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  m_LocalRotation: {x: -0, y: -0, z: 0.09949822, w: 0.9950378}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1132527634272378842}
+  m_Father: {fileID: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.421}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 141.7, y: 57.1}
+  m_SizeDelta: {x: 172.7552, y: 65.7585}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3700033355154013030
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  m_CullTransparentMesh: 1
+--- !u!114 &429128512067996824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  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.32941177, g: 0.654902, b: 0.6509804, 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: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8848809442754795059
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6639653483637829207}
+  - component: {fileID: 3169785772497008671}
+  - component: {fileID: 6725735528704137599}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Marsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6639653483637829207
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -12.171082, y: 28.15599}
+  m_SizeDelta: {x: 655, y: 250}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3169785772497008671
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  m_CullTransparentMesh: 1
+--- !u!114 &6725735528704137599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  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: 0.49019608}
+  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: 1
+  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

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -328,11 +328,12 @@ RectTransform:
   m_Children:
   - {fileID: 5171746521320677542}
   - {fileID: 6634741294730613967}
+  - {fileID: 8111297521971765792}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 13.299988, y: -213.20001}
+  m_AnchoredPosition: {x: 13.299988, y: -288}
   m_SizeDelta: {x: 76, y: 74}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &76856068010717943
@@ -939,6 +940,93 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &3233637757483136916
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8111297521971765792}
+  - component: {fileID: 5038450651613138194}
+  - component: {fileID: 6960660248127154089}
+  - component: {fileID: 6619368622079106145}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: EventConditionRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8111297521971765792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  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: 3695676087259227986}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 170, y: -81.6}
+  m_SizeDelta: {x: 242.4876, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5038450651613138194
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_CullTransparentMesh: 1
+--- !u!114 &6960660248127154089
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 8.18
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6619368622079106145
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &3348075033185530517
 GameObject:
   m_ObjectHideFlags: 0
@@ -2554,6 +2642,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: EventConditionRoot
+    gameObject: {fileID: 8111297521971765792}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -34,8 +34,9 @@ RectTransform:
   - {fileID: 2569128129379278262}
   - {fileID: 4688522053669353716}
   - {fileID: 8515100903656146540}
-  - {fileID: 3203492498983292032}
   - {fileID: 3220702368838562604}
+  - {fileID: 112700476894147953}
+  - {fileID: 708683880219238892}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -71,17 +72,12 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_Name
-    gameObject: {fileID: 9048041755528718903}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_desc
     gameObject: {fileID: 1040938809657299556}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_Title
+  - key: Text_Name
     gameObject: {fileID: 1087322108478024986}
     isAssetBundle: 0
     isList: 0
@@ -91,6 +87,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Condition
+    gameObject: {fileID: 8902432584562006073}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1408015899473625068
 GameObject:
@@ -125,11 +126,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4038523271141183626}
-  m_Father: {fileID: 3220702368838562604}
+  m_Father: {fileID: 8599819629026832582}
   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: 0, y: -287.1}
+  m_AnchoredPosition: {x: 0, y: 666.9}
   m_SizeDelta: {x: 410.77, y: 248.4609}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -309,8 +310,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: -9, y: -288.69}
-  m_SizeDelta: {x: 132.3538, y: 50.3799}
+  m_AnchoredPosition: {x: -9, y: -276.2}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2934276402299459566
 CanvasRenderer:
@@ -333,7 +334,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.27792454, g: 1, b: 0, a: 1}
+  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
@@ -350,7 +351,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
+  _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -465,7 +466,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.9490197, g: 0.94117653, b: 0.94117653, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -473,9 +474,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 21
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 33
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -485,7 +486,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6311\u6218"
+  m_Text: "\u4EFB\u52A1\u5B8C\u6210"
 --- !u!1 &3627747089450203247
 GameObject:
   m_ObjectHideFlags: 0
@@ -517,13 +518,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 708683880219238892}
+  m_Children: []
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -506}
+  m_AnchoredPosition: {x: 0, y: -467.9}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
@@ -582,86 +582,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &5056397833504547694
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3203492498983292032}
-  - component: {fileID: 7191667401234808033}
-  - component: {fileID: 9048041755528718903}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3203492498983292032
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  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: 8599819629026832582}
-  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: -121.43, y: 339.6}
-  m_SizeDelta: {x: 167.8958, y: 40.0044}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7191667401234808033
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  m_CullTransparentMesh: 1
---- !u!114 &9048041755528718903
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 26
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4EFB\u52A1\u4FE1\u606F"
 --- !u!1 &6488653642591306706
 GameObject:
   m_ObjectHideFlags: 0
@@ -884,6 +804,101 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7852697166483862012
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 112700476894147953}
+  - component: {fileID: 3214678112079635339}
+  - component: {fileID: 8902432584562006073}
+  - component: {fileID: 8492955492561521038}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Condition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &112700476894147953
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -575.3}
+  m_SizeDelta: {x: 410.77, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3214678112079635339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  m_CullTransparentMesh: 1
+--- !u!114 &8902432584562006073
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  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: 0.61960787, g: 0.6117647, b: 0.1764706, 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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1.3
+  m_Text: "\u51FB\u8D25\u540E\u5C71\u5C0F\u59960/6\n\u51FB\u8D25\u540E\u5C71\u5C0F\u59960/6"
+--- !u!114 &8492955492561521038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &8794085188831228050
 GameObject:
   m_ObjectHideFlags: 0
@@ -897,7 +912,7 @@ GameObject:
   - component: {fileID: 1087322108478024986}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Title
+  m_Name: Text_Name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -919,7 +934,7 @@ 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: -0.0000038147, y: 380}
+  m_AnchoredPosition: {x: -0.0000038147, y: 390.8}
   m_SizeDelta: {x: 410.7655, y: 55.7865}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088

Assets/Scenes/testCombat.scene

@@ -2185,7 +2185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2261,7 +2261,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.data[0]
-      value: 14055
+      value: 14022
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skill.Array.data[0]
@@ -2297,7 +2297,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4743,6 +4743,63 @@ Sprite:
     - {x: 0.415, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &667277092
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.958
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4387452523578066488, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7797750196052067437, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_Name
+      value: fx_gf_1402
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
 --- !u!1 &675361046
 GameObject:
   m_ObjectHideFlags: 0
@@ -9427,7 +9484,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
@@ -13262,3 +13319,4 @@ SceneRoots:
   - {fileID: 1359684029}
   - {fileID: 1544803331}
   - {fileID: 1085826000}
+  - {fileID: 667277092}

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -115,7 +115,8 @@ namespace Fort23.Core
       /// 获得道具
       /// </summary>
       AddItem,
-      DaoYouCounUpdate
+      DaoYouCounUpdate,
+      UpdateZuiZhongEvent
       
     }
 }

Assets/Scripts/GameData/ExcelConfig/ChanllegeTower.cs.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scripts/GameData/ExcelConfig/TanxianConfig.cs.meta
+guid: DHhOvCz+Vn7rrzC0n2WAoCYB+tzBdyuXw6bagroYUuzo2XnXb2YVsIszVMxW
+========
 guid: W34dsCn+Vy2sy+toBdaM6yWGdZbJvgXtHRq8ILcxeyHzuK2x5AL6rEQ5kAkh
+>>>>>>>> b803d55feb70756034431e1de63b00a09af92353:Assets/Scripts/GameData/ExcelConfig/ChanllegeTower.cs.meta
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -92,6 +92,12 @@ public int Daoyoushowuptime;
 public int[] DaoyouguajiDuration;
 
 
+		/// <summary>
+		///刷新关联事件概率 （100=100%）
+		/// </summary>
+public int RefreshRelevanceEventProbability;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/Buff/BuffControl.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 
@@ -22,12 +23,13 @@ namespace GameLogic.Combat.Buff
             startAddBuffEventData.BuffInfo = buffInfo;
             startAddBuffEventData.source = source;
             startAddBuffEventData.target = _combatHeroEntity;
-            CombatEventManager.Instance.Dispatch(CombatEventType.StartAddBuff, startAddBuffEventData,false);
+            CombatEventManager.Instance.Dispatch(CombatEventType.StartAddBuff, startAddBuffEventData, false);
             if (startAddBuffEventData.isNotAddBuff)
             {
                 startAddBuffEventData.Recycle();
                 return null;
             }
+
             startAddBuffEventData.Recycle();
             BuffBasic buffBasic = GetBuffBasicForIdGroup(buffInfo.BuffConfig.buffGroup);
             if (buffBasic == null)
@@ -86,6 +88,26 @@ namespace GameLogic.Combat.Buff
             return null;
         }
 
+        /// <summary>
+        /// 获得对应buff
+        /// </summary>
+        /// <param name="buffType"> 1=buff 2=debuff 3=中立</param>
+        /// <returns></returns>
+        public List<BuffBasic> GetBuffBasicForBuffType(int buffType)
+        {
+            List<BuffBasic> buffBasics = new List<BuffBasic>();
+            for (int i = 0; i < _allBuff.Count; i++)
+            {
+                BuffBasic b = _allBuff[i];
+                if (b.buffInf.BuffConfig.buffType == buffType)
+                {
+                    buffBasics.Add(b);
+                }
+            }
+
+            return buffBasics;
+        }
+
         public BuffBasic GetBuffBasicForIdGroup(int idGroup)
         {
             for (int i = 0; i < _allBuff.Count; i++)

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -114,7 +114,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance && distance < 400)
+                if (distance < minDistance && distance < 225)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -84,9 +84,9 @@ namespace GameLogic.Combat.CombatTool
         public void CameraSelect_onValueChanged(float value)
         {
             _cameraSelectValue = value;
-            Vector3 pos1 = new Vector3(0, -2, -0.7f);
+            Vector3 pos1 = new Vector3(0, -3, -0.7f);
             Vector3 e1 = new Vector3(20, 0, 0);
-            Vector3 pos2 = new Vector3(9, 0.7f, -1.4f);
+            Vector3 pos2 = new Vector3(9, -1, -1.4f);
             Vector3 e2 = new Vector3(17.77f, -28.25f, 1.165f);
             Camera.transform.localPosition =
                 Vector3.Lerp(pos1, pos2, value);

Assets/Scripts/GameLogic/Combat/Skill/S1102.cs

@@ -23,12 +23,16 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
-            ballisticsCount = (int)effectValue[0];
-            for (int i = 0; i < effectValue[0]; i++)
+            ballisticsCount = 1;
+            for (int i = 0; i < 1; i++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                // float x=CombatCalculateTool.Instance.GetOdd(-100, 100)/100f*3;
+                // float y=CombatCalculateTool.Instance.GetOdd(50, 100)/100f*2;
+                Vector3 off = new Vector3(0, 1,1.5f);
+                off = CombatHeroEntity.GameObject.transform.TransformPoint(off);
+                // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
                 ActivationTimeLineData("1102_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                    customizePos: new Vector3[] { off }, indexCount: i);
             }
         }
 

Assets/Scripts/GameLogic/Combat/Skill/S1103.cs

@@ -17,6 +17,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            _finishTimeLineGroupName = "1103";
             ActivationTimeLineData("1103");
             CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
                 .GetThis<CombatHeroEntity>()
@@ -26,16 +27,21 @@ namespace GameLogic.Combat.Skill
             ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
-                float startTime = i * -0.02f;
+                float a = CombatCalculateTool.Instance.GetOdd(0, 360);
+                Quaternion q = Quaternion.Euler(0, 0, a);
+                q = CombatHeroEntity.GameObject.transform.rotation * q;
+                Vector3 qe = q.eulerAngles;
+                float startTime = i * -0.2f;
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
                 ActivationTimeLineData("1103_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i,startTime:startTime);
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos(), qe }, indexCount: i,
+                    startTime: startTime);
             }
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             if (SelfSkillConfig.level > 5)
@@ -52,7 +58,7 @@ namespace GameLogic.Combat.Skill
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,skillFeatures,
+                wuXingType, skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {

Assets/Scripts/GameLogic/Combat/Skill/S1402.cs

@@ -27,9 +27,13 @@ namespace GameLogic.Combat.Skill
             ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                float x = CombatCalculateTool.Instance.GetOdd(-100, 100);
+                x = (x ) / 200;
+                Vector3 pos = new Vector3(x, 0.7f, -2f);
+                pos = CombatHeroEntity.GameObject.transform.TransformPoint(pos);
+                // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo(pos);
                 ActivationTimeLineData("1402_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                    customizePos: new Vector3[] { pos }, indexCount: i, startTime: -0.2f * i);
             }
 
             ActivationTimeLineData("1402");
@@ -40,16 +44,15 @@ namespace GameLogic.Combat.Skill
         {
         }
 
-      
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData, wuXingType,skillFeatures,
+                AttType.Skill, triggerData, wuXingType, skillFeatures,
                 HarmType.Default);
 
             if (harmReturnInfo.isHitHero)
@@ -76,7 +79,7 @@ namespace GameLogic.Combat.Skill
                         CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                         effectValue[4]);
                     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2,
-                        AttType.Skill, triggerData, wuXingType,skillFeatures,
+                        AttType.Skill, triggerData, wuXingType, skillFeatures,
                         HarmType.Default);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S2009.cs

@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 青莲净体诀  前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%最大生命
+    /// 后方槽位也能获得青莲之气
+    ///如果为相生功法，各自获得的青莲之气数*2
+    /// </summary>
+    public class S2009 : SkillBasic
+    {
+        private int currCount;
+
+        private bool isSymbiosis;
+
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProInitSkill()
+        {
+            currCount = 0;
+            isSymbiosis = false;
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        protected override void ProActiveSkill()
+        {
+            if (SelfSkillConfig.PromoteLanPara_1.Length > 1)
+            {
+                CombatHeroSkillControl combatHeroSkillControl =
+                    CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>();
+                SkillBasic skillBasic = combatHeroSkillControl.GetSkillQueueForIndex(index + 1);
+                SkillBasic skillBasic2 = combatHeroSkillControl.GetSkillQueueForIndex(index - 1);
+                if (skillBasic != null && skillBasic2 != null)
+                {
+                    isSymbiosis =
+                        CombatCalculateTool.Instance.IsSymbiosis(skillBasic.wuXingType, skillBasic2.wuXingType);
+                }
+            }
+        }
+
+        private void HeroInjured(IEventData eventData)
+        {
+            HeroInjuredEventData heroInjuredEventData = eventData as HeroInjuredEventData;
+            HarmReturnInfo harmReturnInfo = heroInjuredEventData.HarmReturnInfo;
+            if (harmReturnInfo.source != CombatHeroEntity)
+            {
+                return;
+            }
+
+            SkillBasic skillBasic = harmReturnInfo.triggerData.Source as SkillBasic;
+            if (IsPassiveActivateSkill(skillBasic))
+            {
+                object iBarrier = heroInjuredEventData.HarmReturnInfo.triggerData.IBarrier;
+                if (iBarrier != null)
+                {
+                    return;
+                }
+
+                if (isSymbiosis)
+                {
+                    currCount += 2;
+                }
+                else
+                {
+                    currCount++;
+                }
+
+                if (currCount >= effectValue[0]) //满足层数
+                {
+                    currCount = 0;
+                    List<BuffBasic> buffBasics = CombatHeroEntity.BuffControl.GetBuffBasicForBuffType(2);
+                    int count = (int)effectValue[1];
+                    for (int i = 0; i < count; i++)
+                    {
+                        if (buffBasics.Count <= 0)
+                        {
+                            break;
+                        }
+
+                        int index = CombatCalculateTool.Instance.GetOdd(0, buffBasics.Count);
+                        BuffBasic buffBasic = buffBasics[index];
+                        CombatHeroEntity.BuffControl.RemoveBuff(buffBasic);
+                        buffBasics.RemoveAt(index);
+                    }
+
+                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[2]);
+                    Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
+                        AttType.Skill);
+                }
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S2009.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 05fbe9c8e6e14e469c5fa60739c8af2f
+timeCreated: 1749710466

Assets/Scripts/GameLogic/Combat/Skill/S2010.cs

@@ -0,0 +1,42 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 碧霄回春术  功法在经过木系区域时会触发生机，为角色治疗{0}生命值
+    /// </summary>
+    public class S2010 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProActiveSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        private void TriggerSkillSlots(IEventData ieventData)
+        {
+            TriggerSkillSlotsEventData triggerSkillSlotsEventData = ieventData as TriggerSkillSlotsEventData;
+            if (triggerSkillSlotsEventData.SkillBasic == this)
+            {
+                if (triggerSkillSlotsEventData.triggerType == 2) //触发到木的位置
+                {
+                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[0]);
+                    Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
+                        AttType.Skill);
+                }
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S2010.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 51d9df94eebf4ae9a9f87c5656858606
+timeCreated: 1749783019

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -328,7 +328,7 @@ namespace GameLogic.Combat.Skill
         }
 
         public HarmReturnInfo Recover(CombatHeroEntity source, CombatHeroHitPoint target, long att,
-            AttType attType, HarmType harmType)
+            AttType attType, HarmType harmType=HarmType.Recover)
         {
             return CombatCalculateTool.Instance.Recover(source, target, att, attType, harmType, triggerData);
         }
@@ -603,14 +603,14 @@ namespace GameLogic.Combat.Skill
                 return false;
             }
 
-            if (SelfSkillConfig.PromoteLanPara == null)
+            if (SelfSkillConfig.PromoteLanPara_1 == null)
             {
                 return false;
             }
 
-            for (int i = 0; i < SelfSkillConfig.PromoteLanPara.Length; i++)
+            for (int i = 0; i < SelfSkillConfig.PromoteLanPara_1.Length; i++)
             {
-                int configIndex = (int)SelfSkillConfig.PromoteLanPara[i];
+                int configIndex = (int)SelfSkillConfig.PromoteLanPara_1[i];
                 if (targetSkillBasic.index == configIndex + index)
                 {
                     return true;

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -19,6 +19,7 @@ namespace Common.Combat.FxAILogic
 {
     public abstract class FxAILogicBasic : MonoBehaviour, IDisposable, ITimelineFxLogic, ITriggerEntity
     {
+        [Header("移动的根节点，默认是root")] public GameObject moveTarget;
         private TimeLineEventParticleLogicBasic _timeLineEventParticleLogicBasic;
         private ILifetCycleHitPoint _attTarget;
 
@@ -106,6 +107,12 @@ namespace Common.Combat.FxAILogic
                 Dispose();
                 return;
             }
+
+            if (moveTarget == null)
+            {
+                moveTarget = ObjectPoolInterface.own;
+            }
+
             ObjectPoolInterface.own.SetActive(false);
             BarrierTriggerData = new BarrierTriggerData();
             isNotMove = false;

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Core.Audio;
 using Core.Triiger;
 using Core.Utility;
+using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using GameLogic.Combat.Skill;
@@ -14,7 +15,10 @@ namespace Common.Combat.FxAILogic
     [AddComponentMenu("特效脚本/弹道/功法通用弹道")]
     public class FxParabolaBulletLogic : FxAILogicBasic
     {
+      
         public float speed;
+        public Transform roatRoot;
+        public int raotIndex;
         private IUnRegister UnRegister = null;
 
 
@@ -50,7 +54,12 @@ namespace Common.Combat.FxAILogic
         protected override void ProInit()
         {
             maxDisSpr = maxDis * maxDis;
-           
+
+            if (roatRoot!=null&&TimeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isRoat)
+            {
+                roatRoot.transform.eulerAngles = TimeLineEventParticleLogicBasic.customizePos[raotIndex];
+            }
+
             if (isUseCustomTargetEndPos)
             {
                 endPos = TimeLineEventParticleLogicBasic.customizePos[
@@ -76,13 +85,13 @@ namespace Common.Combat.FxAILogic
                 startDir = CombatHeroEntity.GameObject.transform.TransformPoint(off +
                     new Vector3(
                         x,
-                        Random.Range(0.1f, 1f),
+                        0,
                         Random.Range(0.1f, 5f)));
 
                 startDir = (startDir - _currPos).normalized;
                 dirLerpTime = 0;
                 dir = (endPos - CurrPos).normalized;
-                gameObject.transform.rotation = Quaternion.LookRotation(dir);
+                moveTarget.transform.rotation = Quaternion.LookRotation(dir);
             }
             else if (parabolaCurveType == CurveType.Beeline)
             {
@@ -105,7 +114,7 @@ namespace Common.Combat.FxAILogic
                     Vector3 p = BesselPath.controlPoints[i];
                     if (isUseX)
                     {
-                        if (i == 1)
+                        if (i == 1||i==2)
                         {
                             p.x = pos.x > 0 ? p.x * -1 : p.x;
                         }
@@ -118,10 +127,10 @@ namespace Common.Combat.FxAILogic
                 moveBezierPath.SetLengthAtT();
 
                 currTime = 0;
-              
             }
+
             CombatUpdate(0.016f);
-            UnRegister = gameObject.OnTriggerEnterEvent(this, OnTriggerEnterEvent);
+            UnRegister = moveTarget.OnTriggerEnterEvent(this, OnTriggerEnterEvent);
         }
 
         private float GetMoveSpeed()
@@ -262,12 +271,12 @@ namespace Common.Combat.FxAILogic
                 {
                     timeLineTriggerEvent.TimeLineTrigger(
                         TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
+                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
                     if (!BarrierTriggerData.isPenetrate)
                     {
                         if (!string.IsNullOrEmpty(hitFxName))
                         {
-                            FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
+                            FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
                         }
 
                         AudioManager.Instance.PlayAudio(hitAudioName, false);
@@ -305,10 +314,10 @@ namespace Common.Combat.FxAILogic
             if (timeLineTriggerEvent != null)
             {
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
+                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);
                 if (!string.IsNullOrEmpty(hitFxName))
                 {
-                    FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);
+                    FinishHit(collision.ClosestPoint(moveTarget.transform.position), hitFxName);
                 }
 
                 AudioManager.Instance.PlayAudio(hitAudioName, false);
@@ -325,7 +334,15 @@ namespace Common.Combat.FxAILogic
             if (!string.IsNullOrEmpty(hitFxName))
             {
                 CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,
-                    pos, null, false, null, null);
+                    pos, null, false, null, CallBack);
+            }
+        }
+
+        private void CallBack(ParticleSystemPool obj)
+        {
+            if (roatRoot != null)
+            {
+                obj.transform.rotation=  roatRoot.rotation;
             }
         }
 
@@ -360,9 +377,9 @@ namespace Common.Combat.FxAILogic
             // startDir= dir;
             Vector3 lasetPos = _currPos;
             _currPos += dir * GetMoveSpeed() * time;
-            gameObject.transform.position = _currPos;
+            moveTarget.transform.position = _currPos;
 
-            gameObject.transform.rotation = Quaternion.LookRotation(dir);
+            moveTarget.transform.rotation = Quaternion.LookRotation(dir);
         }
 
         private void CustomizeCurve(float time)
@@ -374,8 +391,8 @@ namespace Common.Combat.FxAILogic
             // moveBezierPath.controlPoints[0] = (gameObject.transform.TransformPoint(BesselPath.controlPoints[0]));
             Vector3 p = moveBezierPath.CalculatePoint(currTime);
             Vector3 p2 = moveBezierPath.CalculatePoint(currTime - 0.01f);
-            gameObject.transform.position = p;
-            gameObject.transform.rotation = Quaternion.LookRotation((p - p2).normalized);
+            moveTarget.transform.position = p;
+            moveTarget.transform.rotation = Quaternion.LookRotation((p - p2).normalized);
         }
 
         private void DynamicCurve(float time)
@@ -392,9 +409,9 @@ namespace Common.Combat.FxAILogic
             // startDir= dir;
             Vector3 lasetPos = _currPos;
             _currPos += dir * GetMoveSpeed() * time;
-            gameObject.transform.position = _currPos;
+            moveTarget.transform.position = _currPos;
 
-            gameObject.transform.rotation = Quaternion.LookRotation(dir);
+            moveTarget.transform.rotation = Quaternion.LookRotation(dir);
         }
 
         protected override void ProDispose()

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1402_FXLogic.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Common.Combat.FxAILogic;
+using UnityEngine;
+
+public class S1402_FXLogic : MonoBehaviour
+{
+    public Vector3 offRotation;
+    public Transform[] bodys;
+
+    public float[] bodyDis;
+    private Vector3[] defaultPos;
+    Quaternion offRotationQ;
+    private void Awake()
+    {
+        bodyDis = new float[bodys.Length];
+        defaultPos = new Vector3[bodys.Length];
+        defaultPos[0]=bodys[0].position;
+        for (int i = 1; i < bodys.Length; i++)
+        {
+           
+            Transform t1 = bodys[i - 1];
+            Transform t2 = bodys[i];
+            defaultPos[i]=t2.localPosition;
+            bodyDis[i] = Vector3.Distance(t1.position, t2.position);
+        }
+        offRotationQ=Quaternion.Euler(offRotation);
+    }
+
+    private void OnEnable()
+    {
+        for (int i = 0; i < bodys.Length; i++)
+        {
+            bodys[i].localPosition = defaultPos[i];
+        }
+    }
+
+    private void LateUpdate()
+    {
+        bodys[0].rotation *= Quaternion.Euler(0, 270, 0);
+        for (int i = 1; i < bodys.Length; i++)
+        {
+            Transform t1 = bodys[i - 1];
+            Transform t2 = bodys[i];
+            float d = bodyDis[i];
+            Vector3 dir = (t2.position - t1.position).normalized;
+            Quaternion q = Quaternion.LookRotation(dir)*offRotationQ;
+            t2.rotation=q;
+            t2.position = t1.position + dir * d;
+        }
+    }
+}

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1402_FXLogic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Xi4ZvX/4AXt8qdpHI2YQEPSm/+4mXLARKh00bMfuw1tHmEVRJOyAwo/xfAKA
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -60,6 +60,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public HeroData heroData;
 
+        public EventList CurrentZuiZhongEventList;
+
         public List<DaoYouData> daoYouDatas = new List<DaoYouData>();
 
 
@@ -92,7 +94,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // /// 事件链数据
         // /// </summary>
         // public List<EventLinkData> eventLinkDatas = new List<EventLinkData>();
-        
+
         // /// <summary>
         // /// 
         // /// </summary>
@@ -241,7 +243,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 事件监听列表
         /// </summary>
         public List<EventConditionData> eventConditions = new List<EventConditionData>();
-
     }
 
 
@@ -251,9 +252,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class EventConditionData
     {
-     
-     
-
         public int eventId;
         public int eventCondition;
 
@@ -267,11 +265,15 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class EventList
     {
+        public int guid;
+        
         public int eventID;
 
-       public List<EventLinkData> eventLinks = new List<EventLinkData>();
+        public List<EventLinkData> eventLinks = new List<EventLinkData>();
 
         public int curStep;
+
+        public bool isCompleted;
     }
 
 

Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineParticleSystem/TimeLineParticleSystemAsset.cs

@@ -37,7 +37,8 @@ public class TimeLineParticleSystemAsset : ControlPlayableAsset
     [Header("激活自定义目标点")] public bool isActivityCustomTargetPos;
     [Header("自定义目标点下标")] public int CustomTargetPosIndex;
     [Header("间隔时间")] public float intervalTime;
-    
+    [Header("是否自定义旋转")] public bool isRoat;
+    [Header("旋转值下标")] public int roatIndex;
     public override Playable CreatePlayable(PlayableGraph graph, GameObject go)
     {
         return base.CreatePlayable(graph, go);

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineEventParticleLogicBasic.cs

@@ -320,6 +320,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                             }
 
                             _timeLineEventLogicGroup.OnInitParticleSystemPoolCallBack?.Invoke(pool);
+                            if (timeLinePlayFxSerializtion.isRoat)
+                            {
+                                pool.own.transform.eulerAngles = customizePos[timeLinePlayFxSerializtion.roatIndex];
+                            }
                         }
                     });
                 if (clock != null)

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLinePlayFxSerializtion.cs

@@ -19,12 +19,15 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
     public FXLocationType locationType;
     public string targetSpecialDotName;
     public string hitPointGroupName;
-    public  bool isGround;
+    public bool isGround;
+
     /// <summary>
     /// 是否跟随目标
     /// </summary>
     public bool isFollowTarget;
+
     public bool isFollowRootTarget;
+
     /// <summary>
     /// 是否不旋转 （默认是跟随目标旋转）
     /// </summary>
@@ -37,15 +40,20 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
 
     public int CustomTargetPosIndex;
     public bool isActivityCustomTargetPos;
+
     /// <summary>
     /// 是否循环
     /// </summary>
     public bool isLoop;
+
     /// <summary>
     /// 循环独立
     /// </summary>
     public bool loopAlone;
+
     public float intervalTime;
+    public bool isRoat;
+    public int roatIndex;
     public TimeLinePlayFxSerializtion()
     {
     }
@@ -61,21 +69,21 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
         }
 
         GameObject go = null;
-       
+
         if (controlPlayableAsset.prefabGameObject != null)
         {
             go = controlPlayableAsset.prefabGameObject;
         }
-        else if(playableDirector.playableGraph.GetResolver()!=null)
+        else if (playableDirector.playableGraph.GetResolver() != null)
         {
-            go=  controlPlayableAsset.sourceGameObject.Resolve(playableDirector.playableGraph.GetResolver());
+            go = controlPlayableAsset.sourceGameObject.Resolve(playableDirector.playableGraph.GetResolver());
         }
 
         Object obj = controlPlayableAsset.sourceGameObject.defaultValue;
         // Debug.Log(playableDirector.playableGraph.GetResolver());
         if (go != null)
         {
-            fxName =go.name;
+            fxName = go.name;
             randomSeed = controlPlayableAsset.particleRandomSeed;
             locationType = controlPlayableAsset.LocationType;
             targetSpecialDotName = controlPlayableAsset.targetSpecialDotName;
@@ -89,13 +97,15 @@ public class TimeLinePlayFxSerializtion : TimeLineAssetSerialization
             CustomTargetPosIndex = controlPlayableAsset.CustomTargetPosIndex;
             isActivityCustomTargetPos = controlPlayableAsset.isActivityCustomTargetPos;
             loopAlone = controlPlayableAsset.loopAlone;
-            isLoop=controlPlayableAsset.isLoop;
-            intervalTime=controlPlayableAsset.intervalTime;
+            isLoop = controlPlayableAsset.isLoop;
+            intervalTime = controlPlayableAsset.intervalTime;
+            isRoat = controlPlayableAsset.isRoat;
+            roatIndex = controlPlayableAsset.roatIndex;
         }
     }
 #endif
     public override TimeLineEventLogicBasic CreateLogic()
     {
-            return CObjectPool.Instance.Fetch<TimeLineEventParticleLogicBasic>();
+        return CObjectPool.Instance.Fetch<TimeLineEventParticleLogicBasic>();
     }
 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -86,6 +86,26 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     public List<AccountFileInfo.EventList> UseDivinesense()
     {
+        //使用神识先移除完成的事件
+        List<AccountFileInfo.EventList> removeEvents = new List<AccountFileInfo.EventList>();
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            if (eventList.isCompleted)
+            {
+                removeEvents.Add(eventList);
+               
+            }
+        }
+        
+        foreach (var removeEvent in removeEvents)
+        {
+            AccountFileInfo.Instance.playerData.completeEvents.Add(removeEvent);
+            AccountFileInfo.Instance.playerData.eventList.Remove(removeEvent);
+        }
+
+        AccountFileInfo.Instance.SavePlayerData();
+
+
         HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
         int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         if (count <= 0)
@@ -111,11 +131,29 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
         AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
 
+
         AccountFileInfo.Instance.playerData.eventList.AddRange(eventConfigs);
+        UpdateZuizhongEventData();
         AccountFileInfo.Instance.SavePlayerData();
         return eventConfigs;
     }
 
+    public void UpdateZuizhongEventData()
+    {
+        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList == null || AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == 0)
+        {
+            var mainEventData = GetMainEventDta();
+            if (mainEventData != null)
+            {
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = mainEventData;
+            }
+            else
+            {
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = AccountFileInfo.Instance.playerData.eventList[0];
+            }
+        }
+    }
+
     private void UpDivinesense()
     {
         for (var i = AccountFileInfo.Instance.playerData.divineSenseLevel - 1; i < divineSenseConfigs.Count; i++)
@@ -128,7 +166,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
         AccountFileInfo.Instance.SavePlayerData();
-    }
+    } 
 
 
     public bool BagIsEvent(int eventID)
@@ -144,6 +182,20 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
+    public int GetBagEventCount(int eventID)
+    {
+        int count = 0;
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            if (eventList.eventID == eventID)
+            {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
     public bool IsEventTrigger(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.completeEvents)
@@ -202,6 +254,47 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         for (int i = 0; i < eventCount; i++)
         {
+            int randomValue3 = Random.Range(0, 101);
+
+            //先刷事件关联的事件
+            if (randomValue3 >= 50)
+            {
+                bool isRefence = false;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    for (var i1 = 0; i1 < eventConfig.RelatedEvents?.Length; i1++)
+                    {
+                        EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConfig.RelatedEvents[i1]);
+                        int count = 0;
+                        foreach (var list in eventLists)
+                        {
+                            if (list.eventID == eventConfig1.ID)
+                            {
+                                count++;
+                            }
+                        }
+
+                        if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
+                        {
+                            continue;
+                        }
+
+                        int randomValue4 = Random.Range(0, 101);
+                        if (randomValue4 >= eventConfig1.RefreshProbability)
+                        {
+                            eventLists.Add(AddEvent(eventConfig1.ID));
+                            isRefence = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (isRefence)
+                    continue;
+            }
+
+
             //先掉落出品质
             int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
 
@@ -268,6 +361,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 eventList = new AccountFileInfo.EventList();
                 eventList.eventID = eventID;
             }
+
+            eventList.guid = IdGenerater.GenerateIdInt();
+            eventList.curStep = eventConfig.EventLinksId[0];
         }
 
         //初始化神识链条，用于监听条件是否完成
@@ -413,6 +509,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         bool isUlock = true;
+        //分组检测 其中一个组绑定成功就可以执行
         foreach (var keyValuePair in eventConditionDataGroup)
         {
             isUlock = true;
@@ -428,11 +525,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 return isUlock;
             }
-
-         
         }
 
-        return false;
+        return isUlock;
     }
 
     public void CeekEventCompletes(int type, int[] value)
@@ -617,18 +712,26 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+        //先不移除 下次探索神识移除
+        eventList.isCompleted = true;
 
-        // if (PlayerManager.Instance.CurrentPlaces.progress < 100)
-        //    
+        // AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+        //
+        //
+        //
+        // AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
 
+        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+        {
+            AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = null;
+            UpdateZuizhongEventData();
+        }
 
-        AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
         AccountFileInfo.Instance.SavePlayerData();
 
         if (eventConfig.EventTriggerType == 4)
         {
-            TaskInfoPanel.OpenPanel(eventList.eventID, "任务完成");
+            TaskInfoPanel.OpenPanel(eventList);
         }
 
 

Assets/Scripts/GameUI/GameApplction.cs

@@ -115,7 +115,7 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
-        
+
         EventSystemManager.Instance.CustomInit();
         PlayerManager.Instance.Init();
         // SkillConfig[] skillConfigs= ConfigComponent.Instance.GetAll<SkillConfig>();
@@ -137,7 +137,7 @@ public class GameApplction : IGameStart
             FaBaoInfo faBaoInfo = new FaBaoInfo(playerDataAllSkillData);
             PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
         }
-        
+
         // for (int i = 1; i < 4; i++)
         // {
         //     PlayerManager.Instance.FaBaoControl.FightFaBao[i] = PlayerManager.Instance.FaBaoControl.myAllFaBao[i];
@@ -161,12 +161,14 @@ public class GameApplction : IGameStart
         CombatDrive.Instance.AddCombatController(new CombatController());
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
-        var eventList =EventSystemManager.Instance.AddEvent(10001);
+        var eventList = EventSystemManager.Instance.AddEvent(10001);
+        EventSystemManager.Instance.UpdateZuizhongEventData();
         if (eventList != null)
         {
             AccountFileInfo.Instance.playerData.eventList.Add(eventList);
             AccountFileInfo.Instance.SavePlayerData();
         }
+
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
         PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData

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

@@ -140,12 +140,14 @@ namespace Fort23.Mono
 
             if (eventLists != null && eventLists.Count > 0)
             {
-                EventSystemManager.Instance.isOpenUi = true;
+                // EventSystemManager.Instance.isOpenUi = true;
 
-                DivineSenceEventResultPanel divineSenceEventResultPanel =
-                    await DivineSenceEventResultPanel.OpenPanel(eventLists);
-                await divineSenceEventResultPanel.UIClosed();
-                EventSystemManager.Instance.isOpenUi = false;
+                // DivineSenceEventResultPanel divineSenceEventResultPanel =
+                //     await DivineSenceEventResultPanel.OpenPanel(eventLists);
+                
+                await DivineSenceEventPreviewPanel.OpenPanel();
+                // await divineSenceEventResultPanel.UIClosed();
+                // EventSystemManager.Instance.isOpenUi = false;
             }
 
 

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -8,11 +9,18 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DivineSenceEventPreviewPanel")]
     public partial class DivineSenceEventPreviewPanel : UIPanel, IScrollListContent
     {
+        public List<AccountFileInfo.EventList> showEventList = new List<AccountFileInfo.EventList>();
+
+        List<ShengShiEventWidgetType2> shengShiEventWidgetTypeList = new List<ShengShiEventWidgetType2>();
+
+        private int saixuanType = 1;
+
+
         private void Init()
         {
-            isPopUi = true;
-            // isAddStack = true;
-            // IsShowAppBar = false;
+            // isPopUi = true;
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -34,75 +42,122 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+
+            Btn_ShenShi.onClick.AddListener(async () =>
+            {
+                if (saixuanType == 1)
+                    return;
+                saixuanType = 1;
+                SaiXuan(1);
+                foreach (var shengShiEventWidgetType2 in shengShiEventWidgetTypeList)
+                {
+                    UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
+                }
+
+                shengShiEventWidgetTypeList.Clear();
+                await Content.Init(this, showEventList.Count);
+            });
+
+            Btn_DaoYou.onClick.AddListener(async () =>
+            {
+                if (saixuanType == 2)
+                    return;
+                saixuanType = 2;
+                SaiXuan(2);
+                foreach (var shengShiEventWidgetType2 in shengShiEventWidgetTypeList)
+                {
+                    UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
+                }
+                shengShiEventWidgetTypeList.Clear();
+                await Content.Init(this, showEventList.Count);
+            });
         }
 
         private void RemoveEvent(IEventData e)
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
-            Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+            Content.Init(this, showEventList.Count);
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
-            return base.AsyncInit(uiData);
+            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+            shengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
+            shengShiEventWidgetType2.OnClick = OnClick;
+            SaiXuan(1);
+            await Content.Init(this, showEventList.Count);
+            return await base.AsyncInit(uiData);
         }
 
 
-        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+        public void SaiXuan(int type)
         {
-            if (index < 0 || index >= AccountFileInfo.Instance.playerData.eventList.Count)
+            showEventList.Clear();
+            if (type == 1)
             {
-                return null;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    if (eventConfig.EventTriggerType != 5 && eventConfig.EventTriggerType != 4)
+                    {
+                        showEventList.Add(eventList);
+                    }
+                }
             }
-
-            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(AccountFileInfo.Instance.playerData.eventList[index].eventID);
-            if (eventConfig.EventType == 2)
+            else
             {
-                ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-                return shengShiEventWidgetType2;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    if (eventConfig.EventTriggerType == 5 && eventConfig.EventTriggerType != 4)
+                    {
+                        showEventList.Add(eventList);
+                    }
+                }
             }
-            else
+        }
+
+
+        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+        {
+            if (index < 0 || index >= showEventList.Count)
             {
-                ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.OnClick = OnClick;
-                return shengShiEventWidgetType2;
+                return null;
             }
+
+
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+            shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
+            shengShiEventWidgetType2.OnClick = OnClick;
+            shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
+            return shengShiEventWidgetType2;
         }
 
-        private void ShengShiEventWidgetType3OnClick(ItemWidgetBasic obj)
+        private void GoOnClick(ItemWidgetBasic obj)
         {
-            ShengShiEventWidgetType3 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType3;
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
+
+
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-
             this.GObjectPoolInterface.SetActive(false);
             EventSystemManager.Instance.isOpenUi = false;
+
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+                Content.Init(this, showEventList.Count);
                 this.GObjectPoolInterface.SetActive(true);
                 EventSystemManager.Instance.isOpenUi = true;
             });
         }
 
+
         private void OnClick(ItemWidgetBasic obj)
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-            this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-        
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            {
-                Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
-                this.GObjectPoolInterface.SetActive(true);
-                EventSystemManager.Instance.isOpenUi = true;
-            });
+
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
@@ -119,6 +174,7 @@ namespace Fort23.Mono
         public override void Close()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
+            shengShiEventWidgetTypeList.Clear();
             EventSystemManager.Instance.isOpenUi = false;
             base.Close();
         }

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

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _myButton;
 	     }
 	   }
-	  private Object _Massge;
-	  public Object Massge
-	   {
-	   get{
-	      if (_Massge == null)
-	       {
-	         _Massge  = GetUIUnit<Object>("Massge"); 
-	       }
-	      return _Massge;
-	     }
-	   }
 	  private MyImage _bg;
 	  public MyImage bg
 	   {
@@ -74,6 +63,39 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
+	  private RectTransform _ShengShiEventWidgetType2Root;
+	  public RectTransform ShengShiEventWidgetType2Root
+	   {
+	   get{
+	      if (_ShengShiEventWidgetType2Root == null)
+	       {
+	         _ShengShiEventWidgetType2Root  = GetUIUnit<RectTransform>("ShengShiEventWidgetType2Root"); 
+	       }
+	      return _ShengShiEventWidgetType2Root;
+	     }
+	   }
+	  private Button _Btn_ShenShi;
+	  public Button Btn_ShenShi
+	   {
+	   get{
+	      if (_Btn_ShenShi == null)
+	       {
+	         _Btn_ShenShi  = GetUIUnit<Button>("Btn_ShenShi"); 
+	       }
+	      return _Btn_ShenShi;
+	     }
+	   }
+	  private Button _Btn_DaoYou;
+	  public Button Btn_DaoYou
+	   {
+	   get{
+	      if (_Btn_DaoYou == null)
+	       {
+	         _Btn_DaoYou  = GetUIUnit<Button>("Btn_DaoYou"); 
+	       }
+	      return _Btn_DaoYou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -60,17 +60,17 @@ namespace Fort23.Mono
             }
 
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList[index].eventID);
-            if (eventConfig.EventType == 2)
-            {
-                ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index]);
-                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-                return shengShiEventWidgetType2;
-            }
-            else
+            // if (eventConfig.EventType == 2)
+            // {
+            //     ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
+            //     shengShiEventWidgetType2.CustomInit(eventList[index]);
+            //     shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
+            //     return shengShiEventWidgetType2;
+            // }
+            // else
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index]);
+                shengShiEventWidgetType2.CustomInit(eventList[index],GoOnClick);
                 shengShiEventWidgetType2.OnClick = OnClick;
                 return shengShiEventWidgetType2;
             }
@@ -92,8 +92,30 @@ namespace Fort23.Mono
                 this.GObjectPoolInterface.SetActive(true);
             });
         }
-
+        
         private void OnClick(ItemWidgetBasic obj)
+        {
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
+            
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
+            
+            // if (EventSystemManager.Instance.isTriggerEvent)
+            //     return;
+            //
+        
+            // this.GObjectPoolInterface.SetActive(false);
+            // EventSystemManager.Instance.isOpenUi = false;
+            // EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
+            // {
+            //     eventList.Remove(shengShiEventWidgetType2.eventList);
+            //     Content.Init(this, eventList.Count);
+            //     EventSystemManager.Instance.isOpenUi = true;
+            //     this.GObjectPoolInterface.SetActive(true);
+            //
+            // });
+        }
+
+       private void GoOnClick(ItemWidgetBasic obj)
         {
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
@@ -111,7 +133,7 @@ namespace Fort23.Mono
             });
         }
 
-
+ 
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);

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

@@ -0,0 +1,35 @@
+using System.Linq;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ShengShiConditionWidget"  )]
+	public partial class ShengShiConditionWidget : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit(AccountFileInfo.EventConditionData eventConditionData)
+		{
+			
+			Text_Name.text = EventHelper.GetTaskMessage(eventConditionData) ;
+			
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiConditionWidget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W3wY4HyrUHqEelG93Bs84Vo7HzmsQWrRcNPmRFkLGCEpq0H+0QKgLt4zTKph
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShengShiConditionWidget 
+	{
+	  #region 自定义数据 
+	  private Button _myButton;
+	  public Button myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Button>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiConditionWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DS5Kty/4Unp/JmdJHO/a2rWrHNNvIUdy0NBQ7Otnox1A8MhjZGjYFLmnn8cG
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: