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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/UIAssets/Button/btn_01.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 47, y: 0, z: 42, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,76 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -119,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Res/Config/EventConditionConfig.json

@@ -16,7 +16,7 @@
       "Operation": null,
       "ConditionType": 3,
       "ConditionPara": [
-        10
+        11
       ],
       "finishCount": 1
     },
@@ -63,6 +63,86 @@
         100001
       ],
       "finishCount": 1
+    },
+    {
+      "ID": 8,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        21
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 9,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100004
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 10,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 3
+    },
+    {
+      "ID": 11,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 3
+    },
+    {
+      "ID": 12,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100004
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 13,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100004
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 14,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        31
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 15,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100004
+      ],
+      "finishCount": 1
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -22,8 +22,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 8,
+      "XiantuID": 4,
       "EventConditionId": 3,
       "EventValue": [
         5
@@ -56,8 +56,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 9,
+      "XiantuID": 4,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
@@ -87,8 +87,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 3,
-      "XiantuID": 2,
+      "placeID": 10,
+      "XiantuID": 4,
       "EventConditionId": 1,
       "EventValue": [
         1004
@@ -115,8 +115,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 3,
-      "XiantuID": 2,
+      "placeID": 5,
+      "XiantuID": 3,
       "EventConditionId": 7,
       "EventValue": [
         500
@@ -143,7 +143,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 5,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -168,7 +168,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 6,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -193,7 +193,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 7,
       "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
@@ -451,6 +451,81 @@
     },
     {
       "ID": 10005,
+      "EventLinksId": [
+        1000501,
+        1000502,
+        1000503,
+        1000504,
+        1000505,
+        1000506,
+        1000507,
+        1000508,
+        1000509,
+        1000510,
+        1000511,
+        1000512,
+        1000513,
+        1000514
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2135,
+      "Description": 2137
+    },
+    {
+      "ID": 10006,
+      "EventLinksId": [
+        1000601,
+        1000602,
+        1000603,
+        1000604,
+        1000605,
+        1000606
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2136,
+      "Description": 2138
+    },
+    {
+      "ID": 10007,
+      "EventLinksId": [
+        1000701,
+        1000702,
+        1000703,
+        1000704,
+        1000705
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -472,16 +547,25 @@
       "Description": null
     },
     {
-      "ID": 1001,
+      "ID": 10008,
       "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005
+        1000801,
+        1000802,
+        1000803,
+        1000804,
+        1000805,
+        1000806,
+        1000807,
+        1000808,
+        1000809,
+        1000810,
+        1000811,
+        1000812,
+        1000813,
+        1000814
       ],
-      "EventTriggerType": 99,
-      "EventTag": 4,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -493,26 +577,24 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 1943,
-      "Description": 1944
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 20001,
+      "ID": 10009,
       "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005
+        1000901,
+        1000902,
+        1000903
       ],
-      "EventTriggerType": 5,
-      "EventTag": null,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -522,28 +604,22 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 174,
-      "Description": 1936
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 20002,
+      "ID": 10010,
       "EventLinksId": [
-        1010,
-        1011,
-        1012,
-        1013,
-        1014,
-        1015,
-        1016
+        1001001
       ],
-      "EventTriggerType": 5,
-      "EventTag": null,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -553,26 +629,22 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 175,
-      "Description": 1937
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 20003,
+      "ID": 10011,
       "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005
+        1001101
       ],
-      "EventTriggerType": 5,
-      "EventTag": null,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -582,26 +654,33 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 1943,
-      "Description": 1944
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9001,
+      "ID": 10012,
       "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005
+        1001201,
+        1001202,
+        1001203,
+        1001204,
+        1001205,
+        1001206,
+        1001207,
+        1001208,
+        1001209,
+        1001210,
+        1001211,
+        1001212
       ],
-      "EventTriggerType": 99,
-      "EventTag": 3,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -611,28 +690,37 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 174,
-      "Description": 1936
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9002,
+      "ID": 10013,
       "EventLinksId": [
-        1010,
-        1011,
-        1012,
-        1013,
-        1014,
-        1015,
-        1016
+        1001301,
+        1001302,
+        1001303,
+        1001304,
+        1001305,
+        1001306,
+        1001307,
+        1001308,
+        1001309,
+        1001310,
+        1001311,
+        1001312,
+        1001313,
+        1001314,
+        1001315,
+        1001316
       ],
-      "EventTriggerType": 99,
-      "EventTag": 3,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -642,27 +730,29 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 175,
-      "Description": 1937
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9003,
+      "ID": 10014,
       "EventLinksId": [
-        9003,
-        9004,
-        9005,
-        9006,
-        9007,
-        9008
+        1001401,
+        1001402,
+        1001403,
+        1001404,
+        1001405,
+        1001406,
+        1001407,
+        1001408
       ],
-      "EventTriggerType": 99,
-      "EventTag": 5,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -672,23 +762,29 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 2035,
-      "Description": 2036
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9025,
+      "ID": 10015,
       "EventLinksId": [
-        9025,
-        9026
+        1001501,
+        1001502,
+        1001503,
+        1001504,
+        1001505,
+        1001506,
+        1001507,
+        1001508
       ],
-      "EventTriggerType": 1,
-      "EventTag": 3,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -698,22 +794,34 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 2067,
-      "Description": 2068
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9014,
+      "ID": 10016,
       "EventLinksId": [
-        9014
+        1001601,
+        1001602,
+        1001603,
+        1001604,
+        1001605,
+        1001606,
+        1001607,
+        1001608,
+        1001609,
+        1001610,
+        1001611,
+        1001612,
+        1001613
       ],
-      "EventTriggerType": 99,
-      "EventTag": 3,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -721,27 +829,33 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        9031
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": 2069,
-      "Description": 2070
+      "EventName": null,
+      "Description": null
     },
     {
-      "ID": 9031,
+      "ID": 10017,
       "EventLinksId": [
-        9031
+        1001701,
+        1001702,
+        1001703,
+        1001704,
+        1001705,
+        1001706,
+        1001707,
+        1001708,
+        1001709,
+        1001710
       ],
-      "EventTriggerType": 99,
-      "EventTag": 3,
+      "EventTriggerType": 4,
+      "EventTag": 1,
       "EventType": 1,
-      "Score": 0,
+      "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
         1001
@@ -749,10 +863,563 @@
       "PrizeNums": [
         10
       ],
-      "RefreshProbability": 30,
-      "RefreshCount": 2,
-      "placeID": null,
-      "XiantuID": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10018,
+      "EventLinksId": [
+        1001801,
+        1001802,
+        1001803,
+        1001804,
+        1001805,
+        1001806,
+        1001807,
+        1001808,
+        1001809,
+        1001810,
+        1001811,
+        1001812,
+        1001813,
+        1001814,
+        1001815,
+        1001816
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10019,
+      "EventLinksId": [
+        1001901,
+        1001902
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10020,
+      "EventLinksId": [
+        1002001,
+        1002002,
+        1002003,
+        1002004
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10021,
+      "EventLinksId": [
+        1002101,
+        1002102,
+        1002103,
+        1002104,
+        1002105,
+        1002106,
+        1002107,
+        1002108,
+        1002109,
+        1002110,
+        1002111,
+        1002112
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10022,
+      "EventLinksId": [
+        1002201,
+        1002202
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10023,
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10024,
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10025,
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10026,
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 10027,
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 1001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 4,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 1943,
+      "Description": 1944
+    },
+    {
+      "ID": 20001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 174,
+      "Description": 1936
+    },
+    {
+      "ID": 20002,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 175,
+      "Description": 1937
+    },
+    {
+      "ID": 20003,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 1943,
+      "Description": 1944
+    },
+    {
+      "ID": 9001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 174,
+      "Description": 1936
+    },
+    {
+      "ID": 9002,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 175,
+      "Description": 1937
+    },
+    {
+      "ID": 9003,
+      "EventLinksId": [
+        9003,
+        9004,
+        9005,
+        9006,
+        9007,
+        9008
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2035,
+      "Description": 2036
+    },
+    {
+      "ID": 9025,
+      "EventLinksId": [
+        9025,
+        9026
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 2,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2067,
+      "Description": 2068
+    },
+    {
+      "ID": 9014,
+      "EventLinksId": [
+        9014
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RelatedEvents": [
+        9031
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 2,
+      "XiantuID": 2,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2069,
+      "Description": 2070
+    },
+    {
+      "ID": 9031,
+      "EventLinksId": [
+        9031
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": 30,
+      "RefreshCount": 2,
+      "placeID": 3,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2071,

Assets/Res/Config/EventLinkConfig.json

@@ -2,12 +2,26 @@
   "configList": [
     {
       "ID": 100,
-      "conciseEventMessage": 216,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        216
+      ],
+      "DialogueType": null,
+      "EventID": null,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         216
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -20,6 +34,7 @@
       "LanID": [
         177
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -40,6 +55,7 @@
       "LanID": [
         178
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -59,6 +75,7 @@
       "LanID": [
         179
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -77,6 +94,7 @@
       "LanID": [
         180
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -95,6 +113,7 @@
       "LanID": [
         181
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -113,6 +132,7 @@
       "LanID": [
         182
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -133,6 +153,7 @@
       "LanID": [
         183
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -154,6 +175,7 @@
         184,
         187
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -172,6 +194,7 @@
       "LanID": [
         185
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -192,6 +215,7 @@
         186,
         189
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -210,6 +234,7 @@
       "LanID": [
         188
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "PrizeIDs": [
@@ -228,6 +253,7 @@
       "LanID": [
         190
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -248,6 +274,7 @@
       "LanID": [
         191
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -273,6 +300,7 @@
       "LanID": [
         192
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 4,
       "PrizeIDs": [
@@ -292,6 +320,7 @@
         193,
         196
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -318,6 +347,7 @@
         194,
         197
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -336,6 +366,7 @@
       "LanID": [
         207
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -356,6 +387,7 @@
       "LanID": [
         221
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -374,6 +406,7 @@
       "LanID": [
         222
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -392,6 +425,7 @@
       "LanID": [
         223
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -412,6 +446,7 @@
       "LanID": [
         224
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -424,6 +459,7 @@
       "LanID": [
         208
       ],
+      "DialogueType": null,
       "EventID": 11,
       "optionType": 2,
       "optionPara1": [
@@ -443,6 +479,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 11,
       "optionType": 3,
       "PrizeIDs": [
@@ -461,6 +498,7 @@
       "LanID": [
         210
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": null,
       "ResultType": 1,
@@ -476,6 +514,7 @@
       "LanID": [
         211
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": null,
       "ResultType": 1,
@@ -491,6 +530,7 @@
       "LanID": [
         1903
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": 3,
       "PrizeIDs": [
@@ -509,6 +549,7 @@
       "LanID": [
         212
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -524,6 +565,7 @@
       "LanID": [
         213
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -539,6 +581,7 @@
       "LanID": [
         214
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -554,6 +597,7 @@
       "LanID": [
         215
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": 3,
       "PrizeIDs": [
@@ -572,6 +616,7 @@
       "LanID": [
         1901
       ],
+      "DialogueType": null,
       "EventID": 14,
       "optionType": 2,
       "optionPara1": [
@@ -591,6 +636,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 14,
       "optionType": 3,
       "PrizeIDs": [
@@ -609,6 +655,7 @@
       "LanID": [
         1902
       ],
+      "DialogueType": null,
       "EventID": 15,
       "optionType": 2,
       "optionPara1": [
@@ -628,6 +675,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 15,
       "optionType": 3,
       "PrizeIDs": [
@@ -646,6 +694,7 @@
       "LanID": [
         2036
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -666,6 +715,7 @@
       "LanID": [
         2037
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -685,6 +735,7 @@
       "LanID": [
         2038
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -697,6 +748,7 @@
       "LanID": [
         2039
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -709,6 +761,7 @@
       "LanID": [
         2040
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 4,
       "ResultType": 1,
@@ -721,6 +774,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -739,6 +793,7 @@
       "LanID": [
         2074
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -754,6 +809,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": 3,
@@ -766,6 +822,7 @@
       "conciseEventMessage": 2070,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "ConditionId": [
         3
@@ -778,6 +835,7 @@
       "conciseEventMessage": 2076,
       "EventConditionMessage": 2077,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -793,6 +851,7 @@
       "LanID": [
         2083
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -808,6 +867,7 @@
       "LanID": [
         2084
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -823,6 +883,7 @@
       "LanID": [
         2085
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -835,6 +896,7 @@
       "conciseEventMessage": 2086,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": 10001,
       "ConditionId": [
         5
@@ -853,6 +915,7 @@
       "LanID": [
         2092
       ],
+      "DialogueType": 3,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -868,6 +931,7 @@
       "LanID": [
         2093
       ],
+      "DialogueType": 3,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -880,6 +944,7 @@
       "conciseEventMessage": 2091,
       "EventConditionMessage": 2094,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 3,
@@ -895,6 +960,7 @@
       "LanID": [
         2096
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -910,6 +976,7 @@
       "LanID": [
         2097
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -925,6 +992,7 @@
       "LanID": [
         2098
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -943,6 +1011,7 @@
       "LanID": [
         2100
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -958,6 +1027,7 @@
       "LanID": [
         2101
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -976,6 +1046,7 @@
       "LanID": [
         2103
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -991,6 +1062,7 @@
       "LanID": [
         2104
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -1010,6 +1082,7 @@
       "LanID": [
         2107
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -1028,6 +1101,7 @@
       "LanID": [
         2109
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 3,
@@ -1043,6 +1117,7 @@
       "LanID": [
         2111
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": 1,
       "optionPara1": [
@@ -1061,6 +1136,7 @@
       "LanID": [
         2113
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": null,
       "ResultType": 1,
@@ -1076,6 +1152,7 @@
       "LanID": [
         2114
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": 2,
       "optionPara1": [
@@ -1083,7 +1160,8 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        1000404
+        1000404,
+        101
       ]
     },
     {
@@ -1094,12 +1172,2555 @@
       "LanID": [
         2115
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10005
       ]
+    },
+    {
+      "ID": 1000501,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2116
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000502
+      ]
+    },
+    {
+      "ID": 1000502,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2117
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000503
+      ]
+    },
+    {
+      "ID": 1000503,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2118
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000504
+      ]
+    },
+    {
+      "ID": 1000504,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2119
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000505
+      ],
+      "optionPara2": [
+        2120
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000505,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2121
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000506
+      ],
+      "optionPara2": [
+        2122
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000506,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2123
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000507
+      ]
+    },
+    {
+      "ID": 1000507,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2124
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000508
+      ]
+    },
+    {
+      "ID": 1000508,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2125
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000509
+      ],
+      "optionPara2": [
+        2126,
+        2127
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000509,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2128
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000510
+      ],
+      "optionPara2": [
+        2129
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000510,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2130
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000511
+      ]
+    },
+    {
+      "ID": 1000511,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2131
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000512
+      ]
+    },
+    {
+      "ID": 1000512,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2132
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000513
+      ],
+      "optionPara2": [
+        2133
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000513,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2134
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000514
+      ]
+    },
+    {
+      "ID": 1000514,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10005,
+      "ConditionId": [
+        2
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10006
+      ]
+    },
+    {
+      "ID": 1000601,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2139
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": 1,
+      "optionPara1": [
+        100603,
+        100602
+      ],
+      "optionPara2": [
+        2140,
+        2141
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000602,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2142
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": 1,
+      "optionPara1": [
+        1000603
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000603,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2143
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000604
+      ]
+    },
+    {
+      "ID": 1000604,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2144
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000605
+      ]
+    },
+    {
+      "ID": 1000605,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2145
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000606
+      ]
+    },
+    {
+      "ID": 1000606,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2146
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10007
+      ]
+    },
+    {
+      "ID": 1000701,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2147
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000702
+      ]
+    },
+    {
+      "ID": 1000702,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2148
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000703
+      ]
+    },
+    {
+      "ID": 1000703,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2149
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": 1,
+      "optionPara1": [
+        1000704
+      ],
+      "optionPara2": [
+        2150
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000704,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2154
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": 2,
+      "optionPara1": [
+        100004
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1000705,
+        101
+      ]
+    },
+    {
+      "ID": 1000705,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2155
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10008
+      ]
+    },
+    {
+      "ID": 1000801,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2157
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000802
+      ],
+      "optionPara2": [
+        2158
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000802,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2159
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000803
+      ]
+    },
+    {
+      "ID": 1000803,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2160
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000804
+      ],
+      "optionPara2": [
+        2161
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000804,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2162
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000805
+      ]
+    },
+    {
+      "ID": 1000805,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2163
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000806
+      ]
+    },
+    {
+      "ID": 1000806,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2164
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000807
+      ]
+    },
+    {
+      "ID": 1000807,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2165
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000808
+      ]
+    },
+    {
+      "ID": 1000808,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2166
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000809
+      ]
+    },
+    {
+      "ID": 1000809,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2167
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000810
+      ]
+    },
+    {
+      "ID": 1000810,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2168
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000811
+      ],
+      "optionPara2": [
+        2169
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000811,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2170
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000812
+      ]
+    },
+    {
+      "ID": 1000812,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2171
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000813
+      ],
+      "optionPara2": [
+        2172,
+        2173
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000813,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2174
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000814
+      ]
+    },
+    {
+      "ID": 1000814,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2175
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10009
+      ]
+    },
+    {
+      "ID": 1000901,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2177
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000902
+      ]
+    },
+    {
+      "ID": 1000902,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2178
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000903
+      ]
+    },
+    {
+      "ID": 1000903,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2179
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "ConditionId": [
+        8
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10010
+      ]
+    },
+    {
+      "ID": 1001001,
+      "conciseEventMessage": 2180,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10010,
+      "ConditionId": [
+        9
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10011
+      ]
+    },
+    {
+      "ID": 1001101,
+      "conciseEventMessage": 2181,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2182
+      ],
+      "DialogueType": null,
+      "EventID": 10011,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10012
+      ]
+    },
+    {
+      "ID": 1001201,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": null,
+      "LanID": [
+        2185
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001202
+      ]
+    },
+    {
+      "ID": 1001202,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": null,
+      "LanID": [
+        2186
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001203
+      ]
+    },
+    {
+      "ID": 1001203,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": null,
+      "LanID": [
+        2187
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001204
+      ],
+      "optionPara2": [
+        2188
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001204,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2189
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001205
+      ]
+    },
+    {
+      "ID": 1001205,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2190
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001206
+      ],
+      "optionPara2": [
+        2191,
+        2192
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001206,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2193
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001207
+      ],
+      "optionPara2": [
+        2194
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001207,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2195
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001208
+      ],
+      "optionPara2": [
+        2196
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001208,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2197
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001209
+      ],
+      "optionPara2": [
+        2198
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001209,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2199
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001210
+      ]
+    },
+    {
+      "ID": 1001210,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2200
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001211
+      ],
+      "optionPara2": [
+        2201
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001211,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": 105,
+      "LanID": [
+        2202
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001212
+      ],
+      "optionPara2": [
+        2203
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001212,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10013
+      ]
+    },
+    {
+      "ID": 1001301,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2206
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001302
+      ]
+    },
+    {
+      "ID": 1001302,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2207
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001303
+      ]
+    },
+    {
+      "ID": 1001303,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2208
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001304
+      ],
+      "optionPara2": [
+        2209
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001304,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2210
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001305
+      ]
+    },
+    {
+      "ID": 1001305,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 100,
+      "LanID": [
+        2211
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001306
+      ]
+    },
+    {
+      "ID": 1001306,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2212
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001307
+      ]
+    },
+    {
+      "ID": 1001307,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2213
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001308
+      ],
+      "optionPara2": [
+        2214
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001308,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2215
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001309
+      ]
+    },
+    {
+      "ID": 1001309,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2216
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001310
+      ]
+    },
+    {
+      "ID": 1001310,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2217
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001311
+      ]
+    },
+    {
+      "ID": 1001311,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2218
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001312
+      ]
+    },
+    {
+      "ID": 1001312,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2219
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001313
+      ],
+      "optionPara2": [
+        2220
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001313,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2221
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001314
+      ],
+      "optionPara2": [
+        2222
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001314,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2223
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001315
+      ]
+    },
+    {
+      "ID": 1001315,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2224
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001316
+      ],
+      "optionPara2": [
+        2225
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001316,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10014
+      ]
+    },
+    {
+      "ID": 1001401,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2227
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001402
+      ]
+    },
+    {
+      "ID": 1001402,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2228
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": 1,
+      "optionPara1": [
+        1001403
+      ],
+      "optionPara2": [
+        2229
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001403,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2230
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001404
+      ]
+    },
+    {
+      "ID": 1001404,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2231
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001405
+      ]
+    },
+    {
+      "ID": 1001405,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2232
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "ConditionId": [
+        10,
+        11
+      ],
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001406
+      ]
+    },
+    {
+      "ID": 1001406,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2233
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001407
+      ]
+    },
+    {
+      "ID": 1001407,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2234
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": 1,
+      "optionPara1": [
+        1001408
+      ],
+      "optionPara2": [
+        2235
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001408,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2236
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10015
+      ]
+    },
+    {
+      "ID": 1001501,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2238
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001502
+      ]
+    },
+    {
+      "ID": 1001502,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2239
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001503
+      ]
+    },
+    {
+      "ID": 1001503,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2240
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": 1,
+      "optionPara1": [
+        1001504
+      ],
+      "optionPara2": [
+        2241
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001504,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10015,
+      "ConditionId": [
+        12
+      ],
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001505
+      ]
+    },
+    {
+      "ID": 1001505,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2238
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001506
+      ]
+    },
+    {
+      "ID": 1001506,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2239
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001507
+      ]
+    },
+    {
+      "ID": 1001507,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2240
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": 1,
+      "optionPara1": [
+        1001508
+      ],
+      "optionPara2": [
+        2241
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001508,
+      "conciseEventMessage": 2237,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2242
+      ],
+      "DialogueType": null,
+      "EventID": 10015,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10016
+      ]
+    },
+    {
+      "ID": 1001601,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2244
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001602
+      ]
+    },
+    {
+      "ID": 1001602,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2245
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": 1,
+      "optionPara1": [
+        1001603
+      ],
+      "optionPara2": [
+        2246
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001603,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2247
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001604
+      ]
+    },
+    {
+      "ID": 1001604,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10016,
+      "ConditionId": [
+        13
+      ],
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001605
+      ]
+    },
+    {
+      "ID": 1001605,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2244
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001606
+      ]
+    },
+    {
+      "ID": 1001606,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2245
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001607
+      ]
+    },
+    {
+      "ID": 1001607,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2246
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001608
+      ]
+    },
+    {
+      "ID": 1001608,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2247
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001609
+      ]
+    },
+    {
+      "ID": 1001609,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2248
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001610
+      ]
+    },
+    {
+      "ID": 1001610,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2249
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": 1,
+      "optionPara1": [
+        1001611,
+        1001612
+      ],
+      "optionPara2": [
+        2250,
+        2251
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001611,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2252
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001612
+      ]
+    },
+    {
+      "ID": 1001612,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2253
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001613
+      ]
+    },
+    {
+      "ID": 1001613,
+      "conciseEventMessage": 2243,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2254
+      ],
+      "DialogueType": null,
+      "EventID": 10016,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10017
+      ]
+    },
+    {
+      "ID": 1001701,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2256
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001702
+      ]
+    },
+    {
+      "ID": 1001702,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2257
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001703
+      ]
+    },
+    {
+      "ID": 1001703,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2258
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001704
+      ]
+    },
+    {
+      "ID": 1001704,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2259
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001705
+      ]
+    },
+    {
+      "ID": 1001705,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2260
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001706
+      ]
+    },
+    {
+      "ID": 1001706,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2261
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001707
+      ]
+    },
+    {
+      "ID": 1001707,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2262
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001708
+      ]
+    },
+    {
+      "ID": 1001708,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2263
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001709
+      ]
+    },
+    {
+      "ID": 1001709,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2264
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001710
+      ]
+    },
+    {
+      "ID": 1001710,
+      "conciseEventMessage": 2255,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2265
+      ],
+      "DialogueType": null,
+      "EventID": 10017,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10018
+      ]
+    },
+    {
+      "ID": 1001801,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 107,
+      "LanID": [
+        2267
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001802
+      ]
+    },
+    {
+      "ID": 1001802,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 108,
+      "LanID": [
+        2268
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001803
+      ]
+    },
+    {
+      "ID": 1001803,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 109,
+      "LanID": [
+        2269
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001804
+      ]
+    },
+    {
+      "ID": 1001804,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 107,
+      "LanID": [
+        2270
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001805
+      ]
+    },
+    {
+      "ID": 1001805,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 108,
+      "LanID": [
+        2271
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001806
+      ],
+      "optionPara2": [
+        2272
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001806,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 109,
+      "LanID": [
+        2273
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001807
+      ],
+      "optionPara2": [
+        2274
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001807,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 107,
+      "LanID": [
+        2275
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001808
+      ],
+      "optionPara2": [
+        2276
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001808,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 108,
+      "LanID": [
+        2277
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001809
+      ]
+    },
+    {
+      "ID": 1001809,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 108,
+      "LanID": [
+        2278
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001810
+      ]
+    },
+    {
+      "ID": 1001810,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 109,
+      "LanID": [
+        2279
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001811
+      ]
+    },
+    {
+      "ID": 1001811,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2280
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001812
+      ]
+    },
+    {
+      "ID": 1001812,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2281
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001813
+      ]
+    },
+    {
+      "ID": 1001813,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2282
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001814
+      ]
+    },
+    {
+      "ID": 1001814,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2283
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001815
+      ],
+      "optionPara2": [
+        2284
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001815,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2285
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001816
+      ]
+    },
+    {
+      "ID": 1001816,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2286
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001817
+      ]
+    },
+    {
+      "ID": 1001817,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2287
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001818
+      ],
+      "optionPara2": [
+        2288
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001818,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2289
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001819
+      ]
+    },
+    {
+      "ID": 1001819,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2290
+      ],
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": 1,
+      "optionPara1": [
+        1001820
+      ],
+      "optionPara2": [
+        2291
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001820,
+      "conciseEventMessage": 2266,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10018,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10019
+      ]
+    },
+    {
+      "ID": 1001901,
+      "conciseEventMessage": 2292,
+      "EventConditionMessage": 2293,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10019,
+      "optionType": 2,
+      "optionPara1": [
+        100004
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1001902,
+        101
+      ]
+    },
+    {
+      "ID": 1001902,
+      "conciseEventMessage": 2292,
+      "EventConditionMessage": 2293,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10019,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10020
+      ]
+    },
+    {
+      "ID": 1002001,
+      "conciseEventMessage": 2294,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2295
+      ],
+      "DialogueType": null,
+      "EventID": 10020,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002002
+      ]
+    },
+    {
+      "ID": 1002002,
+      "conciseEventMessage": 2294,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2296
+      ],
+      "DialogueType": null,
+      "EventID": 10020,
+      "ConditionId": [
+        14
+      ],
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002003
+      ]
+    },
+    {
+      "ID": 1002003,
+      "conciseEventMessage": 2294,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2297
+      ],
+      "DialogueType": null,
+      "EventID": 10020,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002004
+      ]
+    },
+    {
+      "ID": 1002004,
+      "conciseEventMessage": 2294,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2298
+      ],
+      "DialogueType": null,
+      "EventID": 10020,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10021
+      ]
+    },
+    {
+      "ID": 1002101,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2300
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002102
+      ]
+    },
+    {
+      "ID": 1002102,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2301
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002103
+      ]
+    },
+    {
+      "ID": 1002103,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2302
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002104
+      ]
+    },
+    {
+      "ID": 1002104,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2303
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": 1,
+      "optionPara1": [
+        1002105,
+        1002109
+      ],
+      "optionPara2": [
+        2304,
+        2305
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002105,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2306
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002106
+      ]
+    },
+    {
+      "ID": 1002106,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2307
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002107
+      ]
+    },
+    {
+      "ID": 1002107,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2308
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002108
+      ]
+    },
+    {
+      "ID": 1002108,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2309
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002109
+      ]
+    },
+    {
+      "ID": 1002109,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2310
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": 1,
+      "optionPara1": [
+        1002110
+      ],
+      "optionPara2": [
+        2311
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002110,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2312
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002111
+      ]
+    },
+    {
+      "ID": 1002111,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2313
+      ],
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": 1,
+      "optionPara1": [
+        1002112
+      ],
+      "optionPara2": [
+        2314
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002112,
+      "conciseEventMessage": 2299,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10021,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10022
+      ]
+    },
+    {
+      "ID": 1002201,
+      "conciseEventMessage": 2315,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2316
+      ],
+      "DialogueType": null,
+      "EventID": 10022,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002202
+      ]
+    },
+    {
+      "ID": 1002202,
+      "conciseEventMessage": 2315,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2317
+      ],
+      "DialogueType": null,
+      "EventID": 10022,
+      "ConditionId": [
+        15
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10023
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -68,19 +68,67 @@
     },
     {
       "ID": 100,
-      "name": null,
+      "name": 3000,
       "ID_1": null,
       "DaoyouID": null
     },
     {
       "ID": 101,
-      "name": null,
+      "name": 3001,
       "ID_1": null,
       "DaoyouID": null
     },
     {
       "ID": 102,
-      "name": null,
+      "name": 3002,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 103,
+      "name": 3003,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 104,
+      "name": 3004,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 105,
+      "name": 3005,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 106,
+      "name": 3006,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 107,
+      "name": 3007,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 108,
+      "name": 3008,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 109,
+      "name": 3009,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 110,
+      "name": 3010,
       "ID_1": null,
       "DaoyouID": null
     }

