Browse Source

修改bug

lzx 15 hours ago
parent
commit
58909751f4

+ 20 - 0
Assets/Res/Config/EventConditionConfig.json

@@ -153,6 +153,26 @@
         1008
         1008
       ],
       ],
       "finishCount": 1
       "finishCount": 1
+    },
+    {
+      "ID": 18,
+      "message": 2853,
+      "Operation": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1301
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 19,
+      "message": 2854,
+      "Operation": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 1
     }
     }
   ]
   ]
 }
 }

+ 404 - 27
Assets/Res/Config/EventConfig.json

@@ -1229,7 +1229,7 @@
       "EventTag": 7,
       "EventTag": 7,
       "EventType": 1,
       "EventType": 1,
       "Score": 0,
       "Score": 0,
-      "EventQuality": 3,
+      "EventQuality": 1,
       "PrizeIDs": [
       "PrizeIDs": [
         1401
         1401
       ],
       ],
@@ -1245,6 +1245,272 @@
       "EventName": 3017,
       "EventName": 3017,
       "Description": 3018
       "Description": 3018
     },
     },
+    {
+      "ID": 1012,
+      "EventLinksId": [
+        101201
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3038,
+      "Description": 3039
+    },
+    {
+      "ID": 1013,
+      "EventLinksId": [
+        101301
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3040,
+      "Description": 3041
+    },
+    {
+      "ID": 1014,
+      "EventLinksId": [
+        101401
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3042,
+      "Description": 3043
+    },
+    {
+      "ID": 1015,
+      "EventLinksId": [
+        101501,
+        101502
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3046,
+      "Description": 3047
+    },
+    {
+      "ID": 1016,
+      "EventLinksId": [
+        101601,
+        101602
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RelatedEvents": [
+        30009
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3048,
+      "Description": 3049
+    },
+    {
+      "ID": 1017,
+      "EventLinksId": [
+        101701
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": 10,
+      "EventValue": [
+        30009
+      ],
+      "EventCount": null,
+      "EventName": 3048,
+      "Description": 3050
+    },
+    {
+      "ID": 1018,
+      "EventLinksId": [
+        101801,
+        101802,
+        101803,
+        101804
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1201
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3051,
+      "Description": 3052
+    },
+    {
+      "ID": 1019,
+      "EventLinksId": [
+        101901,
+        101902,
+        101903
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1201
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3053,
+      "Description": 3054
+    },
+    {
+      "ID": 1020,
+      "EventLinksId": [
+        102001,
+        102002
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1203
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3055,
+      "Description": 3056
+    },
+    {
+      "ID": 1021,
+      "EventLinksId": [
+        102101,
+        102102,
+        102103
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1203
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3057,
+      "Description": 3058
+    },
     {
     {
       "ID": 20001,
       "ID": 20001,
       "EventLinksId": [
       "EventLinksId": [
@@ -1645,6 +1911,62 @@
       "EventName": null,
       "EventName": null,
       "Description": null
       "Description": null
     },
     },
+    {
+      "ID": 30009,
+      "EventLinksId": [
+        3000901
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1301
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RelatedEvents": [
+        1017
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 1,
+      "placeID": 3,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30010,
+      "EventLinksId": [
+        3001001
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 1,
+      "placeID": 3,
+      "XiantuID": null,
+      "EventConditionId": 10,
+      "EventValue": [
+        1021
+      ],
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
     {
     {
       "ID": 5001,
       "ID": 5001,
       "EventLinksId": [
       "EventLinksId": [
@@ -1663,13 +1985,16 @@
         500113,
         500113,
         500114,
         500114,
         500115,
         500115,
-        500116
+        500116,
+        500117,
+        500118,
+        500119
       ],
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventTag": 5,
       "EventType": 1,
       "EventType": 1,
       "Score": 10,
       "Score": 10,
-      "EventQuality": 3,
+      "EventQuality": 1,
       "PrizeIDs": [
       "PrizeIDs": [
         1401
         1401
       ],
       ],
@@ -1680,45 +2005,97 @@
       "RefreshCount": null,
       "RefreshCount": null,
       "placeID": 1,
       "placeID": 1,
       "XiantuID": 1,
       "XiantuID": 1,
-      "EventConditionId": 10,
-      "EventValue": [
-        10008
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
       "EventName": 3019,
       "EventName": 3019,
       "Description": 3020
       "Description": 3020
     },
     },
     {
     {
       "ID": 5002,
       "ID": 5002,
-      "EventTriggerType": null,
-      "EventTag": null,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventLinksId": [
+        500201,
+        500202,
+        500203,
+        500204,
+        500205,
+        500206,
+        500207,
+        500208,
+        500209,
+        500210,
+        500211,
+        500212,
+        500213,
+        500214,
+        500215,
+        500216
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": null,
       "RefreshProbability": null,
       "RefreshCount": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": 10,
+      "EventValue": [
+        5001
+      ],
       "EventCount": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 3036,
+      "Description": 3037
     },
     },
     {
     {
       "ID": 5003,
       "ID": 5003,
-      "EventTriggerType": null,
-      "EventTag": null,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventLinksId": [
+        500301,
+        500302,
+        500303,
+        500304,
+        500305,
+        500306,
+        500307,
+        500308,
+        500309,
+        500310,
+        500311,
+        500312,
+        500313,
+        500314,
+        500315,
+        500316,
+        500317,
+        500318,
+        500319,
+        500320
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1401
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": null,
       "RefreshProbability": null,
       "RefreshCount": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 3034,
+      "Description": 3035
     }
     }
   ]
   ]
 }
 }

+ 1100 - 4
Assets/Res/Config/EventLinkConfig.json

@@ -4864,7 +4864,7 @@
       "ID": 500101,
       "ID": 500101,
       "conciseEventMessage": 2365,
       "conciseEventMessage": 2365,
       "EventConditionMessage": 2366,
       "EventConditionMessage": 2366,
-      "PreShow": 1,
+      "PreShow": null,
       "PreShowPar": null,
       "PreShowPar": null,
       "NPCID": 103,
       "NPCID": 103,
       "LanID": [
       "LanID": [
@@ -5042,7 +5042,7 @@
       ],
       ],
       "DialogueType": null,
       "DialogueType": null,
       "EventID": 5001,
       "EventID": 5001,
-      "optionType": null,
+      "optionType": 5,
       "ResultType": 1,
       "ResultType": 1,
       "ResultOptions": [
       "ResultOptions": [
         500111
         500111
@@ -5052,7 +5052,7 @@
       "ID": 500111,
       "ID": 500111,
       "conciseEventMessage": 2365,
       "conciseEventMessage": 2365,
       "EventConditionMessage": 2379,
       "EventConditionMessage": 2379,
-      "PreShow": 1,
+      "PreShow": null,
       "PreShowPar": null,
       "PreShowPar": null,
       "NPCID": null,
       "NPCID": null,
       "LanID": [
       "LanID": [
@@ -5060,7 +5060,7 @@
       ],
       ],
       "DialogueType": null,
       "DialogueType": null,
       "EventID": 5001,
       "EventID": 5001,
-      "optionType": 5,
+      "optionType": null,
       "ResultType": 1,
       "ResultType": 1,
       "ResultOptions": [
       "ResultOptions": [
         500112
         500112
@@ -5216,6 +5216,1102 @@
       "EventID": 5001,
       "EventID": 5001,
       "optionType": null,
       "optionType": null,
       "ResultType": null
       "ResultType": null
+    },
+    {
+      "ID": 500301,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2414
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500302
+      ]
+    },
+    {
+      "ID": 500302,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2415
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500303
+      ]
+    },
+    {
+      "ID": 500303,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2416
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500304
+      ]
+    },
+    {
+      "ID": 500304,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2417
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500305
+      ]
+    },
+    {
+      "ID": 500305,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2418
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500306
+      ]
+    },
+    {
+      "ID": 500306,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2419
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500307
+      ]
+    },
+    {
+      "ID": 500307,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2420
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500308
+      ]
+    },
+    {
+      "ID": 500308,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2421
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500309
+      ]
+    },
+    {
+      "ID": 500309,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2422
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500310
+      ]
+    },
+    {
+      "ID": 500310,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2423
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500311
+      ]
+    },
+    {
+      "ID": 500311,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2424
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500312
+      ]
+    },
+    {
+      "ID": 500312,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2425
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500313
+      ]
+    },
+    {
+      "ID": 500313,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2413,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2426
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500314
+      ]
+    },
+    {
+      "ID": 500314,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2428
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        500315,
+        101
+      ]
+    },
+    {
+      "ID": 500315,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2429
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500316
+      ]
+    },
+    {
+      "ID": 500316,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2430
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500317
+      ]
+    },
+    {
+      "ID": 500317,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2431
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500318
+      ]
+    },
+    {
+      "ID": 500318,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2432
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500319
+      ]
+    },
+    {
+      "ID": 500319,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 113,
+      "LanID": [
+        2433
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500320
+      ]
+    },
+    {
+      "ID": 500320,
+      "conciseEventMessage": 2412,
+      "EventConditionMessage": 2427,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2434
+      ],
+      "DialogueType": null,
+      "EventID": 5003,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 500201,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2437
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500202
+      ]
+    },
+    {
+      "ID": 500202,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2438
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500203
+      ]
+    },
+    {
+      "ID": 500203,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2439
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500204
+      ]
+    },
+    {
+      "ID": 500204,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2440
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500205
+      ]
+    },
+    {
+      "ID": 500205,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2441
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500206
+      ]
+    },
+    {
+      "ID": 500206,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2442
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500207
+      ]
+    },
+    {
+      "ID": 500207,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2436,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 112,
+      "LanID": [
+        2443
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500208
+      ]
+    },
+    {
+      "ID": 500208,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2445
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        500209,
+        101
+      ]
+    },
+    {
+      "ID": 500209,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2446
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500210
+      ]
+    },
+    {
+      "ID": 500210,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2447
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500211
+      ]
+    },
+    {
+      "ID": 500211,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2448
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500212
+      ]
+    },
+    {
+      "ID": 500212,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2449
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": 1,
+      "optionPara1": [
+        500213,
+        500213
+      ],
+      "optionPara2": [
+        2450,
+        2451
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        500213
+      ]
+    },
+    {
+      "ID": 500213,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2452
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500214
+      ]
+    },
+    {
+      "ID": 500214,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2453
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500215
+      ]
+    },
+    {
+      "ID": 500215,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2454
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        500216
+      ]
+    },
+    {
+      "ID": 500216,
+      "conciseEventMessage": 2435,
+      "EventConditionMessage": 2444,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 103,
+      "LanID": [
+        2455
+      ],
+      "DialogueType": null,
+      "EventID": 5002,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101201,
+      "conciseEventMessage": 2456,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2457
+      ],
+      "DialogueType": null,
+      "EventID": 1012,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101301,
+      "conciseEventMessage": 2458,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2459
+      ],
+      "DialogueType": null,
+      "EventID": 1013,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101401,
+      "conciseEventMessage": 2460,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2461
+      ],
+      "DialogueType": null,
+      "EventID": 1014,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101501,
+      "conciseEventMessage": 2462,
+      "EventConditionMessage": 2463,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2464
+      ],
+      "DialogueType": null,
+      "EventID": 1015,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        101502
+      ]
+    },
+    {
+      "ID": 101502,
+      "conciseEventMessage": 2462,
+      "EventConditionMessage": 2463,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2465
+      ],
+      "DialogueType": null,
+      "EventID": 1015,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        101503,
+        101
+      ]
+    },
+    {
+      "ID": 101601,
+      "conciseEventMessage": 2466,
+      "EventConditionMessage": 2467,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2468
+      ],
+      "DialogueType": null,
+      "EventID": 1016,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        101602
+      ]
+    },
+    {
+      "ID": 101602,
+      "conciseEventMessage": 2466,
+      "EventConditionMessage": 2467,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2469
+      ],
+      "DialogueType": null,
+      "EventID": 1016,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        30009
+      ]
+    },
+    {
+      "ID": 101701,
+      "conciseEventMessage": 2470,
+      "EventConditionMessage": 2471,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2472
+      ],
+      "DialogueType": null,
+      "EventID": 1017,
+      "ConditionId": [
+        18
+      ],
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 3000901,
+      "conciseEventMessage": 2473,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30009,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1301
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 101801,
+      "conciseEventMessage": 2474,
+      "EventConditionMessage": 2475,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2476
+      ],
+      "DialogueType": null,
+      "EventID": 1018,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101802,
+      "conciseEventMessage": 2474,
+      "EventConditionMessage": 2475,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2477
+      ],
+      "DialogueType": null,
+      "EventID": 1018,
+      "optionType": 1,
+      "optionPara1": [
+        101806,
+        101803
+      ],
+      "optionPara2": [
+        2478,
+        2479
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 101803,
+      "conciseEventMessage": 2474,
+      "EventConditionMessage": 2475,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2480
+      ],
+      "DialogueType": null,
+      "EventID": 1018,
+      "optionType": null,
+      "PrizeIDs": [
+        1202
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 101804,
+      "conciseEventMessage": 2474,
+      "EventConditionMessage": 2475,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2481
+      ],
+      "DialogueType": null,
+      "EventID": 1018,
+      "optionType": null,
+      "PrizeIDs": [
+        1201
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 101901,
+      "conciseEventMessage": 2482,
+      "EventConditionMessage": 2483,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2484
+      ],
+      "DialogueType": null,
+      "EventID": 1019,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101902,
+      "conciseEventMessage": 2482,
+      "EventConditionMessage": 2483,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2485
+      ],
+      "DialogueType": null,
+      "EventID": 1019,
+      "optionType": 5,
+      "ResultType": null
+    },
+    {
+      "ID": 101903,
+      "conciseEventMessage": 2482,
+      "EventConditionMessage": 2483,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 1019,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        101904,
+        101
+      ]
+    },
+    {
+      "ID": 102001,
+      "conciseEventMessage": 2486,
+      "EventConditionMessage": 2487,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2488
+      ],
+      "DialogueType": null,
+      "EventID": 1020,
+      "optionType": 1,
+      "optionPara1": [
+        102002,
+        102002
+      ],
+      "optionPara2": [
+        2489,
+        2490
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102002,
+      "conciseEventMessage": 2486,
+      "EventConditionMessage": 2487,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2491
+      ],
+      "DialogueType": null,
+      "EventID": 1020,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1203
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102003,
+        101
+      ]
+    },
+    {
+      "ID": 102101,
+      "conciseEventMessage": 2492,
+      "EventConditionMessage": 2493,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2494
+      ],
+      "DialogueType": null,
+      "EventID": 1021,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102102
+      ]
+    },
+    {
+      "ID": 102102,
+      "conciseEventMessage": 2492,
+      "EventConditionMessage": 2493,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2495
+      ],
+      "DialogueType": null,
+      "EventID": 1021,
+      "optionType": 1,
+      "optionPara1": [
+        102103
+      ],
+      "optionPara2": [
+        2496
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        102103
+      ]
+    },
+    {
+      "ID": 102103,
+      "conciseEventMessage": 2492,
+      "EventConditionMessage": 2493,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 108,
+      "LanID": [
+        2497
+      ],
+      "DialogueType": null,
+      "EventID": 1021,
+      "ConditionId": [
+        19
+      ],
+      "optionType": null,
+      "PrizeIDs": [
+        1203
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 3,
+      "ResultOptions": [
+        30010
+      ]
+    },
+    {
+      "ID": 3001001,
+      "conciseEventMessage": 2498,
+      "EventConditionMessage": 2499,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2500
+      ],
+      "DialogueType": null,
+      "EventID": 30010,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
     }
     }
   ]
   ]
 }
 }

+ 6 - 0
Assets/Res/Config/EventNPC.json

@@ -143,6 +143,12 @@
       "name": 3021,
       "name": 3021,
       "ID_1": null,
       "ID_1": null,
       "DaoyouID": null
       "DaoyouID": null
+    },
+    {
+      "ID": 113,
+      "name": 3034,
+      "ID_1": null,
+      "DaoyouID": null
     }
     }
   ]
   ]
 }
 }

+ 193 - 93
Assets/Res/Config/LanguageChineseConfig.json

@@ -9526,7 +9526,7 @@
     },
     },
     {
     {
       "ID": 2382,
       "ID": 2382,
-      "txt": "前辈见往日情面不愿亲自动手,我一人足以   "
+      "txt": "前辈见往日情面不愿亲自动手,我一人足以"
     },
     },
     {
     {
       "ID": 2383,
       "ID": 2383,
@@ -9546,7 +9546,7 @@
     },
     },
     {
     {
       "ID": 2387,
       "ID": 2387,
-      "txt": " 轮回?今日是我大意了!老东西还有你,给我等着!(化作一震妖风带着《御风化影诀》逃往远方"
+      "txt": "轮回?今日是我大意了!老东西还有你,给我等着!(化作一震妖风带着《御风化影诀》逃往远方"
     },
     },
     {
     {
       "ID": 2388,
       "ID": 2388,
@@ -9646,359 +9646,359 @@
     },
     },
     {
     {
       "ID": 2412,
       "ID": 2412,
-      "txt": ""
+      "txt": "受化妖剑士所托,帮助他消灭藏匿北海的海妖"
     },
     },
     {
     {
       "ID": 2413,
       "ID": 2413,
-      "txt": ""
+      "txt": "与化妖剑士对话"
     },
     },
     {
     {
       "ID": 2414,
       "ID": 2414,
-      "txt": ""
+      "txt": "咸腥的海风中,你看见礁石上蜷缩着人形怪物——它的脊椎刺破皮肤形成剑鞘,一柄生满红锈的巨剑就背在嵴骨之间。当它转头看向你时,你不由得心底生寒。"
     },
     },
     {
     {
       "ID": 2415,
       "ID": 2415,
-      "txt": ""
+      "txt": "你闻到了吗...海里的血锈味。那厮海妖在这片海滩卷走阿蘅时的这种味道"
     },
     },
     {
     {
       "ID": 2416,
       "ID": 2416,
-      "txt": ""
+      "txt": "什么血锈味,我闻不见,你口中的阿蘅是?"
     },
     },
     {
     {
       "ID": 2417,
       "ID": 2417,
-      "txt": ""
+      "txt": "我的妻子。"
     },
     },
     {
     {
       "ID": 2418,
       "ID": 2418,
-      "txt": ""
+      "txt": "妖怪还有妻子,还挺稀奇。"
     },
     },
     {
     {
       "ID": 2419,
       "ID": 2419,
-      "txt": ""
+      "txt": "当年我可是和你一样的修士,但从那之后一切都变了"
     },
     },
     {
     {
       "ID": 2420,
       "ID": 2420,
-      "txt": ""
+      "txt": "百余年我送给阿蘅的定情信物贝壳项链,被阿蘅不慎遗失在这片海滩,她于是在这苦苦寻找。可突然间一头妖兽现身,将她拖入了海中!"
     },
     },
     {
     {
       "ID": 2421,
       "ID": 2421,
-      "txt": ""
+      "txt": "得知此事后一直守在这,等着那厮妖兽从海中现身。"
     },
     },
     {
     {
       "ID": 2422,
       "ID": 2422,
-      "txt": ""
+      "txt": "我在这片海滩终于等到那厮妖兽从海中出现,我便提剑向其冲去,我的剑深深刺入了妖兽的身体,它一吃痛逃入了这片海中,空中忽然刮起了狂风,被狂风阻拦无法进入海中追寻,妖兽也被狂风困在了海中"
     },
     },
     {
     {
       "ID": 2423,
       "ID": 2423,
-      "txt": ""
+      "txt": "那你为何会变成了妖"
     },
     },
     {
     {
       "ID": 2424,
       "ID": 2424,
-      "txt": ""
+      "txt": "因北海妖气横行,我被妖气入体,身体慢慢发生了变化,不妨这也算北海对我的恩赐,妻子死后我日以继日的待在这里等着复仇,等着斩杀掉那只吞掉我妻子的妖兽。"
     },
     },
     {
     {
       "ID": 2425,
       "ID": 2425,
-      "txt": ""
+      "txt": "我有办法驱散狂风"
     },
     },
     {
     {
       "ID": 2426,
       "ID": 2426,
-      "txt": ""
+      "txt": "(拿出风灵珠驱散海面狂风)(瞬间海面变的不平,一头妖力浑厚的妖兽从海面中跃出)"
     },
     },
     {
     {
       "ID": 2427,
       "ID": 2427,
-      "txt": ""
+      "txt": "追查海妖(0/1)"
     },
     },
     {
     {
       "ID": 2428,
       "ID": 2428,
-      "txt": ""
+      "txt": "小友有如此绝技,当斩杀那厮妖兽后定当好好报答你!"
     },
     },
     {
     {
       "ID": 2429,
       "ID": 2429,
-      "txt": ""
+      "txt": "小友你快躲开,无论如何我也要这妖兽葬身于此!即便魂飞魄散永世不得轮回也无所谓!阿蘅,我来见你了!"
     },
     },
     {
     {
       "ID": 2430,
       "ID": 2430,
-      "txt": ""
+      "txt": "海面沸腾,妖兽嘶吼着掀起滔天巨浪,触须如铁鞭般抽向你。剑妖猛地推开你,他脊骨间的锈剑剧烈震颤,裂纹中迸发出刺目的血光。"
     },
     },
     {
     {
       "ID": 2431,
       "ID": 2431,
-      "txt": ""
+      "txt": "百年的执念……今日,该了结了!"
     },
     },
     {
     {
       "ID": 2432,
       "ID": 2432,
-      "txt": ""
+      "txt": "剑妖的身体开始崩解,血肉化作赤红的火焰,缠绕着锈剑熊熊燃烧。那半枚嵌在脸上的银簪突然亮起幽蓝的光,与妖兽颅骨中的另半枚遥相呼应。"
     },
     },
     {
     {
       "ID": 2433,
       "ID": 2433,
-      "txt": ""
+      "txt": "阿蘅……你看到了吗?我终于……能带你回家了!"
     },
     },
     {
     {
       "ID": 2434,
       "ID": 2434,
-      "txt": ""
+      "txt": "他化作一道血色,贯穿妖兽的头颅。银簪在爆炸的强光中被蹦飞,妖兽发出凄厉的哀嚎,庞大的身躯寸寸瓦解,化作漫天荧光。"
     },
     },
     {
     {
       "ID": 2435,
       "ID": 2435,
-      "txt": ""
+      "txt": "受疯道人所托,追查《御风化影诀》的下落"
     },
     },
     {
     {
       "ID": 2436,
       "ID": 2436,
-      "txt": ""
+      "txt": "与疯道人对话(0/1)"
     },
     },
     {
     {
       "ID": 2437,
       "ID": 2437,
-      "txt": ""
+      "txt": "小友,可曾记得风无咎"
     },
     },
     {
     {
       "ID": 2438,
       "ID": 2438,
-      "txt": ""
+      "txt": "老夫感受到了风无咎的藏匿之地。"
     },
     },
     {
     {
       "ID": 2439,
       "ID": 2439,
-      "txt": ""
+      "txt": "前辈我这就赶去。"
     },
     },
     {
     {
       "ID": 2440,
       "ID": 2440,
-      "txt": ""
+      "txt": "(风无咎在一血池之中打坐,身旁妖气环绕,一眼望去全是生灵血肉)"
     },
     },
     {
     {
       "ID": 2441,
       "ID": 2441,
-      "txt": ""
+      "txt": "竟用生魂喂养功法...小友当心!"
     },
     },
     {
     {
       "ID": 2442,
       "ID": 2442,
-      "txt": ""
+      "txt": "(血池突然炸开,风妖与影妖完全融合,妖躯浮现古魔纹路)"
     },
     },
     {
     {
       "ID": 2443,
       "ID": 2443,
-      "txt": ""
+      "txt": "那日是我疏忽大意,这《御风化影诀》留给你们也是暴殄天物,如今在我手上才能发挥它的用处,多说无益既然你们追来了就留下给我当做丹引让我的功力更上一步吧!"
     },
     },
     {
     {
       "ID": 2444,
       "ID": 2444,
-      "txt": ""
+      "txt": "击败风无咎(0/1)"
     },
     },
     {
     {
       "ID": 2445,
       "ID": 2445,
-      "txt": ""
+      "txt": "大胆邪修,今日就让你魂飞魄散。"
     },
     },
     {
     {
       "ID": 2446,
       "ID": 2446,
-      "txt": ""
+      "txt": "妖族灭我父母,修道的也要杀了我,我究竟做错了什么!"
     },
     },
     {
     {
       "ID": 2447,
       "ID": 2447,
-      "txt": ""
+      "txt": "疯道人赶来后醉醺醺的说道"
     },
     },
     {
     {
       "ID": 2448,
       "ID": 2448,
-      "txt": ""
+      "txt": "小友还请留手。"
     },
     },
     {
     {
       "ID": 2449,
       "ID": 2449,
-      "txt": ""
+      "txt": "\"\""
     },
     },
     {
     {
       "ID": 2450,
       "ID": 2450,
-      "txt": ""
+      "txt": "前辈这种时刻还有心思喝酒"
     },
     },
     {
     {
       "ID": 2451,
       "ID": 2451,
-      "txt": ""
+      "txt": "这步入邪道之人留着为何"
     },
     },
     {
     {
       "ID": 2452,
       "ID": 2452,
-      "txt": ""
+      "txt": "所谓《御风化影诀》凡人无法驾驭,老夫念他风灵根强大便想着拿去便是"
     },
     },
     {
     {
       "ID": 2453,
       "ID": 2453,
-      "txt": ""
+      "txt": "没想到你以魂为薪...以血为引...强行修炼"
     },
     },
     {
     {
       "ID": 2454,
       "ID": 2454,
-      "txt": ""
+      "txt": "今日放你一马,去洗涤魔气后还能拜入我的门下"
     },
     },
     {
     {
       "ID": 2455,
       "ID": 2455,
-      "txt": ""
+      "txt": "记住,靠吞噬得来的力量,终有一日会反噬其主。"
     },
     },
     {
     {
       "ID": 2456,
       "ID": 2456,
-      "txt": ""
+      "txt": "神识探索至一处矿井之中,此处灵气氤氲"
     },
     },
     {
     {
       "ID": 2457,
       "ID": 2457,
-      "txt": ""
+      "txt": "前往矿井采集灵矿"
     },
     },
     {
     {
       "ID": 2458,
       "ID": 2458,
-      "txt": ""
+      "txt": "神识经过一处荒废寺庙之外,寺庙之中似乎有不同寻常之物"
     },
     },
     {
     {
       "ID": 2459,
       "ID": 2459,
-      "txt": ""
+      "txt": "进入寺庙找寻散发灵气的修为丹"
     },
     },
     {
     {
       "ID": 2460,
       "ID": 2460,
-      "txt": ""
+      "txt": "神识至一处灵气充盈之地,似乎是处洞府"
     },
     },
     {
     {
       "ID": 2461,
       "ID": 2461,
-      "txt": ""
+      "txt": "进入洞府收集可用之物"
     },
     },
     {
     {
       "ID": 2462,
       "ID": 2462,
-      "txt": ""
+      "txt": "一个不知好歹的邪修拦住了你的去路!"
     },
     },
     {
     {
       "ID": 2463,
       "ID": 2463,
-      "txt": ""
+      "txt": "击败山贼(0/1)"
     },
     },
     {
     {
       "ID": 2464,
       "ID": 2464,
-      "txt": ""
+      "txt": "此路是我开,此树是我栽,要想从此过,留下买命财!"
     },
     },
     {
     {
       "ID": 2465,
       "ID": 2465,
-      "txt": ""
+      "txt": "大胆山贼,拿命来!"
     },
     },
     {
     {
       "ID": 2466,
       "ID": 2466,
-      "txt": ""
+      "txt": "一位和尚叫住了你,貌似有什么急事"
     },
     },
     {
     {
       "ID": 2467,
       "ID": 2467,
-      "txt": ""
+      "txt": "找到袈裟"
     },
     },
     {
     {
       "ID": 2468,
       "ID": 2468,
-      "txt": ""
+      "txt": "仙长,我的袈裟被可恶的妖兽夺走了,还请为老僧主持公道啊"
     },
     },
     {
     {
       "ID": 2469,
       "ID": 2469,
-      "txt": ""
+      "txt": "在此等待即可"
     },
     },
     {
     {
       "ID": 2470,
       "ID": 2470,
-      "txt": ""
+      "txt": "一位和尚叫住了你,貌似有什么急事"
     },
     },
     {
     {
       "ID": 2471,
       "ID": 2471,
-      "txt": ""
+      "txt": "找到袈裟"
     },
     },
     {
     {
       "ID": 2472,
       "ID": 2472,
-      "txt": ""
+      "txt": "感谢仙长帮我寻回这件袈裟!"
     },
     },
     {
     {
       "ID": 2473,
       "ID": 2473,
-      "txt": ""
+      "txt": "击杀灵兽获得袈裟"
     },
     },
     {
     {
       "ID": 2474,
       "ID": 2474,
-      "txt": ""
+      "txt": "云游修士历练在即,急待前辈指点一二"
     },
     },
     {
     {
       "ID": 2475,
       "ID": 2475,
-      "txt": ""
+      "txt": "指引云游修士"
     },
     },
     {
     {
       "ID": 2476,
       "ID": 2476,
-      "txt": ""
+      "txt": "前辈还请赐教一二"
     },
     },
     {
     {
       "ID": 2477,
       "ID": 2477,
-      "txt": ""
+      "txt": "“”"
     },
     },
     {
     {
       "ID": 2478,
       "ID": 2478,
-      "txt": ""
+      "txt": "不予理睬直接离开"
     },
     },
     {
     {
       "ID": 2479,
       "ID": 2479,
-      "txt": ""
+      "txt": "指导云游修士进行修炼"
     },
     },
     {
     {
       "ID": 2480,
       "ID": 2480,
-      "txt": ""
+      "txt": "多谢前辈!"
     },
     },
     {
     {
       "ID": 2481,
       "ID": 2481,
-      "txt": ""
+      "txt": "云游修士见你不愿教导便离开了"
     },
     },
     {
     {
       "ID": 2482,
       "ID": 2482,
-      "txt": ""
+      "txt": "逍遥宗的长老似乎有事找你"
     },
     },
     {
     {
       "ID": 2483,
       "ID": 2483,
-      "txt": ""
+      "txt": "???"
     },
     },
     {
     {
       "ID": 2484,
       "ID": 2484,
-      "txt": ""
+      "txt": "今日我宗弟子发现云海妖气冲天,怕是有妖兽来临。还望小友走一趟,消灭那的妖王"
     },
     },
     {
     {
       "ID": 2485,
       "ID": 2485,
-      "txt": ""
+      "txt": "小事一桩"
     },
     },
     {
     {
       "ID": 2486,
       "ID": 2486,
-      "txt": ""
+      "txt": "村民急匆匆的前来找你"
     },
     },
     {
     {
       "ID": 2487,
       "ID": 2487,
-      "txt": ""
+      "txt": "清剿妖兽(0/1)"
     },
     },
     {
     {
       "ID": 2488,
       "ID": 2488,
-      "txt": ""
+      "txt": "仙长,村中有妖兽闹事,还请出手解决!"
     },
     },
     {
     {
       "ID": 2489,
       "ID": 2489,
-      "txt": ""
+      "txt": "区区妖兽,灭掉便是"
     },
     },
     {
     {
       "ID": 2490,
       "ID": 2490,
-      "txt": ""
+      "txt": "我可是要酬劳的"
     },
     },
     {
     {
       "ID": 2491,
       "ID": 2491,
-      "txt": ""
+      "txt": "多谢仙长相救!报酬好说"
     },
     },
     {
     {
       "ID": 2492,
       "ID": 2492,
-      "txt": ""
+      "txt": "一个和尚急匆匆的叫住了你"
     },
     },
     {
     {
       "ID": 2493,
       "ID": 2493,
-      "txt": ""
+      "txt": "与和尚对话"
     },
     },
     {
     {
       "ID": 2494,
       "ID": 2494,
-      "txt": ""
+      "txt": "前些日子有妖兽在寺中大闹,盗走了琉璃盏,还请仙长出手相助"
     },
     },
     {
     {
       "ID": 2495,
       "ID": 2495,
-      "txt": ""
+      "txt": "“”"
     },
     },
     {
     {
       "ID": 2496,
       "ID": 2496,
-      "txt": ""
+      "txt": "还请在此等候我拿来琉璃盏"
     },
     },
     {
     {
       "ID": 2497,
       "ID": 2497,
-      "txt": ""
+      "txt": "感谢仙长相助!"
     },
     },
     {
     {
       "ID": 2498,
       "ID": 2498,
-      "txt": ""
+      "txt": "击败盗走琉璃盏的妖兽"
     },
     },
     {
     {
       "ID": 2499,
       "ID": 2499,
-      "txt": ""
+      "txt": "击败妖兽"
     },
     },
     {
     {
       "ID": 2500,
       "ID": 2500,
-      "txt": ""
+      "txt": "好一个妖兽竟敢盗走琉璃盏!"
     },
     },
     {
     {
       "ID": 2501,
       "ID": 2501,
@@ -11410,11 +11410,11 @@
     },
     },
     {
     {
       "ID": 2853,
       "ID": 2853,
-      "txt": ""
+      "txt": "- 获得一件袈裟{0}/{1}"
     },
     },
     {
     {
       "ID": 2854,
       "ID": 2854,
-      "txt": ""
+      "txt": "- 夺回琉璃盏{0}/{1}"
     },
     },
     {
     {
       "ID": 2855,
       "ID": 2855,
@@ -12131,6 +12131,106 @@
     {
     {
       "ID": 3033,
       "ID": 3033,
       "txt": "怎么想过去,就去吧.."
       "txt": "怎么想过去,就去吧.."
+    },
+    {
+      "ID": 3034,
+      "txt": "北海剑妖"
+    },
+    {
+      "ID": 3035,
+      "txt": "百年化妖为红颜,一剑焚海断孽缘"
+    },
+    {
+      "ID": 3036,
+      "txt": "风影合一"
+    },
+    {
+      "ID": 3037,
+      "txt": "风影合一详情占位"
+    },
+    {
+      "ID": 3038,
+      "txt": "矿山"
+    },
+    {
+      "ID": 3039,
+      "txt": "眼前的矿井不同寻常,矿井攀附在灵脉之上,似乎有着稀世灵矿。\n前往矿井采集灵矿。"
+    },
+    {
+      "ID": 3040,
+      "txt": "寺庙"
+    },
+    {
+      "ID": 3041,
+      "txt": "荒芜的寺庙之中,却有着一丝不易查询的灵气遗存。\n进入寺庙找寻散发灵气的修为丹。"
+    },
+    {
+      "ID": 3042,
+      "txt": "洞府遗址"
+    },
+    {
+      "ID": 3043,
+      "txt": "洞府好像荒废多年,洞府之中好像还有能用的东西。\n进入洞府收集可用之物。"
+    },
+    {
+      "ID": 3044,
+      "txt": "灵泉"
+    },
+    {
+      "ID": 3045,
+      "txt": "灵气积聚在一处泉水之中,似乎藏有修行奥秘。\n吸收灵泉提升灵力。"
+    },
+    {
+      "ID": 3046,
+      "txt": "拦路山贼"
+    },
+    {
+      "ID": 3047,
+      "txt": "一个不知好歹的山贼拦住了你的去路!"
+    },
+    {
+      "ID": 3048,
+      "txt": "丢袈裟的和尚"
+    },
+    {
+      "ID": 3049,
+      "txt": "一位和尚叫住了你,貌似有什么急事"
+    },
+    {
+      "ID": 3050,
+      "txt": "将袈裟还给和尚"
+    },
+    {
+      "ID": 3051,
+      "txt": "云游修士"
+    },
+    {
+      "ID": 3052,
+      "txt": "一名云游修士前来问道"
+    },
+    {
+      "ID": 3053,
+      "txt": "镇压妖王"
+    },
+    {
+      "ID": 3054,
+      "txt": "逍遥宗长老前来求教"
+    },
+    {
+      "ID": 3055,
+      "txt": "清剿妖兽"
+    },
+    {
+      "ID": 3056,
+      "txt": "妖兽入侵了村子,消灭它们"
+    },
+    {
+      "ID": 3057,
+      "txt": "失窃的琉璃盏"
+    },
+    {
+      "ID": 3058,
+      "txt": "琉璃盏被妖兽盗窃,前去寻回"
     }
     }
   ]
   ]
 }
 }

+ 75 - 24
Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -46,7 +46,6 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 5356005532403119995}
   - component: {fileID: 5356005532403119995}
   - component: {fileID: 7368292285738498687}
   - component: {fileID: 7368292285738498687}
-  - component: {fileID: 4076525721253167778}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: ShowItemMoveToTargetPanel
   m_Name: ShowItemMoveToTargetPanel
@@ -70,6 +69,7 @@ RectTransform:
   - {fileID: 6127126221331158600}
   - {fileID: 6127126221331158600}
   - {fileID: 3118263861250186501}
   - {fileID: 3118263861250186501}
   - {fileID: 468572457641896074}
   - {fileID: 468572457641896074}
+  - {fileID: 3536505121131481239}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -105,30 +105,12 @@ MonoBehaviour:
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
+  - key: Ui
+    gameObject: {fileID: 3536505121131481239}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
---- !u!223 &4076525721253167778
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4955333483468909094}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: -1
-  m_TargetDisplay: 0
 --- !u!1 &5048446545418806876
 --- !u!1 &5048446545418806876
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -166,6 +148,75 @@ RectTransform:
   m_AnchoredPosition: {x: -71, y: 702}
   m_AnchoredPosition: {x: -71, y: 702}
   m_SizeDelta: {x: 100, y: 100}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5793281267933635054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3536505121131481239}
+  - component: {fileID: 6704702385722977685}
+  - component: {fileID: 7235788929534476578}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Ui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3536505121131481239
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5793281267933635054}
+  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: 5356005532403119995}
+  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!222 &6704702385722977685
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5793281267933635054}
+  m_CullTransparentMesh: 1
+--- !u!223 &7235788929534476578
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5793281267933635054}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 3
+  m_TargetDisplay: 0
 --- !u!1 &5911324704009596132
 --- !u!1 &5911324704009596132
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 6 - 0
Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -38,6 +38,12 @@ public int Title;
 public int Desc;
 public int Desc;
 
 
 
 
+		/// <summary>
+		///属于哪个章节
+		/// </summary>
+public int BigMapID;
+
+
 	}
 	}
 
 
 }
 }

+ 2 - 1
Assets/Scripts/GameUI/UI/DialoguePanel/DialogueOptionWidget.cs

@@ -33,10 +33,11 @@ namespace Fort23.Mono
         }
         }
 
 
 
 
-        public void CustomInit(int selectIndex,AccountFileInfo.EventLinkData eventLinkData, int id, int mainOpid, Action<DialogueOptionWidget> callback)
+        public void CustomInit(int selectIndex, AccountFileInfo.EventList CurrentEventList, int id, int mainOpid, Action<DialogueOptionWidget> callback)
         {
         {
             type = 1;
             type = 1;
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);
+            var eventLinkData = CurrentEventList.eventLinks.FirstOrDefault(l => l.eventLinkId == id);
             var mainEventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(mainOpid);
             var mainEventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(mainOpid);
             // int index = mainEventConditionConfig.optionPara1.ToList().IndexOf(eventConditionConfig.ID);
             // int index = mainEventConditionConfig.optionPara1.ToList().IndexOf(eventConditionConfig.ID);
             Text_desc.text = LanguageManager.Instance.Text(mainEventConditionConfig.optionPara2[selectIndex]);
             Text_desc.text = LanguageManager.Instance.Text(mainEventConditionConfig.optionPara2[selectIndex]);

+ 1 - 1
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -267,7 +267,7 @@ namespace Fort23.Mono
                 {
                 {
                     DialogueOptionWidget dialogueOptionWidget =
                     DialogueOptionWidget dialogueOptionWidget =
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(i,_eventLinkData, eventConditionConfig.optionPara1[i], eventConditionConfig.ID, SelectOption);
+                    dialogueOptionWidget.CustomInit(i,CurrentEventList, eventConditionConfig.optionPara1[i], eventConditionConfig.ID, SelectOption);
                 }
                 }
      
      
 
 

+ 8 - 0
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DXxOsCykAnq+tmzfZesXD+WjQnnWCl1OoZkqUQXqyQE3oIh4Q3UtaFZTbYWo
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 173 - 0
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs

@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using CombatLibrary.CombatLibrary.CombatCore.Utility;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
+using UnityEngine.UI;
+using Utility.UITool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ShowItemMoveToTargetPanel")]
+    public partial class ShowItemMoveToTargetPanel : UIPanel
+    {
+        protected List<ImageMove> allImageMove = new List<ImageMove>();
+
+        List<ImageMoveContainer> _imageMoveContainers = new List<ImageMoveContainer>();
+
+        public static async CTask<ShowItemMoveToTargetPanel> OpenShowItemMoveToTargetPanel()
+        {
+            ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Bottom,
+                    isFocus: false);
+            return showItemMoveToTargetPanel;
+        }
+
+        public async  override CTask Show()
+        {
+            await base.Show();
+            Ui.sizeDelta = transform.sizeDelta;
+            // Combat.sizeDelta =  transform.sizeDelta;
+        }
+
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+            StaticUpdater.Instance.AddRenderUpdateCallBack(RenderUpdateCallBack);
+        }
+
+        protected override void DelEvent()
+        {
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(RenderUpdateCallBack);
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+
+        protected void RenderUpdateCallBack()
+        {
+            for (int i = 0; i < allImageMove.Count; i++)
+            {
+                ImageMove imageMove = allImageMove[i];
+                if (imageMove.Update())
+                {
+                    GObjectPool.Instance.Recycle(imageMove.GameObjectPool);
+                    allImageMove.RemoveAt(i);
+                    i--;
+                }
+            }
+
+            if (allImageMove.Count <= 0)
+            {
+                moveTarget.gameObject.SetActive(false);
+            }
+        }
+
+        private async CTask<ImageMove> AddACurve(Vector2 startPos, Vector2 target, string itemConfig, object data, CombatItemShowEventData.ShowType showType,
+            System.Action<ImageMove> finishCallBack, System.Action<ImageMove> targetPointSet)
+        {
+            ACurve aCurve = new ACurve();
+            CurveInfo curveInfo = new CurveInfo();
+            // Vector3 p = startPos + (startPos - target).normalized * 30;
+            Vector3 moveTargetPos = startPos + new Vector2(Random.Range(-50, 50),
+                Random.Range(-50, 50));
+
+            Vector2 newStartPos = moveTargetPos;
+
+            curveInfo.t = newStartPos.x;
+            curveInfo.v = newStartPos.y;
+            curveInfo.BSLt = 0;
+            // float x = Random.Range(-10, 10) * 30;
+            Vector2 normal = (newStartPos - target).normalized;
+            int x = Random.Range(0, 100) < 50 ? 1 : -1;
+            normal = new Vector2(normal.y, -normal.x) * x * 300 + newStartPos;
+            normal = (normal - target).normalized * 500;
+
+            curveInfo.it = normal.x + curveInfo.t;
+            curveInfo.ot = normal.y + curveInfo.v;
+            CurveInfo curveInfo2 = new CurveInfo();
+            curveInfo2.t = target.x;
+            curveInfo2.v = target.y;
+            Vector3 normal2 = (newStartPos - target).normalized;
+            curveInfo2.it = normal2.x + curveInfo2.t;
+            curveInfo2.ot = normal2.y + curveInfo2.v + 10;
+            curveInfo2.BSLt = 1;
+            aCurve.CurveInfos = new List<CurveInfo>();
+            aCurve.CurveInfos.Add(curveInfo);
+            aCurve.CurveInfos.Add(curveInfo2);
+            aCurve.CurveType = CurveType.BSL;
+            ImageMove currImageMove = CObjectPool.Instance.Fetch<ImageMove>();
+            currImageMove.finishCallBack = finishCallBack;
+            currImageMove.targetPointSet = targetPointSet;
+            currImageMove.data = data;
+
+            currImageMove.moveSpeed = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSpped;
+            // currImageMove.ShowSizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_showSize;
+            // currImageMove.showSizeSpeed = 10;
+
+
+            GameObjectPool gameObjectPool;
+            MyImage myImage;
+            
+            currImageMove.speed = AnimationCurveManager.Instance.AnimationCurveLibrary.uiMoveSpeed;
+            gameObjectPool =
+                GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(moveIcon.gameObject, "moveIcon");
+            myImage = gameObjectPool.own.GetComponent<MyImage>();
+            myImage.icon_name = itemConfig;
+     
+            
+            // currImageMove.speed = AnimationCurveManager.Instance.AnimationCurveLibrary.uiMoveSpeed;
+            // gameObjectPool =
+            //     GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(moveIcon.gameObject, "moveIcon");
+            // myImage = gameObjectPool.own.GetComponent<MyImage>();
+            // myImage.icon_name = itemConfig;
+
+            currImageMove.SizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSize;
+            // gameObjectPool.own.transform.SetParent(Ui);
+
+
+            gameObjectPool.own.SetActive(false);
+            gameObjectPool.own.transform.localScale = Vector3.zero;
+
+            currImageMove.GameObjectPool = gameObjectPool;
+            currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
+            currImageMove.transform.sizeDelta = new Vector2(50, 65);
+            currImageMove.moveStartPos = startPos;
+            currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
+            currImageMove.yanChi = Random.Range(0, 0.5f);
+
+
+            currImageMove.currAcur = aCurve;
+            allImageMove.Add(currImageMove);
+            return currImageMove;
+        }
+
+        public async void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName, CombatItemShowEventData.ShowType showType,
+            System.Action<ImageMove> finishCallBack = null, System.Action<ImageMove> targetPointSet = null, object data = null, System.Action<ImageMove> initCallBack = null)
+        {
+            if (target.x == -5000)
+            {
+                target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
+            }
+            
+
+            for (int i = 0; i < count; i++)
+            {
+                ImageMove imageMove = await AddACurve(startPos, target, showName, data, showType, finishCallBack, targetPointSet);
+                imageMove.GroupIndex = i;
+                initCallBack?.Invoke(imageMove);
+            }
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs.meta

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

+ 62 - 0
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanelData.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 ShowItemMoveToTargetPanel 
+	{
+	  #region 自定义数据 
+	  private MyImage _moveIcon;
+	  public MyImage moveIcon
+	   {
+	   get{
+	      if (_moveIcon == null)
+	       {
+	         _moveIcon  = GetUIUnit<MyImage>("moveIcon"); 
+	       }
+	      return _moveIcon;
+	     }
+	   }
+	  private RectTransform _root;
+	  public RectTransform root
+	   {
+	   get{
+	      if (_root == null)
+	       {
+	         _root  = GetUIUnit<RectTransform>("root"); 
+	       }
+	      return _root;
+	     }
+	   }
+	  private RectTransform _moveTarget;
+	  public RectTransform moveTarget
+	   {
+	   get{
+	      if (_moveTarget == null)
+	       {
+	         _moveTarget  = GetUIUnit<RectTransform>("moveTarget"); 
+	       }
+	      return _moveTarget;
+	     }
+	   }
+	  private RectTransform _Ui;
+	  public RectTransform Ui
+	   {
+	   get{
+	      if (_Ui == null)
+	       {
+	         _Ui  = GetUIUnit<RectTransform>("Ui"); 
+	       }
+	      return _Ui;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanelData.cs.meta

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

File diff suppressed because it is too large
+ 96 - 701
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff