diff --git a/configs/ItemMergeConfig.json b/configs/ItemMergeConfig.json index 354b7c4..a0447d0 100644 --- a/configs/ItemMergeConfig.json +++ b/configs/ItemMergeConfig.json @@ -3554,6 +3554,150 @@ "openserverday": 45, "level": 1 }, + "233": { + "circle": 7, + "compose": { + "id": 917, + "type": 0, + "count": 1 + }, + "index": 2, + "mergelimit": { + "smLevel": 50 + }, + "Eid": 233, + "second_index": 5, + "table": [ + { + "id": 970, + "type": 0, + "count": 300 + } + ], + "openserverday": 50, + "level": 1, + "text": "兑换", + "limitTips": "神魔总等级50级" + }, + "234": { + "circle": 7, + "compose": { + "id": 907, + "type": 0, + "count": 1 + }, + "index": 2, + "mergelimit": { + "smLevel": 50 + }, + "Eid": 234, + "second_index": 5, + "table": [ + { + "id": 970, + "type": 0, + "count": 300 + } + ], + "openserverday": 50, + "level": 1, + "text": "兑换", + "limitTips": "神魔总等级50级" + } + }, + "6": { + "2601": { + "circle": 1, + "compose": { + "id": 1063, + "type": 0, + "count": 1 + }, + "index": 2, + "text": "兑换", + "buttontxt10": "合成10次", + "mergebutton10": 1, + "Eid": 2601, + "second_index": 1, + "table": [ + { + "id": 1067, + "type": 0, + "count": 1 + } + ], + "openserverday": 1, + "level": 1 + }, + "2602": { + "circle": 1, + "compose": { + "id": 1064, + "type": 0, + "count": 1 + }, + "index": 2, + "text": "兑换", + "buttontxt10": "合成10次", + "mergebutton10": 1, + "Eid": 2602, + "second_index": 1, + "table": [ + { + "id": 1068, + "type": 0, + "count": 1 + } + ], + "openserverday": 1, + "level": 1 + }, + "2603": { + "circle": 1, + "compose": { + "id": 1065, + "type": 0, + "count": 1 + }, + "index": 2, + "text": "兑换", + "buttontxt10": "合成10次", + "mergebutton10": 1, + "Eid": 2603, + "second_index": 1, + "table": [ + { + "id": 1069, + "type": 0, + "count": 1 + } + ], + "openserverday": 1, + "level": 1 + }, + "2604": { + "circle": 1, + "compose": { + "id": 1066, + "type": 0, + "count": 1 + }, + "index": 2, + "text": "兑换", + "buttontxt10": "合成10次", + "mergebutton10": 1, + "Eid": 2604, + "second_index": 1, + "table": [ + { + "id": 1070, + "type": 0, + "count": 1 + } + ], + "openserverday": 1, + "level": 1 + }, "211": { "circle": 3, "compose": { @@ -3637,56 +3781,6 @@ ], "openserverday": 3, "level": 1 - }, - "233": { - "circle": 7, - "compose": { - "id": 917, - "type": 0, - "count": 1 - }, - "index": 2, - "mergelimit": { - "smLevel": 50 - }, - "Eid": 233, - "second_index": 5, - "table": [ - { - "id": 970, - "type": 0, - "count": 300 - } - ], - "openserverday": 50, - "level": 1, - "text": "兑换", - "limitTips": "神魔总等级50级" - }, - "234": { - "circle": 7, - "compose": { - "id": 907, - "type": 0, - "count": 1 - }, - "index": 2, - "mergelimit": { - "smLevel": 50 - }, - "Eid": 234, - "second_index": 5, - "table": [ - { - "id": 970, - "type": 0, - "count": 300 - } - ], - "openserverday": 50, - "level": 1, - "text": "兑换", - "limitTips": "神魔总等级50级" } } }, diff --git a/configs/MergeConfig.json b/configs/MergeConfig.json index 140c266..2a255a8 100644 --- a/configs/MergeConfig.json +++ b/configs/MergeConfig.json @@ -136,6 +136,15 @@ "levelconds": 1, "dayconds": 1, "name": "高阶材料" + }, + "6": { + "rebornconds": 0, + "index": 6, + "Uitype": 1, + "id": 2, + "levelconds": 1, + "dayconds": 1, + "name": "兵魂" } }, "3": { diff --git a/configs/StdItems.json b/configs/StdItems.json index 1810e3a..d5eb0e8 100644 --- a/configs/StdItems.json +++ b/configs/StdItems.json @@ -14172,7 +14172,7 @@ "existScenes": [-1] }, "299": { - "dup": 9999, + "dup": 99, "denyDestroy": 1, "suggVocation": 0, "staitcAttrs": [ @@ -14210,7 +14210,7 @@ "existScenes": [-1] }, "300": { - "dup": 9999, + "dup": 99, "denyDestroy": 1, "suggVocation": 0, "staitcAttrs": [ @@ -14248,7 +14248,7 @@ "existScenes": [-1] }, "301": { - "dup": 9999, + "dup": 99, "denyDestroy": 1, "suggVocation": 0, "staitcAttrs": [ @@ -14286,7 +14286,7 @@ "existScenes": [-1] }, "302": { - "dup": 9999, + "dup": 99, "denyDestroy": 1, "suggVocation": 0, "staitcAttrs": [ @@ -66316,7 +66316,6 @@ "1244": { "dup": 9999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66354,7 +66353,6 @@ "1245": { "dup": 9999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66392,7 +66390,6 @@ "1246": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66430,7 +66427,6 @@ "1247": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66468,7 +66464,6 @@ "1248": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66506,7 +66501,6 @@ "1249": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66544,7 +66538,6 @@ "1250": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66582,7 +66575,6 @@ "1251": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66624,7 +66616,6 @@ "1252": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [], @@ -66666,7 +66657,6 @@ "1253": { "dup": 999, "denyDestroy": 1, - "isShowUseBtn": 1, "forcetips": 1, "suggVocation": 0, "staitcAttrs": [],