liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

跨服创建英雄对象+ 配置更新

Browse Source
This commit is contained in:
meixiongfeng 2023-03-02 18:46:04 +08:00
parent 7926c46ce0
commit e1722eca92
9 changed files with 1224 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

459
bin/json/game_drawcard.json
View File

@ -5,7 +5,7 @@
"card_pool_type": "base_pool1", "card_pool_type": "base_pool1",
"star": 3, "star": 3,
"race": 1, "race": 1,
"id": "34007", "id": "14005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -14,7 +14,7 @@
"card_pool_type": "base_pool1", "card_pool_type": "base_pool1",
"star": 4, "star": 4,
"race": 1, "race": 1,
"id": "34007", "id": "14005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -23,7 +23,7 @@
"card_pool_type": "base_pool1", "card_pool_type": "base_pool1",
"star": 5, "star": 5,
"race": 1, "race": 1,
"id": "34007", "id": "14005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -32,7 +32,7 @@
"card_pool_type": "base_pool2", "card_pool_type": "base_pool2",
"star": 3, "star": 3,
"race": 1, "race": 1,
"id": "13003", "id": "45001",
"weight": 1000 "weight": 1000
}, },
{ {
@ -41,7 +41,7 @@
"card_pool_type": "base_pool2", "card_pool_type": "base_pool2",
"star": 4, "star": 4,
"race": 1, "race": 1,
"id": "13003", "id": "45001",
"weight": 1000 "weight": 1000
}, },
{ {
@ -50,7 +50,7 @@
"card_pool_type": "base_pool2", "card_pool_type": "base_pool2",
"star": 5, "star": 5,
"race": 1, "race": 1,
"id": "13003", "id": "45001",
"weight": 1000 "weight": 1000
}, },
{ {
@ -59,7 +59,7 @@
"card_pool_type": "base_pool3", "card_pool_type": "base_pool3",
"star": 3, "star": 3,
"race": 1, "race": 1,
"id": "34002", "id": "44005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -68,7 +68,7 @@
"card_pool_type": "base_pool3", "card_pool_type": "base_pool3",
"star": 4, "star": 4,
"race": 1, "race": 1,
"id": "34002", "id": "44005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -77,7 +77,7 @@
"card_pool_type": "base_pool3", "card_pool_type": "base_pool3",
"star": 5, "star": 5,
"race": 1, "race": 1,
"id": "34002", "id": "44005",
"weight": 1000 "weight": 1000
}, },
{ {
@ -86,7 +86,7 @@
"card_pool_type": "base_pool4", "card_pool_type": "base_pool4",
"star": 3, "star": 3,
"race": 1, "race": 1,
"id": "15002", "id": "24004",
"weight": 1000 "weight": 1000
}, },
{ {
@ -95,7 +95,7 @@
"card_pool_type": "base_pool4", "card_pool_type": "base_pool4",
"star": 4, "star": 4,
"race": 1, "race": 1,
"id": "15002", "id": "24004",
"weight": 1000 "weight": 1000
}, },
{ {
@ -104,7 +104,7 @@
"card_pool_type": "base_pool4", "card_pool_type": "base_pool4",
"star": 5, "star": 5,
"race": 1, "race": 1,
"id": "15002", "id": "24004",
"weight": 1000 "weight": 1000
}, },
{ {
@ -113,7 +113,7 @@
"card_pool_type": "base_pool5", "card_pool_type": "base_pool5",
"star": 3, "star": 3,
"race": 1, "race": 1,
"id": "24003", "id": "24008",
"weight": 1000 "weight": 1000
}, },
{ {
@ -122,7 +122,7 @@
"card_pool_type": "base_pool5", "card_pool_type": "base_pool5",
"star": 4, "star": 4,
"race": 1, "race": 1,
"id": "24003", "id": "24008",
"weight": 1000 "weight": 1000
}, },
{ {
@ -131,7 +131,7 @@
"card_pool_type": "base_pool5", "card_pool_type": "base_pool5",
"star": 5, "star": 5,
"race": 1, "race": 1,
"id": "24003", "id": "24008",
"weight": 1000 "weight": 1000
}, },
{ {
@ -162,79 +162,16 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 48, "key": 19,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"race": 1,
"id": "13003",
"weight": 1000
},
{
"key": 49,
"recruitment_type": 1, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 4, "star": 4,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 50,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 2, "race": 2,
"id": "35001", "id": "24008",
"weight": 1000 "weight": 1000
}, },
{ {
"key": 51, "key": 20,
"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, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 5, "star": 5,
@ -243,7 +180,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 57, "key": 21,
"recruitment_type": 1, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 4, "star": 4,
@ -252,25 +189,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 58, "key": 22,
"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, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 4, "star": 4,
@ -279,7 +198,70 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 61, "key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 2,
"id": "35001",
"weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 1,
"id": "15004",
"weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"race": 2,
"id": "24002",
"weight": 1000
},
{
"key": 26,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 4,
"id": "45003",
"weight": 1000
},
{
"key": 27,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 2,
"id": "25004",
"weight": 1000
},
{
"key": 28,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 4,
"id": "44005",
"weight": 1000
},
{
"key": 29,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 3,
"id": "35002",
"weight": 1000
},
{
"key": 30,
"recruitment_type": 1, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 5, "star": 5,
@ -288,7 +270,124 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 62, "key": 31,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 1,
"id": "14001",
"weight": 1000
},
{
"key": 32,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 4,
"id": "44006",
"weight": 1000
},
{
"key": 33,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 3,
"id": "35006",
"weight": 1000
},
{
"key": 34,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 2,
"id": "24005",
"weight": 1000
},
{
"key": 35,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 3,
"race": 1,
"id": "13003",
"weight": 1000
},
{
"key": 36,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 3,
"id": "34002",
"weight": 1000
},
{
"key": 37,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 3,
"id": "34007",
"weight": 1000
},
{
"key": 38,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 4,
"id": "45001",
"weight": 1000
},
{
"key": 39,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 1,
"id": "14003",
"weight": 1000
},
{
"key": 40,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 3,
"id": "35003",
"weight": 1000
},
{
"key": 41,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 3,
"id": "35005",
"weight": 1000
},
{
"key": 42,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 1,
"id": "14005",
"weight": 1000
},
{
"key": 43,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 2,
"id": "24004",
"weight": 1000
},
{
"key": 44,
"recruitment_type": 1, "recruitment_type": 1,
"card_pool_type": "base_pool7", "card_pool_type": "base_pool7",
"star": 4, "star": 4,
@ -297,7 +396,25 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 63, "key": 45,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 5,
"race": 1,
"id": "15002",
"weight": 1000
},
{
"key": 46,
"recruitment_type": 1,
"card_pool_type": "base_pool7",
"star": 4,
"race": 4,
"id": "44002",
"weight": 1000
},
{
"key": 47,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 3, "star": 3,
@ -306,7 +423,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 64, "key": 48,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 3, "star": 3,
@ -315,7 +432,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 65, "key": 49,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 3, "star": 3,
@ -324,7 +441,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 66, "key": 50,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 3, "star": 3,
@ -333,7 +450,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 67, "key": 51,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 3, "star": 3,
@ -342,7 +459,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 68, "key": 52,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -351,7 +468,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 69, "key": 53,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -360,7 +477,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 70, "key": 54,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -369,7 +486,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 71, "key": 55,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -378,7 +495,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 72, "key": 56,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -387,7 +504,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 73, "key": 57,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -396,7 +513,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 74, "key": 58,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 4, "star": 4,
@ -405,7 +522,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 75, "key": 59,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 5, "star": 5,
@ -414,7 +531,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 76, "key": 60,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 5, "star": 5,
@ -423,7 +540,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 77, "key": 61,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 5, "star": 5,
@ -432,7 +549,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 78, "key": 62,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp1_pool", "card_pool_type": "camp1_pool",
"star": 5, "star": 5,
@ -441,7 +558,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 79, "key": 63,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 3, "star": 3,
@ -450,7 +567,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 80, "key": 64,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 3, "star": 3,
@ -459,7 +576,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 81, "key": 65,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 3, "star": 3,
@ -468,7 +585,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 82, "key": 66,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 3, "star": 3,
@ -477,7 +594,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 83, "key": 67,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -486,7 +603,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 84, "key": 68,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 3, "star": 3,
@ -495,7 +612,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 85, "key": 69,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -504,7 +621,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 86, "key": 70,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -513,7 +630,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 87, "key": 71,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -522,7 +639,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 88, "key": 72,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -531,7 +648,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 89, "key": 73,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -540,7 +657,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 90, "key": 74,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -549,7 +666,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 91, "key": 75,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 4, "star": 4,
@ -558,7 +675,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 92, "key": 76,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 5, "star": 5,
@ -567,7 +684,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 93, "key": 77,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 5, "star": 5,
@ -576,7 +693,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 94, "key": 78,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 5, "star": 5,
@ -585,7 +702,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 95, "key": 79,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp2_pool", "card_pool_type": "camp2_pool",
"star": 5, "star": 5,
@ -594,7 +711,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 96, "key": 80,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -603,7 +720,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 97, "key": 81,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -612,7 +729,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 98, "key": 82,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -621,7 +738,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 99, "key": 83,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -630,7 +747,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 100, "key": 84,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -639,7 +756,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 101, "key": 85,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 3, "star": 3,
@ -648,7 +765,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 102, "key": 86,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -657,7 +774,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 103, "key": 87,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -666,7 +783,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 104, "key": 88,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -675,7 +792,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 105, "key": 89,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -684,7 +801,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 106, "key": 90,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -693,7 +810,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 107, "key": 91,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -702,7 +819,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 108, "key": 92,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -711,7 +828,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 109, "key": 93,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 4, "star": 4,
@ -720,7 +837,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 110, "key": 94,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 5, "star": 5,
@ -729,7 +846,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 111, "key": 95,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 5, "star": 5,
@ -738,7 +855,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 112, "key": 96,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 5, "star": 5,
@ -747,7 +864,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 113, "key": 97,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 5, "star": 5,
@ -756,7 +873,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 114, "key": 98,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp3_pool", "card_pool_type": "camp3_pool",
"star": 5, "star": 5,
@ -765,7 +882,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 115, "key": 99,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -774,7 +891,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 116, "key": 100,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -783,7 +900,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 117, "key": 101,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -792,7 +909,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 118, "key": 102,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -801,7 +918,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 119, "key": 103,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -810,7 +927,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 120, "key": 104,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -819,7 +936,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 121, "key": 105,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 3, "star": 3,
@ -828,7 +945,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 122, "key": 106,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -837,7 +954,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 123, "key": 107,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -846,7 +963,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 124, "key": 108,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -855,7 +972,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 125, "key": 109,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -864,7 +981,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 126, "key": 110,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -873,7 +990,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 127, "key": 111,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -882,7 +999,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 128, "key": 112,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -891,7 +1008,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 129, "key": 113,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,
@ -900,7 +1017,7 @@
"weight": 1000 "weight": 1000
}, },
{ {
"key": 130, "key": 114,
"recruitment_type": 2, "recruitment_type": 2,
"card_pool_type": "camp4_pool", "card_pool_type": "camp4_pool",
"star": 4, "star": 4,

735
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

12
bin/json/game_heroexp.json
View File

@ -1,7 +1,17 @@
[ [
{ {
"itemid": "625002", "itemid": "600002",
"exp": 1000, "exp": 1000,
"needgold": 10000 "needgold": 10000
},
{
"itemid": "600003",
"exp": 2000,
"needgold": 20000
},
{
"itemid": "600004",
"exp": 3000,
"needgold": 30000
} }
] ]

430
bin/json/game_initial.json
View File

@ -258,5 +258,435 @@
"n": 1 "n": 1
} }
] ]
},
{
"index": "128",
"var": [
{
"a": "item",
"t": "120001",
"n": 100
}
]
},
{
"index": "129",
"var": [
{
"a": "item",
"t": "120002",
"n": 100
}
]
},
{
"index": "130",
"var": [
{
"a": "item",
"t": "120003",
"n": 100
}
]
},
{
"index": "131",
"var": [
{
"a": "item",
"t": "120004",
"n": 100
}
]
},
{
"index": "132",
"var": [
{
"a": "item",
"t": "120005",
"n": 100
}
]
},
{
"index": "133",
"var": [
{
"a": "item",
"t": "120006",
"n": 100
}
]
},
{
"index": "134",
"var": [
{
"a": "item",
"t": "120007",
"n": 100
}
]
},
{
"index": "135",
"var": [
{
"a": "item",
"t": "120008",
"n": 100
}
]
},
{
"index": "136",
"var": [
{
"a": "item",
"t": "120009",
"n": 100
}
]
},
{
"index": "137",
"var": [
{
"a": "item",
"t": "120101",
"n": 100
}
]
},
{
"index": "138",
"var": [
{
"a": "item",
"t": "120102",
"n": 100
}
]
},
{
"index": "139",
"var": [
{
"a": "item",
"t": "120103",
"n": 100
}
]
},
{
"index": "140",
"var": [
{
"a": "item",
"t": "120104",
"n": 100
}
]
},
{
"index": "141",
"var": [
{
"a": "item",
"t": "600001",
"n": 1000
}
]
},
{
"index": "142",
"var": [
{
"a": "item",
"t": "10017",
"n": 1000
}
]
},
{
"index": "143",
"var": [
{
"a": "item",
"t": "500000",
"n": 1000
}
]
},
{
"index": "144",
"var": [
{
"a": "item",
"t": "513001",
"n": 1000
}
]
},
{
"index": "145",
"var": [
{
"a": "item",
"t": "100100",
"n": 1000
}
]
},
{
"index": "146",
"var": [
{
"a": "item",
"t": "40001",
"n": 1000
}
]
},
{
"index": "147",
"var": [
{
"a": "item",
"t": "40002",
"n": 1000
}
]
},
{
"index": "148",
"var": [
{
"a": "item",
"t": "40003",
"n": 1000
}
]
},
{
"index": "149",
"var": [
{
"a": "item",
"t": "40004",
"n": 1000
}
]
},
{
"index": "150",
"var": [
{
"a": "item",
"t": "40005",
"n": 1000
}
]
},
{
"index": "151",
"var": [
{
"a": "item",
"t": "40006",
"n": 1000
}
]
},
{
"index": "152",
"var": [
{
"a": "item",
"t": "40007",
"n": 1000
}
]
},
{
"index": "153",
"var": [
{
"a": "item",
"t": "40008",
"n": 1000
}
]
},
{
"index": "154",
"var": [
{
"a": "item",
"t": "40009",
"n": 1000
}
]
},
{
"index": "155",
"var": [
{
"a": "item",
"t": "40010",
"n": 1000
}
]
},
{
"index": "156",
"var": [
{
"a": "item",
"t": "40011",
"n": 1000
}
]
},
{
"index": "157",
"var": [
{
"a": "item",
"t": "40012",
"n": 1000
}
]
},
{
"index": "158",
"var": [
{
"a": "item",
"t": "40013",
"n": 1000
}
]
},
{
"index": "159",
"var": [
{
"a": "item",
"t": "40014",
"n": 1000
}
]
},
{
"index": "160",
"var": [
{
"a": "item",
"t": "40015",
"n": 1000
}
]
},
{
"index": "161",
"var": [
{
"a": "item",
"t": "40016",
"n": 1000
}
]
},
{
"index": "162",
"var": [
{
"a": "item",
"t": "40017",
"n": 1000
}
]
},
{
"index": "163",
"var": [
{
"a": "item",
"t": "40018",
"n": 1000
}
]
},
{
"index": "164",
"var": [
{
"a": "item",
"t": "40019",
"n": 1000
}
]
},
{
"index": "165",
"var": [
{
"a": "item",
"t": "600002",
"n": 1000
}
]
},
{
"index": "166",
"var": [
{
"a": "item",
"t": "600003",
"n": 1000
}
]
},
{
"index": "167",
"var": [
{
"a": "item",
"t": "600004",
"n": 1000
}
]
},
{
"index": "168",
"var": [
{
"a": "item",
"t": "600005",
"n": 1000
}
]
},
{
"index": "169",
"var": [
{
"a": "item",
"t": "600006",
"n": 1000
}
]
},
{
"index": "170",
"var": [
{
"a": "item",
"t": "600007",
"n": 1000
}
]
} }
] ]

78
bin/json/game_item.json
View File

@ -3086,7 +3086,7 @@
"text": "葛伦科火花" "text": "葛伦科火花"
}, },
"usetype": 3, "usetype": 3,
"color": 3, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 120001, "index": 120001,
"special_type": 0, "special_type": 0,
@ -3103,8 +3103,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10001", "img": "wp_icon_10009",
"ico": "wp_icon_10001", "ico": "wp_icon_10009",
"intr": { "intr": {
"key": "itemdesc_120001", "key": "itemdesc_120001",
"text": "熔岩泰坦掉落初级材料，可用于打造装备" "text": "熔岩泰坦掉落初级材料，可用于打造装备"
@ -3124,7 +3124,7 @@
"text": "原始火油" "text": "原始火油"
}, },
"usetype": 3, "usetype": 3,
"color": 4, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 120002, "index": 120002,
"special_type": 0, "special_type": 0,
@ -3141,8 +3141,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10002", "img": "wp_icon_10010",
"ico": "wp_icon_10002", "ico": "wp_icon_10010",
"intr": { "intr": {
"key": "itemdesc_120002", "key": "itemdesc_120002",
"text": "熔岩泰坦掉落中级材料，可用于打造装备" "text": "熔岩泰坦掉落中级材料，可用于打造装备"
@ -3162,7 +3162,7 @@
"text": "炉心岩浆" "text": "炉心岩浆"
}, },
"usetype": 3, "usetype": 3,
"color": 5, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 120003, "index": 120003,
"special_type": 0, "special_type": 0,
@ -3179,8 +3179,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10003", "img": "wp_icon_10011",
"ico": "wp_icon_10003", "ico": "wp_icon_10011",
"intr": { "intr": {
"key": "itemdesc_120003", "key": "itemdesc_120003",
"text": "熔岩泰坦掉落高级材料，可用于打造装备" "text": "熔岩泰坦掉落高级材料，可用于打造装备"
@ -3200,7 +3200,7 @@
"text": "荒漠枯枝" "text": "荒漠枯枝"
}, },
"usetype": 3, "usetype": 3,
"color": 3, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 120004, "index": 120004,
"special_type": 0, "special_type": 0,
@ -3217,8 +3217,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10004", "img": "wp_icon_10012",
"ico": "wp_icon_10004", "ico": "wp_icon_10012",
"intr": { "intr": {
"key": "itemdesc_120004", "key": "itemdesc_120004",
"text": "森林泰坦掉落初级材料，可用于打造装备" "text": "森林泰坦掉落初级材料，可用于打造装备"
@ -3238,7 +3238,7 @@
"text": "洛基圆木" "text": "洛基圆木"
}, },
"usetype": 3, "usetype": 3,
"color": 4, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 120005, "index": 120005,
"special_type": 0, "special_type": 0,
@ -3255,8 +3255,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10005", "img": "wp_icon_10013",
"ico": "wp_icon_10005", "ico": "wp_icon_10013",
"intr": { "intr": {
"key": "itemdesc_120005", "key": "itemdesc_120005",
"text": "森林泰坦掉落中级材料，可用于打造装备" "text": "森林泰坦掉落中级材料，可用于打造装备"
@ -3276,7 +3276,7 @@
"text": "恶魔藤蔓" "text": "恶魔藤蔓"
}, },
"usetype": 3, "usetype": 3,
"color": 5, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 120006, "index": 120006,
"special_type": 0, "special_type": 0,
@ -3293,8 +3293,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10006", "img": "wp_icon_10014",
"ico": "wp_icon_10006", "ico": "wp_icon_10014",
"intr": { "intr": {
"key": "itemdesc_120006", "key": "itemdesc_120006",
"text": "森林泰坦掉落高级材料，可用于打造装备" "text": "森林泰坦掉落高级材料，可用于打造装备"
@ -3314,7 +3314,7 @@
"text": "凛冬雪花" "text": "凛冬雪花"
}, },
"usetype": 3, "usetype": 3,
"color": 3, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 120007, "index": 120007,
"special_type": 0, "special_type": 0,
@ -3331,8 +3331,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10007", "img": "wp_icon_10015",
"ico": "wp_icon_10007", "ico": "wp_icon_10015",
"intr": { "intr": {
"key": "itemdesc_120007", "key": "itemdesc_120007",
"text": "森林泰坦掉落初级材料，可用于打造装备" "text": "森林泰坦掉落初级材料，可用于打造装备"
@ -3352,7 +3352,7 @@
"text": "北极冰砖" "text": "北极冰砖"
}, },
"usetype": 3, "usetype": 3,
"color": 4, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 120008, "index": 120008,
"special_type": 0, "special_type": 0,
@ -3369,8 +3369,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10008", "img": "wp_icon_10016",
"ico": "wp_icon_10008", "ico": "wp_icon_10016",
"intr": { "intr": {
"key": "itemdesc_120008", "key": "itemdesc_120008",
"text": "森林泰坦掉落中级材料，可用于打造装备" "text": "森林泰坦掉落中级材料，可用于打造装备"
@ -3390,7 +3390,7 @@
"text": "龙之冰晶" "text": "龙之冰晶"
}, },
"usetype": 3, "usetype": 3,
"color": 5, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 120009, "index": 120009,
"special_type": 0, "special_type": 0,
@ -3407,8 +3407,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10009", "img": "wp_icon_10017",
"ico": "wp_icon_10009", "ico": "wp_icon_10017",
"intr": { "intr": {
"key": "itemdesc_120009", "key": "itemdesc_120009",
"text": "森林泰坦掉落高级材料，可用于打造装备" "text": "森林泰坦掉落高级材料，可用于打造装备"
@ -3428,7 +3428,7 @@
"text": "精炼石" "text": "精炼石"
}, },
"usetype": 3, "usetype": 3,
"color": 10, "color": 5,
"bagtype": 1, "bagtype": 1,
"index": 120101, "index": 120101,
"special_type": 0, "special_type": 0,
@ -3445,8 +3445,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10010", "img": "wp_icon_10018",
"ico": "wp_icon_10010", "ico": "wp_icon_10018",
"intr": { "intr": {
"key": "itemdesc_120101", "key": "itemdesc_120101",
"text": "打造时添加精炼石，必出高品质装备" "text": "打造时添加精炼石，必出高品质装备"
@ -3466,7 +3466,7 @@
"text": "太阳石" "text": "太阳石"
}, },
"usetype": 3, "usetype": 3,
"color": 10, "color": 5,
"bagtype": 1, "bagtype": 1,
"index": 120102, "index": 120102,
"special_type": 0, "special_type": 0,
@ -3483,8 +3483,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10011", "img": "wp_icon_10019",
"ico": "wp_icon_10011", "ico": "wp_icon_10019",
"intr": { "intr": {
"key": "itemdesc_120102", "key": "itemdesc_120102",
"text": "打造时添加太阳石，可以选择打造的套装，添加大量太阳石可以选择打造的套装和套装部位" "text": "打造时添加太阳石，可以选择打造的套装，添加大量太阳石可以选择打造的套装和套装部位"
@ -3504,7 +3504,7 @@
"text": "熔岩石" "text": "熔岩石"
}, },
"usetype": 3, "usetype": 3,
"color": 10, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 120103, "index": 120103,
"special_type": 0, "special_type": 0,
@ -3521,8 +3521,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10012", "img": "wp_icon_10020",
"ico": "wp_icon_10012", "ico": "wp_icon_10020",
"intr": { "intr": {
"key": "itemdesc_120103", "key": "itemdesc_120103",
"text": "打造时添加熔岩石，不增加熔炉CD" "text": "打造时添加熔岩石，不增加熔炉CD"
@ -3542,7 +3542,7 @@
"text": "木炭" "text": "木炭"
}, },
"usetype": 3, "usetype": 3,
"color": 10, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 120104, "index": 120104,
"special_type": 0, "special_type": 0,
@ -3559,8 +3559,8 @@
"isani": 0, "isani": 0,
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10013", "img": "wp_icon_10021",
"ico": "wp_icon_10013", "ico": "wp_icon_10021",
"intr": { "intr": {
"key": "itemdesc_120104", "key": "itemdesc_120104",
"text": "清除熔炉的CD" "text": "清除熔炉的CD"

20
bin/json/game_mail.json
View File

@ -178,5 +178,25 @@
"text": "商会管理员" "text": "商会管理员"
}, },
"duration": 720 "duration": 720
},
{
"id": "Drivethemail",
"title": {
"key": "MailTitle_Drivethemail",
"text": "好友木桩驱赶邮件"
},
"recipient": {
"key": "MailRecipient_Drivethemail",
"text": "亲爱的玩家："
},
"content": {
"key": "MailContent_Drivethemail",
"text": "好友已将您的英雄遣送返回，特此告知"
},
"sender": {
"key": "MailSender_Drivethemail",
"text": "系统"
},
"duration": 720
} }
] ]

6
bin/json/game_msgdistrib.json
View File

@ -106,5 +106,11 @@
"open": true, "open": true,
"routrules": "~/worker", "routrules": "~/worker",
"describe": "pvp" "describe": "pvp"
},
{
"msgid": "fitness",
"open": true,
"routrules": "~/worker",
"describe": "武馆练功房"
} }
] ]

2
modules/hero/configure_comp.go
View File

@ -84,7 +84,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
return return
} }
} else { } else {
err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) err = fmt.Errorf("%T no is *cfg.GameHeroAwaken", v)
} }
}) })

8
modules/hero/model_hero.go
View File

@ -817,12 +817,14 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
return return
} }
if this.moduleHero.IsCross() { if this.moduleHero.IsCross() {
if dbModel, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { if dbModel, err1 := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err1 == nil {
this.moduleHero.Errorln(err)
} else {
if err = dbModel.GetList(uid, &heros); err != nil { if err = dbModel.GetList(uid, &heros); err != nil {
this.moduleHero.Errorf("err:%v", err) this.moduleHero.Errorf("err:%v", err)
return
} }
} else {
this.moduleHero.Errorln(err) // 获取跨服对象失败
return
} }
} else { } else {
if err = this.GetList(uid, &heros); err != nil { if err = this.GetList(uid, &heros); err != nil {