diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index c0a5bec5b..04c7ab53c 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -5,7 +5,7 @@ "card_pool_type": "base_pool1", "star": 3, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { @@ -14,7 +14,7 @@ "card_pool_type": "base_pool1", "star": 4, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { @@ -23,20 +23,155 @@ "card_pool_type": "base_pool1", "star": 5, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { "key": 4, "recruitment_type": 1, "card_pool_type": "base_pool2", + "star": 3, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 5, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 6, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 7, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 3, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 8, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 4, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 9, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 5, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 10, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 3, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 11, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 12, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 13, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 14, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 15, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 5, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 16, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 17, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 18, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 5, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 19, + "recruitment_type": 1, + "card_pool_type": "base_pool2", "star": 4, "race": 3, "id": "34006", "weight": 1000 }, { - "key": 5, + "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 5, @@ -44,145 +179,10 @@ "id": "45003", "weight": 1000 }, - { - "key": 6, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 7, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 8, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 9, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 10, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24008", - "weight": 1000 - }, - { - "key": 11, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 12, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 13, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 3, - "id": "35006", - "weight": 1000 - }, - { - "key": 14, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44002", - "weight": 1000 - }, - { - "key": 15, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 16, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 17, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 18, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 1, - "id": "13003", - "weight": 1000 - }, - { - "key": 19, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "44006", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, { "key": 21, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 4, "id": "44005", @@ -191,106 +191,106 @@ { "key": 22, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 23, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 24, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 25, - "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 1, "id": "14003", "weight": 1000 }, { - "key": 26, + "key": 23, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 5, "race": 1, "id": "15005", "weight": 1000 }, { - "key": 27, + "key": 24, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 2, "id": "24003", "weight": 1000 }, { - "key": 28, + "key": 25, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 2, - "id": "24004", + "id": "24008", "weight": 1000 }, { - "key": 29, + "key": 26, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 30, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 31, - "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 5, "race": 2, "id": "25001", "weight": 1000 }, + { + "key": 27, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 28, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 3, + "id": "35006", + "weight": 1000 + }, + { + "key": 29, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 4, + "id": "44002", + "weight": 1000 + }, + { + "key": 30, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 31, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, { "key": 32, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 1, - "id": "14007", + "card_pool_type": "base_pool2", + "star": 5, + "race": 2, + "id": "35001", "weight": 1000 }, { "key": 33, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 3, "race": 1, "id": "13003", @@ -299,7 +299,7 @@ { "key": 34, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "44006", @@ -308,7 +308,7 @@ { "key": 35, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "35001", @@ -317,7 +317,7 @@ { "key": 36, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "44005", @@ -326,7 +326,7 @@ { "key": 37, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 1, "id": "15004", @@ -335,7 +335,7 @@ { "key": 38, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 3, "race": 2, "id": "24002", @@ -344,7 +344,7 @@ { "key": 39, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "45003", @@ -353,7 +353,7 @@ { "key": 40, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 1, "id": "14003", @@ -362,7 +362,7 @@ { "key": 41, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 1, "id": "15005", @@ -371,7 +371,7 @@ { "key": 42, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 2, "id": "24003", @@ -380,7 +380,7 @@ { "key": 43, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 2, "id": "24004", @@ -389,7 +389,7 @@ { "key": 44, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "25004", @@ -398,7 +398,7 @@ { "key": 45, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 3, "id": "34006", @@ -407,7 +407,7 @@ { "key": 46, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "25001", @@ -416,7 +416,7 @@ { "key": 47, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 1, "id": "14007", @@ -424,6 +424,141 @@ }, { "key": 48, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "13003", + "weight": 1000 + }, + { + "key": 49, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 50, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 51, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 52, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 53, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 54, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 55, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 56, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 57, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 58, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 59, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 60, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 61, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 62, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 63, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -432,7 +567,7 @@ "weight": 1000 }, { - "key": 49, + "key": 64, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -441,7 +576,7 @@ "weight": 1000 }, { - "key": 50, + "key": 65, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -450,7 +585,7 @@ "weight": 1000 }, { - "key": 51, + "key": 66, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -459,7 +594,7 @@ "weight": 1000 }, { - "key": 52, + "key": 67, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -468,7 +603,7 @@ "weight": 1000 }, { - "key": 53, + "key": 68, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -477,7 +612,7 @@ "weight": 1000 }, { - "key": 54, + "key": 69, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -486,7 +621,7 @@ "weight": 1000 }, { - "key": 55, + "key": 70, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -495,7 +630,7 @@ "weight": 1000 }, { - "key": 56, + "key": 71, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -504,7 +639,7 @@ "weight": 1000 }, { - "key": 57, + "key": 72, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -513,7 +648,7 @@ "weight": 1000 }, { - "key": 58, + "key": 73, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -522,7 +657,7 @@ "weight": 1000 }, { - "key": 59, + "key": 74, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -531,7 +666,7 @@ "weight": 1000 }, { - "key": 60, + "key": 75, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -540,7 +675,7 @@ "weight": 1000 }, { - "key": 61, + "key": 76, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -549,7 +684,7 @@ "weight": 1000 }, { - "key": 62, + "key": 77, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -558,7 +693,7 @@ "weight": 1000 }, { - "key": 63, + "key": 78, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -567,7 +702,7 @@ "weight": 1000 }, { - "key": 64, + "key": 79, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -576,7 +711,7 @@ "weight": 1000 }, { - "key": 65, + "key": 80, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -585,7 +720,7 @@ "weight": 1000 }, { - "key": 66, + "key": 81, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -594,7 +729,7 @@ "weight": 1000 }, { - "key": 67, + "key": 82, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -603,7 +738,7 @@ "weight": 1000 }, { - "key": 68, + "key": 83, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -612,7 +747,7 @@ "weight": 1000 }, { - "key": 69, + "key": 84, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -621,7 +756,7 @@ "weight": 1000 }, { - "key": 70, + "key": 85, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -630,7 +765,7 @@ "weight": 1000 }, { - "key": 71, + "key": 86, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -639,7 +774,7 @@ "weight": 1000 }, { - "key": 72, + "key": 87, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -648,7 +783,7 @@ "weight": 1000 }, { - "key": 73, + "key": 88, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -657,7 +792,7 @@ "weight": 1000 }, { - "key": 74, + "key": 89, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -666,7 +801,7 @@ "weight": 1000 }, { - "key": 75, + "key": 90, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -675,7 +810,7 @@ "weight": 1000 }, { - "key": 76, + "key": 91, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -684,7 +819,7 @@ "weight": 1000 }, { - "key": 77, + "key": 92, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -693,7 +828,7 @@ "weight": 1000 }, { - "key": 78, + "key": 93, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -702,7 +837,7 @@ "weight": 1000 }, { - "key": 79, + "key": 94, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -711,7 +846,7 @@ "weight": 1000 }, { - "key": 80, + "key": 95, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -720,7 +855,7 @@ "weight": 1000 }, { - "key": 81, + "key": 96, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -729,7 +864,7 @@ "weight": 1000 }, { - "key": 82, + "key": 97, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -738,7 +873,7 @@ "weight": 1000 }, { - "key": 83, + "key": 98, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -747,7 +882,7 @@ "weight": 1000 }, { - "key": 84, + "key": 99, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -756,7 +891,7 @@ "weight": 1000 }, { - "key": 85, + "key": 100, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -765,7 +900,7 @@ "weight": 1000 }, { - "key": 86, + "key": 101, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -774,7 +909,7 @@ "weight": 1000 }, { - "key": 87, + "key": 102, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -783,7 +918,7 @@ "weight": 1000 }, { - "key": 88, + "key": 103, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -792,7 +927,7 @@ "weight": 1000 }, { - "key": 89, + "key": 104, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -801,7 +936,7 @@ "weight": 1000 }, { - "key": 90, + "key": 105, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -810,7 +945,7 @@ "weight": 1000 }, { - "key": 91, + "key": 106, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -819,7 +954,7 @@ "weight": 1000 }, { - "key": 92, + "key": 107, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -828,7 +963,7 @@ "weight": 1000 }, { - "key": 93, + "key": 108, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -837,7 +972,7 @@ "weight": 1000 }, { - "key": 94, + "key": 109, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -846,7 +981,7 @@ "weight": 1000 }, { - "key": 95, + "key": 110, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -855,7 +990,7 @@ "weight": 1000 }, { - "key": 96, + "key": 111, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -864,7 +999,7 @@ "weight": 1000 }, { - "key": 97, + "key": 112, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -873,7 +1008,7 @@ "weight": 1000 }, { - "key": 98, + "key": 113, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -882,7 +1017,7 @@ "weight": 1000 }, { - "key": 99, + "key": 114, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -891,7 +1026,7 @@ "weight": 1000 }, { - "key": 100, + "key": 115, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -900,7 +1035,7 @@ "weight": 1000 }, { - "key": 101, + "key": 116, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -909,7 +1044,7 @@ "weight": 1000 }, { - "key": 102, + "key": 117, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -918,7 +1053,7 @@ "weight": 1000 }, { - "key": 103, + "key": 118, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -927,7 +1062,7 @@ "weight": 1000 }, { - "key": 104, + "key": 119, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -936,7 +1071,7 @@ "weight": 1000 }, { - "key": 105, + "key": 120, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -945,7 +1080,7 @@ "weight": 1000 }, { - "key": 106, + "key": 121, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -954,7 +1089,7 @@ "weight": 1000 }, { - "key": 107, + "key": 122, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -963,7 +1098,7 @@ "weight": 1000 }, { - "key": 108, + "key": 123, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -972,7 +1107,7 @@ "weight": 1000 }, { - "key": 109, + "key": 124, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -981,7 +1116,7 @@ "weight": 1000 }, { - "key": 110, + "key": 125, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -990,7 +1125,7 @@ "weight": 1000 }, { - "key": 111, + "key": 126, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -999,7 +1134,7 @@ "weight": 1000 }, { - "key": 112, + "key": 127, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1008,7 +1143,7 @@ "weight": 1000 }, { - "key": 113, + "key": 128, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1017,7 +1152,7 @@ "weight": 1000 }, { - "key": 114, + "key": 129, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1026,7 +1161,7 @@ "weight": 1000 }, { - "key": 115, + "key": 130, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 50af3dc5b..0e5c07f48 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -104,37 +104,37 @@ "camp3_pool1": "camp3_pool", "camp4_pool1": "camp4_pool", "base_pool1": { - "s": 0, - "e": 0, + "s": 1, + "e": 1, "p": "base_pool1" }, "base_pool2": { - "s": 1, - "e": 99999, + "s": 2, + "e": 2, "p": "base_pool2" }, "base_pool3": { - "s": 100000, - "e": 999999999, - "p": "base_pool6" + "s": 3, + "e": 3, + "p": "base_pool3" }, "base_pool4": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 4, + "e": 4, + "p": "base_pool4" }, "base_pool5": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 5, + "e": 5, + "p": "base_pool5" }, "base_pool6": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 6, + "e": 6, + "p": "base_pool6" }, "base_pool7": { - "s": 99999999, + "s": 7, "e": 999999999, "p": "base_pool7" }, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index ae1a108ca..ea76a9aff 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -9,10 +9,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -35,10 +31,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -61,10 +53,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -109,10 +97,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -135,10 +119,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -161,10 +141,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -187,10 +163,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -213,10 +185,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -239,10 +207,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -265,10 +229,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -291,10 +251,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -317,10 +273,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -343,10 +295,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -369,10 +317,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -395,10 +339,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -421,10 +361,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -447,10 +383,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -473,10 +405,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -499,10 +427,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -525,10 +449,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -551,10 +471,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -577,10 +493,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -603,10 +515,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -629,10 +537,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -655,10 +559,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -681,10 +581,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -707,10 +603,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -755,10 +647,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -781,10 +669,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -807,10 +691,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -833,10 +713,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -859,10 +735,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -885,10 +757,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -911,10 +779,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -937,10 +801,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -963,10 +823,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -989,10 +845,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1015,10 +867,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1041,10 +889,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1067,10 +911,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1093,10 +933,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1119,10 +955,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1145,10 +977,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1171,10 +999,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1197,10 +1021,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1289,10 +1109,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1315,10 +1131,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1341,10 +1153,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1367,10 +1175,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1393,10 +1197,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1419,10 +1219,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1445,10 +1241,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1471,10 +1263,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1497,10 +1285,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1523,10 +1307,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1549,10 +1329,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1573,8 +1349,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", @@ -1595,8 +1371,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", @@ -1617,8 +1393,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "",