diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index a06f3545c..3316ae4d8 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -1,15 +1,15 @@ [ { "id": 10001, - "drop": 1001 + "drop": 1002 }, { "id": 10002, - "drop": 1001 + "drop": 1002 }, { "id": 10003, - "drop": 1001 + "drop": 1002 }, { "id": 10004, @@ -58,5 +58,37 @@ { "id": 10015, "drop": 1001 + }, + { + "id": 10101, + "drop": 1001 + }, + { + "id": 10102, + "drop": 1001 + }, + { + "id": 10103, + "drop": 1001 + }, + { + "id": 10301, + "drop": 1001 + }, + { + "id": 10302, + "drop": 1001 + }, + { + "id": 10401, + "drop": 1001 + }, + { + "id": 10402, + "drop": 1001 + }, + { + "id": 10403, + "drop": 1001 } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index faf789660..ecfa969d0 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -1,18 +1,18 @@ [ { "id": 10001, - "scene": "LevelDemo_Fcamer 1", - "formatList": [ - 101011, - 101021 - ], + "scene": "LevelDemo_Fcamer_1_1", + "formatList": [], "droplist": [ 10001, - 10002 + 10002, + 10003 ], "passformatList": [], "passdroplist": [ - 10001 + 10001, + 10002, + 10003 ], "award": [ { @@ -24,17 +24,18 @@ }, { "id": 10002, - "scene": "LevelDemo", - "formatList": [ - 110212, - 110213 - ], + "scene": "LevelDemo_Fcamer_1_2", + "formatList": [], "droplist": [ - 10002 + 10101, + 10102, + 10103 ], "passformatList": [], "passdroplist": [ - 10002 + 10101, + 10102, + 10103 ], "award": [ { @@ -46,17 +47,16 @@ }, { "id": 10003, - "scene": "LevelDemo", - "formatList": [ - 110213, - 110214 - ], + "scene": "LevelDemo_Fcamer_1_3", + "formatList": [], "droplist": [ - 10003 + 10301, + 10302 ], "passformatList": [], "passdroplist": [ - 10003 + 10301, + 10302 ], "award": [ { @@ -67,255 +67,17 @@ ] }, { - "id": 20001, - "scene": "LevelDemo", - "formatList": [ - 110214, - 110215 - ], + "id": 10004, + "scene": "LevelDemo_Fcamer_1_4", + "formatList": [], "droplist": [ - 10004 + 10401, + 10402, + 10403 ], "passformatList": [], "passdroplist": [ - 10004 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 20002, - "scene": "LevelDemo", - "formatList": [ - 110215, - 110216 - ], - "droplist": [ - 10005 - ], - "passformatList": [], - "passdroplist": [ - 10005 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 20003, - "scene": "LevelDemo", - "formatList": [ - 110216, - 120031 - ], - "droplist": [ - 10006 - ], - "passformatList": [], - "passdroplist": [ - 10006 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120031, - 120032 - ], - "droplist": [ - 10007 - ], - "passformatList": [], - "passdroplist": [ - 10007 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120032, - 120033 - ], - "droplist": [ - 10008 - ], - "passformatList": [], - "passdroplist": [ - 10008 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120033, - 120034 - ], - "droplist": [ - 10009 - ], - "passformatList": [], - "passdroplist": [ - 10009 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120034, - 120035 - ], - "droplist": [ - 10010 - ], - "passformatList": [], - "passdroplist": [ - 10010 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120035 - ], - "droplist": [ - 10011 - ], - "passformatList": [], - "passdroplist": [ - 10011 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120036 - ], - "droplist": [ - 10012 - ], - "passformatList": [], - "passdroplist": [ - 10012 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130011 - ], - "droplist": [ - 10013 - ], - "passformatList": [], - "passdroplist": [ - 10013 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130012 - ], - "droplist": [ - 10014 - ], - "passformatList": [], - "passdroplist": [ - 10014 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130013 - ], - "droplist": [ - 10015 - ], - "passformatList": [], - "passdroplist": [ - 10015 + 10403 ], "award": [ {