diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 6c84fbd1f..a61f17982 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -58,138 +58,30 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 3, - "race": 2, - "id": "25004", + "race": 3, + "id": "34006", "weight": 1000 }, { "key": 8, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44006", + "star": 4, + "race": 3, + "id": "34006", "weight": 1000 }, { "key": 9, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 10, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 11, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 12, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 13, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 14, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 15, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 16, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 17, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 18, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 4, + "star": 5, "race": 3, "id": "34006", "weight": 1000 }, { - "key": 19, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 4, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 5, - "race": 1, - "id": "14007", - "weight": 1000 - }, - { - "key": 21, - "recruitment_type": 1, - "card_pool_type": "base_pool4", - "star": 3, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 22, + "key": 10, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -198,7 +90,7 @@ "weight": 1000 }, { - "key": 23, + "key": 11, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -207,7 +99,7 @@ "weight": 1000 }, { - "key": 24, + "key": 12, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -216,7 +108,7 @@ "weight": 1000 }, { - "key": 25, + "key": 13, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -225,7 +117,7 @@ "weight": 1000 }, { - "key": 26, + "key": 14, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -234,7 +126,7 @@ "weight": 1000 }, { - "key": 27, + "key": 15, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -243,7 +135,7 @@ "weight": 1000 }, { - "key": 28, + "key": 16, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -252,7 +144,7 @@ "weight": 1000 }, { - "key": 29, + "key": 17, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -261,7 +153,7 @@ "weight": 1000 }, { - "key": 30, + "key": 18, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -270,7 +162,7 @@ "weight": 1000 }, { - "key": 31, + "key": 19, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -279,21 +171,129 @@ "weight": 1000 }, { - "key": 32, + "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, - "race": 3, - "id": "34006", + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 21, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 22, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 23, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 24, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 25, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 26, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 27, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 28, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 29, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 30, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 31, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 32, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "44005", "weight": 1000 }, { "key": 33, "recruitment_type": 1, "card_pool_type": "base_pool4", - "star": 4, - "race": 2, - "id": "25001", + "star": 5, + "race": 1, + "id": "15004", "weight": 1000 }, { @@ -301,12 +301,435 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 5, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 35, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 36, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 37, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 38, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 39, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 40, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 41, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 42, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 43, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 44, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 45, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 46, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 47, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 48, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 49, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 50, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 51, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 52, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 53, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 5, "race": 1, "id": "14007", "weight": 1000 }, { - "key": 35, + "key": 54, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 55, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 56, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 57, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 58, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 59, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 60, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 61, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 62, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 63, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 64, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 65, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 66, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 67, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 5, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 68, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 69, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 70, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 71, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 72, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 73, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 74, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 75, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 76, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 77, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 78, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 79, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 80, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 81, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 82, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -315,7 +738,7 @@ "weight": 1000 }, { - "key": 36, + "key": 83, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -324,7 +747,7 @@ "weight": 1000 }, { - "key": 37, + "key": 84, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -333,7 +756,7 @@ "weight": 1000 }, { - "key": 38, + "key": 85, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -342,7 +765,7 @@ "weight": 1000 }, { - "key": 39, + "key": 86, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -351,7 +774,7 @@ "weight": 1000 }, { - "key": 40, + "key": 87, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -360,7 +783,7 @@ "weight": 1000 }, { - "key": 41, + "key": 88, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -369,7 +792,7 @@ "weight": 1000 }, { - "key": 42, + "key": 89, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -378,7 +801,7 @@ "weight": 1000 }, { - "key": 43, + "key": 90, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -387,7 +810,7 @@ "weight": 1000 }, { - "key": 44, + "key": 91, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -396,7 +819,7 @@ "weight": 1000 }, { - "key": 45, + "key": 92, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -405,7 +828,7 @@ "weight": 1000 }, { - "key": 46, + "key": 93, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -414,7 +837,7 @@ "weight": 1000 }, { - "key": 47, + "key": 94, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -423,7 +846,7 @@ "weight": 1000 }, { - "key": 48, + "key": 95, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -432,7 +855,7 @@ "weight": 1000 }, { - "key": 49, + "key": 96, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -441,7 +864,7 @@ "weight": 1000 }, { - "key": 50, + "key": 97, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -450,7 +873,7 @@ "weight": 1000 }, { - "key": 51, + "key": 98, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -459,7 +882,7 @@ "weight": 1000 }, { - "key": 52, + "key": 99, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -468,7 +891,7 @@ "weight": 1000 }, { - "key": 53, + "key": 100, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -477,7 +900,7 @@ "weight": 1000 }, { - "key": 54, + "key": 101, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -486,7 +909,7 @@ "weight": 1000 }, { - "key": 55, + "key": 102, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -495,7 +918,7 @@ "weight": 1000 }, { - "key": 56, + "key": 103, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -504,7 +927,7 @@ "weight": 1000 }, { - "key": 57, + "key": 104, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -513,7 +936,7 @@ "weight": 1000 }, { - "key": 58, + "key": 105, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -522,7 +945,7 @@ "weight": 1000 }, { - "key": 59, + "key": 106, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -531,7 +954,7 @@ "weight": 1000 }, { - "key": 60, + "key": 107, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -540,7 +963,7 @@ "weight": 1000 }, { - "key": 61, + "key": 108, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -549,7 +972,7 @@ "weight": 1000 }, { - "key": 62, + "key": 109, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -558,7 +981,7 @@ "weight": 1000 }, { - "key": 63, + "key": 110, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -567,7 +990,7 @@ "weight": 1000 }, { - "key": 64, + "key": 111, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -576,7 +999,7 @@ "weight": 1000 }, { - "key": 65, + "key": 112, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -585,7 +1008,7 @@ "weight": 1000 }, { - "key": 66, + "key": 113, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -594,7 +1017,7 @@ "weight": 1000 }, { - "key": 67, + "key": 114, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -603,7 +1026,7 @@ "weight": 1000 }, { - "key": 68, + "key": 115, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -612,7 +1035,7 @@ "weight": 1000 }, { - "key": 69, + "key": 116, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -621,7 +1044,7 @@ "weight": 1000 }, { - "key": 70, + "key": 117, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -630,7 +1053,7 @@ "weight": 1000 }, { - "key": 71, + "key": 118, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -639,7 +1062,7 @@ "weight": 1000 }, { - "key": 72, + "key": 119, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -648,7 +1071,7 @@ "weight": 1000 }, { - "key": 73, + "key": 120, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -657,7 +1080,7 @@ "weight": 1000 }, { - "key": 74, + "key": 121, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -666,7 +1089,7 @@ "weight": 1000 }, { - "key": 75, + "key": 122, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -675,7 +1098,7 @@ "weight": 1000 }, { - "key": 76, + "key": 123, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -684,7 +1107,7 @@ "weight": 1000 }, { - "key": 77, + "key": 124, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -693,7 +1116,7 @@ "weight": 1000 }, { - "key": 78, + "key": 125, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -702,7 +1125,7 @@ "weight": 1000 }, { - "key": 79, + "key": 126, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -711,7 +1134,7 @@ "weight": 1000 }, { - "key": 80, + "key": 127, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -720,7 +1143,7 @@ "weight": 1000 }, { - "key": 81, + "key": 128, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -729,7 +1152,7 @@ "weight": 1000 }, { - "key": 82, + "key": 129, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -738,7 +1161,7 @@ "weight": 1000 }, { - "key": 83, + "key": 130, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -747,7 +1170,7 @@ "weight": 1000 }, { - "key": 84, + "key": 131, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -756,7 +1179,7 @@ "weight": 1000 }, { - "key": 85, + "key": 132, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -765,7 +1188,7 @@ "weight": 1000 }, { - "key": 86, + "key": 133, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -774,7 +1197,7 @@ "weight": 1000 }, { - "key": 87, + "key": 134, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -783,7 +1206,7 @@ "weight": 1000 }, { - "key": 88, + "key": 135, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -792,7 +1215,7 @@ "weight": 1000 }, { - "key": 89, + "key": 136, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -801,7 +1224,7 @@ "weight": 1000 }, { - "key": 90, + "key": 137, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -810,7 +1233,7 @@ "weight": 1000 }, { - "key": 91, + "key": 138, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -819,7 +1242,7 @@ "weight": 1000 }, { - "key": 92, + "key": 139, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -828,7 +1251,7 @@ "weight": 1000 }, { - "key": 93, + "key": 140, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -837,7 +1260,7 @@ "weight": 1000 }, { - "key": 94, + "key": 141, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -846,7 +1269,7 @@ "weight": 1000 }, { - "key": 95, + "key": 142, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -855,7 +1278,7 @@ "weight": 1000 }, { - "key": 96, + "key": 143, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -864,7 +1287,7 @@ "weight": 1000 }, { - "key": 97, + "key": 144, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -873,7 +1296,7 @@ "weight": 1000 }, { - "key": 98, + "key": 145, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -882,7 +1305,7 @@ "weight": 1000 }, { - "key": 99, + "key": 146, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -891,7 +1314,7 @@ "weight": 1000 }, { - "key": 100, + "key": 147, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -900,7 +1323,7 @@ "weight": 1000 }, { - "key": 101, + "key": 148, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -909,7 +1332,7 @@ "weight": 1000 }, { - "key": 102, + "key": 149, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index a1b63da5a..7750bf552 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -115,14 +115,29 @@ }, "base_pool3": { "s": 2, - "e": 200, + "e": 2, "p": "base_pool3" }, "base_pool4": { - "s": 201, - "e": 99999999, + "s": 3, + "e": 10, "p": "base_pool4" }, + "base_pool5": { + "s": 11, + "e": 199, + "p": "base_pool5" + }, + "base_pool6": { + "s": 200, + "e": 999, + "p": "base_pool6" + }, + "base_pool7": { + "s": 1000, + "e": 99999999, + "p": "base_pool7" + }, "base_pool_star3": 9000, "base_pool_star4": 900, "base_pool_star5": 100, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 90856e420..1b3414494 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1925,8 +1925,8 @@ "key": "hero_25004", "text": "波比" }, - "star": 3, - "color": 2, + "star": 4, + "color": 3, "race": 2, "job": 3, "type": 1, diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 2db96f5c5..080512bb3 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -60,6 +60,9 @@ type GameGlobalData struct { BasePool2 *Gamebasepool BasePool3 *Gamebasepool BasePool4 *Gamebasepool + BasePool5 *Gamebasepool + BasePool6 *Gamebasepool + BasePool7 *Gamebasepool BasePoolStar3 int32 BasePoolStar4 int32 BasePoolStar5 int32 @@ -191,6 +194,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool5"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool5 error"); return }; if _v.BasePool5, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool6"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool6 error"); return }; if _v.BasePool6, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool7"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool7 error"); return }; if _v.BasePool7, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) }