浏览代码

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

DESKTOP-FB72PO8\Administrator 3 天之前
父节点
当前提交
6fe4b8b941
共有 36 个文件被更改,包括 4901 次插入655 次删除
  1. 50 10
      Assets/Res/Config/EventConditionConfig.json
  2. 292 31
      Assets/Res/Config/EventConfig.json
  3. 1059 71
      Assets/Res/Config/EventLinkConfig.json
  4. 6 0
      Assets/Res/Config/EventNPC.json
  5. 112 112
      Assets/Res/Config/ItemConfig.json
  6. 664 160
      Assets/Res/Config/LanguageChineseConfig.json
  7. 32 32
      Assets/Res/Config/LevelbattleConfig.json
  8. 67 19
      Assets/Res/Config/SentimentConfig.json
  9. 821 173
      Assets/Res/Config/SentimentEffectConfig.json
  10. 8 0
      Assets/Res/UI/ItemDetailsPanel.meta
  11. 945 0
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab
  12. 7 0
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab.meta
  13. 428 0
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsWidget.prefab
  14. 7 0
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsWidget.prefab.meta
  15. 50 5
      Assets/Res/UI/WidgetItem.prefab
  16. 6 0
      Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs
  17. 0 6
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  18. 1 1
      Assets/Scripts/GameData/ExcelConfig/ItemConfig.cs
  19. 2 2
      Assets/Scripts/GameData/ExcelConfig/SentimentConfig.cs
  20. 39 31
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  21. 8 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel.meta
  22. 85 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs
  23. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs.meta
  24. 84 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanelData.cs
  25. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanelData.cs.meta
  26. 30 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidget.cs
  27. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidget.cs.meta
  28. 40 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidgetData.cs
  29. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidgetData.cs.meta
  30. 3 2
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs
  31. 11 0
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs
  32. 0 0
      Assets/StreamingAssets/assetConfig.txt
  33. 二进制
      Excel2Json/Excel/EventConfig.xlsx
  34. 二进制
      Excel2Json/Excel/Item.xlsx
  35. 二进制
      Excel2Json/Excel/Language.xlsx
  36. 二进制
      Excel2Json/Excel/Sentiment.xlsx

+ 50 - 10
Assets/Res/Config/EventConditionConfig.json

@@ -28,7 +28,10 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 5
+      "finishCount": 5,
+      "RelatedEvents": [
+        9031
+      ]
     },
     {
       "ID": 4,
@@ -82,7 +85,10 @@
       "ConditionPara": [
         1003
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30003
+      ]
     },
     {
       "ID": 10,
@@ -92,7 +98,10 @@
       "ConditionPara": [
         1004
       ],
-      "finishCount": 3
+      "finishCount": 3,
+      "RelatedEvents": [
+        30004
+      ]
     },
     {
       "ID": 11,
@@ -102,7 +111,10 @@
       "ConditionPara": [
         1002
       ],
-      "finishCount": 3
+      "finishCount": 3,
+      "RelatedEvents": [
+        30011
+      ]
     },
     {
       "ID": 12,
@@ -112,7 +124,10 @@
       "ConditionPara": [
         1005
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30005
+      ]
     },
     {
       "ID": 13,
@@ -122,7 +137,10 @@
       "ConditionPara": [
         1006
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30006
+      ]
     },
     {
       "ID": 14,
@@ -142,7 +160,10 @@
       "ConditionPara": [
         1007
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30007
+      ]
     },
     {
       "ID": 17,
@@ -152,22 +173,41 @@
       "ConditionPara": [
         1008
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30008
+      ]
     },
     {
       "ID": 18,
       "message": 2853,
       "Operation": null,
-      "ConditionType": 1,
+      "ConditionType": 6,
       "ConditionPara": [
         1301
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "RelatedEvents": [
+        30009
+      ]
     },
     {
       "ID": 19,
       "message": 2854,
       "Operation": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 1,
+      "RelatedEvents": [
+        30010
+      ]
+    },
+    {
+      "ID": 20,
+      "message": 2855,
+      "Operation": null,
       "ConditionType": 1,
       "ConditionPara": [
         1001

+ 292 - 31
Assets/Res/Config/EventConfig.json

@@ -627,9 +627,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30003
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 1,
@@ -763,9 +760,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30004
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -798,9 +792,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30005
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -838,9 +829,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30006
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -1032,9 +1020,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30007
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 3,
@@ -1102,9 +1087,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        30008
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 3,
@@ -1363,9 +1345,6 @@
       "PrizeNums": [
         1
       ],
-      "RelatedEvents": [
-        30009
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
@@ -1496,9 +1475,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1203
-      ],
       "PrizeNums": [
         1
       ],
@@ -1511,6 +1487,270 @@
       "EventName": 3057,
       "Description": 3058
     },
+    {
+      "ID": 1022,
+      "EventLinksId": [
+        102201,
+        102202,
+        102203,
+        102204,
+        102205,
+        102206,
+        102207
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3059,
+      "Description": 3060
+    },
+    {
+      "ID": 1023,
+      "EventLinksId": [
+        102301,
+        102302,
+        102303
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3061,
+      "Description": 3062
+    },
+    {
+      "ID": 1024,
+      "EventLinksId": [
+        102401,
+        102402,
+        102403
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3063,
+      "Description": 3064
+    },
+    {
+      "ID": 1025,
+      "EventLinksId": [
+        102501,
+        102502,
+        102503
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3065,
+      "Description": 3066
+    },
+    {
+      "ID": 1026,
+      "EventLinksId": [
+        102601,
+        102602
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3067,
+      "Description": 3068
+    },
+    {
+      "ID": 1027,
+      "EventLinksId": [
+        102701,
+        102702
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3069,
+      "Description": 3070
+    },
+    {
+      "ID": 1028,
+      "EventLinksId": [
+        102801,
+        102802,
+        102803,
+        102804,
+        102805
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3071,
+      "Description": 3072
+    },
+    {
+      "ID": 1029,
+      "EventLinksId": [
+        102901,
+        102902,
+        102903,
+        102904,
+        102905,
+        102906,
+        102907,
+        102908
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3073,
+      "Description": 3074
+    },
+    {
+      "ID": 1030,
+      "EventLinksId": [
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3075,
+      "Description": 3076
+    },
+    {
+      "ID": 1031,
+      "EventLinksId": [
+        103101,
+        103102,
+        103103,
+        103104,
+        103105
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3077,
+      "Description": 3074
+    },
     {
       "ID": 20001,
       "EventLinksId": [
@@ -1728,9 +1968,6 @@
       "PrizeNums": [
         10
       ],
-      "RelatedEvents": [
-        9031
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -1914,7 +2151,8 @@
     {
       "ID": 30009,
       "EventLinksId": [
-        3000901
+        3000901,
+        3000902
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -1927,9 +2165,6 @@
       "PrizeNums": [
         1
       ],
-      "RelatedEvents": [
-        1017
-      ],
       "RefreshProbability": 100,
       "RefreshCount": 1,
       "placeID": 3,
@@ -1967,6 +2202,32 @@
       "EventName": null,
       "Description": null
     },
+    {
+      "ID": 30011,
+      "EventLinksId": [
+        3001101,
+        3001102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20003
+      ],
+      "PrizeNums": [
+        3
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 1,
+      "placeID": 2,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
     {
       "ID": 5001,
       "EventLinksId": [

+ 1059 - 71
Assets/Res/Config/EventLinkConfig.json

@@ -4846,7 +4846,7 @@
       ]
     },
     {
-      "ID": 101101,
+      "ID": 3001101,
       "conciseEventMessage": 2363,
       "EventConditionMessage": null,
       "PreShow": null,
@@ -4856,19 +4856,52 @@
         2364
       ],
       "DialogueType": null,
+      "EventID": 30011,
+      "optionType": 1,
+      "optionPara1": [
+        3001102
+      ],
+      "optionPara2": [
+        2365
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 3001102,
+      "conciseEventMessage": 2363,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30011,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101101,
+      "conciseEventMessage": 2366,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2367
+      ],
+      "DialogueType": null,
       "EventID": 1011,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 500101,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2367
+        2370
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4880,13 +4913,13 @@
     },
     {
       "ID": 500102,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2368
+        2371
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4898,13 +4931,13 @@
     },
     {
       "ID": 500103,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2369
+        2372
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4916,13 +4949,13 @@
     },
     {
       "ID": 500104,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2370
+        2373
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4934,13 +4967,13 @@
     },
     {
       "ID": 500105,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2371
+        2374
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4952,13 +4985,13 @@
     },
     {
       "ID": 500106,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2372
+        2375
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4970,13 +5003,13 @@
     },
     {
       "ID": 500107,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 100,
       "LanID": [
-        2373
+        2376
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -4986,8 +5019,8 @@
         500108
       ],
       "optionPara2": [
-        2374,
-        2375
+        2377,
+        2378
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -4996,13 +5029,13 @@
     },
     {
       "ID": 500108,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2376
+        2379
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5014,13 +5047,13 @@
     },
     {
       "ID": 500109,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2377
+        2380
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5032,13 +5065,13 @@
     },
     {
       "ID": 500110,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2366,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2369,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2378
+        2381
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5050,13 +5083,13 @@
     },
     {
       "ID": 500111,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        2380
+        2383
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5068,13 +5101,13 @@
     },
     {
       "ID": 500112,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 112,
       "LanID": [
-        2381
+        2384
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5086,13 +5119,13 @@
     },
     {
       "ID": 500113,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 100,
       "LanID": [
-        2382
+        2385
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5104,13 +5137,13 @@
     },
     {
       "ID": 500114,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        2383
+        2386
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5122,13 +5155,13 @@
     },
     {
       "ID": 500115,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 112,
       "LanID": [
-        2384
+        2387
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5144,13 +5177,13 @@
     },
     {
       "ID": 500116,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 112,
       "LanID": [
-        2385
+        2388
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5159,7 +5192,7 @@
         500117
       ],
       "optionPara2": [
-        2386
+        2389
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -5168,13 +5201,13 @@
     },
     {
       "ID": 500117,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 112,
       "LanID": [
-        2387
+        2390
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5186,13 +5219,13 @@
     },
     {
       "ID": 500118,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2388
+        2391
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -5204,13 +5237,13 @@
     },
     {
       "ID": 500119,
-      "conciseEventMessage": 2365,
-      "EventConditionMessage": 2379,
+      "conciseEventMessage": 2368,
+      "EventConditionMessage": 2382,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 103,
       "LanID": [
-        2389
+        2392
       ],
       "DialogueType": null,
       "EventID": 5001,
@@ -6035,10 +6068,25 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        102,
+        3000902,
         101
       ]
     },
+    {
+      "ID": 3000902,
+      "conciseEventMessage": 2473,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30009,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        1017
+      ]
+    },
     {
       "ID": 101801,
       "conciseEventMessage": 2474,
@@ -6052,7 +6100,10 @@
       "DialogueType": null,
       "EventID": 1018,
       "optionType": null,
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        101802
+      ]
     },
     {
       "ID": 101802,
@@ -6068,14 +6119,17 @@
       "EventID": 1018,
       "optionType": 1,
       "optionPara1": [
-        101806,
+        101804,
         101803
       ],
       "optionPara2": [
         2478,
         2479
       ],
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        101803
+      ]
     },
     {
       "ID": 101803,
@@ -6132,7 +6186,10 @@
       "DialogueType": null,
       "EventID": 1019,
       "optionType": null,
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        101902
+      ]
     },
     {
       "ID": 101902,
@@ -6147,7 +6204,10 @@
       "DialogueType": null,
       "EventID": 1019,
       "optionType": 5,
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        101903
+      ]
     },
     {
       "ID": 101903,
@@ -6283,10 +6343,7 @@
       "PrizeNums": [
         1
       ],
-      "ResultType": 3,
-      "ResultOptions": [
-        30010
-      ]
+      "ResultType": null
     },
     {
       "ID": 3001001,
@@ -6312,6 +6369,937 @@
         102,
         101
       ]
+    },
+    {
+      "ID": 102201,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2503
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102202
+      ]
+    },
+    {
+      "ID": 102202,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2504
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102203
+      ]
+    },
+    {
+      "ID": 102203,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2505
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102204
+      ]
+    },
+    {
+      "ID": 102204,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2506
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": 1,
+      "optionPara1": [
+        102205,
+        102207
+      ],
+      "optionPara2": [
+        2507,
+        2508
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        102205
+      ]
+    },
+    {
+      "ID": 102205,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2509
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102206
+      ]
+    },
+    {
+      "ID": 102206,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2510
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102207,
+      "conciseEventMessage": 2501,
+      "EventConditionMessage": 2502,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2511
+      ],
+      "DialogueType": null,
+      "EventID": 1022,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102301,
+      "conciseEventMessage": 2512,
+      "EventConditionMessage": 2513,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2514
+      ],
+      "DialogueType": null,
+      "EventID": 1023,
+      "optionType": 1,
+      "optionPara1": [
+        102302,
+        102303
+      ],
+      "optionPara2": [
+        2515,
+        2516
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102302,
+      "conciseEventMessage": 2512,
+      "EventConditionMessage": 2513,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2517
+      ],
+      "DialogueType": null,
+      "EventID": 1023,
+      "ConditionId": [
+        20
+      ],
+      "optionType": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102303,
+      "conciseEventMessage": 2512,
+      "EventConditionMessage": 2513,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2518
+      ],
+      "DialogueType": null,
+      "EventID": 1023,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102401,
+      "conciseEventMessage": 2519,
+      "EventConditionMessage": 2520,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 112,
+      "LanID": [
+        2521
+      ],
+      "DialogueType": null,
+      "EventID": 1024,
+      "optionType": 1,
+      "optionPara1": [
+        102402,
+        102403
+      ],
+      "optionPara2": [
+        2522,
+        2523
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102402,
+      "conciseEventMessage": 2519,
+      "EventConditionMessage": 2520,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 112,
+      "LanID": [
+        2524
+      ],
+      "DialogueType": null,
+      "EventID": 1024,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        2
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102403,
+        101
+      ]
+    },
+    {
+      "ID": 102403,
+      "conciseEventMessage": 2519,
+      "EventConditionMessage": 2520,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 112,
+      "LanID": [
+        2525
+      ],
+      "DialogueType": null,
+      "EventID": 1024,
+      "optionType": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102501,
+      "conciseEventMessage": 2526,
+      "EventConditionMessage": 2527,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2528
+      ],
+      "DialogueType": null,
+      "EventID": 1025,
+      "optionType": 1,
+      "optionPara1": [
+        102502,
+        102503
+      ],
+      "optionPara2": [
+        2529,
+        2530
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102502,
+      "conciseEventMessage": 2526,
+      "EventConditionMessage": 2527,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2531
+      ],
+      "DialogueType": null,
+      "EventID": 1025,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102503,
+        101
+      ]
+    },
+    {
+      "ID": 102503,
+      "conciseEventMessage": 2526,
+      "EventConditionMessage": 2527,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2532
+      ],
+      "DialogueType": null,
+      "EventID": 1025,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102601,
+      "conciseEventMessage": 2533,
+      "EventConditionMessage": 2534,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2535
+      ],
+      "DialogueType": null,
+      "EventID": 1026,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102602,
+        101
+      ]
+    },
+    {
+      "ID": 102602,
+      "conciseEventMessage": 2533,
+      "EventConditionMessage": 2534,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2536
+      ],
+      "DialogueType": null,
+      "EventID": 1026,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102701,
+      "conciseEventMessage": 2537,
+      "EventConditionMessage": 2538,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 114,
+      "LanID": [
+        2539
+      ],
+      "DialogueType": null,
+      "EventID": 1027,
+      "optionType": 1,
+      "optionPara1": [
+        102702
+      ],
+      "optionPara2": [
+        2540
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102702,
+      "conciseEventMessage": 2537,
+      "EventConditionMessage": 2538,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 114,
+      "LanID": [
+        2541
+      ],
+      "DialogueType": null,
+      "EventID": 1027,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102703,
+        101
+      ]
+    },
+    {
+      "ID": 102801,
+      "conciseEventMessage": 2542,
+      "EventConditionMessage": 2543,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 114,
+      "LanID": [
+        2544
+      ],
+      "DialogueType": null,
+      "EventID": 1028,
+      "optionType": 1,
+      "optionPara1": [
+        102802
+      ],
+      "optionPara2": [
+        2545
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102802,
+      "conciseEventMessage": 2542,
+      "EventConditionMessage": 2543,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 114,
+      "LanID": [
+        2546
+      ],
+      "DialogueType": null,
+      "EventID": 1028,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102803,
+        101
+      ]
+    },
+    {
+      "ID": 102803,
+      "conciseEventMessage": 2542,
+      "EventConditionMessage": 2543,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2547
+      ],
+      "DialogueType": null,
+      "EventID": 1028,
+      "optionType": 1,
+      "optionPara1": [
+        102804,
+        102805
+      ],
+      "optionPara2": [
+        2548,
+        2549
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102804,
+      "conciseEventMessage": 2542,
+      "EventConditionMessage": 2543,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2550
+      ],
+      "DialogueType": null,
+      "EventID": 1028,
+      "optionType": 5,
+      "ResultType": null
+    },
+    {
+      "ID": 102805,
+      "conciseEventMessage": 2542,
+      "EventConditionMessage": 2543,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 114,
+      "LanID": [
+        2551
+      ],
+      "DialogueType": null,
+      "EventID": 1028,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102806,
+        101
+      ]
+    },
+    {
+      "ID": 102901,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2554
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": 1,
+      "optionPara1": [
+        102902,
+        102903
+      ],
+      "optionPara2": [
+        2555,
+        2556
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102902,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2557
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": 1,
+      "optionPara1": [
+        102904,
+        102905
+      ],
+      "optionPara2": [
+        2558,
+        2559
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102903,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2560
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": 1,
+      "optionPara1": [
+        102904,
+        102907
+      ],
+      "optionPara2": [
+        2561,
+        2562
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102904,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2563
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": 1,
+      "optionPara1": [
+        102905
+      ],
+      "optionPara2": [
+        2564
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102905,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2565
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        102906
+      ]
+    },
+    {
+      "ID": 102906,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 100,
+      "LanID": [
+        2566
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102907,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2567
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": 1,
+      "optionPara1": [
+        102908,
+        102908
+      ],
+      "optionPara2": [
+        2568,
+        2569
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 102908,
+      "conciseEventMessage": 2552,
+      "EventConditionMessage": 2553,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2570
+      ],
+      "DialogueType": null,
+      "EventID": 1029,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 103001,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2573
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        103002
+      ]
+    },
+    {
+      "ID": 103002,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2574
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": 1,
+      "optionPara1": [
+        103003,
+        103004
+      ],
+      "optionPara2": [
+        2575,
+        2576
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103003
+      ]
+    },
+    {
+      "ID": 103003,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2577
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": 1,
+      "optionPara1": [
+        103005
+      ],
+      "optionPara2": [
+        2578
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103004
+      ]
+    },
+    {
+      "ID": 103004,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2579
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": 1,
+      "optionPara1": [
+        103005
+      ],
+      "optionPara2": [
+        2580
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103005
+      ]
+    },
+    {
+      "ID": 103005,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2581
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": 1,
+      "optionPara1": [
+        103006
+      ],
+      "optionPara2": [
+        2582
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103006
+      ]
+    },
+    {
+      "ID": 103006,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2583
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": 1,
+      "optionPara1": [
+        103007
+      ],
+      "optionPara2": [
+        2584
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103007
+      ]
+    },
+    {
+      "ID": 103007,
+      "conciseEventMessage": 2571,
+      "EventConditionMessage": 2572,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2585
+      ],
+      "DialogueType": null,
+      "EventID": 1030,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 103101,
+      "conciseEventMessage": 2586,
+      "EventConditionMessage": 2587,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2588
+      ],
+      "DialogueType": null,
+      "EventID": 1031,
+      "optionType": 1,
+      "optionPara1": [
+        103102,
+        103105
+      ],
+      "optionPara2": [
+        2589,
+        2590
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 103102,
+      "conciseEventMessage": 2586,
+      "EventConditionMessage": 2587,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2591
+      ],
+      "DialogueType": null,
+      "EventID": 1031,
+      "optionType": 1,
+      "optionPara1": [
+        103103
+      ],
+      "optionPara2": [
+        2592
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103103
+      ]
+    },
+    {
+      "ID": 103103,
+      "conciseEventMessage": 2586,
+      "EventConditionMessage": 2587,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2593
+      ],
+      "DialogueType": null,
+      "EventID": 1031,
+      "optionType": 1,
+      "optionPara1": [
+        103104
+      ],
+      "optionPara2": [
+        2594
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        103104
+      ]
+    },
+    {
+      "ID": 103104,
+      "conciseEventMessage": 2586,
+      "EventConditionMessage": 2587,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2595
+      ],
+      "DialogueType": null,
+      "EventID": 1031,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 103105,
+      "conciseEventMessage": 2586,
+      "EventConditionMessage": 2587,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": 107,
+      "LanID": [
+        2596
+      ],
+      "DialogueType": null,
+      "EventID": 1031,
+      "optionType": null,
+      "ResultType": null
     }
   ]
 }

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

@@ -149,6 +149,12 @@
       "name": 3034,
       "ID_1": null,
       "DaoyouID": null
+    },
+    {
+      "ID": 114,
+      "name": 3067,
+      "ID_1": null,
+      "DaoyouID": null
     }
   ]
 }

文件差异内容过多而无法显示
+ 112 - 112
Assets/Res/Config/ItemConfig.json


+ 664 - 160
Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道 "
+      "txt": "玄黄道"
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)\n"
+      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)"
     },
     {
       "ID": 702,
@@ -7622,19 +7622,19 @@
     },
     {
       "ID": 1906,
-      "txt": "鲲鹏何在"
+      "txt": ""
     },
     {
       "ID": 1907,
-      "txt": "北海迷径1"
+      "txt": ""
     },
     {
       "ID": 1908,
-      "txt": "北海迷径2"
+      "txt": ""
     },
     {
       "ID": 1909,
-      "txt": "古径阵法"
+      "txt": ""
     },
     {
       "ID": 1910,
@@ -8458,7 +8458,7 @@
     },
     {
       "ID": 2115,
-      "txt": "击败结界兽怎么想过去,就去吧.."
+      "txt": "击败结界兽这么想过去,就去吧..."
     },
     {
       "ID": 2116,
@@ -8538,11 +8538,11 @@
     },
     {
       "ID": 2135,
-      "txt": "浮空之岛1"
+      "txt": ""
     },
     {
       "ID": 2136,
-      "txt": "浮空之岛2"
+      "txt": ""
     },
     {
       "ID": 2137,
@@ -9450,123 +9450,123 @@
     },
     {
       "ID": 2363,
-      "txt": "神识探索至一处山洞之中,似乎别有洞天"
+      "txt": "获得灵草种子"
     },
     {
       "ID": 2364,
-      "txt": "前往山洞之中收集药材"
+      "txt": "你来到后山的草园中,按照许由的要求,摘了几株灵草种子。"
     },
     {
       "ID": 2365,
-      "txt": "受疯道人所托,追查《御风化影诀》的下落"
+      "txt": "将种子收好"
     },
     {
       "ID": 2366,
-      "txt": "与疯道人对话(0/1)"
+      "txt": "神识探索至一处山洞之中,似乎别有洞天"
     },
     {
       "ID": 2367,
-      "txt": "小友留步,老夫有一事相求"
+      "txt": "前往山洞之中收集药材"
     },
     {
       "ID": 2368,
-      "txt": "三十年前北海妖族来犯,击退妖族后老夫捡到个被妖兽重伤的娃娃。"
+      "txt": "受疯道人所托,追查《御风化影诀》的下落"
     },
     {
       "ID": 2369,
-      "txt": "他心口妖气汇聚,周身却萦绕着纯净的风灵根。这般矛盾体质,注定要卷入因果轮回。"
+      "txt": "与疯道人对话(0/1)"
     },
     {
       "ID": 2370,
-      "txt": "于是老夫收留他在门下修养"
+      "txt": "小友留步,老夫有一事相求"
     },
     {
       "ID": 2371,
-      "txt": "但他心智被妖气所蛊惑一心只想报仇,整日念叨着要杀尽北海妖族。"
+      "txt": "三十年前北海妖族来犯,击退妖族后老夫捡到个被妖兽重伤的娃娃。"
     },
     {
       "ID": 2372,
-      "txt": "但十年的相处老夫早就把他当做亲人看待,为了断掉念想,只得让他离去,他离开之时盗走了洞府中的禁书《御风化影诀》。"
+      "txt": "他心口妖气汇聚,周身却萦绕着纯净的风灵根。这般矛盾体质,注定要卷入因果轮回。"
     },
     {
       "ID": 2373,
-      "txt": "\"\""
+      "txt": "于是老夫收留他在门下修养"
     },
     {
       "ID": 2374,
-      "txt": "前辈为何不追"
+      "txt": "但他心智被妖气所蛊惑一心只想报仇,整日念叨着要杀尽北海妖族。"
     },
     {
       "ID": 2375,
-      "txt": "他怎会轻易盗走此书"
+      "txt": "但十年的相处老夫早就把他当做亲人看待,为了断掉念想,只得让他离去,他离开之时盗走了洞府中的禁书《御风化影诀》。"
     },
     {
       "ID": 2376,
-      "txt": "那孩子恐是为了给爹妈寻仇,也是看往日情面,老夫不想亲自动手。"
+      "txt": "\"\""
     },
     {
       "ID": 2377,
-      "txt": "现如今老夫发现山中的生灵会莫名消失,村中孩童也是被神秘的妖气所卷走,这和书中的血肉炼化的方法一模一样,老夫断定是那孩子所为。"
+      "txt": "前辈为何不追"
     },
     {
       "ID": 2378,
-      "txt": "小友,我追踪妖气波动,他就在西边的树林之中!"
+      "txt": "他怎会轻易盗走此书"
     },
     {
       "ID": 2379,
-      "txt": "追查风无咎(0/1)"
+      "txt": "那孩子恐是为了给爹妈寻仇,也是看往日情面,老夫不想亲自动手。"
     },
     {
       "ID": 2380,
-      "txt": "(枯叶居然无风漂浮在空中,地面残留着扭曲的符文刻痕,见风无咎在地上刻画着什么)"
+      "txt": "现如今老夫发现山中的生灵会莫名消失,村中孩童也是被神秘的妖气所卷走,这和书中的血肉炼化的方法一模一样,老夫断定是那孩子所为。"
     },
     {
       "ID": 2381,
-      "txt": "(看见主角到来)你小子身上怎会有老疯子的气,是那老头让你来抓我的吗。"
+      "txt": "小友,我追踪妖气波动,他就在西边的树林之中!"
     },
     {
       "ID": 2382,
-      "txt": "前辈见往日情面不愿亲自动手,我一人足以"
+      "txt": "追查风无咎(0/1)"
     },
     {
       "ID": 2383,
-      "txt": "(说罢,风无咎的影子化形,为了一妖,顿时煞气暴涨)"
+      "txt": "(枯叶居然无风漂浮在空中,地面残留着扭曲的符文刻痕,见风无咎在地上刻画着什么)"
     },
     {
       "ID": 2384,
-      "txt": "如今我自断妖魂炼出影身,正好今天拿你试试!"
+      "txt": "(看见主角到来)你小子身上怎会有老疯子的气,是那老头让你来抓我的吗。"
     },
     {
       "ID": 2385,
-      "txt": "岂会如此!"
+      "txt": "前辈见往日情面不愿亲自动手,我一人足以"
     },
     {
       "ID": 2386,
-      "txt": "交还书页,我可留你魂魄入轮回。"
+      "txt": "(说罢,风无咎的影子化形,为了一妖,顿时煞气暴涨)"
     },
     {
       "ID": 2387,
-      "txt": "轮回?今日是我大意了!老东西还有你,给我等着!(化作一震妖风带着《御风化影诀》逃往远方"
+      "txt": "如今我自断妖魂炼出影身,正好今天拿你试试!"
     },
     {
       "ID": 2388,
-      "txt": "这孩子天资聪颖,短短二十年就能参悟书中所写。"
+      "txt": "岂会如此!"
     },
     {
       "ID": 2389,
-      "txt": "无妨,此法需要大量血肉献祭,如此规模的法术定会妖气四散,找到他也是迟早之事。"
+      "txt": "交还书页,我可留你魂魄入轮回。"
     },
     {
       "ID": 2390,
-      "txt": ""
+      "txt": "轮回?今日是我大意了!老东西还有你,给我等着!(化作一震妖风带着《御风化影诀》逃往远方"
     },
     {
       "ID": 2391,
-      "txt": ""
+      "txt": "这孩子天资聪颖,短短二十年就能参悟书中所写。"
     },
     {
       "ID": 2392,
-      "txt": ""
+      "txt": "无妨,此法需要大量血肉献祭,如此规模的法术定会妖气四散,找到他也是迟早之事。"
     },
     {
       "ID": 2393,
@@ -9906,7 +9906,7 @@
     },
     {
       "ID": 2477,
-      "txt": "“”"
+      "txt": "\"\""
     },
     {
       "ID": 2478,
@@ -9930,7 +9930,7 @@
     },
     {
       "ID": 2483,
-      "txt": "???"
+      "txt": "清剿妖王(0/1)"
     },
     {
       "ID": 2484,
@@ -9978,7 +9978,7 @@
     },
     {
       "ID": 2495,
-      "txt": "“”"
+      "txt": " "
     },
     {
       "ID": 2496,
@@ -10002,387 +10002,387 @@
     },
     {
       "ID": 2501,
-      "txt": ""
+      "txt": "道之何在,明境道长前来论道"
     },
     {
       "ID": 2502,
-      "txt": ""
+      "txt": "与道长进行对话"
     },
     {
       "ID": 2503,
-      "txt": ""
+      "txt": "世人都知神仙好,惟有功名忘不了。"
     },
     {
       "ID": 2504,
-      "txt": ""
+      "txt": "古今将相在何方?荒冢一堆草没了。"
     },
     {
       "ID": 2505,
-      "txt": ""
+      "txt": "仙友,这歌儿有些意思,可替我注解?"
     },
     {
       "ID": 2506,
-      "txt": ""
+      "txt": "\"\""
     },
     {
       "ID": 2507,
-      "txt": ""
+      "txt": "言语论道"
     },
     {
       "ID": 2508,
-      "txt": ""
+      "txt": "拒绝回答"
     },
     {
       "ID": 2509,
-      "txt": ""
+      "txt": "求仙不舍功名场,甚荒唐,到头来都是为他人作嫁衣裳。"
     },
     {
       "ID": 2510,
-      "txt": ""
+      "txt": "明镜道长听到你的回复后,甚为满意的离去了。"
     },
     {
       "ID": 2511,
-      "txt": ""
+      "txt": "明镜道长听到你的回复后,离开了。"
     },
     {
       "ID": 2512,
-      "txt": ""
+      "txt": "药童前来求得一枚丹药"
     },
     {
       "ID": 2513,
-      "txt": ""
+      "txt": "与小药童对话(0/1)"
     },
     {
       "ID": 2514,
-      "txt": ""
+      "txt": "听闻道友经常出外历练,今日我师傅炼制丹药,尚缺一颗渡劫丹作为药引,苦寻不得,道友可否赠与一颗。"
     },
     {
       "ID": 2515,
-      "txt": ""
+      "txt": "给予一颗渡劫丹"
     },
     {
       "ID": 2516,
-      "txt": ""
+      "txt": "没有此渡劫丹"
     },
     {
       "ID": 2517,
-      "txt": ""
+      "txt": "你将丹药赠与药童。药童十分高兴表示可以回复命了。"
     },
     {
       "ID": 2518,
-      "txt": ""
+      "txt": "药童听完便离开了"
     },
     {
       "ID": 2519,
-      "txt": ""
+      "txt": "风无咎前来武艺论道"
     },
     {
       "ID": 2520,
-      "txt": ""
+      "txt": "与风无咎对话(0/1)"
     },
     {
       "ID": 2521,
-      "txt": ""
+      "txt": "听闻道友最近修为又有所精进,特来讨教,望能切磋一二"
     },
     {
       "ID": 2522,
-      "txt": ""
+      "txt": "全力切磋"
     },
     {
       "ID": 2523,
-      "txt": ""
+      "txt": "回绝切磋"
     },
     {
       "ID": 2524,
-      "txt": ""
+      "txt": "还请讨教!"
     },
     {
       "ID": 2525,
-      "txt": ""
+      "txt": "若不愿意,也无妨,此物赠与道友继续修行"
     },
     {
       "ID": 2526,
-      "txt": ""
+      "txt": "魔族修士前来威胁你加入魔族"
     },
     {
       "ID": 2527,
-      "txt": ""
+      "txt": "与魔族交涉"
     },
     {
       "ID": 2528,
-      "txt": ""
+      "txt": "三番两次邀请你加入我魔族,你却为了北海执迷不悟,今日本宫便让你知道拒绝魔族的后果!"
     },
     {
       "ID": 2529,
-      "txt": ""
+      "txt": "全力应战"
     },
     {
       "ID": 2530,
-      "txt": ""
+      "txt": "御剑逃离"
     },
     {
       "ID": 2531,
-      "txt": ""
+      "txt": "你可知魔族威名!受死吧!"
     },
     {
       "ID": 2532,
-      "txt": ""
+      "txt": "可恶!今日饶你一马"
     },
     {
       "ID": 2533,
-      "txt": ""
+      "txt": "妖兽入侵"
     },
     {
       "ID": 2534,
-      "txt": ""
+      "txt": "前去击杀妖兽"
     },
     {
       "ID": 2535,
-      "txt": ""
+      "txt": "我在北海境内发现一只妖兽闯入,还请道友前往镇压"
     },
     {
       "ID": 2536,
-      "txt": ""
+      "txt": "北海境内越来越不安定了,若还有妖兽闯入,我会第一时间告知你"
     },
     {
       "ID": 2537,
-      "txt": ""
+      "txt": "妖兽拦住了你的去路"
     },
     {
       "ID": 2538,
-      "txt": ""
+      "txt": "阻止妖族前往北海"
     },
     {
       "ID": 2539,
-      "txt": ""
+      "txt": "站住,乖乖告诉我北海在哪"
     },
     {
       "ID": 2540,
-      "txt": ""
+      "txt": "大胆妖兽,今日就让你葬身于此"
     },
     {
       "ID": 2541,
-      "txt": ""
+      "txt": "不识抬举,去死吧"
     },
     {
       "ID": 2542,
-      "txt": ""
+      "txt": "前去击败入侵妖兽"
     },
     {
       "ID": 2543,
-      "txt": ""
+      "txt": "击败入侵的妖兽"
     },
     {
       "ID": 2544,
-      "txt": ""
+      "txt": "终于找到了北海城镇了,你拦不住我的,滚吧"
     },
     {
       "ID": 2545,
-      "txt": ""
+      "txt": "迎接敌人"
     },
     {
       "ID": 2546,
-      "txt": ""
+      "txt": "不识抬举,去死吧"
     },
     {
       "ID": 2547,
-      "txt": ""
+      "txt": "妖兽被重伤后吞下丹药激发了潜力,实力突然暴涨,阻止他破坏城镇"
     },
     {
       "ID": 2548,
-      "txt": ""
+      "txt": "稍作休整"
     },
     {
       "ID": 2549,
-      "txt": ""
+      "txt": "挑战妖兽"
     },
     {
       "ID": 2550,
-      "txt": ""
+      "txt": "见到情况不对,稍作休整再去击杀妖兽"
     },
     {
       "ID": 2551,
-      "txt": ""
+      "txt": "见到我不逃跑反而朝我攻来吗,有趣"
     },
     {
       "ID": 2552,
-      "txt": ""
+      "txt": "明境道长邀请你前去论道"
     },
     {
       "ID": 2553,
-      "txt": ""
+      "txt": "与道长进行对话"
     },
     {
       "ID": 2554,
-      "txt": ""
+      "txt": "小友修为有所长进,但我却不知你的道是独自一人还是众人前行"
     },
     {
       "ID": 2555,
-      "txt": ""
+      "txt": "道之所在,在于自己,修炼其身即可成星火之势"
     },
     {
       "ID": 2556,
-      "txt": ""
+      "txt": "道之所在,在于众势,天下大同可让蚍蜉撼树"
     },
     {
       "ID": 2557,
-      "txt": ""
+      "txt": "此言甚好,却不知小友遇见难关,是真的独自面对,还是寻求了他人帮助"
     },
     {
       "ID": 2558,
-      "txt": ""
+      "txt": "这...."
     },
     {
       "ID": 2559,
-      "txt": ""
+      "txt": "道长此言甚有意为之,如遇难关确实迷茫会去寻求他人"
     },
     {
       "ID": 2560,
-      "txt": ""
+      "txt": "绝境之中,众人离去,你又该如何呢?"
     },
     {
       "ID": 2561,
-      "txt": ""
+      "txt": "这...."
     },
     {
       "ID": 2562,
-      "txt": ""
+      "txt": "绝境之下,亦能爆发潜能,无需借助他人也能成功"
     },
     {
       "ID": 2563,
-      "txt": ""
+      "txt": "看来你的道,还在混沌之中,独自面对亦或是众人攻克,这事并无绝对,还请小友继续去追寻自己正确的道"
     },
     {
       "ID": 2564,
-      "txt": ""
+      "txt": "多谢道长指点,晚辈明白"
     },
     {
       "ID": 2565,
-      "txt": ""
+      "txt": "如你所说,道还不够坚定,你已经告诉了你自己还没有足够的力量去找到真正的道"
     },
     {
       "ID": 2566,
-      "txt": ""
+      "txt": "晚辈明白,多谢道长"
     },
     {
       "ID": 2567,
-      "txt": ""
+      "txt": "有趣,既然不是独步天下,为何又说无需借助"
     },
     {
       "ID": 2568,
-      "txt": ""
+      "txt": "道长此言差矣,没有他人帮助,怎会在绝境之战激发潜能去攻克难关,这并非独步天下"
     },
     {
       "ID": 2569,
-      "txt": ""
+      "txt": "无需借助并非独步天下,能结缘不同的人,才能在绝境之中爆发潜能"
     },
     {
       "ID": 2570,
-      "txt": ""
+      "txt": "禹能众万人心,舜能独断万古,你的道如禹舜之续,我很满意"
     },
     {
       "ID": 2571,
-      "txt": ""
+      "txt": "印宗邀请你一同论道"
     },
     {
       "ID": 2572,
-      "txt": ""
+      "txt": "与印宗法师进行对话"
     },
     {
       "ID": 2573,
-      "txt": ""
+      "txt": "你正遇上这里的印宗法师在讲经书。这时吹来了一阵风,把挂在门口和堂内的佛幡吹得飘舞起来。印宗法师看到佛幡舞动,于是问你"
     },
     {
       "ID": 2574,
-      "txt": ""
+      "txt": "小友可知,这是风动?还是幡动?"
     },
     {
       "ID": 2575,
-      "txt": ""
+      "txt": "是风在动而幡没有动"
     },
     {
       "ID": 2576,
-      "txt": ""
+      "txt": "是幡在动而风没有动"
     },
     {
       "ID": 2577,
-      "txt": ""
+      "txt": "小友为何会认为是风动呢?"
     },
     {
       "ID": 2578,
-      "txt": ""
+      "txt": "风若不吹,幡怎么会自己动"
     },
     {
       "ID": 2579,
-      "txt": ""
+      "txt": "小友为何会认为是幡动呢?"
     },
     {
       "ID": 2580,
-      "txt": ""
+      "txt": "可能是幡有灵气,自己动了起来"
     },
     {
       "ID": 2581,
-      "txt": ""
+      "txt": "小友此解释确实有意思,但还是不对"
     },
     {
       "ID": 2582,
-      "txt": ""
+      "txt": "大师此话怎讲,还请赐教"
     },
     {
       "ID": 2583,
-      "txt": ""
+      "txt": "不是风动,不是幡动,是仁者心动"
     },
     {
       "ID": 2584,
-      "txt": ""
+      "txt": "既不是风在动,也不是幡在动,而是我内心认为是在动的吗"
     },
     {
       "ID": 2585,
-      "txt": ""
+      "txt": "此话也不对。小友,你听经不得心识不专注,心识看到了旗帜上,而非经书上,你的心若在修行之上,那风与幡怎么会因你的心而舞动呢"
     },
     {
       "ID": 2586,
-      "txt": ""
+      "txt": "明境道长邀请你前去论道"
     },
     {
       "ID": 2587,
-      "txt": ""
+      "txt": "与道长进行对话"
     },
     {
       "ID": 2588,
-      "txt": ""
+      "txt": "小友好些日子不见,可有时间与我看些经文"
     },
     {
       "ID": 2589,
-      "txt": ""
+      "txt": "道长请讲"
     },
     {
       "ID": 2590,
-      "txt": ""
+      "txt": "回绝论道"
     },
     {
       "ID": 2591,
-      "txt": ""
+      "txt": "人生天地之间,若白驹之过隙,忽然而已。道友,这话有些意思,可知何意?"
     },
     {
       "ID": 2592,
-      "txt": ""
+      "txt": "生命如骏马跃过缝隙般短暂"
     },
     {
       "ID": 2593,
-      "txt": ""
+      "txt": "小友可深得此话所讲?"
     },
     {
       "ID": 2594,
-      "txt": ""
+      "txt": "道长之意,可是想让我珍惜当下"
     },
     {
       "ID": 2595,
-      "txt": ""
+      "txt": "看来你心有所感,我甚为满意。时间匆匆,还请小友破除对时间流逝的焦虑,好好感受现在的每一刻。"
     },
     {
       "ID": 2596,
-      "txt": ""
+      "txt": "明镜道长听到你的拒绝后暂时离开了"
     },
     {
       "ID": 2597,
@@ -11202,87 +11202,87 @@
     },
     {
       "ID": 2801,
-      "txt": "风中洞府1"
+      "txt": ""
     },
     {
       "ID": 2802,
-      "txt": "风中洞府2"
+      "txt": ""
     },
     {
       "ID": 2803,
-      "txt": "风灵之力"
+      "txt": ""
     },
     {
       "ID": 2804,
-      "txt": "北海深处1"
+      "txt": ""
     },
     {
       "ID": 2805,
-      "txt": "北海深处2"
+      "txt": ""
     },
     {
       "ID": 2806,
-      "txt": "尧之都"
+      "txt": ""
     },
     {
       "ID": 2807,
-      "txt": "山林清音"
+      "txt": ""
     },
     {
       "ID": 2808,
-      "txt": "山中劳作"
+      "txt": ""
     },
     {
       "ID": 2809,
-      "txt": "风起夜战"
+      "txt": ""
     },
     {
       "ID": 2810,
-      "txt": "吃茶三问"
+      "txt": ""
     },
     {
       "ID": 2811,
-      "txt": "尧让天下"
+      "txt": ""
     },
     {
       "ID": 2812,
-      "txt": "无用之树"
+      "txt": ""
     },
     {
       "ID": 2813,
-      "txt": "樗木之灵"
+      "txt": ""
     },
     {
       "ID": 2814,
-      "txt": "游尧都"
+      "txt": ""
     },
     {
       "ID": 2815,
-      "txt": "再见尧帝"
+      "txt": ""
     },
     {
       "ID": 2816,
-      "txt": "云海漫行"
+      "txt": ""
     },
     {
       "ID": 2817,
-      "txt": "初见惠子"
+      "txt": ""
     },
     {
       "ID": 2818,
-      "txt": "葫芦肥料"
+      "txt": ""
     },
     {
       "ID": 2819,
-      "txt": "藐姑射山"
+      "txt": ""
     },
     {
       "ID": 2820,
-      "txt": "炼器师"
+      "txt": ""
     },
     {
       "ID": 2821,
-      "txt": "忘火剑"
+      "txt": ""
     },
     {
       "ID": 2822,
@@ -11418,7 +11418,7 @@
     },
     {
       "ID": 2855,
-      "txt": ""
+      "txt": "- 给予渡劫丹{0}/{1}"
     },
     {
       "ID": 2856,
@@ -12231,6 +12231,510 @@
     {
       "ID": 3058,
       "txt": "琉璃盏被妖兽盗窃,前去寻回"
+    },
+    {
+      "ID": 3059,
+      "txt": "论道何长"
+    },
+    {
+      "ID": 3060,
+      "txt": "明镜道长前来论道"
+    },
+    {
+      "ID": 3061,
+      "txt": "炼丹药童"
+    },
+    {
+      "ID": 3062,
+      "txt": "炼丹药童前来询问丹药"
+    },
+    {
+      "ID": 3063,
+      "txt": "风无咎前来切磋"
+    },
+    {
+      "ID": 3064,
+      "txt": "风无咎前来与你武艺论道"
+    },
+    {
+      "ID": 3065,
+      "txt": "魔族来犯"
+    },
+    {
+      "ID": 3066,
+      "txt": "与魔族交涉"
+    },
+    {
+      "ID": 3067,
+      "txt": "妖族入侵"
+    },
+    {
+      "ID": 3068,
+      "txt": "击败妖族"
+    },
+    {
+      "ID": 3069,
+      "txt": "北海危机"
+    },
+    {
+      "ID": 3070,
+      "txt": "击败拦路妖兽"
+    },
+    {
+      "ID": 3071,
+      "txt": "保护北海"
+    },
+    {
+      "ID": 3072,
+      "txt": "击败入侵妖兽"
+    },
+    {
+      "ID": 3073,
+      "txt": "境明论道"
+    },
+    {
+      "ID": 3074,
+      "txt": "境明道长邀请你与其论道"
+    },
+    {
+      "ID": 3075,
+      "txt": "听经习道"
+    },
+    {
+      "ID": 3076,
+      "txt": "前去寺庙中听经"
+    },
+    {
+      "ID": 3077,
+      "txt": "境明论道二"
+    },
+    {
+      "ID": 3078,
+      "txt": "逍遥自在"
+    },
+    {
+      "ID": 3079,
+      "txt": "万法归一"
+    },
+    {
+      "ID": 3080,
+      "txt": "出神入化"
+    },
+    {
+      "ID": 3081,
+      "txt": "无我无相"
+    },
+    {
+      "ID": 3082,
+      "txt": "天人合一"
+    },
+    {
+      "ID": 3083,
+      "txt": "超脱生死"
+    },
+    {
+      "ID": 3084,
+      "txt": "无为至尊"
+    },
+    {
+      "ID": 3085,
+      "txt": "主感悟-1"
+    },
+    {
+      "ID": 3086,
+      "txt": "主感悟-2"
+    },
+    {
+      "ID": 3087,
+      "txt": "主感悟-3"
+    },
+    {
+      "ID": 3088,
+      "txt": "主感悟-4"
+    },
+    {
+      "ID": 3089,
+      "txt": "主感悟-5"
+    },
+    {
+      "ID": 3090,
+      "txt": "主感悟-6"
+    },
+    {
+      "ID": 3091,
+      "txt": "主感悟-7"
+    },
+    {
+      "ID": 3092,
+      "txt": "感悟-111"
+    },
+    {
+      "ID": 3093,
+      "txt": "感悟-112"
+    },
+    {
+      "ID": 3094,
+      "txt": "感悟-113"
+    },
+    {
+      "ID": 3095,
+      "txt": "感悟-114"
+    },
+    {
+      "ID": 3096,
+      "txt": "火焰专精"
+    },
+    {
+      "ID": 3097,
+      "txt": "毒专精"
+    },
+    {
+      "ID": 3098,
+      "txt": "感悟-121"
+    },
+    {
+      "ID": 3099,
+      "txt": "感悟-122"
+    },
+    {
+      "ID": 3100,
+      "txt": "感悟-123"
+    },
+    {
+      "ID": 3101,
+      "txt": "感悟-124"
+    },
+    {
+      "ID": 3102,
+      "txt": "毒专精"
+    },
+    {
+      "ID": 3103,
+      "txt": "流血专精"
+    },
+    {
+      "ID": 3104,
+      "txt": "感悟-131"
+    },
+    {
+      "ID": 3105,
+      "txt": "感悟-132"
+    },
+    {
+      "ID": 3106,
+      "txt": "感悟-133"
+    },
+    {
+      "ID": 3107,
+      "txt": "感悟-134"
+    },
+    {
+      "ID": 3108,
+      "txt": "流血专精"
+    },
+    {
+      "ID": 3109,
+      "txt": "火焰专精"
+    },
+    {
+      "ID": 3110,
+      "txt": "感悟-141"
+    },
+    {
+      "ID": 3111,
+      "txt": "感悟-142"
+    },
+    {
+      "ID": 3112,
+      "txt": "感悟-143"
+    },
+    {
+      "ID": 3113,
+      "txt": "感悟-144"
+    },
+    {
+      "ID": 3114,
+      "txt": "寒气专精"
+    },
+    {
+      "ID": 3115,
+      "txt": "土专精"
+    },
+    {
+      "ID": 3116,
+      "txt": "感悟-151"
+    },
+    {
+      "ID": 3117,
+      "txt": "感悟-152"
+    },
+    {
+      "ID": 3118,
+      "txt": "感悟-153"
+    },
+    {
+      "ID": 3119,
+      "txt": "感悟-154"
+    },
+    {
+      "ID": 3120,
+      "txt": "土专精"
+    },
+    {
+      "ID": 3121,
+      "txt": "寒气专精"
+    },
+    {
+      "ID": 3122,
+      "txt": "感悟-161"
+    },
+    {
+      "ID": 3123,
+      "txt": "感悟-162"
+    },
+    {
+      "ID": 3124,
+      "txt": "感悟-163"
+    },
+    {
+      "ID": 3125,
+      "txt": "感悟-164"
+    },
+    {
+      "ID": 3126,
+      "txt": "土专精"
+    },
+    {
+      "ID": 3127,
+      "txt": "寒气专精"
+    },
+    {
+      "ID": 3128,
+      "txt": "感悟-171"
+    },
+    {
+      "ID": 3129,
+      "txt": "感悟-172"
+    },
+    {
+      "ID": 3130,
+      "txt": "感悟-173"
+    },
+    {
+      "ID": 3131,
+      "txt": "感悟-174"
+    },
+    {
+      "ID": 3132,
+      "txt": "土专精"
+    },
+    {
+      "ID": 3133,
+      "txt": "寒气专精"
+    },
+    {
+      "ID": 3134,
+      "txt": "星辰道可以获得充能,充能满后启动星辰道,转盘速度增加10%"
+    },
+    {
+      "ID": 3135,
+      "txt": "启动期间功法在对碰时受到的克制影响降低80%"
+    },
+    {
+      "ID": 3136,
+      "txt": "启动期间没使用一个功法生命恢复2%"
+    },
+    {
+      "ID": 3137,
+      "txt": "星辰道启动期间释放的功法带有星辰之力,对敌人额外照成30%当前伤害"
+    },
+    {
+      "ID": 3138,
+      "txt": "星辰之力打中敌人后,为期注入星辰印记,在星辰道结束时结算,没3层印记受到20%伤害"
+    },
+    {
+      "ID": 3139,
+      "txt": "死亡时恢复30%最大生命"
+    },
+    {
+      "ID": 3140,
+      "txt": "死亡后星辰道不在运转,转而获得200%伤害加成"
+    },
+    {
+      "ID": 3141,
+      "txt": "攻击+2%"
+    },
+    {
+      "ID": 3142,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3143,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3144,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3145,
+      "txt": "灼烧对敌人的伤害增加1%"
+    },
+    {
+      "ID": 3146,
+      "txt": "毒照成的伤害+1%,且蔓延速度加快2%"
+    },
+    {
+      "ID": 3147,
+      "txt": "功法强度+3%"
+    },
+    {
+      "ID": 3148,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3149,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3150,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3151,
+      "txt": "毒照成的伤害+1%,且蔓延速度加快2%"
+    },
+    {
+      "ID": 3152,
+      "txt": "敌人流血伤害+1%"
+    },
+    {
+      "ID": 3153,
+      "txt": "生命+2%"
+    },
+    {
+      "ID": 3154,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3155,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3156,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3157,
+      "txt": "敌人流血伤害+1%"
+    },
+    {
+      "ID": 3158,
+      "txt": "灼烧对敌人的伤害增加1%"
+    },
+    {
+      "ID": 3159,
+      "txt": "防御+5%"
+    },
+    {
+      "ID": 3160,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3161,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3162,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3163,
+      "txt": "减速效果+1%"
+    },
+    {
+      "ID": 3164,
+      "txt": "提升细尘的累计速度(加快封锁经脉)"
+    },
+    {
+      "ID": 3165,
+      "txt": "攻击+2%"
+    },
+    {
+      "ID": 3166,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3167,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3168,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3169,
+      "txt": "提升细尘的累计速度(加快封锁经脉)"
+    },
+    {
+      "ID": 3170,
+      "txt": "减速效果+1%"
+    },
+    {
+      "ID": 3171,
+      "txt": "攻击+2%"
+    },
+    {
+      "ID": 3172,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3173,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3174,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3175,
+      "txt": "提升细尘的累计速度(加快封锁经脉)"
+    },
+    {
+      "ID": 3176,
+      "txt": "减速效果+1%"
+    },
+    {
+      "ID": 3177,
+      "txt": "攻击+2%"
+    },
+    {
+      "ID": 3178,
+      "txt": "最终伤害抵抗+1%"
+    },
+    {
+      "ID": 3179,
+      "txt": "对异常状态敌人伤害增加1%"
+    },
+    {
+      "ID": 3180,
+      "txt": "金木水火土任意一个属性伤害增加"
+    },
+    {
+      "ID": 3181,
+      "txt": "提升细尘的累计速度(加快封锁经脉)"
+    },
+    {
+      "ID": 3182,
+      "txt": "减速效果+1%"
+    },
+    {
+      "ID": 3183,
+      "txt": "灵草种子"
+    },
+    {
+      "ID": 3184,
+      "txt": "灵草种子的描述"
     }
   ]
 }

+ 32 - 32
Assets/Res/Config/LevelbattleConfig.json

@@ -45,80 +45,80 @@
       "Group": [
         100001
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1002,
       "Group": [
         100002
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1003,
       "Group": [
         100003
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1004,
       "Group": [
         100001
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1005,
       "Group": [
         100002
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1006,
       "Group": [
         100004
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1007,
       "Group": [
         100001
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     },
     {
       "ID": 1008,
       "Group": [
         100001
       ],
-      "combatTime": 0,
-      "combatType": null,
-      "MonsterGroupTruePower": null,
-      "MonsterGroupPower": null
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

+ 67 - 19
Assets/Res/Config/SentimentConfig.json

@@ -2,53 +2,101 @@
   "configList": [
     {
       "ID": 1,
-      "name": 3022,
+      "name": 3078,
       "icon": "",
       "mainSentimentEffect": 1,
       "sentimentEffect": [
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
+        111,
+        112,
+        113,
+        114,
+        115,
+        116
       ]
     },
     {
       "ID": 2,
-      "name": 3023,
+      "name": 3079,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 2,
+      "sentimentEffect": [
+        121,
+        122,
+        123,
+        124,
+        125,
+        126
+      ]
     },
     {
       "ID": 3,
-      "name": 3024,
+      "name": 3080,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 3,
+      "sentimentEffect": [
+        131,
+        132,
+        133,
+        134,
+        135,
+        136
+      ]
     },
     {
       "ID": 4,
-      "name": 3025,
+      "name": 3081,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 4,
+      "sentimentEffect": [
+        141,
+        142,
+        143,
+        144,
+        145,
+        146
+      ]
     },
     {
       "ID": 5,
-      "name": 3025,
+      "name": 3082,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 5,
+      "sentimentEffect": [
+        151,
+        152,
+        153,
+        154,
+        155,
+        156
+      ]
     },
     {
       "ID": 6,
-      "name": 3025,
+      "name": 3083,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 6,
+      "sentimentEffect": [
+        161,
+        162,
+        163,
+        164,
+        165,
+        166
+      ]
     },
     {
       "ID": 7,
-      "name": 3025,
+      "name": 3084,
       "icon": "",
-      "mainSentimentEffect": null
+      "mainSentimentEffect": 7,
+      "sentimentEffect": [
+        171,
+        172,
+        173,
+        174,
+        175,
+        176
+      ]
     }
   ]
 }

+ 821 - 173
Assets/Res/Config/SentimentEffectConfig.json

@@ -4,12 +4,12 @@
       "ID": 101,
       "groupId": 1,
       "level": 1,
-      "name": 3022,
+      "name": 3085,
       "icon": "icon",
-      "massge": 3026,
-      "effectType": 1,
+      "massge": 3134,
+      "effectType": 99,
       "effectVale": [
-        10
+        60101
       ],
       "upConstItemId": 1,
       "upConstCount": 1
@@ -18,12 +18,12 @@
       "ID": 102,
       "groupId": 1,
       "level": 2,
-      "name": 3022,
+      "name": 3085,
       "icon": "icon",
-      "massge": 3026,
-      "effectType": 1,
+      "massge": 3134,
+      "effectType": 99,
       "effectVale": [
-        11
+        60101
       ],
       "upConstItemId": 1,
       "upConstCount": 1
@@ -32,12 +32,12 @@
       "ID": 103,
       "groupId": 1,
       "level": 3,
-      "name": 3022,
+      "name": 3085,
       "icon": "icon",
-      "massge": 3026,
-      "effectType": 1,
+      "massge": 3134,
+      "effectType": 99,
       "effectVale": [
-        12
+        60101
       ],
       "upConstItemId": 1,
       "upConstCount": 1
@@ -46,12 +46,12 @@
       "ID": 104,
       "groupId": 1,
       "level": 4,
-      "name": 3022,
+      "name": 3085,
       "icon": "icon",
-      "massge": 3026,
-      "effectType": 1,
+      "massge": 3134,
+      "effectType": 99,
       "effectVale": [
-        13
+        60101
       ],
       "upConstItemId": 1,
       "upConstCount": 1
@@ -60,440 +60,1088 @@
       "ID": 105,
       "groupId": 1,
       "level": 5,
-      "name": 3022,
+      "name": 3085,
       "icon": "icon",
-      "massge": 3026,
-      "effectType": 1,
+      "massge": 3134,
+      "effectType": 99,
       "effectVale": [
-        14
+        60101
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 201,
+      "ID": 111,
       "groupId": 2,
       "level": 1,
-      "name": 3023,
+      "name": 3086,
       "icon": "icon",
-      "massge": 3027,
-      "effectType": 1,
+      "massge": 3135,
+      "effectType": 99,
       "effectVale": [
-        2
+        60102
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 202,
+      "ID": 112,
       "groupId": 2,
       "level": 2,
-      "name": 3023,
+      "name": 3086,
       "icon": "icon",
-      "massge": 3027,
-      "effectType": 1,
+      "massge": 3135,
+      "effectType": 99,
       "effectVale": [
-        3
+        60102
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 203,
+      "ID": 113,
       "groupId": 2,
       "level": 3,
-      "name": 3023,
+      "name": 3086,
       "icon": "icon",
-      "massge": 3027,
-      "effectType": 1,
+      "massge": 3135,
+      "effectType": 99,
       "effectVale": [
-        4
+        60102
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 204,
+      "ID": 114,
       "groupId": 2,
       "level": 4,
-      "name": 3023,
+      "name": 3086,
       "icon": "icon",
-      "massge": 3027,
-      "effectType": 1,
+      "massge": 3135,
+      "effectType": 99,
       "effectVale": [
-        5
+        60102
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 205,
+      "ID": 115,
       "groupId": 2,
       "level": 5,
-      "name": 3023,
+      "name": 3086,
       "icon": "icon",
-      "massge": 3027,
-      "effectType": 1,
+      "massge": 3135,
+      "effectType": 99,
       "effectVale": [
-        6
+        60102
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 301,
+      "ID": 121,
       "groupId": 3,
       "level": 1,
-      "name": 3022,
+      "name": 3087,
       "icon": "icon",
-      "massge": 3028,
-      "effectType": 1,
+      "massge": 3136,
+      "effectType": 99,
       "effectVale": [
-        1
+        60103
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 302,
+      "ID": 122,
       "groupId": 3,
       "level": 2,
-      "name": 3022,
+      "name": 3087,
       "icon": "icon",
-      "massge": 3028,
-      "effectType": 1,
+      "massge": 3136,
+      "effectType": 99,
       "effectVale": [
-        2
+        60103
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 303,
+      "ID": 123,
       "groupId": 3,
       "level": 3,
-      "name": 3022,
+      "name": 3087,
       "icon": "icon",
-      "massge": 3028,
-      "effectType": 1,
+      "massge": 3136,
+      "effectType": 99,
       "effectVale": [
-        3
+        60103
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 304,
+      "ID": 124,
       "groupId": 3,
       "level": 4,
-      "name": 3022,
+      "name": 3087,
       "icon": "icon",
-      "massge": 3028,
-      "effectType": 1,
+      "massge": 3136,
+      "effectType": 99,
       "effectVale": [
-        4
+        60103
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 305,
+      "ID": 125,
       "groupId": 3,
       "level": 5,
-      "name": 3022,
+      "name": 3087,
       "icon": "icon",
-      "massge": 3028,
-      "effectType": 1,
+      "massge": 3136,
+      "effectType": 99,
       "effectVale": [
-        5
+        60103
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 401,
+      "ID": 131,
       "groupId": 4,
       "level": 1,
-      "name": 3023,
+      "name": 3088,
       "icon": "icon",
-      "massge": 3029,
-      "effectType": 1,
+      "massge": 3137,
+      "effectType": 99,
       "effectVale": [
-        1
+        60104
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 402,
+      "ID": 132,
       "groupId": 4,
       "level": 2,
-      "name": 3023,
+      "name": 3088,
       "icon": "icon",
-      "massge": 3029,
-      "effectType": 1,
+      "massge": 3137,
+      "effectType": 99,
       "effectVale": [
-        2
+        60104
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 403,
+      "ID": 133,
       "groupId": 4,
       "level": 3,
-      "name": 3023,
+      "name": 3088,
       "icon": "icon",
-      "massge": 3029,
-      "effectType": 1,
+      "massge": 3137,
+      "effectType": 99,
       "effectVale": [
-        3
+        60104
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 404,
+      "ID": 134,
       "groupId": 4,
       "level": 4,
-      "name": 3023,
+      "name": 3088,
       "icon": "icon",
-      "massge": 3029,
-      "effectType": 1,
+      "massge": 3137,
+      "effectType": 99,
       "effectVale": [
-        4
+        60104
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 405,
+      "ID": 135,
       "groupId": 4,
       "level": 5,
-      "name": 3023,
+      "name": 3088,
       "icon": "icon",
-      "massge": 3029,
-      "effectType": 1,
+      "massge": 3137,
+      "effectType": 99,
       "effectVale": [
-        5
+        60104
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 501,
+      "ID": 141,
       "groupId": 5,
       "level": 1,
-      "name": 3022,
+      "name": 3089,
       "icon": "icon",
-      "massge": 3030,
-      "effectType": 1,
+      "massge": 3138,
+      "effectType": 99,
       "effectVale": [
-        1
+        60105
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 502,
+      "ID": 142,
       "groupId": 5,
       "level": 2,
-      "name": 3022,
+      "name": 3089,
       "icon": "icon",
-      "massge": 3030,
-      "effectType": 1,
+      "massge": 3138,
+      "effectType": 99,
       "effectVale": [
-        1
+        60105
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 503,
+      "ID": 143,
       "groupId": 5,
       "level": 3,
-      "name": 3022,
+      "name": 3089,
       "icon": "icon",
-      "massge": 3030,
-      "effectType": 1,
+      "massge": 3138,
+      "effectType": 99,
       "effectVale": [
-        1
+        60105
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 504,
+      "ID": 144,
       "groupId": 5,
       "level": 4,
-      "name": 3022,
+      "name": 3089,
       "icon": "icon",
-      "massge": 3030,
-      "effectType": 1,
+      "massge": 3138,
+      "effectType": 99,
       "effectVale": [
-        1
+        60105
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 505,
+      "ID": 145,
       "groupId": 5,
       "level": 5,
-      "name": 3022,
+      "name": 3089,
       "icon": "icon",
-      "massge": 3030,
-      "effectType": 1,
+      "massge": 3138,
+      "effectType": 99,
       "effectVale": [
-        1
+        60105
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 601,
+      "ID": 151,
       "groupId": 6,
       "level": 1,
-      "name": 3023,
+      "name": 3090,
       "icon": "icon",
-      "massge": 3031,
-      "effectType": 1,
+      "massge": 3139,
+      "effectType": 99,
       "effectVale": [
-        1
+        60106
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 602,
+      "ID": 152,
       "groupId": 6,
       "level": 2,
-      "name": 3023,
+      "name": 3090,
       "icon": "icon",
-      "massge": 3031,
-      "effectType": 1,
+      "massge": 3139,
+      "effectType": 99,
       "effectVale": [
-        2
+        60106
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 603,
+      "ID": 153,
       "groupId": 6,
       "level": 3,
-      "name": 3023,
+      "name": 3090,
       "icon": "icon",
-      "massge": 3031,
-      "effectType": 1,
+      "massge": 3139,
+      "effectType": 99,
       "effectVale": [
-        3
+        60106
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 604,
+      "ID": 154,
       "groupId": 6,
       "level": 4,
-      "name": 3023,
+      "name": 3090,
       "icon": "icon",
-      "massge": 3031,
-      "effectType": 1,
+      "massge": 3139,
+      "effectType": 99,
       "effectVale": [
-        4
+        60106
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 605,
+      "ID": 155,
       "groupId": 6,
       "level": 5,
-      "name": 3023,
+      "name": 3090,
       "icon": "icon",
-      "massge": 3031,
-      "effectType": 1,
+      "massge": 3139,
+      "effectType": 99,
       "effectVale": [
-        5
+        60106
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 701,
+      "ID": 161,
       "groupId": 7,
       "level": 1,
-      "name": 3022,
+      "name": 3091,
       "icon": "icon",
-      "massge": 3032,
-      "effectType": 1,
+      "massge": 3140,
+      "effectType": 99,
       "effectVale": [
-        1,
-        2
+        60107
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 702,
+      "ID": 162,
       "groupId": 7,
       "level": 2,
-      "name": 3022,
+      "name": 3091,
       "icon": "icon",
-      "massge": 3032,
-      "effectType": 1,
+      "massge": 3140,
+      "effectType": 99,
       "effectVale": [
-        1,
-        3
+        60107
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 703,
+      "ID": 163,
       "groupId": 7,
       "level": 3,
-      "name": 3022,
+      "name": 3091,
       "icon": "icon",
-      "massge": 3032,
-      "effectType": 1,
+      "massge": 3140,
+      "effectType": 99,
       "effectVale": [
-        1,
-        4
+        60107
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 704,
+      "ID": 164,
       "groupId": 7,
       "level": 4,
-      "name": 3022,
+      "name": 3091,
       "icon": "icon",
-      "massge": 3032,
-      "effectType": 1,
+      "massge": 3140,
+      "effectType": 99,
       "effectVale": [
-        1,
-        5
+        60107
       ],
       "upConstItemId": 1,
       "upConstCount": 1
     },
     {
-      "ID": 705,
+      "ID": 165,
       "groupId": 7,
       "level": 5,
-      "name": 3022,
+      "name": 3091,
       "icon": "icon",
-      "massge": 3032,
+      "massge": 3140,
+      "effectType": 99,
+      "effectVale": [
+        60107
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1101,
+      "groupId": 111,
+      "level": 1,
+      "name": 3092,
+      "icon": "icon",
+      "massge": 3141,
       "effectType": 1,
       "effectVale": [
-        1,
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1102,
+      "groupId": 176,
+      "level": 2,
+      "name": 3133,
+      "icon": "icon",
+      "massge": 3182,
+      "effectType": 11,
+      "effectVale": [
+        3
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1103,
+      "groupId": 176,
+      "level": 3,
+      "name": 3133,
+      "icon": "icon",
+      "massge": 3182,
+      "effectType": 11,
+      "effectVale": [
+        4
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1104,
+      "groupId": 176,
+      "level": 4,
+      "name": 3133,
+      "icon": "icon",
+      "massge": 3182,
+      "effectType": 11,
+      "effectVale": [
+        5
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1105,
+      "groupId": 176,
+      "level": 5,
+      "name": 3133,
+      "icon": "icon",
+      "massge": 3182,
+      "effectType": 11,
+      "effectVale": [
         6
       ],
       "upConstItemId": 1,
       "upConstCount": 1
+    },
+    {
+      "ID": 1111,
+      "groupId": 112,
+      "level": 1,
+      "name": 3093,
+      "icon": "icon",
+      "massge": 3142,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1121,
+      "groupId": 113,
+      "level": 1,
+      "name": 3094,
+      "icon": "icon",
+      "massge": 3143,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1131,
+      "groupId": 114,
+      "level": 1,
+      "name": 3095,
+      "icon": "icon",
+      "massge": 3144,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1141,
+      "groupId": 115,
+      "level": 1,
+      "name": 3096,
+      "icon": "icon",
+      "massge": 3145,
+      "effectType": 8,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1151,
+      "groupId": 116,
+      "level": 1,
+      "name": 3097,
+      "icon": "icon",
+      "massge": 3146,
+      "effectType": 9,
+      "effectVale": [
+        2,
+        5
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1161,
+      "groupId": 121,
+      "level": 1,
+      "name": 3098,
+      "icon": "icon",
+      "massge": 3147,
+      "effectType": 2,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1171,
+      "groupId": 122,
+      "level": 1,
+      "name": 3099,
+      "icon": "icon",
+      "massge": 3148,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1181,
+      "groupId": 123,
+      "level": 1,
+      "name": 3100,
+      "icon": "icon",
+      "massge": 3149,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1191,
+      "groupId": 124,
+      "level": 1,
+      "name": 3101,
+      "icon": "icon",
+      "massge": 3150,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1201,
+      "groupId": 125,
+      "level": 1,
+      "name": 3102,
+      "icon": "icon",
+      "massge": 3151,
+      "effectType": 9,
+      "effectVale": [
+        2,
+        5
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1211,
+      "groupId": 126,
+      "level": 1,
+      "name": 3103,
+      "icon": "icon",
+      "massge": 3152,
+      "effectType": 10,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1221,
+      "groupId": 131,
+      "level": 1,
+      "name": 3104,
+      "icon": "icon",
+      "massge": 3153,
+      "effectType": 3,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1231,
+      "groupId": 132,
+      "level": 1,
+      "name": 3105,
+      "icon": "icon",
+      "massge": 3154,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1241,
+      "groupId": 133,
+      "level": 1,
+      "name": 3106,
+      "icon": "icon",
+      "massge": 3155,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1251,
+      "groupId": 134,
+      "level": 1,
+      "name": 3107,
+      "icon": "icon",
+      "massge": 3156,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1261,
+      "groupId": 135,
+      "level": 1,
+      "name": 3108,
+      "icon": "icon",
+      "massge": 3157,
+      "effectType": 10,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1271,
+      "groupId": 136,
+      "level": 1,
+      "name": 3109,
+      "icon": "icon",
+      "massge": 3158,
+      "effectType": 8,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1281,
+      "groupId": 141,
+      "level": 1,
+      "name": 3110,
+      "icon": "icon",
+      "massge": 3159,
+      "effectType": 4,
+      "effectVale": [
+        4
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1291,
+      "groupId": 142,
+      "level": 1,
+      "name": 3111,
+      "icon": "icon",
+      "massge": 3160,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1301,
+      "groupId": 143,
+      "level": 1,
+      "name": 3112,
+      "icon": "icon",
+      "massge": 3161,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1311,
+      "groupId": 144,
+      "level": 1,
+      "name": 3113,
+      "icon": "icon",
+      "massge": 3162,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1321,
+      "groupId": 145,
+      "level": 1,
+      "name": 3114,
+      "icon": "icon",
+      "massge": 3163,
+      "effectType": 11,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1331,
+      "groupId": 146,
+      "level": 1,
+      "name": 3115,
+      "icon": "icon",
+      "massge": 3164,
+      "effectType": 12,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1341,
+      "groupId": 151,
+      "level": 1,
+      "name": 3116,
+      "icon": "icon",
+      "massge": 3165,
+      "effectType": 1,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1351,
+      "groupId": 152,
+      "level": 1,
+      "name": 3117,
+      "icon": "icon",
+      "massge": 3166,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1361,
+      "groupId": 153,
+      "level": 1,
+      "name": 3118,
+      "icon": "icon",
+      "massge": 3167,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1371,
+      "groupId": 154,
+      "level": 1,
+      "name": 3119,
+      "icon": "icon",
+      "massge": 3168,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1381,
+      "groupId": 155,
+      "level": 1,
+      "name": 3120,
+      "icon": "icon",
+      "massge": 3169,
+      "effectType": 12,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1391,
+      "groupId": 156,
+      "level": 1,
+      "name": 3121,
+      "icon": "icon",
+      "massge": 3170,
+      "effectType": 11,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1401,
+      "groupId": 161,
+      "level": 1,
+      "name": 3122,
+      "icon": "icon",
+      "massge": 3171,
+      "effectType": 1,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1411,
+      "groupId": 162,
+      "level": 1,
+      "name": 3123,
+      "icon": "icon",
+      "massge": 3172,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1421,
+      "groupId": 163,
+      "level": 1,
+      "name": 3124,
+      "icon": "icon",
+      "massge": 3173,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1431,
+      "groupId": 164,
+      "level": 1,
+      "name": 3125,
+      "icon": "icon",
+      "massge": 3174,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1441,
+      "groupId": 165,
+      "level": 1,
+      "name": 3126,
+      "icon": "icon",
+      "massge": 3175,
+      "effectType": 12,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1451,
+      "groupId": 166,
+      "level": 1,
+      "name": 3127,
+      "icon": "icon",
+      "massge": 3176,
+      "effectType": 11,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1461,
+      "groupId": 171,
+      "level": 1,
+      "name": 3128,
+      "icon": "icon",
+      "massge": 3177,
+      "effectType": 1,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1471,
+      "groupId": 172,
+      "level": 1,
+      "name": 3129,
+      "icon": "icon",
+      "massge": 3178,
+      "effectType": 6,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1481,
+      "groupId": 173,
+      "level": 1,
+      "name": 3130,
+      "icon": "icon",
+      "massge": 3179,
+      "effectType": 7,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1491,
+      "groupId": 174,
+      "level": 1,
+      "name": 3131,
+      "icon": "icon",
+      "massge": 3180,
+      "effectType": 5,
+      "effectVale": [
+        106,
+        1
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1501,
+      "groupId": 175,
+      "level": 1,
+      "name": 3132,
+      "icon": "icon",
+      "massge": 3181,
+      "effectType": 12,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
+    },
+    {
+      "ID": 1511,
+      "groupId": 176,
+      "level": 1,
+      "name": 3133,
+      "icon": "icon",
+      "massge": 3182,
+      "effectType": 11,
+      "effectVale": [
+        2
+      ],
+      "upConstItemId": 1,
+      "upConstCount": 1
     }
   ]
 }

+ 8 - 0
Assets/Res/UI/ItemDetailsPanel.meta

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

+ 945 - 0
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -0,0 +1,945 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &583737062655296145
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7884348931799053584}
+  - component: {fileID: 5984661092418457972}
+  - component: {fileID: 705275978297865375}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Quality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7884348931799053584
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 583737062655296145}
+  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: 7793865181194012869}
+  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}
+  m_SizeDelta: {x: 112, y: 113}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5984661092418457972
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 583737062655296145}
+  m_CullTransparentMesh: 1
+--- !u!114 &705275978297865375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 583737062655296145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_di_05
+  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 &1501318962295269995
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7793865181194012869}
+  - component: {fileID: 736593123517672725}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7793865181194012869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1501318962295269995}
+  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: 7884348931799053584}
+  - {fileID: 2462319743663962172}
+  - {fileID: 3405432979607021335}
+  m_Father: {fileID: 4534880848114758260}
+  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: -67}
+  m_SizeDelta: {x: 112, y: 113}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &736593123517672725
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1501318962295269995}
+  m_CullTransparentMesh: 1
+--- !u!1 &1593047470368811258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 872147779270780934}
+  - component: {fileID: 316931629161001709}
+  - component: {fileID: 2827083566351216829}
+  - component: {fileID: 6975020652370468018}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Connect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &872147779270780934
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1593047470368811258}
+  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: 7892632760807934045}
+  m_Father: {fileID: 4534880848114758260}
+  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: -222.9}
+  m_SizeDelta: {x: 563.56, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &316931629161001709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1593047470368811258}
+  m_CullTransparentMesh: 1
+--- !u!114 &2827083566351216829
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1593047470368811258}
+  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!114 &6975020652370468018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1593047470368811258}
+  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: 13.27
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &2049999833027880694
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3448986095428033778}
+  - component: {fileID: 700079147170673296}
+  - component: {fileID: 3803316130909754873}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3448986095428033778
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2049999833027880694}
+  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: 4534880848114758260}
+  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}
+  m_SizeDelta: {x: 298.803, y: 54.7022}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &700079147170673296
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2049999833027880694}
+  m_CullTransparentMesh: 1
+--- !u!114 &3803316130909754873
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2049999833027880694}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7269\u54C1\u8BF4\u660E"
+--- !u!1 &4339270302534241287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1390114855689535063}
+  - component: {fileID: 7485414286195926253}
+  - component: {fileID: 264577896367833749}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1390114855689535063
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4339270302534241287}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 144.01807}
+  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &7485414286195926253
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4339270302534241287}
+  m_CullTransparentMesh: 1
+--- !u!114 &264577896367833749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4339270302534241287}
+  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: 29
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!1 &4375583303445089987
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3405432979607021335}
+  - component: {fileID: 8836854868087396015}
+  - component: {fileID: 7765388183148181976}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3405432979607021335
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4375583303445089987}
+  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: 7793865181194012869}
+  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: -73}
+  m_SizeDelta: {x: 160, y: 37.1388}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8836854868087396015
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4375583303445089987}
+  m_CullTransparentMesh: 1
+--- !u!114 &7765388183148181976
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4375583303445089987}
+  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.227451, g: 0.6509804, b: 0.19215688, 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: 0
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8D64\u94DC\u77FF"
+--- !u!1 &5936847983662490449
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7354664618027818273}
+  - component: {fileID: 1359551343155104095}
+  - component: {fileID: 2337773986720364468}
+  - component: {fileID: 4119980142080941945}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7354664618027818273
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1359551343155104095
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  m_CullTransparentMesh: 1
+--- !u!114 &2337773986720364468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  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.21960786, g: 0.21960786, b: 0.21960786, 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: 21300000, guid: 2ce0740c14f50c442b22a6e578a7726d, type: 3}
+  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 &4119980142080941945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  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: 2337773986720364468}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6510083600123788025
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4534880848114758260}
+  - component: {fileID: 6624760465754027965}
+  - component: {fileID: 930542250473253188}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4534880848114758260
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  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: 3448986095428033778}
+  - {fileID: 7793865181194012869}
+  - {fileID: 872147779270780934}
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 564.6368, y: 646.9775}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6624760465754027965
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  m_CullTransparentMesh: 1
+--- !u!114 &930542250473253188
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_di_01
+  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 &7182261811213703053
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7892632760807934045}
+  - component: {fileID: 6166222951810868570}
+  - component: {fileID: 7437275654845754838}
+  - component: {fileID: 8929679043194737762}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7892632760807934045
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182261811213703053}
+  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: 872147779270780934}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 272.18, y: -0}
+  m_SizeDelta: {x: 544.36, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6166222951810868570
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182261811213703053}
+  m_CullTransparentMesh: 1
+--- !u!114 &7437275654845754838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182261811213703053}
+  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.6862745, g: 0.64705884, b: 0.59607846, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7ECF\u8FC7\u71C3\u70E7\u7684\u94DC\u77FF\uFF0C\u8D28\u5730\u975E\u5E38\u575A\u786C"
+--- !u!114 &8929679043194737762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182261811213703053}
+  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 &7872658753454459103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2462319743663962172}
+  - component: {fileID: 3154884708424253563}
+  - component: {fileID: 3274131623436862551}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ItemIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2462319743663962172
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7872658753454459103}
+  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: 7793865181194012869}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3154884708424253563
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7872658753454459103}
+  m_CullTransparentMesh: 1
+--- !u!114 &3274131623436862551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7872658753454459103}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_eq_priest_armor3
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: c28e54f99ed5b137a09ad8c2e8fcb311
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ItemDetailsPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  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: 7354664618027818273}
+  - {fileID: 1390114855689535063}
+  - {fileID: 4534880848114758260}
+  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 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Icon_Quality
+    gameObject: {fileID: 705275978297865375}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_ItemIcon
+    gameObject: {fileID: 3274131623436862551}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 7765388183148181976}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Desc
+    gameObject: {fileID: 7437275654845754838}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Connect
+    gameObject: {fileID: 872147779270780934}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 4119980142080941945}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0

+ 7 - 0
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xngb4H+rBnzrsDqMrAB96GMdI6xeZHwn+9I8/onaVCi/cXJuBXcRj8yZE9Ky
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 428 - 0
Assets/Res/UI/ItemDetailsPanel/ItemDetailsWidget.prefab

@@ -0,0 +1,428 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &5244930074141343768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 421255519500138520}
+  - component: {fileID: 2402554420221786078}
+  - component: {fileID: 5226556865820737182}
+  - component: {fileID: 8431556242072536130}
+  - component: {fileID: 829282624478156509}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &421255519500138520
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5244930074141343768}
+  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: 2084937765644687861}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 279.65588, y: -42}
+  m_SizeDelta: {x: 503.3118, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2402554420221786078
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5244930074141343768}
+  m_CullTransparentMesh: 1
+--- !u!114 &5226556865820737182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5244930074141343768}
+  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.6862745, g: 0.64705884, b: 0.59607846, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u53EF\u7528\u4E8E\u88C5\u5907\u5F3A\u5316"
+--- !u!114 &8431556242072536130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5244930074141343768}
+  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!114 &829282624478156509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5244930074141343768}
+  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!1 &5708923818751384516
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1067899526149624036}
+  - component: {fileID: 148234252027209298}
+  - component: {fileID: 6158176793110340728}
+  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 &1067899526149624036
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5708923818751384516}
+  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: 7316785334477769751}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10.981598, y: 0.18878174}
+  m_SizeDelta: {x: 197.4788, y: 38.9235}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &148234252027209298
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5708923818751384516}
+  m_CullTransparentMesh: 1
+--- !u!114 &6158176793110340728
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5708923818751384516}
+  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.2901961, g: 0.25882354, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7528\u56FE"
+--- !u!1 &5857023669870623636
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7316785334477769751}
+  - component: {fileID: 8038961183241554895}
+  - component: {fileID: 3995357262059129639}
+  - component: {fileID: 2983626399763427929}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7316785334477769751
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5857023669870623636}
+  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: 1067899526149624036}
+  m_Father: {fileID: 2084937765644687861}
+  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: -36.134247, y: 17.674316}
+  m_SizeDelta: {x: 487.0498, y: 32.7422}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8038961183241554895
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5857023669870623636}
+  m_CullTransparentMesh: 1
+--- !u!114 &3995357262059129639
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5857023669870623636}
+  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.86274517, g: 0.8235295, b: 0.7607844, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &2983626399763427929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5857023669870623636}
+  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 &6802863674397796072
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2084937765644687861}
+  - component: {fileID: 8394058936730934344}
+  - component: {fileID: 1520981340062287112}
+  - component: {fileID: 7103357040357655981}
+  - component: {fileID: 5198597648913517496}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ItemDetailsWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2084937765644687861
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6802863674397796072}
+  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: 7316785334477769751}
+  - {fileID: 421255519500138520}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 281.66, y: -35.27}
+  m_SizeDelta: {x: 563.32, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8394058936730934344
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6802863674397796072}
+  m_CullTransparentMesh: 1
+--- !u!114 &1520981340062287112
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6802863674397796072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 28
+    m_Right: 0
+    m_Top: 42
+    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 &7103357040357655981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6802863674397796072}
+  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!114 &5198597648913517496
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6802863674397796072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Title
+    gameObject: {fileID: 6158176793110340728}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Desc
+    gameObject: {fileID: 5226556865820737182}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

+ 7 - 0
Assets/Res/UI/ItemDetailsPanel/ItemDetailsWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Dy4b4yP+Bng55xuprJdNVkIY9ynQ9+UsYvUaBYbzQV9Mjhrkc8yvXTQOMA6Q
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 50 - 5
Assets/Res/UI/WidgetItem.prefab

@@ -419,6 +419,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1515036893769208877}
   - component: {fileID: 5132790119407906693}
+  - component: {fileID: 259851968356172009}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: WidgetItem
@@ -460,11 +461,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: btnClick
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 1823105549938950596}
     isAssetBundle: 0
@@ -485,4 +481,53 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_WidgetItem
+    gameObject: {fileID: 259851968356172009}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &259851968356172009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8408847998961895963}
+  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: []

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

@@ -50,6 +50,12 @@ public int[] ConditionPara;
 public int finishCount;
 
 
+		/// <summary>
+		///关联的事件Id
+		/// </summary>
+public int[] RelatedEvents;
+
+
 	}
 
 }

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

@@ -68,12 +68,6 @@ public int[] PrizeIDs;
 public int[] PrizeNums;
 
 
-		/// <summary>
-		///关联的事件Id
-		/// </summary>
-public int[] RelatedEvents;
-
-
 		/// <summary>
 		///刷新的概率 (100=100%)
 		/// </summary>

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/ItemConfig.cs

@@ -137,7 +137,7 @@ public int sort;
 		/// <summary>
 		///包装文本
 		/// </summary>
-public int itemDesc_1;
+public int itemDesc2;
 
 
 	}

+ 2 - 2
Assets/Scripts/GameData/ExcelConfig/SentimentConfig.cs

@@ -33,13 +33,13 @@ public string icon;
 
 
 		/// <summary>
-		///
+		///核心感悟点
 		/// </summary>
 public int mainSentimentEffect;
 
 
 		/// <summary>
-		///
+		///支线感悟点
 		/// </summary>
 public int[] sentimentEffect;
 

+ 39 - 31
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -309,40 +309,48 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 bool isRefence = false;
                 foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
                 {
-                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-                    for (var i1 = 0; i1 < eventConfig.RelatedEvents?.Length; i1++)
+                    foreach (var eventListEventLink in eventList.eventLinks)
                     {
-                        EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConfig.RelatedEvents[i1]);
-                        int count = 0;
-                        foreach (var list in eventLists)
+                        foreach (var eventConditionData in eventListEventLink.eventConditions)
                         {
-                            if (list.eventID == eventConfig1.ID)
+                            if (IsEvenkLinkComplete(eventConditionData))
+                                continue;
+                            EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+                            for (var i1 = 0; i1 < eventConditionConfig.RelatedEvents?.Length; i1++)
                             {
-                                count++;
+                                EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConditionConfig.RelatedEvents[i1]);
+                                int count = 0;
+                                foreach (var list in eventLists)
+                                {
+                                    if (list.eventID == eventConfig1.ID)
+                                    {
+                                        count++;
+                                    }
+                                }
+
+                                if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
+                                {
+                                    continue;
+                                }
+
+                                int randomValue4 = Random.Range(0, 101);
+                                if (randomValue4 <= eventConfig1.RefreshProbability)
+                                {
+                                    var eventList1 = AddEvent(eventConfig1.ID);
+                                    if (eventList1 != null)
+                                    {
+                                        eventLists.Add(AddEvent(eventConfig1.ID));
+                                        isRefence = true;
+                                    }
+                                    else
+                                    {
+                                        LogTool.Error("管理事件没有刷新出来 id:" + eventConfig1.ID);
+                                    }
+
+                                    break;
+                                }
                             }
                         }
-
-                        if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
-                        {
-                            continue;
-                        }
-
-                        int randomValue4 = Random.Range(0, 101);
-                        if (randomValue4 <= eventConfig1.RefreshProbability)
-                        {
-                            var eventList1 = AddEvent(eventConfig1.ID);
-                            if (eventList1 != null)
-                            {
-                                eventLists.Add(AddEvent(eventConfig1.ID));
-                                isRefence = true;
-                            }
-                            else
-                            {
-                                LogTool.Error("管理事件没有刷新出来 id:" + eventConfig1.ID);
-                            }
-
-                            break;
-                        }
                     }
                 }
 
@@ -837,13 +845,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
             }
         }
-        
+
         foreach (var eventListItemInfo in eventList.itemInfos)
         {
             itemInfos.Add(new ItemInfo(eventListItemInfo));
         }
 
-       
+
         PlayerManager.Instance.BagController.AddItem(itemInfos);
         RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
         await rewardsPanel.UIClosed();

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DSgd53/+Ai0gIZE93XJeJBNJzx0CEnpSk3hp6ar7Nh2IGAM0NnSmmD8wb/5D
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 85 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using Core.Language;
+using Fort23.Core;
+using GameLogic.Bag;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ItemDetailsPanel")]
+    public partial class ItemDetailsPanel : UIPanel
+    {
+        ItemInfo itemInfo;
+        List<ItemDetailsWidget> itemDetailsWidgets = new List<ItemDetailsWidget>();
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            itemInfo = uiData[0] as ItemInfo;
+            Icon_ItemIcon.icon_name = itemInfo.config.icon;
+            Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
+            Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc2);
+
+            ItemDetailsWidget itemDetailsWidget1 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
+            itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));
+            itemDetailsWidgets.Add(itemDetailsWidget1);
+
+            //突破丹
+            if (itemInfo.config.associateID == 1)
+            {
+                ItemDetailsWidget itemDetailsWidge2 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
+                itemDetailsWidge2.CustomInit("服用效果", $"增加成功概率{itemInfo.config.associateVlaue[2]},突破失败降低修为损耗{itemInfo.config.associateVlaue[3]}%");
+                itemDetailsWidgets.Add(itemDetailsWidge2);
+            }
+            //修为丹
+            else if (itemInfo.config.associateID == 2)
+            {
+                ItemDetailsWidget itemDetailsWidge2 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
+                itemDetailsWidge2.CustomInit("服用效果", $"增加修为值{itemInfo.config.associateVlaue[0]}");
+                itemDetailsWidgets.Add(itemDetailsWidge2);
+            }
+
+            if (PlayerManager.Instance.BagController.GetItemCount(itemInfo.itemID) > 0)
+            {
+                ItemDetailsWidget itemDetailsWidget = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
+                itemDetailsWidget.CustomInit("道具数量", "道具数量:" + PlayerManager.Instance.BagController.GetItemCount(itemInfo.itemID));
+                itemDetailsWidgets.Add(itemDetailsWidget);
+            }
+
+
+            return await base.AsyncInit(uiData);
+        }
+
+        public static async CTask OpenPanel(ItemInfo itemInfo)
+        {
+            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null, uiData: new object[] { itemInfo });
+        }
+
+        public override void Close()
+        {
+            foreach (var itemDetailsWidget in itemDetailsWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(itemDetailsWidget);
+            }
+
+            itemDetailsWidgets.Clear();
+
+            base.Close();
+        }
+    }
+}

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

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

+ 84 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanelData.cs

@@ -0,0 +1,84 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ItemDetailsPanel 
+	{
+	  #region 自定义数据 
+	  private MyImage _Icon_Quality;
+	  public MyImage Icon_Quality
+	   {
+	   get{
+	      if (_Icon_Quality == null)
+	       {
+	         _Icon_Quality  = GetUIUnit<MyImage>("Icon_Quality"); 
+	       }
+	      return _Icon_Quality;
+	     }
+	   }
+	  private MyImage _Icon_ItemIcon;
+	  public MyImage Icon_ItemIcon
+	   {
+	   get{
+	      if (_Icon_ItemIcon == null)
+	       {
+	         _Icon_ItemIcon  = GetUIUnit<MyImage>("Icon_ItemIcon"); 
+	       }
+	      return _Icon_ItemIcon;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  private RectTransform _Connect;
+	  public RectTransform Connect
+	   {
+	   get{
+	      if (_Connect == null)
+	       {
+	         _Connect  = GetUIUnit<RectTransform>("Connect"); 
+	       }
+	      return _Connect;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 30 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidget.cs

@@ -0,0 +1,30 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ItemDetailsWidget"  )]
+	public partial class ItemDetailsWidget : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit(string title,string desc)
+		{
+			Text_Title.text = title;
+			Text_Desc.text = desc;
+		}
+
+	}
+}

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

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

+ 40 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsWidgetData.cs

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

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

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

+ 3 - 2
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -28,6 +28,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_WidgetItem.onClick.AddListener(() => { ItemDetailsPanel.OpenPanel(itemInfo); });
             base.AddButtonEvent();
         }
 
@@ -61,8 +62,8 @@ namespace Fort23.Mono
         public override void DormancyObj()
         {
             transform.RecoverColor();
-            
-            
+
+
             base.DormancyObj();
         }
     }

+ 11 - 0
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

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

文件差异内容过多而无法显示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/Item.xlsx


二进制
Excel2Json/Excel/Language.xlsx


二进制
Excel2Json/Excel/Sentiment.xlsx


部分文件因为文件数量过多而无法显示