diff --git a/LogicServer/data/config/Merge/ItemMerge.config b/LogicServer/data/config/Merge/ItemMerge.config index 5f97610..639d15e 100755 --- a/LogicServer/data/config/Merge/ItemMerge.config +++ b/LogicServer/data/config/Merge/ItemMerge.config @@ -921,10 +921,10 @@ ItemMergeConfig = { compose = { id = 995, type = 0, count = 1 }, index = 1, buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 1 }, redpoint = 1, redpointlimit = { zsLevel = 2 }, - mergebutton10 = 1, Eid = 112, second_index = 8, table = { { id = 994, type = 0, count = 5 }, { id = 2, type = 2, count = 500 } }, @@ -1044,6 +1044,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 842, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 10 }, redpoint = 1, Eid = 1801, @@ -1058,6 +1060,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 843, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 12 }, redpoint = 1, Eid = 1802, @@ -1072,6 +1076,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 846, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 15 }, redpoint = 1, Eid = 1803, @@ -1086,6 +1092,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 847, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 15 }, redpoint = 1, Eid = 1804, @@ -1100,6 +1108,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 844, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 23 }, redpoint = 1, Eid = 1805, @@ -1114,6 +1124,8 @@ ItemMergeConfig = { circle = 2, compose = { id = 845, type = 0, count = 1 }, index = 1, + buttontxt10 = "合成10次", + mergebutton10 = 1, mergelimit = { office = 28 }, redpoint = 1, Eid = 1806,