This commit is contained in:
wh_zcy 2022-09-20 20:47:09 +08:00
commit 69276c9c89
13 changed files with 503 additions and 874 deletions

View File

@ -3,7 +3,7 @@
"key": 1,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"star": 3,
"race": 1,
"id": "14007",
"weight": 1000
@ -13,318 +13,264 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 2,
"id": "24002",
"race": 1,
"id": "14007",
"weight": 1000
},
{
"key": 3,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 2,
"id": "35001",
"star": 5,
"race": 1,
"id": "14007",
"weight": 1000
},
{
"key": 4,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44006",
"card_pool_type": "base_pool2",
"star": 5,
"race": 1,
"id": "14007",
"weight": 1000
},
{
"key": 5,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44005",
"card_pool_type": "base_pool2",
"star": 3,
"race": 2,
"id": "24002",
"weight": 1000
},
{
"key": 6,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 1,
"id": "15004",
"card_pool_type": "base_pool2",
"star": 3,
"race": 2,
"id": "35001",
"weight": 1000
},
{
"key": 7,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25001",
"card_pool_type": "base_pool2",
"star": 3,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 8,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25004",
"card_pool_type": "base_pool2",
"star": 3,
"race": 4,
"id": "44005",
"weight": 1000
},
{
"key": 9,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 4,
"id": "45003",
"card_pool_type": "base_pool2",
"star": 4,
"race": 1,
"id": "15004",
"weight": 1000
},
{
"key": 10,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool2",
"star": 4,
"race": 1,
"id": "14007",
"race": 2,
"id": "25001",
"weight": 1000
},
{
"key": 11,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool2",
"star": 4,
"race": 2,
"id": "24002",
"id": "25004",
"weight": 1000
},
{
"key": 12,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool2",
"star": 4,
"race": 2,
"id": "35001",
"race": 4,
"id": "45003",
"weight": 1000
},
{
"key": 13,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44006",
"card_pool_type": "base_pool3",
"star": 5,
"race": 1,
"id": "14007",
"weight": 1000
},
{
"key": 14,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44005",
"card_pool_type": "base_pool3",
"star": 3,
"race": 2,
"id": "24002",
"weight": 1000
},
{
"key": 15,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 1,
"id": "15004",
"card_pool_type": "base_pool3",
"star": 3,
"race": 2,
"id": "35001",
"weight": 1000
},
{
"key": 16,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25001",
"card_pool_type": "base_pool3",
"star": 3,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 17,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25004",
"card_pool_type": "base_pool3",
"star": 3,
"race": 4,
"id": "44005",
"weight": 1000
},
{
"key": 18,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 4,
"id": "45003",
"card_pool_type": "base_pool3",
"star": 4,
"race": 1,
"id": "15004",
"weight": 1000
},
{
"key": 19,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool3",
"star": 4,
"race": 1,
"id": "14007",
"race": 2,
"id": "25001",
"weight": 1000
},
{
"key": 20,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool3",
"star": 4,
"race": 2,
"id": "24002",
"id": "25004",
"weight": 1000
},
{
"key": 21,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"card_pool_type": "base_pool3",
"star": 4,
"race": 2,
"id": "35001",
"weight": 1000
},
{
"key": 22,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"race": 4,
"id": "44005",
"weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 1,
"id": "15004",
"weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25001",
"weight": 1000
},
{
"key": 26,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 2,
"id": "25004",
"weight": 1000
},
{
"key": 27,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"race": 4,
"id": "45003",
"weight": 1000
},
{
"key": 28,
"key": 22,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"card_pool_type": "base_pool4",
"star": 5,
"race": 1,
"id": "14007",
"weight": 1000
},
{
"key": 29,
"key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"card_pool_type": "base_pool4",
"star": 3,
"race": 2,
"id": "24002",
"weight": 1000
},
{
"key": 30,
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"card_pool_type": "base_pool4",
"star": 3,
"race": 2,
"id": "35001",
"weight": 1000
},
{
"key": 31,
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"card_pool_type": "base_pool4",
"star": 3,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 32,
"key": 26,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"card_pool_type": "base_pool4",
"star": 3,
"race": 4,
"id": "44005",
"weight": 1000
},
{
"key": 33,
"key": 27,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"card_pool_type": "base_pool4",
"star": 4,
"race": 1,
"id": "15004",
"weight": 1000
},
{
"key": 34,
"key": 28,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"card_pool_type": "base_pool4",
"star": 4,
"race": 2,
"id": "25001",
"weight": 1000
},
{
"key": 35,
"key": 29,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
"card_pool_type": "base_pool4",
"star": 4,
"race": 2,
"id": "25004",
"weight": 1000
},
{
"key": 36,
"key": 30,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
"card_pool_type": "base_pool4",
"star": 4,
"race": 4,
"id": "13001",
"id": "45003",
"weight": 1000
},
{
"key": 121,
"key": 31,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 3,
@ -333,7 +279,7 @@
"weight": 1000
},
{
"key": 122,
"key": 32,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 3,
@ -342,7 +288,7 @@
"weight": 1000
},
{
"key": 123,
"key": 33,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 3,
@ -351,7 +297,7 @@
"weight": 1000
},
{
"key": 124,
"key": 34,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 3,
@ -360,7 +306,7 @@
"weight": 1000
},
{
"key": 125,
"key": 35,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 3,
@ -369,7 +315,7 @@
"weight": 1000
},
{
"key": 126,
"key": 36,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -378,7 +324,7 @@
"weight": 1000
},
{
"key": 127,
"key": 37,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -387,7 +333,7 @@
"weight": 1000
},
{
"key": 128,
"key": 38,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -396,7 +342,7 @@
"weight": 1000
},
{
"key": 129,
"key": 39,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -405,7 +351,7 @@
"weight": 1000
},
{
"key": 130,
"key": 40,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -414,7 +360,7 @@
"weight": 1000
},
{
"key": 131,
"key": 41,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -423,7 +369,7 @@
"weight": 1000
},
{
"key": 132,
"key": 42,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@ -432,7 +378,7 @@
"weight": 1000
},
{
"key": 133,
"key": 43,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@ -441,7 +387,7 @@
"weight": 1000
},
{
"key": 134,
"key": 44,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@ -450,7 +396,7 @@
"weight": 1000
},
{
"key": 135,
"key": 45,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@ -459,7 +405,7 @@
"weight": 1000
},
{
"key": 136,
"key": 46,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@ -468,7 +414,7 @@
"weight": 1000
},
{
"key": 137,
"key": 47,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@ -477,7 +423,7 @@
"weight": 1000
},
{
"key": 138,
"key": 48,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@ -486,7 +432,7 @@
"weight": 1000
},
{
"key": 139,
"key": 49,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@ -495,7 +441,7 @@
"weight": 1000
},
{
"key": 140,
"key": 50,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@ -504,7 +450,7 @@
"weight": 1000
},
{
"key": 141,
"key": 51,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -513,7 +459,7 @@
"weight": 1000
},
{
"key": 142,
"key": 52,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -522,7 +468,7 @@
"weight": 1000
},
{
"key": 143,
"key": 53,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -531,7 +477,7 @@
"weight": 1000
},
{
"key": 144,
"key": 54,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -540,7 +486,7 @@
"weight": 1000
},
{
"key": 145,
"key": 55,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -549,7 +495,7 @@
"weight": 1000
},
{
"key": 146,
"key": 56,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -558,7 +504,7 @@
"weight": 1000
},
{
"key": 147,
"key": 57,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -567,7 +513,7 @@
"weight": 1000
},
{
"key": 148,
"key": 58,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -576,7 +522,7 @@
"weight": 1000
},
{
"key": 149,
"key": 59,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@ -585,7 +531,7 @@
"weight": 1000
},
{
"key": 150,
"key": 60,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@ -594,7 +540,7 @@
"weight": 1000
},
{
"key": 151,
"key": 61,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@ -603,7 +549,7 @@
"weight": 1000
},
{
"key": 152,
"key": 62,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@ -612,7 +558,7 @@
"weight": 1000
},
{
"key": 153,
"key": 63,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@ -621,7 +567,7 @@
"weight": 1000
},
{
"key": 154,
"key": 64,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -630,7 +576,7 @@
"weight": 1000
},
{
"key": 155,
"key": 65,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -639,7 +585,7 @@
"weight": 1000
},
{
"key": 156,
"key": 66,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -648,7 +594,7 @@
"weight": 1000
},
{
"key": 157,
"key": 67,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -657,7 +603,7 @@
"weight": 1000
},
{
"key": 158,
"key": 68,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -666,7 +612,7 @@
"weight": 1000
},
{
"key": 159,
"key": 69,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@ -675,7 +621,7 @@
"weight": 1000
},
{
"key": 160,
"key": 70,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -684,7 +630,7 @@
"weight": 1000
},
{
"key": 161,
"key": 71,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -693,7 +639,7 @@
"weight": 1000
},
{
"key": 162,
"key": 72,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -702,7 +648,7 @@
"weight": 1000
},
{
"key": 163,
"key": 73,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -711,7 +657,7 @@
"weight": 1000
},
{
"key": 164,
"key": 74,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -720,7 +666,7 @@
"weight": 1000
},
{
"key": 165,
"key": 75,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -729,7 +675,7 @@
"weight": 1000
},
{
"key": 166,
"key": 76,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -738,7 +684,7 @@
"weight": 1000
},
{
"key": 167,
"key": 77,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@ -747,7 +693,7 @@
"weight": 1000
},
{
"key": 168,
"key": 78,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@ -756,7 +702,7 @@
"weight": 1000
},
{
"key": 169,
"key": 79,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@ -765,7 +711,7 @@
"weight": 1000
},
{
"key": 170,
"key": 80,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@ -774,7 +720,7 @@
"weight": 1000
},
{
"key": 171,
"key": 81,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@ -783,7 +729,7 @@
"weight": 1000
},
{
"key": 172,
"key": 82,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@ -792,7 +738,7 @@
"weight": 1000
},
{
"key": 173,
"key": 83,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -801,7 +747,7 @@
"weight": 1000
},
{
"key": 174,
"key": 84,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -810,7 +756,7 @@
"weight": 1000
},
{
"key": 175,
"key": 85,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -819,7 +765,7 @@
"weight": 1000
},
{
"key": 176,
"key": 86,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -828,7 +774,7 @@
"weight": 1000
},
{
"key": 177,
"key": 87,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -837,7 +783,7 @@
"weight": 1000
},
{
"key": 178,
"key": 88,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -846,7 +792,7 @@
"weight": 1000
},
{
"key": 179,
"key": 89,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@ -855,7 +801,7 @@
"weight": 1000
},
{
"key": 180,
"key": 90,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@ -864,7 +810,7 @@
"weight": 1000
},
{
"key": 181,
"key": 91,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@ -873,7 +819,7 @@
"weight": 1000
},
{
"key": 182,
"key": 92,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@ -882,7 +828,7 @@
"weight": 1000
},
{
"key": 183,
"key": 93,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@ -891,7 +837,7 @@
"weight": 1000
},
{
"key": 184,
"key": 94,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@ -900,7 +846,7 @@
"weight": 1000
},
{
"key": 185,
"key": 95,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 5,
@ -909,7 +855,7 @@
"weight": 1000
},
{
"key": 186,
"key": 96,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 5,
@ -918,7 +864,7 @@
"weight": 1000
},
{
"key": 187,
"key": 97,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 5,
@ -927,7 +873,7 @@
"weight": 1000
},
{
"key": 188,
"key": 98,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 5,

View File

@ -105,11 +105,11 @@
"camp4_pool1": "camp4_pool",
"base_pool1": {
"s": 0,
"e": 60,
"e": 1,
"p": "base_pool1"
},
"base_pool2": {
"s": 61,
"s": 2,
"e": 200,
"p": "base_pool2"
},
@ -119,7 +119,7 @@
"p": "base_pool3"
},
"base_pool4": {
"s": 1000,
"s": 1001,
"e": 99999999,
"p": "base_pool4"
},

View File

@ -654,8 +654,8 @@
"key": "hero_14007",
"text": "格里斯特王子"
},
"star": 4,
"color": 3,
"star": 5,
"color": 4,
"race": 1,
"job": 2,
"type": 1,
@ -890,8 +890,8 @@
"key": "hero_15004",
"text": "小欧"
},
"star": 5,
"color": 4,
"star": 3,
"color": 2,
"race": 1,
"job": 4,
"type": 1,
@ -1244,8 +1244,8 @@
"key": "hero_24002",
"text": "牙仙"
},
"star": 4,
"color": 3,
"star": 3,
"color": 2,
"race": 2,
"job": 1,
"type": 1,
@ -1303,8 +1303,8 @@
"key": "hero_24003",
"text": "睡神沙人"
},
"star": 4,
"color": 3,
"star": 3,
"color": 2,
"race": 2,
"job": 4,
"type": 1,
@ -1362,8 +1362,8 @@
"key": "hero_24004",
"text": "邦尼兔"
},
"star": 4,
"color": 3,
"star": 3,
"color": 2,
"race": 2,
"job": 1,
"type": 1,
@ -1716,8 +1716,8 @@
"key": "hero_25001",
"text": "阿宝"
},
"star": 5,
"color": 4,
"star": 4,
"color": 3,
"race": 2,
"job": 2,
"type": 1,
@ -1893,8 +1893,8 @@
"key": "hero_25004",
"text": "波比"
},
"star": 5,
"color": 4,
"star": 3,
"color": 2,
"race": 2,
"job": 3,
"type": 1,
@ -2778,8 +2778,8 @@
"key": "hero_35001",
"text": "师父"
},
"star": 4,
"color": 3,
"star": 3,
"color": 2,
"race": 2,
"job": 2,
"type": 1,
@ -3781,8 +3781,8 @@
"key": "hero_44006",
"text": "悍娇虎"
},
"star": 4,
"color": 3,
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 1,
@ -3958,8 +3958,8 @@
"key": "hero_45003",
"text": "盖"
},
"star": 5,
"color": 4,
"star": 3,
"color": 2,
"race": 4,
"job": 3,
"type": 1,
@ -5434,7 +5434,7 @@
"text": "致命纳得"
},
"star": 4,
"color": 1,
"color": 3,
"race": 4,
"job": 1,
"type": 5,
@ -6379,8 +6379,8 @@
"key": "hero_44005",
"text": "小伊"
},
"star": 4,
"color": 4,
"star": 3,
"color": 2,
"race": 4,
"job": 3,
"type": 1,
@ -6439,7 +6439,7 @@
"text": "亚力克斯"
},
"star": 5,
"color": 5,
"color": 4,
"race": 1,
"job": 3,
"type": 1,
@ -7125,7 +7125,7 @@
"text": "黑化小伊"
},
"star": 4,
"color": 4,
"color": 3,
"race": 4,
"job": 3,
"type": 1,

View File

@ -30,12 +30,7 @@
"hpscale": 736,
"atkscale": 90,
"defscale": 174,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "13002",
@ -68,12 +63,7 @@
"hpscale": 106,
"atkscale": 50,
"defscale": 844,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "13003",
@ -106,12 +96,7 @@
"hpscale": 255,
"atkscale": 140,
"defscale": 605,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "13004",
@ -144,12 +129,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "13005",
@ -182,12 +162,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14001",
@ -220,12 +195,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14002",
@ -258,12 +228,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14003",
@ -296,12 +261,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14004",
@ -334,12 +294,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14005",
@ -372,12 +327,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14006",
@ -410,12 +360,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "14007",
@ -448,12 +393,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "15001",
@ -486,12 +426,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "15002",
@ -524,12 +459,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "15003",
@ -562,12 +492,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "15004",
@ -600,12 +525,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "23001",
@ -638,12 +558,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "23002",
@ -676,12 +591,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "23003",
@ -714,12 +624,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "23004",
@ -752,12 +657,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24001",
@ -790,12 +690,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24002",
@ -828,12 +723,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24003",
@ -866,12 +756,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24004",
@ -904,12 +789,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24005",
@ -942,12 +822,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24006",
@ -980,12 +855,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24007",
@ -1018,12 +888,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24008",
@ -1056,12 +921,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "24009",
@ -1094,12 +954,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "25001",
@ -1132,12 +987,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "25002",
@ -1170,12 +1020,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "25003",
@ -1208,12 +1053,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "25004",
@ -1246,12 +1086,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33001",
@ -1284,12 +1119,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33002",
@ -1322,12 +1152,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33003",
@ -1360,12 +1185,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33004",
@ -1398,12 +1218,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33005",
@ -1436,12 +1251,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "33006",
@ -1474,12 +1284,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34001",
@ -1512,12 +1317,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34002",
@ -1550,12 +1350,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34003",
@ -1588,12 +1383,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34004",
@ -1626,12 +1416,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34005",
@ -1664,12 +1449,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34006",
@ -1702,12 +1482,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34007",
@ -1740,12 +1515,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "34008",
@ -1778,12 +1548,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35001",
@ -1816,12 +1581,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35002",
@ -1854,12 +1614,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35003",
@ -1892,12 +1647,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35004",
@ -1930,12 +1680,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35005",
@ -1968,12 +1713,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "35006",
@ -2006,12 +1746,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43001",
@ -2044,12 +1779,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43002",
@ -2082,12 +1812,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43003",
@ -2120,12 +1845,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43004",
@ -2158,12 +1878,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43005",
@ -2196,12 +1911,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43006",
@ -2234,12 +1944,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "43007",
@ -2272,12 +1977,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44001",
@ -2310,12 +2010,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44002",
@ -2348,12 +2043,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44003",
@ -2386,12 +2076,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44004",
@ -2424,12 +2109,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44006",
@ -2462,12 +2142,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "45001",
@ -2500,12 +2175,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "45002",
@ -2538,12 +2208,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "45003",
@ -2576,12 +2241,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "45004",
@ -2614,12 +2274,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "44005",
@ -2652,12 +2307,7 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
},
{
"hid": "15005",
@ -2690,11 +2340,6 @@
"hpscale": 105,
"atkscale": 750,
"defscale": 145,
"maxnum": 6,
"recommend_percentage": [
750,
175,
75
]
"maxnum": 6
}
]

View File

@ -602,7 +602,7 @@
101061,
101062
],
"captainId": "",
"captainId": "240031",
"battlescene": "bg_zhandoulmboss",
"award": [
{
@ -642,7 +642,7 @@
101071,
101072
],
"captainId": "240031",
"captainId": "",
"battlescene": "bg_zhandoulmboss",
"award": [
{

View File

@ -148,7 +148,7 @@
},
"desc": {
"key": "mainline_desc_10004",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去,啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选,让所有人都大跌眼镜。"
"text": "自负的毒蛇大师虽然给人的感觉稍显轻浮,但对这件事的态度就有如她善变的性格,不太明朗;螳螂大师算是几位高手中最聪明的一个,对阿宝的现状很是无奈,总是暗中帮忙。"
},
"icon": "wp_icon_0002",
"text": {
@ -189,11 +189,11 @@
"map": "zx_ddt_zj01",
"title": {
"key": "mainline_title_10005",
"text": "第5章太狼来袭"
"text": "第5章激烈战斗"
},
"desc": {
"key": "mainline_desc_10005",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去,啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选,让所有人都大跌眼镜。"
"text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了,然而有着一身好功夫并不意味着就是完美的,“师父”因为过去犯下的一个错误,一直纠结着没办法释然。"
},
"icon": "wp_icon_0002",
"text": {
@ -234,11 +234,11 @@
"map": "zx_ddt_zj02",
"title": {
"key": "mainline_title_10006",
"text": "第6章乌龟大师"
"text": "第6章下山"
},
"desc": {
"key": "mainline_desc_10006",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去,啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选,让所有人都大跌眼镜。"
"text": "至于那个让人人都如临大敌的太郎则是一只非常自恋的雪豹他等待复仇的这一天已经整整等了20年了可是他做梦也没想到自己等来的竟然是一只大熊猫。"
},
"icon": "wp_icon_0002",
"text": {
@ -279,11 +279,11 @@
"map": "zx_ddt_zj03",
"title": {
"key": "mainline_title_10007",
"text": "第7章太狼来袭"
"text": "第7章事件余波"
},
"desc": {
"key": "mainline_desc_10007",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去,啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选,让所有人都大跌眼镜。"
"text": "激烈的战斗后,阿宝以自己对武功的悟性和师父传授的武术,战胜了太郎,拯救了山谷,为山谷带来了和平。"
},
"icon": "wp_icon_0002",
"text": {

View File

@ -362,7 +362,7 @@
{
"id": "15003",
"preson": "15003",
"presonshow": "15004_exhibition",
"presonshow": "15003",
"presonstory": "15003",
"height": 1,
"weight": 1,
@ -386,7 +386,7 @@
{
"id": "15004",
"preson": "15004",
"presonshow": "15004",
"presonshow": "15004_exhibition",
"presonstory": "15004",
"height": 1,
"weight": 1,

View File

@ -5,7 +5,7 @@
"type": 2,
"preTid": 0,
"condition": [
103
104
],
"sidequest": [
1001,
@ -127,14 +127,13 @@
{
"id": 100205,
"group": 2,
"type": 2,
"type": 3,
"preTid": 100204,
"condition": [
101
],
"sidequest": [
2007,
2006
2010
]
},
{
@ -146,7 +145,8 @@
101
],
"sidequest": [
2008
2007,
2006
]
},
{
@ -157,6 +157,18 @@
"condition": [
101
],
"sidequest": [
2008
]
},
{
"id": 100208,
"group": 2,
"type": 2,
"preTid": 100207,
"condition": [
101
],
"sidequest": [
2009
]

View File

@ -153,7 +153,7 @@
"id": 20004,
"num": 1,
"preTid": 0,
"gotoLevel": 101,
"gotoLevel": 0,
"needItem": [
0
],
@ -167,7 +167,7 @@
"needItem": [
0
],
"nextTid": 100206
"nextTid": 100207
},
{
"id": 20006,
@ -177,6 +177,16 @@
"needItem": [
0
],
"nextTid": 100207
"nextTid": 100208
},
{
"id": 20007,
"num": 1,
"preTid": 0,
"gotoLevel": 0,
"needItem": [
0
],
"nextTid": 100206
}
]

View File

@ -226,6 +226,28 @@
],
"storyEnd": 0,
"nextTid": 100202,
"reward": [],
"CD": 0,
"endTid": -1
},
{
"id": 2002,
"objType": 1,
"location": "middle",
"modelaction": "",
"modelstate": 0,
"rotation": {
"x": 0,
"y": -180,
"z": 0
},
"point": "model_02",
"storyBegin": 202,
"chooseId": [
20003
],
"storyEnd": 0,
"nextTid": 0,
"reward": [
{
"ChooseId": 20001,
@ -251,28 +273,6 @@
"CD": 0,
"endTid": -1
},
{
"id": 2002,
"objType": 1,
"location": "middle",
"modelaction": "",
"modelstate": 0,
"rotation": {
"x": 0,
"y": -180,
"z": 0
},
"point": "model_02",
"storyBegin": 202,
"chooseId": [
20003
],
"storyEnd": 0,
"nextTid": 0,
"reward": [],
"CD": 0,
"endTid": -1
},
{
"id": 2003,
"objType": 1,
@ -333,7 +333,7 @@
"nextTid": 100205,
"reward": [
{
"ChooseId": 2004,
"ChooseId": 20004,
"Reward": [
{
"a": "hero",
@ -383,7 +383,7 @@
20005
],
"storyEnd": 0,
"nextTid": 100206,
"nextTid": 100207,
"reward": [],
"CD": 0,
"endTid": -1
@ -404,8 +404,8 @@
"chooseId": [
20006
],
"storyEnd": 208,
"nextTid": 100207,
"storyEnd": 0,
"nextTid": 100208,
"reward": [],
"CD": 0,
"endTid": -1
@ -424,10 +424,32 @@
"point": "model_02",
"storyBegin": 207,
"chooseId": [],
"storyEnd": 207,
"storyEnd": 0,
"nextTid": 0,
"reward": [],
"CD": 0,
"endTid": -1
},
{
"id": 2010,
"objType": 2,
"location": "right",
"modelaction": "",
"modelstate": 0,
"rotation": {
"x": 0,
"y": 0,
"z": 0
},
"point": "icon_05",
"storyBegin": 207,
"chooseId": [
20007
],
"storyEnd": 0,
"nextTid": 100206,
"reward": [],
"CD": 0,
"endTid": -1
}
]

View File

@ -4283,29 +4283,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4339,29 +4339,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4395,29 +4395,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4451,29 +4451,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4507,29 +4507,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4563,29 +4563,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4599,7 +4599,7 @@
"type": 2,
"bg": "jqdh_bg01",
"place": 0,
"speak": "25001",
"speak": "25004",
"listen": "",
"des": "啊哈!哈哈哈哈!",
"modelstatetarget": "",
@ -4619,29 +4619,29 @@
"z": 0
},
"positionL": {
"x": 0,
"y": -1.2,
"x": -0.1,
"y": -0.8,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4675,29 +4675,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4731,29 +4731,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -0.8,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4787,29 +4787,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4843,29 +4843,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4899,29 +4899,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -4955,29 +4955,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",
@ -5011,29 +5011,29 @@
"z": 0
},
"positionL": {
"x": 0,
"x": -0.1,
"y": -1.2,
"z": 0
},
"revolveR": {
"x": 0,
"y": -180,
"y": -150,
"z": 0
},
"revolveL": {
"x": 0,
"y": -180,
"y": -210,
"z": 0
},
"sizeR": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"sizeL": {
"x": 0.8,
"y": 0.8,
"z": 0.8
"x": 0.9,
"y": 0.9,
"z": 0.9
},
"perf": "",
"cg": "",

View File

@ -29,6 +29,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
heroRecord *pb.DBHeroRecord
pool string
_mapAddHero map[string]int32
strPool []string // 10连跨多个卡池情况
)
_mapAddHero = make(map[string]int32, 0)
cfgDraw = this.module.configure.GetGlobalConf() // 读取抽卡配置文件
@ -45,7 +46,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
heroRecord, _ = this.module.modelRecord.GetHeroRecord(session.GetUserId())
drawCount = heroRecord.Drawcount
pool = this.module.modelHero.CheckPool(drawCount, cfg)
if req.DrawType == 0 { // 普通卡池抽卡
// 获取普通抽卡池
if req.DrawCount == 1 {
@ -60,6 +61,10 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
for i := 0; i < int(req.DrawCount); i++ {
drawCount += 1
pool = this.module.modelHero.CheckPool(drawCount, cfg)
strPool = append(strPool, pool)
sz := make([]int32, 0)
if cfgDraw.BasePoolStar3 != 0 {
sz = append(sz, cfgDraw.BasePoolStar3)
@ -91,6 +96,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
switch req.DrawType {
case 1:
pool = cfg.Camp1Pool1
costAtn = cfgDraw.Camp1PoolCost
case 2:
@ -103,6 +109,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
pool = cfg.Camp4Pool1
costAtn = cfgDraw.Camp4PoolCost
}
strPool = append(strPool, pool)
} else {
costAtn = cfgDraw.Camp1PoolCost
switch req.DrawType {
@ -120,6 +127,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
pool = cfg.Camp4Pool1
costAtn = cfgDraw.Camp4Pool10cost
}
for i := 0; i < int(req.DrawCount); i++ {
strPool = append(strPool, pool)
}
}
costRes = append(costRes, costAtn)
@ -156,13 +166,13 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
}
}
_data := this.module.configure.GetPollByType(pool)
if _data == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
for _, star := range szStar { // szStar 转 szHeroId
for index, star := range szStar {
_data := this.module.configure.GetPollByType(strPool[index])
if _data == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
sz := make([]int32, 0)
for _, v := range _data[int32(star)] {
sz = append(sz, v.Weight)
@ -174,15 +184,14 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
szCards = append(szCards, v[randomIndex].Id)
}
}
}
}
// 更新record 配置信息
update := map[string]interface{}{}
if drawCount != -1 {
drawCount += req.DrawCount
if req.DrawType == 0 {
update := map[string]interface{}{}
//drawCount += req.DrawCount
update["drawcount"] = drawCount
this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
}
this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
// 消耗道具
code = this.module.ConsumeRes(session, costRes, true)
if code != pb.ErrorCode_Success {

View File

@ -24,7 +24,6 @@ type GameHeroResonanceData struct {
Atkscale int32
Defscale int32
Maxnum int32
RecommendPercentage []int32
}
const TypeId_GameHeroResonanceData = -2055259070
@ -86,20 +85,6 @@ func (_v *GameHeroResonanceData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atkscale"].(float64); !_ok_ { err = errors.New("atkscale error"); return }; _v.Atkscale = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["defscale"].(float64); !_ok_ { err = errors.New("defscale error"); return }; _v.Defscale = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxnum"].(float64); !_ok_ { err = errors.New("maxnum error"); return }; _v.Maxnum = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["recommend_percentage"].([]interface{}); !_ok_ { err = errors.New("recommend_percentage error"); return }
_v.RecommendPercentage = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.RecommendPercentage = append(_v.RecommendPercentage, _list_v_)
}
}
return
}