Assets/Res/Config/GameConstantConfig.json

@@ -29,7 +29,7 @@
         160
       ],
       "DetectEventCount": 100,
-      "DadaoPerCircle": 6.0,
+      "BasicCDperSkill": 2000.0,
       "Daoyoushowuptime": 180,
       "DaoyouguajiDuration": [
         120,

Assets/Res/Config/HeroModelConfig.json

@@ -70,7 +70,7 @@
       "hp": 89,
       "def": 50,
       "shield": 72,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -128,7 +128,7 @@
       "hp": 81,
       "def": 65,
       "shield": 51,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -186,7 +186,7 @@
       "hp": 80,
       "def": 50,
       "shield": 63,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -244,7 +244,7 @@
       "hp": 150,
       "def": 50,
       "shield": 0,
-      "speed_atk": 10.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,

Assets/Res/Config/XianTuLogConfig.json

@@ -12,13 +12,20 @@
       "EventType": 2,
       "Title": 2088,
       "Desc": 2090,
-      "BigMapID": 2
+      "BigMapID": 1
     },
     {
       "ID": 3,
       "EventType": 2,
       "Title": 2088,
       "Desc": 2090,
+      "BigMapID": 2
+    },
+    {
+      "ID": 4,
+      "EventType": 2,
+      "Title": 2088,
+      "Desc": 2090,
       "BigMapID": 3
     }
   ]

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -35,10 +35,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8347964422981004825}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 65, y: -23.5}
-  m_SizeDelta: {x: 128, y: 46.8846}
+  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 &5086374945530126731
 CanvasRenderer:
@@ -149,10 +149,10 @@ RectTransform:
   - {fileID: 4229809311072735734}
   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: 0, y: 47}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 4.2567, y: 0}
+  m_SizeDelta: {x: 628.4258, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2619129949825441592
 CanvasRenderer:
@@ -279,7 +279,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586153670201676115}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -293,7 +293,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586153670201676115}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -629,7 +629,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -46.2}
-  m_SizeDelta: {x: 706.78, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8924209297497028959
 CanvasRenderer:
@@ -1076,7 +1076,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -0}
-  m_SizeDelta: {x: 511.09, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8409106499957115708
 CanvasRenderer:

Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab

@@ -250,17 +250,17 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 1326197565086495762}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 8488195482551738332}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   - key: Text_Name
+    gameObject: {fileID: 1326197565086495762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Type
     gameObject: {fileID: 8600374623529695105}
     isAssetBundle: 0
     isList: 0
@@ -589,7 +589,7 @@ GameObject:
   - component: {fileID: 8600374623529695105}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Name
+  m_Name: Text_Type
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -672,7 +672,7 @@ GameObject:
   - component: {fileID: 5529441806350073449}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Massge
+  m_Name: Text_Name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 6940629244054234312}
   - component: {fileID: 3935838372477410148}
   - component: {fileID: 7273584258005758506}
+  - component: {fileID: 3484744758487284944}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Eventcondition
@@ -96,6 +97,37 @@ 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!114 &3484744758487284944
+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: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 533257899024031940}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.7294118, y: 0.70980394, z: 0.70980394, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 533257899024031940}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 1, y: 0.77873516, z: 0, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 533257899024031940}
+  AllComsStateTypes: 80000000
+  CurrIndex: 0
 --- !u!1 &869698564475441709
 GameObject:
   m_ObjectHideFlags: 0
@@ -736,6 +768,7 @@ RectTransform:
   - {fileID: 8807649875490934103}
   - {fileID: 1357522047238736597}
   - {fileID: 3650536308811846443}
+  - {fileID: 7566769296908980725}
   - {fileID: 712579681456886399}
   - {fileID: 2781605243884814213}
   - {fileID: 6760469126628422357}
@@ -1040,6 +1073,21 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Mapname
+    gameObject: {fileID: 5637155694417808183}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Type
+    gameObject: {fileID: 4649399110665748015}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: EventconditionState
+    gameObject: {fileID: 3484744758487284944}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:
@@ -1474,8 +1522,8 @@ RectTransform:
   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_AnchoredPosition: {x: 203.5, y: 58.2}
+  m_SizeDelta: {x: 113.3769, y: 43.1564}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3700033355154013030
 CanvasRenderer:
@@ -1527,6 +1575,102 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8552613376447685522
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7566769296908980725}
+  - component: {fileID: 3905264220941356025}
+  - component: {fileID: 5637155694417808183}
+  - component: {fileID: 1262941091157409969}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Mapname
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7566769296908980725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  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: 61, y: 52.255}
+  m_SizeDelta: {x: 186.0683, y: 42.713}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3905264220941356025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  m_CullTransparentMesh: 1
+--- !u!114 &5637155694417808183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  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.2924528, g: 0.2690014, b: 0.2690014, 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: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    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 &1262941091157409969
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  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 &8848809442754795059
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillUIComponent.prefab

@@ -603,7 +603,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -82}
+  m_AnchoredPosition: {x: 344, y: -55}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4396069779853996381
@@ -698,7 +698,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -41}
+  m_AnchoredPosition: {x: 344, y: -27.5}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7568156432243018947
@@ -1850,7 +1850,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -123}
+  m_AnchoredPosition: {x: 344, y: -82.5}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5946602135712632191

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -31,12 +31,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2896655462721008753}
-  - {fileID: 2569128129379278262}
   - {fileID: 4688522053669353716}
-  - {fileID: 8515100903656146540}
-  - {fileID: 3220702368838562604}
-  - {fileID: 112700476894147953}
-  - {fileID: 708683880219238892}
+  - {fileID: 2569128129379278262}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -104,7 +100,6 @@ GameObject:
   - component: {fileID: 708683880219238892}
   - component: {fileID: 4283077157061789222}
   - component: {fileID: 4881049144302649175}
-  - component: {fileID: 5435399637829414925}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ItemRoot
@@ -126,11 +121,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4038523271141183626}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   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: 666.9}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 410.77, y: 248.4609}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -165,26 +160,6 @@ MonoBehaviour:
   m_Spacing: {x: 2.8, y: 0}
   m_Constraint: 1
   m_ConstraintCount: 4
---- !u!114 &5435399637829414925
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1408015899473625068}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
@@ -215,12 +190,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8887379241100265904}
   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_AnchoredPosition: {x: 0, y: 46.565613}
   m_SizeDelta: {x: 475.8763, y: 777.9515}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9156533754913033698
@@ -514,16 +490,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3627747089450203247}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   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: -467.9}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 238, y: -84.5865}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
@@ -582,6 +558,128 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &6187359724244078961
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8887379241100265904}
+  - component: {fileID: 2541774699167515807}
+  - component: {fileID: 8352399863819387752}
+  - component: {fileID: 4096449100553992080}
+  - component: {fileID: 1843378295882593034}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8887379241100265904
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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: 8515100903656146540}
+  - {fileID: 3220702368838562604}
+  - {fileID: 112700476894147953}
+  - {fileID: 708683880219238892}
+  m_Father: {fileID: 2569128129379278262}
+  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: 0.000030517578}
+  m_SizeDelta: {x: 476, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2541774699167515807
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  m_CullTransparentMesh: 1
+--- !u!114 &8352399863819387752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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: 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
+--- !u!114 &4096449100553992080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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: 4
+  m_Spacing: 28.8
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1843378295882593034
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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 &6488653642591306706
 GameObject:
   m_ObjectHideFlags: 0
@@ -831,16 +929,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7852697166483862012}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 238, y: -199.3865}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3214678112079635339
@@ -925,16 +1023,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8794085188831228050}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   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: 390.8}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 410.7655, y: 55.7865}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088

Assets/Res/UI/TipsPanle.prefab

@@ -0,0 +1,1128 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &320634583198896426
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2425908853498898319}
+  - component: {fileID: 6971699391768751147}
+  - component: {fileID: 8690510915053720273}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2425908853498898319
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 320634583198896426}
+  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: 7506157869452974688}
+  - {fileID: 5434415521502367461}
+  - {fileID: 2312584215440720790}
+  m_Father: {fileID: 1684708767607873713}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 474.9547}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6971699391768751147
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 320634583198896426}
+  m_CullTransparentMesh: 1
+--- !u!114 &8690510915053720273
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 320634583198896426}
+  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, g: 0, b: 0, 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
+--- !u!1 &431848000555088186
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2312584215440720790}
+  - component: {fileID: 1609096999546443627}
+  - component: {fileID: 6346000849865190408}
+  - component: {fileID: 5887948813508603637}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2312584215440720790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 431848000555088186}
+  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: 302517996905285657}
+  - {fileID: 2804765079289173115}
+  m_Father: {fileID: 2425908853498898319}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 12}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1609096999546443627
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 431848000555088186}
+  m_CullTransparentMesh: 1
+--- !u!114 &6346000849865190408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 431848000555088186}
+  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: 4
+  m_Spacing: -0.32
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &5887948813508603637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 431848000555088186}
+  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 &2999472429724751157
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5434415521502367461}
+  - component: {fileID: 6358988861767297554}
+  - component: {fileID: 165115535605617614}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5434415521502367461
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999472429724751157}
+  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: 5301275204031605658}
+  m_Father: {fileID: 2425908853498898319}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 2.195404, y: 0}
+  m_SizeDelta: {x: -96.632324, y: -256.1848}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6358988861767297554
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999472429724751157}
+  m_CullTransparentMesh: 1
+--- !u!114 &165115535605617614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999472429724751157}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 8903814782894296082}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 5301275204031605658}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &4933363999810630426
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1684708767607873713}
+  - component: {fileID: 7157239210222497666}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: TipsPanle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1684708767607873713
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4933363999810630426}
+  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: 3491380053662945734}
+  - {fileID: 2425908853498898319}
+  m_Father: {fileID: 0}
+  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: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7157239210222497666
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4933363999810630426}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Tips
+    gameObject: {fileID: 404204576536264046}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Cancel
+    gameObject: {fileID: 5258264742446547397}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Comfire
+    gameObject: {fileID: 3864184971374510129}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Title
+    gameObject: {fileID: 2894896630456189802}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &5285889826520098264
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8903814782894296082}
+  - component: {fileID: 4689839193141587274}
+  - component: {fileID: 3798362325560463425}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8903814782894296082
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285889826520098264}
+  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: 5192123510054350074}
+  m_Father: {fileID: 5301275204031605658}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &4689839193141587274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285889826520098264}
+  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: 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!114 &3798362325560463425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5285889826520098264}
+  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 &5302440899175704082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5192123510054350074}
+  - component: {fileID: 985165560503277178}
+  - component: {fileID: 404204576536264046}
+  - component: {fileID: 7368505176875826031}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5192123510054350074
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5302440899175704082}
+  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: 8903814782894296082}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 326.685, y: -0}
+  m_SizeDelta: {x: 653.37, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &985165560503277178
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5302440899175704082}
+  m_CullTransparentMesh: 1
+--- !u!114 &404204576536264046
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5302440899175704082}
+  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: 28
+    m_FontStyle: 0
+    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
+  m_Text: "\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F\u516C\u544A\u4FE1\u606F"
+--- !u!114 &7368505176875826031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5302440899175704082}
+  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 &5623637849838901638
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 302517996905285657}
+  - component: {fileID: 5394061741598517719}
+  - component: {fileID: 5258264742446547397}
+  - component: {fileID: 6280862004317188589}
+  - component: {fileID: 4655033348327216161}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Cancel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &302517996905285657
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5623637849838901638}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 2312584215440720790}
+  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: 107.6686, y: 102.5415}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &5394061741598517719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5623637849838901638}
+  m_CullTransparentMesh: 1
+--- !u!114 &5258264742446547397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5623637849838901638}
+  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: 6280862004317188589}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6280862004317188589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5623637849838901638}
+  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: icon_tishi2
+  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 &4655033348327216161
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5623637849838901638}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
+  isEnabled: 1
+--- !u!1 &7002996184236712914
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2804765079289173115}
+  - component: {fileID: 2003472740751472895}
+  - component: {fileID: 3864184971374510129}
+  - component: {fileID: 5916129142861933392}
+  - component: {fileID: 2019822212005636627}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Comfire
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2804765079289173115
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7002996184236712914}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 2312584215440720790}
+  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: 107.6686, y: 102.5415}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2003472740751472895
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7002996184236712914}
+  m_CullTransparentMesh: 1
+--- !u!114 &3864184971374510129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7002996184236712914}
+  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: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &5916129142861933392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7002996184236712914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
+  isEnabled: 1
+--- !u!114 &2019822212005636627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7002996184236712914}
+  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: icon_tishi
+  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 &7235387167611551343
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3491380053662945734}
+  - component: {fileID: 4481379585496979106}
+  - component: {fileID: 4976124229877838441}
+  - component: {fileID: 6662833021364742670}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Dimed
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3491380053662945734
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7235387167611551343}
+  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: 1684708767607873713}
+  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 &4481379585496979106
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7235387167611551343}
+  m_CullTransparentMesh: 1
+--- !u!114 &4976124229877838441
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7235387167611551343}
+  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: 6662833021364742670}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6662833021364742670
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7235387167611551343}
+  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.003921569}
+  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_dim_Black
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 6fe3327873a13c2ef4ad72745247a2a6
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7573146872669189766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7506157869452974688}
+  - component: {fileID: 1068379777111573781}
+  - component: {fileID: 2894896630456189802}
+  - component: {fileID: 7398853809809306635}
+  - component: {fileID: 5434475586334589140}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7506157869452974688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7573146872669189766}
+  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: 2425908853498898319}
+  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: 173.94737}
+  m_SizeDelta: {x: 392.7, y: 92.78}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1068379777111573781
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7573146872669189766}
+  m_CullTransparentMesh: 1
+--- !u!114 &2894896630456189802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7573146872669189766}
+  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: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 45
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u63D0\u793A"
+--- !u!114 &7398853809809306635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7573146872669189766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &5434475586334589140
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7573146872669189766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 1024
+--- !u!1 &8788436369736395446
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5301275204031605658}
+  - component: {fileID: 948737514870425223}
+  - component: {fileID: 5402180492380304903}
+  - component: {fileID: 5116996694458500616}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5301275204031605658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8788436369736395446}
+  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: 8903814782894296082}
+  m_Father: {fileID: 5434415521502367461}
+  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: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &948737514870425223
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8788436369736395446}
+  m_CullTransparentMesh: 1
+--- !u!114 &5402180492380304903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8788436369736395446}
+  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: 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: 10917, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &5116996694458500616
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8788436369736395446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0

Assets/Res/UI/TipsPanle.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Dy4dvCuvUi8n/w1v4sVGP1sTEKYxp+WZv/uJN2v8Oh7t1Fbblz7bMeIKM5Qz
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/EventLogTitleWidget.prefab

@@ -31,16 +31,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4472651858344574542}
-  - {fileID: 2541634502081460392}
-  - {fileID: 7765210620252892146}
+  - {fileID: 5817581626957223903}
   m_Father: {fileID: 0}
   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.00019455, y: 509.2}
-  m_SizeDelta: {x: 750, y: 71.8862}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 717.06, y: 71.88623}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7526096831240874525
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -79,6 +77,7 @@ GameObject:
   - component: {fileID: 2541634502081460392}
   - component: {fileID: 2341308512790474187}
   - component: {fileID: 2194615720204698487}
+  - component: {fileID: 36250349546045231}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -99,12 +98,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: -4.636217, y: 1.1000366}
-  m_SizeDelta: {x: 90.42, y: 55.0878}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 319.2211, y: -35.9431}
+  m_SizeDelta: {x: 187, y: 55.0878}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2341308512790474187
 CanvasRenderer:
@@ -147,7 +146,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77(0/2)"
+--- !u!114 &36250349546045231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4156922756538168925}
+  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 &6073252669721531231
 GameObject:
   m_ObjectHideFlags: 0
@@ -179,11 +192,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: -193.9998, y: -0.5796509}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 201.9211, y: 2.3595}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6087876044226702029
@@ -267,11 +280,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 619117239873045918}
+  m_Father: {fileID: 5817581626957223903}
   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: 177.12073, y: -0.5796509}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 201.9211, y: 2.3595}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3667131906997300648
@@ -324,3 +337,93 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6282881445875391342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5817581626957223903}
+  - component: {fileID: 7730591695276860124}
+  - component: {fileID: 7687747220777130965}
+  - component: {fileID: 6429287572169146635}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5817581626957223903
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  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: 4472651858344574542}
+  - {fileID: 2541634502081460392}
+  - {fileID: 7765210620252892146}
+  m_Father: {fileID: 619117239873045918}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 71.8862}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7730591695276860124
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  m_CullTransparentMesh: 1
+--- !u!114 &7687747220777130965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  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: 4
+  m_Spacing: 23.8
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6429287572169146635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282881445875391342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0

Assets/Scenes/testCombat.scene

@@ -2185,15 +2185,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
-      value: 60
+      value: 200
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.size
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 43373
+      value: 4337300
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2239,10 +2243,18 @@ PrefabInstance:
       propertyPath: enemyHeroInfo.Array.data[0].level
       value: 150
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].level
+      value: 150
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       value: 9201
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].heroID
+      value: 9201
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
       value: 30
