邹舸 2 天之前
父節點
當前提交
119ee87eb5

+ 427 - 76
Assets/Res/Config/ItemConfig.json

@@ -640,7 +640,7 @@
       "ID": 10001,
       "itemName": 284,
       "itemDesc": 292,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -657,7 +657,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11001,
+        901001
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -665,7 +669,7 @@
       "ID": 10002,
       "itemName": 285,
       "itemDesc": 293,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -682,7 +686,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11002,
+        901002
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -690,7 +698,7 @@
       "ID": 10003,
       "itemName": 286,
       "itemDesc": 294,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -707,7 +715,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11003,
+        901003
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -715,7 +727,7 @@
       "ID": 10004,
       "itemName": 287,
       "itemDesc": 295,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -732,7 +744,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11004,
+        901004
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -740,7 +756,7 @@
       "ID": 10005,
       "itemName": 288,
       "itemDesc": 296,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -757,7 +773,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11005,
+        901005
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -765,7 +785,7 @@
       "ID": 10006,
       "itemName": 289,
       "itemDesc": 297,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -782,7 +802,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11006,
+        901006
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -790,7 +814,7 @@
       "ID": 10007,
       "itemName": 290,
       "itemDesc": 298,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 6,
       "stack": 0,
@@ -807,7 +831,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11007,
+        901007
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -815,7 +843,7 @@
       "ID": 10008,
       "itemName": 291,
       "itemDesc": 299,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 6,
       "stack": 0,
@@ -832,7 +860,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11008,
+        901008
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -840,7 +872,7 @@
       "ID": 11001,
       "itemName": 300,
       "itemDesc": 308,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -865,7 +897,7 @@
       "ID": 11002,
       "itemName": 301,
       "itemDesc": 309,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -890,7 +922,7 @@
       "ID": 11003,
       "itemName": 302,
       "itemDesc": 310,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -915,7 +947,7 @@
       "ID": 11004,
       "itemName": 303,
       "itemDesc": 311,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -940,7 +972,7 @@
       "ID": 11005,
       "itemName": 304,
       "itemDesc": 312,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -965,7 +997,7 @@
       "ID": 11006,
       "itemName": 305,
       "itemDesc": 313,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -990,7 +1022,7 @@
       "ID": 11007,
       "itemName": 306,
       "itemDesc": 314,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 6,
       "stack": 0,
@@ -1015,7 +1047,7 @@
       "ID": 11008,
       "itemName": 307,
       "itemDesc": 315,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 6,
       "stack": 0,
@@ -1038,11 +1070,11 @@
     },
     {
       "ID": 12001,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 316,
+      "itemDesc": 326,
+      "icon": "icon_skill_1001",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1057,17 +1089,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13001,
+        1001
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12002,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 336,
+      "itemDesc": 346,
+      "icon": "icon_skill_10001",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1082,17 +1118,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13002,
+        2001
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12003,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 356,
+      "itemDesc": 366,
+      "icon": "icon_skill_40001",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1107,17 +1147,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13003,
+        1101
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12004,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 376,
+      "itemDesc": 386,
+      "icon": "icon_skill_40005",
       "itemTag": 13,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1132,17 +1176,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13004,
+        1201
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12005,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 396,
+      "itemDesc": 406,
+      "icon": "icon_skill_40002",
       "itemTag": 13,
-      "quality": 5,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1157,17 +1205,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13005,
+        1301
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12006,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 416,
+      "itemDesc": 426,
+      "icon": "icon_skill_30005",
       "itemTag": 13,
-      "quality": 5,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1182,17 +1234,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13006,
+        501001
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12007,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 436,
+      "itemDesc": 446,
+      "icon": "icon_skill_20004",
       "itemTag": 13,
-      "quality": 6,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1207,17 +1263,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13007,
+        501101
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12008,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 456,
+      "itemDesc": 466,
+      "icon": "icon_skill_10002",
       "itemTag": 13,
-      "quality": 6,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1232,15 +1292,19 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13008,
+        501201
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12009,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 476,
+      "itemDesc": 486,
+      "icon": "icon_skill_20002",
       "itemTag": 13,
       "quality": 5,
       "stack": 0,
@@ -1257,17 +1321,21 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13009,
+        501301
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12010,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 496,
+      "itemDesc": 506,
+      "icon": "icon_skill_10004",
       "itemTag": 13,
-      "quality": 6,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -1282,15 +1350,19 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 3,
+      "associateVlaue": [
+        13010,
+        501401
+      ],
       "sort": null,
       "itemDesc_1": null
     },
     {
       "ID": 12011,
-      "itemName": null,
-      "itemDesc": null,
-      "icon": "",
+      "itemName": 516,
+      "itemDesc": 526,
+      "icon": "icon_skill_20001",
       "itemTag": 13,
       "quality": 6,
       "stack": 0,
@@ -1307,6 +1379,285 @@
         0
       ],
       "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13011,
+        501501
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13001,
+      "itemName": 727,
+      "itemDesc": 738,
+      "icon": "icon_skill_1001",
+      "itemTag": 14,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13002,
+      "itemName": 728,
+      "itemDesc": 738,
+      "icon": "icon_skill_10001",
+      "itemTag": 14,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13003,
+      "itemName": 729,
+      "itemDesc": 738,
+      "icon": "icon_skill_40001",
+      "itemTag": 14,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13004,
+      "itemName": 730,
+      "itemDesc": 738,
+      "icon": "icon_skill_40005",
+      "itemTag": 14,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13005,
+      "itemName": 731,
+      "itemDesc": 738,
+      "icon": "icon_skill_40002",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13006,
+      "itemName": 732,
+      "itemDesc": 738,
+      "icon": "icon_skill_30005",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13007,
+      "itemName": 733,
+      "itemDesc": 738,
+      "icon": "icon_skill_20004",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13008,
+      "itemName": 734,
+      "itemDesc": 738,
+      "icon": "icon_skill_10002",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13009,
+      "itemName": 735,
+      "itemDesc": 738,
+      "icon": "icon_skill_20002",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13010,
+      "itemName": 736,
+      "itemDesc": 738,
+      "icon": "icon_skill_10004",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13011,
+      "itemName": 737,
+      "itemDesc": 738,
+      "icon": "icon_skill_20001",
+      "itemTag": 14,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
       "associateID": null,
       "sort": null,
       "itemDesc_1": null

+ 12 - 12
Assets/Res/Config/LanguageChineseConfig.json

@@ -2906,51 +2906,51 @@
     },
     {
       "ID": 727,
-      "txt": "0"
+      "txt": "剑诀碎片"
     },
     {
       "ID": 728,
-      "txt": "0"
+      "txt": "烈焰斩碎片"
     },
     {
       "ID": 729,
-      "txt": "0"
+      "txt": "瘴影千丝术碎片"
     },
     {
       "ID": 730,
-      "txt": "0"
+      "txt": "雾隐千流法碎片"
     },
     {
       "ID": 731,
-      "txt": "0"
+      "txt": "碧落幽冥劲碎片"
     },
     {
       "ID": 732,
-      "txt": "0"
+      "txt": "法宝秘籍碎片"
     },
     {
       "ID": 733,
-      "txt": "0"
+      "txt": "双生面具碎片"
     },
     {
       "ID": 734,
-      "txt": "0"
+      "txt": "火灵丹碎片"
     },
     {
       "ID": 735,
-      "txt": "0"
+      "txt": "巨大化碎片"
     },
     {
       "ID": 736,
-      "txt": "0"
+      "txt": "极速齿轮碎片"
     },
     {
       "ID": 737,
-      "txt": "0"
+      "txt": "崩脉决碎片"
     },
     {
       "ID": 738,
-      "txt": "0"
+      "txt": "用于对应功法的升星"
     },
     {
       "ID": 739,

File diff suppressed because it is too large
+ 112 - 112
Assets/Res/Config/SkillConfig.json


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

@@ -21,7 +21,7 @@ public int ID;
 
 
 		/// <summary>
-		///对应的功法碎片ID
+		///对应的碎片ID
 		/// </summary>
 public int PieceID;
 

二進制
Excel2Json/Excel/Item.xlsx


二進制
Excel2Json/Excel/Language.xlsx


二進制
Excel2Json/Excel/skill.xlsx


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