@@ -2251,6 +2263,14 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].skillStart
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillLevel
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillStart
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
       value: 0

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -411,8 +411,9 @@ namespace Fort23.Mono
 
                         destroyUI.Remove(uiBindingAttribute.prefab);
                     }
-
-                    if (uiPanel.isAddStack)
+                    Assembly assembly = Assembly.Load("Fort23.Mono");
+                    Type combatPanel = assembly.GetType(" Fort23.Mono.CombatPanel");
+                    if (uiPanel.isAddStack && uiPanel.GetType() != combatPanel)
                     {
                         EventManager.Instance.Dispatch(CustomEventType.CancelEvent,null);
                     }

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -44,6 +44,12 @@ public int NPCID;
 public int[] LanID;
 
 
+		/// <summary>
+		///对话框类型
+		/// </summary>
+public int DialogueType;
+
+
 		/// <summary>
 		///属于哪个事件
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -75,9 +75,9 @@ public int DetectEventCount;
 
 
 		/// <summary>
-		///大道的默认转速（秒/圈）
+		///角色每有一个功法槽位，圈速增加的基础毫秒数 怪物每有一个功法，全速增加的基础毫秒秒数
 		/// </summary>
-public float DadaoPerCircle;
+public float BasicCDperSkill;
 
 
 		/// <summary>

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -99,14 +99,16 @@ namespace GameLogic.Combat.Hero
 
             if (!_combatHeroEntity.IsEnemy)
             {
-                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 3;
+                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill/1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
                     cd + SkillTurntable.skillAddSkillCd);
             }
             else
             {
+                
+                float cd = (SkillTurntable.skillCount * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill)/1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk + SkillTurntable.skillAddSkillCd);
+                    cd + SkillTurntable.skillAddSkillCd);
             }
         }
 

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Hero.Turntable
         private BetterList<SkillBasic> currUseFinishSkill = new BetterList<SkillBasic>();
 
         public float skillAddSkillCd;
+        public int skillCount;
         public void Init(int count, CombatHeroSkillControl combatHeroSkillControl, CombatHeroEntity combatHeroEntity)
         {
             this.combatHeroSkillControl = combatHeroSkillControl;
@@ -79,6 +80,7 @@ namespace GameLogic.Combat.Hero.Turntable
 
             _removeTime = 0;
             skillAddSkillCd = 0;
+            skillCount=0;
             if (allSkill != null)
             {
                 for (int i = 0; i < allSkill.Length; i++)
@@ -96,6 +98,11 @@ namespace GameLogic.Combat.Hero.Turntable
                         continue;
                     }
 
+                    if (skillConfig.SkillType == 1)
+                    {
+                        skillCount++;
+                    }
+
                     skillAddSkillCd+=skillConfig.addcd;
                     SetSkill(skillInfo.index, skillBasic);
 

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

@@ -0,0 +1,48 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 玄冰神翎  凤凰煽动翅膀，再翅膀前方行程类似于羽毛的冰箭，生成{0}枚冰箭，对敌人造成水属性伤害，并施加一层寒气
+    /// </summary>
+    public class S9011 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                ActivationTimeLineData("1101", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            float harmBl = effectValue[1];
+
+
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                harmBl);
+
+            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+                AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+            // if(harmReturnInfo.isInvalid)
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 95f8ecb2dd214403be4745664de143df
+timeCreated: 1750301607

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -11,50 +11,28 @@ public static class EventHelper
     {
         string result = String.Empty;
         EventConditionConfig eventCondition = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
-        // AccountFileInfo.EventLinkData eventLinkData =
-        //     AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
 
-        // int fishCount = eventCondition == null ? 0 : eventLinkData.fishCount;
 
         result = LanguageManager.Instance.Text(eventCondition.message, eventConditionData.fishCount, eventCondition.finishCount);
-        // switch (eventCondition.ConditionType)
-        // {
-        //     case 1:
-        //         // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-        //         // result =
-        //         //     $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
-        //
-        //         break;
-        //     case 3:
-        //         // HeroPowerUpConfig heroPowerUpConfig =
-        //         //     ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
-        //         // string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-        //         //
-        //         // result =
-        //         //     $"需要达到境界{jingjie}";
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
-        //         break;
-        //
-        //     case 5:
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-        //         // result =
-        //         //     $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
-        //         break;
-        //     case 6:
-        //
-        //         // ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-        //         // // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-        //         // result =
-        //         //     $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
-        //         break;
-        //     default:
-        //         // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
-        //         break;
-        // }
+
 
         return result;
     }
+
+    public static string GetEventType(int type)
+    {
+        switch (type)
+        {
+            case 1:
+                return "主线";
+            case 2:
+                return "支线";
+            case 3:
+                return "通用";
+            case 4:
+                return "地图通用";
+            default:
+                return "没有";
+        }
+    }
 }

Assets/Scripts/GameUI/ScorolList/ScrollList.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
@@ -222,6 +223,15 @@ public class ScrollList : MonoBehaviour, IScrollListContent
         }
     }
 
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.Y))
+        {
+            HindWidget();
+        }
+        
+    }
+
     protected async CTask<IScorllListWidget> Cread(int index, bool isUp)
     {
         int showIndex = index - m_startIndex;
@@ -635,16 +645,12 @@ public class ScrollList : MonoBehaviour, IScrollListContent
         isShow = false;
         isHind = false;
 
-
         Vector2 pos = Vector2.zero;
         float minx = pos.x - (root.rect.size.x * root.pivot.x);
         float miny = pos.y - (root.rect.size.y * root.pivot.y);
         float maxx = pos.x + (root.rect.size.x * (1 - root.pivot.x));
         float maxy = pos.y + (root.rect.size.y * (1 - root.pivot.y));
-
-        // UIManager.Instance.Canvas
-
-        // Debug.Log(pos);
+        
         Vector2 rootPos = posint;
 
 
@@ -677,17 +683,6 @@ public class ScrollList : MonoBehaviour, IScrollListContent
                     isHind = true;
                 }
             }
-
-            // if (p.x > minx && p.x < maxx && p.y > miny && p.y < maxy)
-            // {
-            //     isShow = true;
-            // }
-
-            // if (p.x > minx - size.x - 100 && p.x < maxx + size.x + 100 && p.y > miny - size.y - 100 &&
-            //     p.y < maxy + size.y + 100)
-            // {
-            //     isHind = true;
-            // }
         }
     }
 

Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs

@@ -43,24 +43,7 @@ namespace Fort23.Mono
             this.eventList = eventList;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_Name.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
-
-            // EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            // string desc = String.Empty;
-            // if (conditionConfig.LanID == null)
-            // {
-            //     desc = EventHelper.GetTaskMessage(randomEventConfig.EventLinksId[0]);
-            // }
-            // else
-            // {
-            //     desc = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-            //     if (desc.Length > 8)
-            //     {
-            //         desc = desc.Substring(0, 8);
-            //         desc += "...";
-            //     }
-            // }
-            Massge.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-            // Massge.text = LanguageManager.Instance.Text(desc);
+            Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
         }
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidgetData.cs

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _myButton;
 	     }
 	   }
-	  private Text _Massge;
-	  public Text Massge
-	   {
-	   get{
-	      if (_Massge == null)
-	       {
-	         _Massge  = GetUIUnit<Text>("Massge"); 
-	       }
-	      return _Massge;
-	     }
-	   }
 	  private MyImage _bg;
 	  public MyImage bg
 	   {
@@ -52,6 +41,17 @@ namespace Fort23.Mono
 	      return _Text_Name;
 	     }
 	   }
+	  private Text _Text_Type;
+	  public Text Text_Type
+	   {
+	   get{
+	      if (_Text_Type == null)
+	       {
+	         _Text_Type  = GetUIUnit<Text>("Text_Type"); 
+	       }
+	      return _Text_Type;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -36,12 +36,16 @@ namespace Fort23.Mono
 
         private int type;
 
-        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
+        private Text showText;
+
+        private GameObject shownextIcon;
+
+        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
-            dialoguePanel.ShowPanel(CurrentEventList,id, icon, messageShowType, finish);
+            dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
         }
 
 
@@ -71,6 +75,11 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             nextButton.onClick.AddListener(NextShow);
+            Btn_Cancel.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUIUIPanel(this);
+                finish?.Invoke(-1);
+            });
         }
 
         private void SkipTyping()
@@ -80,7 +89,7 @@ namespace Fort23.Mono
             {
                 _sb.Clear();
                 _sb.Append(_currShowMessage);
-                message.text = _sb.ToString();
+                showText.text = _sb.ToString();
                 _currShowIndex = _currShowMessage.Length;
                 _isUpdate = false;
                 ShowNextIcon();
@@ -92,7 +101,7 @@ namespace Fort23.Mono
                     //     ShowOptions();
                     // }
 
-                    if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                    if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                     {
                         ShowOptions();
                     }
@@ -123,7 +132,7 @@ namespace Fort23.Mono
             }
         }
 
-        public void ShowPanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
+        public void ShowPanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -136,6 +145,31 @@ namespace Fort23.Mono
             this.finish = finish;
             index = 0;
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+            if (eventConditionConfig.DialogueType == 0 || eventConditionConfig.DialogueType == 1)
+            {
+                DialgueType1.gameObject.SetActive(true);
+                DialgueType2.gameObject.SetActive(false);
+                DialgueType3.gameObject.SetActive(false);
+                showText = message;
+                shownextIcon = nextIcon;
+            }
+            else if (eventConditionConfig.DialogueType == 2)
+            {
+                DialgueType1.gameObject.SetActive(false);
+                DialgueType3.gameObject.SetActive(false);
+                DialgueType2.gameObject.SetActive(true);
+                showText = message2;
+                shownextIcon = nextIcon2;
+            }
+            else if (eventConditionConfig.DialogueType == 3)
+            {
+                DialgueType1.gameObject.SetActive(false);
+                DialgueType2.gameObject.SetActive(false);
+                DialgueType3.gameObject.SetActive(true);
+                showText = message3;
+                shownextIcon = nextIcon3;
+            }
+
             StartShowMassge();
         }
 
@@ -157,7 +191,7 @@ namespace Fort23.Mono
         {
             if (index >= dialogueMessaga.Length)
             {
-                if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                 {
                     ShowOptions();
                 }
@@ -179,8 +213,6 @@ namespace Fort23.Mono
                                 return;
                             }
                         }
-
-                     
                     }
 
 
@@ -193,7 +225,7 @@ namespace Fort23.Mono
             }
 
             _isShowNextButton = false;
-            nextIcon.SetActive(false);
+            shownextIcon.SetActive(false);
             string m = LanguageManager.Instance.Text(dialogueMessaga[index]);
 
             if (showIconName != null && index < showIconName.Length)
@@ -205,14 +237,14 @@ namespace Fort23.Mono
             switch (messageShowType)
             {
                 case ShowDialogueEventData.MessageShowType.Default:
-                    message.text = m;
+                    showText.text = m;
                     ShowNextIcon();
                     break;
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
                     _sb.Append(_currShowMessage[0]);
-                    message.text = _sb.ToString();
+                    showText.text = _sb.ToString();
                     _isUpdate = true;
                     _currShowIndex = 1;
                     _skipTyping = false;
@@ -235,24 +267,26 @@ namespace Fort23.Mono
 
                     DialogueOptionWidget dialogueOptionWidget =
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(_eventLinkData,op, eventConditionConfig.ID, SelectOption);
+                    dialogueOptionWidget.CustomInit(_eventLinkData, op, eventConditionConfig.ID, SelectOption);
                 }
-            }
 
+                // DialogueOptionWidget dialogueOptionWidget1 =
+                //     await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
+                // dialogueOptionWidget1.CustomInit((DialogueOptionWidget obj) =>
+                // {
+                //     UIManager.Instance.HideUIUIPanel(this);
+                //     finish?.Invoke(-1);
+                // });
 
-            DialogueOptionWidget dialogueOptionWidget1 =
-                await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-            dialogueOptionWidget1.CustomInit((DialogueOptionWidget obj) =>
-            {
-                UIManager.Instance.HideUIUIPanel(this);
-                finish?.Invoke(-1);
-            });
+                LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
 
-            LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
+                OptionMarsk.SetActive(true);
+            }
         }
 
         private void SelectOption(DialogueOptionWidget obj)
         {
+            OptionMarsk.SetActive(false);
             int selectedOptionID = obj.eventConditionConfig.ID;
             // if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
             // {
@@ -269,7 +303,7 @@ namespace Fort23.Mono
 
         private void ShowNextIcon()
         {
-            nextIcon.SetActive(true);
+            shownextIcon.SetActive(true);
             _isShowNextButton = true;
         }
 
@@ -300,7 +334,7 @@ namespace Fort23.Mono
                         //     ShowOptions();
                         // }
 
-                        if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                        if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                         {
                             ShowOptions();
                         }
@@ -317,7 +351,7 @@ namespace Fort23.Mono
                     _currShowTime -= _showTime;
                     _sb.Append(_currShowMessage[_currShowIndex]);
                     _currShowIndex++;
-                    message.text = _sb.ToString();
+                    showText.text = _sb.ToString();
                 }
             }
         }
@@ -332,7 +366,11 @@ namespace Fort23.Mono
             _eventLinkData = null;
             CurrentEventList = null;
             _currShowMessage = null;
-            dialogueMessaga = null; 
+            dialogueMessaga = null;
+
+            DialgueType1.gameObject.SetActive(false);
+            DialgueType2.gameObject.SetActive(false);
+            OptionMarsk.SetActive(false);
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -74,6 +74,105 @@ namespace Fort23.Mono
 	      return _Dialgue;
 	     }
 	   }
+	  private GameObject _OptionMarsk;
+	  public GameObject OptionMarsk
+	   {
+	   get{
+	      if (_OptionMarsk == null)
+	       {
+	         _OptionMarsk  = GetUIUnit<GameObject>("OptionMarsk"); 
+	       }
+	      return _OptionMarsk;
+	     }
+	   }
+	  private GameObject _DialgueType1;
+	  public GameObject DialgueType1
+	   {
+	   get{
+	      if (_DialgueType1 == null)
+	       {
+	         _DialgueType1  = GetUIUnit<GameObject>("DialgueType1"); 
+	       }
+	      return _DialgueType1;
+	     }
+	   }
+	  private GameObject _DialgueType2;
+	  public GameObject DialgueType2
+	   {
+	   get{
+	      if (_DialgueType2 == null)
+	       {
+	         _DialgueType2  = GetUIUnit<GameObject>("DialgueType2"); 
+	       }
+	      return _DialgueType2;
+	     }
+	   }
+	  private GameObject _nextIcon2;
+	  public GameObject nextIcon2
+	   {
+	   get{
+	      if (_nextIcon2 == null)
+	       {
+	         _nextIcon2  = GetUIUnit<GameObject>("nextIcon2"); 
+	       }
+	      return _nextIcon2;
+	     }
+	   }
+	  private Text _message2;
+	  public Text message2
+	   {
+	   get{
+	      if (_message2 == null)
+	       {
+	         _message2  = GetUIUnit<Text>("message2"); 
+	       }
+	      return _message2;
+	     }
+	   }
+	  private Button _Btn_Cancel;
+	  public Button Btn_Cancel
+	   {
+	   get{
+	      if (_Btn_Cancel == null)
+	       {
+	         _Btn_Cancel  = GetUIUnit<Button>("Btn_Cancel"); 
+	       }
+	      return _Btn_Cancel;
+	     }
+	   }
+	  private Text _message3;
+	  public Text message3
+	   {
+	   get{
+	      if (_message3 == null)
+	       {
+	         _message3  = GetUIUnit<Text>("message3"); 
+	       }
+	      return _message3;
+	     }
+	   }
+	  private GameObject _nextIcon3;
+	  public GameObject nextIcon3
+	   {
+	   get{
+	      if (_nextIcon3 == null)
+	       {
+	         _nextIcon3  = GetUIUnit<GameObject>("nextIcon3"); 
+	       }
+	      return _nextIcon3;
+	     }
+	   }
+	  private GameObject _DialgueType3;
+	  public GameObject DialgueType3
+	   {
+	   get{
+	      if (_DialgueType3 == null)
+	       {
+	         _DialgueType3  = GetUIUnit<GameObject>("DialgueType3"); 
+	       }
+	      return _DialgueType3;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -35,7 +35,12 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
-            Btn_RemoveEvent.onClick.AddListener(() => { EventSystemManager.Instance.RemoveEvent(eventList); });
+            Btn_RemoveEvent.onClick.AddListener(async () =>
+            { 
+                var isOk = await TipsPanle.OpenPnael("", "放弃后，事件会从列表消失。已消耗的神识不会返还。是否确认？");
+                if(isOk)
+                    EventSystemManager.Instance.RemoveEvent(eventList);
+            });
             Btn_Go.onClick.AddListener(() => { goCallBack?.Invoke(this); });
 
             Btn_ZuiZhong.onClick.AddListener(() =>
@@ -92,15 +97,32 @@ namespace Fort23.Mono
                 {
                     Text_Eventcondition.text = "";
                 }
+                EventconditionState.ChangeState(0);
             }
             else
             {
                 string desc = "";
+                bool isComplete = true;
                 foreach (var eventConditionData in eventLinkData.eventConditions)
                 {
+                    if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
+                    {
+                        isComplete = false;
+                    }
                     desc += EventHelper.GetTaskMessage(eventConditionData) + "\n";
                 }
 
+                if (isComplete)
+                {
+                    EventconditionState.ChangeState(1);
+                }
+                else
+                {
+                    EventconditionState.ChangeState(0);
+                }
+                
+             
+
                 Text_Eventcondition.text = desc;
             }
 
@@ -126,6 +148,17 @@ namespace Fort23.Mono
                 }
             }
 
+            if (randomEventConfig.placeID != 0)
+            {
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(randomEventConfig.placeID);
+                Text_Mapname.text = LanguageManager.Instance.Text(placesConfig.placeName);
+                Text_Mapname.gameObject.SetActive(true);
+            }
+            else
+            {
+                Text_Mapname.gameObject.SetActive(false);
+            }
+            Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
             for (var i = 0; i < itemInfos.Count; i++)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);

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

@@ -107,6 +107,39 @@ namespace Fort23.Mono
 	      return _Icon_Marsk;
 	     }
 	   }
+	  private Text _Text_Mapname;
+	  public Text Text_Mapname
+	   {
+	   get{
+	      if (_Text_Mapname == null)
+	       {
+	         _Text_Mapname  = GetUIUnit<Text>("Text_Mapname"); 
+	       }
+	      return _Text_Mapname;
+	     }
+	   }
+	  private Text _Text_Type;
+	  public Text Text_Type
+	   {
+	   get{
+	      if (_Text_Type == null)
+	       {
+	         _Text_Type  = GetUIUnit<Text>("Text_Type"); 
+	       }
+	      return _Text_Type;
+	     }
+	   }
+	  private CustomStateController _EventconditionState;
+	  public CustomStateController EventconditionState
+	   {
+	   get{
+	      if (_EventconditionState == null)
+	       {
+	         _EventconditionState  = GetUIUnit<CustomStateController>("EventconditionState"); 
+	       }
+	      return _EventconditionState;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/TipsPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XSgc5COpV3NL8mM3JW0qOrUr/0jOhWd3YxhUF3NMEBqH1CoxA2PM8m5XdHZf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanle.cs

@@ -0,0 +1,78 @@
+using Core.Language;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "TipsPanle")]
+    public partial class TipsPanle : UIPanel
+    {
+        private CTask<bool> _cTask;
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Cancel.onClick.AddListener(() =>
+            {
+                _cTask?.SetResult(false);
+                UIManager.Instance.HideUIUIPanel(this);
+            });
+
+            Btn_Comfire.onClick.AddListener(() =>
+            {
+                _cTask?.SetResult(true);
+                UIManager.Instance.HideUIUIPanel(this);
+            });
+        }
+
+        public override void Close()
+        {
+            _cTask = null;
+            base.Close();
+        }
+
+        public void CustomInit(string title,string tips, CTask<bool> cTask,int showButCount)
+        {
+            Text_Title.text = title;
+            Text_Tips.text = tips;
+            _cTask = cTask;
+            if (showButCount == 1)
+            {
+                Btn_Cancel.gameObject.SetActive(false);
+                Btn_Comfire.gameObject.SetActive(true);
+            }
+            else
+            {
+                Btn_Cancel.gameObject.SetActive(true);
+                Btn_Comfire.gameObject.SetActive(true);
+            }
+        }
+
+        public async static CTask<bool> OpenPnael(string title, string tips,int showButCount = 2)
+        {
+            CTask<bool> cTask = CTask<bool>.Create();
+            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top);
+            tipsPanle.CustomInit(title,tips, cTask,showButCount);
+            return await cTask;
+        }
+        
+        public async static CTask<bool> OpenPnael(int tips,int showButCount = 2)
+        {
+            CTask<bool> cTask = CTask<bool>.Create();
+            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top);
+            tipsPanle.CustomInit("",LanguageManager.Instance.Text(tips), cTask,showButCount);
+            return await cTask;
+        }
+    }
+}

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanle.cs.meta

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

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanleData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class TipsPanle 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Tips;
+	  public Text Text_Tips
+	   {
+	   get{
+	      if (_Text_Tips == null)
+	       {
+	         _Text_Tips  = GetUIUnit<Text>("Text_Tips"); 
+	       }
+	      return _Text_Tips;
+	     }
+	   }
+	  private Button _Btn_Cancel;
+	  public Button Btn_Cancel
+	   {
+	   get{
+	      if (_Btn_Cancel == null)
+	       {
+	         _Btn_Cancel  = GetUIUnit<Button>("Btn_Cancel"); 
+	       }
+	      return _Btn_Cancel;
+	     }
+	   }
+	  private Button _Btn_Comfire;
+	  public Button Btn_Comfire
+	   {
+	   get{
+	      if (_Btn_Comfire == null)
+	       {
+	         _Btn_Comfire  = GetUIUnit<Button>("Btn_Comfire"); 
+	       }
+	      return _Btn_Comfire;
+	     }
+	   }
+	  private Text _Text_Title;
+	  public Text Text_Title
+	   {
+	   get{
+	      if (_Text_Title == null)
+	       {
+	         _Text_Title  = GetUIUnit<Text>("Text_Title"); 
+	       }
+	      return _Text_Title;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanleData.cs.meta

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

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -121,7 +121,16 @@ namespace Fort23.Mono
                                 {
                                     XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
                                     xianTuLogInfoData1.type = 3;
-                                    xianTuLogInfoData1.message = LanguageManager.Instance.Text(i);
+                                    if (eventLinkConfig.NPCID != 0)
+                                    {
+                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(i)}</color>";
+                                    }
+                                    else
+                                    {
+                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(i)}</color>";
+                                    }
+                                  
+                                  
                                     showXianTuLogInfoData.Add(xianTuLogInfoData1);
                                 }
                             }
@@ -212,7 +221,7 @@ namespace Fort23.Mono
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
-            if (type != 2)
+            if (type != 1)
                 return;
             EventLogTitleWidget highestItem = null;
             float maxY = float.MinValue;
@@ -231,7 +240,7 @@ namespace Fort23.Mono
             if (highestItem != null)
             {
                 float outsideY = eventLogTitleWidget.own.transform.position.y;
-                if (maxY > outsideY - 5)
+                if (maxY > outsideY )
                 {
                     eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
                 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -69,7 +69,7 @@ namespace Fort23.Mono
         {
             if (this.type == 1)
                 return;
-            Sv.transform.SetParent(MarskRoot1,false);
+            Sv.transform.SetParent(MarskRoot1, false);
             eventLogTitleWidget.own.gameObject.SetActive(false);
             ChangeList.ShowTargetIndex(0);
             Btn_XaiXuanClose.gameObject.SetActive(false);
@@ -91,11 +91,11 @@ namespace Fort23.Mono
         {
             if (this.type == 2)
                 return;
-            Sv.transform.SetParent(MarskRoot,false);
+            Sv.transform.SetParent(MarskRoot, false);
             eventLogTitleWidget.own.gameObject.SetActive(true);
             ChangeList.ShowTargetIndex(1);
             Btn_XaiXuanClose.gameObject.SetActive(false);
-            Btn_XaiXuan.gameObject.SetActive(false);
+            Btn_XaiXuan.gameObject.SetActive(true);
             bigMaoXaiXuan = 0;
             placesXaiXuan = 0;
             places.Clear();
@@ -106,7 +106,16 @@ namespace Fort23.Mono
             type = 2;
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
-            eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            if (xianTuDatas.Count > 0)
+            {
+                eventLogTitleWidget.own.SetActive(true);
+                eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            }
+            else
+            {
+                eventLogTitleWidget.own.SetActive(false);
+            }
+
             Content.Init(this, xianTuDatas.Count);
         }
 
@@ -127,6 +136,8 @@ namespace Fort23.Mono
                         xianTuData2.xianTuLogConfig = xianTuLogConfig;
                         xianTuDatas.Add(xianTuData2);
                     }
+
+                    return;
                 }
                 else
                 {
@@ -139,53 +150,36 @@ namespace Fort23.Mono
 
                         xiantuMap[xianTuLogConfig.BigMapID].Add(xianTuLogConfig);
                     }
-
-                    foreach (var keyValuePair in xiantuMap)
-                    {
-                        XianTuData xianTuData = new XianTuData();
-                        xianTuData.type = 1;
-                        BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(keyValuePair.Key);
-                        xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName);
-                        xianTuDatas.Add(xianTuData);
-                        foreach (var xianTuLogConfig in keyValuePair.Value)
-                        {
-                            XianTuData xianTuData2 = new XianTuData();
-                            xianTuData2.type = 2;
-                            xianTuData2.xianTuLogConfig = xianTuLogConfig;
-                            xianTuDatas.Add(xianTuData2);
-                        }
-                    }
                 }
-
-
-                return;
             }
-
-
-            List<EventConfig> eventConfigs;
-            foreach (var xianTuLogConfig in configs)
+            else
             {
-                if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
+                List<EventConfig> eventConfigs;
+                foreach (var xianTuLogConfig in configs)
                 {
-                    eventConfigs = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
-                    foreach (var eventConfig in eventConfigs)
+                    if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
                     {
-                        if (places.Contains(eventConfig.placeID))
+                        eventConfigs = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
+                        foreach (var eventConfig in eventConfigs)
                         {
-                            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
-                            if (!xiantuMap.ContainsKey(placesConfig.bigMapID))
+                            if (places.Contains(eventConfig.placeID))
                             {
-                                xiantuMap.Add(placesConfig.bigMapID, new List<XianTuLogConfig>());
-                            }
+                                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                                if (!xiantuMap.ContainsKey(placesConfig.bigMapID))
+                                {
+                                    xiantuMap.Add(placesConfig.bigMapID, new List<XianTuLogConfig>());
+                                }
+
+                                xiantuMap[placesConfig.bigMapID].Add(xianTuLogConfig);
 
-                            xiantuMap[placesConfig.bigMapID].Add(xianTuLogConfig);
-                            // showConfigs.Add(xianTuLogConfig);
-                            break;
+                                break;
+                            }
                         }
                     }
                 }
             }
 
+
             foreach (var keyValuePair in xiantuMap)
             {
                 XianTuData xianTuData = new XianTuData();
@@ -202,14 +196,17 @@ namespace Fort23.Mono
                         var eventConfigs1 = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
                         foreach (var eventConfig in eventConfigs1)
                         {
-                            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
-                            if (eventList != null)
+                            if (places.Contains(eventConfig.placeID) || places.Count <= 0)
                             {
-                                count++;
+                                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                                if (eventList != null)
+                                {
+                                    count++;
+                                }
+
+                                allCount++;
                             }
                         }
-
-                        allCount += eventConfigs1.Count;
                     }
 
                     XianTuData xianTuData2 = new XianTuData();
@@ -321,6 +318,18 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
+
+            if (xianTuDatas.Count > 0)
+            {
+                eventLogTitleWidget.own.SetActive(true);
+                eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            }
+            else
+            {
+                eventLogTitleWidget.own.SetActive(false);
+            }
+
+
             Content.Init(this, xianTuDatas.Count);
         }