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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2022-09-21 14:44:49 +08:00
commit 439a21cca4
43 changed files with 2269 additions and 1633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
bin/json/game_drawcard.json
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",
"race": 4,
"id": "45003",
"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",
"card_pool_type": "base_pool4",
"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,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
"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": 5,
"card_pool_type": "base_pool4",
"star": 4,
"race": 4,
"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,

8
bin/json/game_global.json
View File

@ -104,12 +104,12 @@
"camp3_pool1": "camp3_pool",
"camp4_pool1": "camp4_pool",
"base_pool1": {
"s": 1,
"e": 60,
"s": 0,
"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"
},

50
bin/json/game_hero.json
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,

497
bin/json/game_heroresonance.json
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
}
]

836
bin/json/game_herostarup.json
View File

@ -2,7 +2,7 @@
{
"key": 1,
"id": "25001",
"star": 5,
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -12,25 +12,13 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 2,
"id": "25001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 3,
"id": "14003",
"star": 5,
"needhero": "",
"needherostar": 0,
@ -46,8 +34,8 @@
"gold": 10000
},
{
"key": 4,
"id": "14003",
"key": 3,
"id": "25001",
"star": 6,
"needhero": "",
"needherostar": 0,
@ -58,9 +46,9 @@
"gold": 0
},
{
"key": 5,
"id": "14007",
"star": 5,
"key": 4,
"id": "25004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -70,12 +58,327 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 5,
"id": "25004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 6,
"id": "25004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 7,
"id": "25004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 8,
"id": "44006",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 9,
"id": "44006",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 10,
"id": "44006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 11,
"id": "44006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 12,
"id": "35001",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 13,
"id": "35001",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 14,
"id": "35001",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 15,
"id": "35001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 16,
"id": "44005",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 17,
"id": "44005",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 18,
"id": "44005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 19,
"id": "44005",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 20,
"id": "15004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 21,
"id": "15004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 22,
"id": "15004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 23,
"id": "15004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 24,
"id": "14007",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 25,
"id": "14007",
"star": 6,
"needhero": "",
@ -86,300 +389,27 @@
"needracenum": 0,
"gold": 0
},
{
"key": 7,
"id": "15004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 8,
"id": "15004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 9,
"id": "15005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 10,
"id": "15005",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 11,
"id": "24002",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 12,
"id": "24002",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 13,
"id": "24003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 14,
"id": "24003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 15,
"id": "24004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 16,
"id": "24004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 17,
"id": "25004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 18,
"id": "25004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 19,
"id": "34006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 20,
"id": "34006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 21,
"id": "35001",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 22,
"id": "35001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 23,
"id": "35003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 24,
"id": "35003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 25,
"id": "44005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 26,
"id": "44005",
"star": 6,
"id": "45003",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 27,
"id": "44006",
"star": 5,
"id": "45003",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -389,24 +419,12 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 28,
"id": "44006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 29,
"id": "45003",
"star": 5,
"needhero": "",
@ -423,7 +441,7 @@
"gold": 10000
},
{
"key": 30,
"key": 29,
"id": "45003",
"star": 6,
"needhero": "",
@ -433,5 +451,177 @@
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 30,
"id": "24004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 31,
"id": "24004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 32,
"id": "24004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 33,
"id": "24004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 34,
"id": "34006",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 35,
"id": "34006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 36,
"id": "34006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 37,
"id": "24003",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 38,
"id": "24003",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 39,
"id": "24003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 40,
"id": "24003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
}
]

40
bin/json/game_initial.json
View File

@ -179,16 +179,6 @@
}
]
},
{
"index": "22",
"var": [
{
"a": "hero",
"t": "11001",
"n": 1
}
]
},
{
"index": "23",
"var": [
@ -598,5 +588,35 @@
"n": 5
}
]
},
{
"index": "68",
"var": [
{
"a": "hero",
"t": "43901",
"n": 5
}
]
},
{
"index": "69",
"var": [
{
"a": "hero",
"t": "43902",
"n": 5
}
]
},
{
"index": "70",
"var": [
{
"a": "hero",
"t": "43903",
"n": 5
}
]
}
]

364
bin/json/game_mainline.json
View File

File diff suppressed because it is too large Load Diff

14
bin/json/game_mainlinechapter.json
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": {

4
bin/json/game_model.json
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,

22
bin/json/game_rdtask.json
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
]

16
bin/json/game_rdtaskchoose.json
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
}
]

76
bin/json/game_rdtaskside.json
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
}
]

526
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

256
bin/json/game_stroy.json
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": "",

4
cmd/v2/FyneApp.toml
View File

@ -4,5 +4,5 @@ Website = "http://legu.cc"
Icon = "app.png"
Name = "RobotGUI"
ID = "cc.legu.app"
Version = "1.0.5"
Build = 5
Version = "1.0.6"
Build = 7

10
cmd/v2/main.go
View File

@ -67,13 +67,14 @@ func init() {
func main() {
// create a new ui
app := app.NewWithID("protocol-test-tool")
app.SetIcon(theme.ResourceIconPng)
app := app.NewWithID("df-toolkit")
app.SetIcon(theme.ResourceAppPng)
appUI := ui.NewUI(app, configService, connService, pttService, obs)
// logLifecycle(app)
//创建enter
w := fyne.CurrentApp().NewWindow("传送门")
w.SetIcon(theme.ResourceAppPng)
// 检查版本
if app.Metadata().Build > 1 {
checkVersion(app, w)
@ -81,12 +82,12 @@ func main() {
w.SetContent(container.NewGridWithColumns(2,
widget.NewButton("工具", func() {
toolWindow := ui.NewToolWindow(appUI)
toolWindow := ui.NewToolWindow(appUI, w)
toolWindow.CreateWindow(common.APP_NAME, 1366, 768, true)
w.Hide()
}),
widget.NewButton("登服", func() {
mainWindow := ui.NewMainWindow(appUI)
mainWindow := ui.NewMainWindow(appUI, w)
mainWindow.CreateWindow(common.APP_NAME, 1366, 768, true)
w.Hide()
})))
@ -96,6 +97,7 @@ func main() {
w.SetCloseIntercept(func() {
app.Quit()
})
logrus.WithField("version", app.Metadata().Version).Info("app starting")
w.Show()
appUI.Run()

7
cmd/v2/service/connService.go
View File

@ -26,6 +26,7 @@ type ConnService interface {
SendMsg(msg *pb.UserMessage, rsp proto.Message) (err error)
ReceiveMsg() (code pb.ErrorCode, msg *pb.UserMessage)
ListenerPush()
Close()
}
type ConnServiceImpl struct {
@ -173,3 +174,9 @@ func (c *ConnServiceImpl) handleNotify(msg *pb.UserMessage) (code pb.ErrorCode)
}
return
}
func (c *ConnServiceImpl) Close() {
if err := c.ws.Close(); err != nil {
logrus.Errorf("close ws conn err: %v", err)
}
}

8
cmd/v2/theme/icon.go
View File

File diff suppressed because one or more lines are too long

29
cmd/v2/ui/mainwindow.go
View File

@ -32,6 +32,7 @@ type MainWindow interface {
type MainWindowImpl struct {
UIImpl
WindowDefaultOptions
parent fyne.Window
w fyne.Window
tb *toolBar //工具条
toys *toys // side
@ -39,11 +40,12 @@ type MainWindowImpl struct {
at *appContainer //tabs
}
func NewMainWindow(ui *UIImpl) MainWindow {
func NewMainWindow(ui *UIImpl, parent fyne.Window) MainWindow {
gobase.NewScheduler().Start()
gobase.RegisterAtExit(gobase.GlobalScheduler.Stop)
mw := &MainWindowImpl{
UIImpl: *ui,
parent: parent,
}
globalWin = mw
@ -109,7 +111,10 @@ func (ui *MainWindowImpl) SetStatusMsg(msg string) {
}
func (ui *MainWindowImpl) quiteHandle() {
ui.parent.Show()
ui.w.Close()
ui.connService.Close()
gobase.NewScheduler().Stop()
}
// CreateWindow ....
@ -126,8 +131,20 @@ func (ui *MainWindowImpl) CreateWindow(_ string, width, height float32, _ bool)
w.Resize(fyne.NewSize(width, height))
}
w.SetMaster()
// w.SetMaster()
w.CenterOnScreen()
w.Canvas().SetOnTypedKey(func(ke *fyne.KeyEvent) {
switch ke.Name {
case fyne.KeyEscape:
{
w.Close()
ui.parent.Show()
}
}
})
w.SetCloseIntercept(func() {
ui.parent.Show()
})
_ = ui.createChooseServerPopUp(w)
}
@ -183,6 +200,10 @@ func (ui *MainWindowImpl) createChooseServerWindow(
w.SetFixedSize(true)
w.Resize(fyne.NewSize(500, 200))
w.Show()
w.SetCloseIntercept(func() {
ui.parent.Show()
w.Close()
})
w.CenterOnScreen()
return w
}
@ -316,4 +337,8 @@ func (ui *MainWindowImpl) NewWelcomeLabel(data string) {
)),
))
ui.w.SetContent(c)
ui.w.SetCloseIntercept(func() {
ui.w.Close()
ui.parent.Show()
})
}

12
cmd/v2/ui/protocol.go
View File

@ -94,6 +94,7 @@ var (
ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{},
ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): &formview.RtaskBattlestartView{},
ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{},
ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{},
// linestory
ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart): &formview.LinestoryStartView{},
ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask): &formview.LinestoryTaskView{},
@ -186,9 +187,11 @@ var (
ff(comm.ModuleRtask, rtask.RtaskSubTypeApply),
ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose),
ff(comm.ModuleRtask, rtask.RtaskSubTypeReward),
ff(comm.ModuleRtask, "rtest"),
ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart),
ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish),
ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord),
ff(comm.ModuleRtask, "rtest"),
},
"linestory": {
ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart),
@ -675,6 +678,13 @@ var (
SubType: rtask.RtaskSubTypeBattleFinish,
Enabled: true,
},
ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): {
NavLabel: "任务数据",
Desc: "任务数据",
MainType: string(comm.ModuleRtask),
SubType: rtask.RtaskSubTypeGetrecord,
Enabled: true,
},
ff(comm.ModuleRtask, "rtest"): {
NavLabel: "测试条件",
Desc: "测试任务触发",

20
cmd/v2/ui/toolwindow.go
View File

@ -16,15 +16,17 @@ type ToolWindow interface {
type ToolWindowImpl struct {
UIImpl
parent fyne.Window
w fyne.Window
tb *toolBar //工具条
sb *statusBar //状态栏
at *appContainer //tabs
}
func NewToolWindow(ui *UIImpl) ToolWindow {
func NewToolWindow(ui *UIImpl, parent fyne.Window) ToolWindow {
mw := &ToolWindowImpl{
UIImpl: *ui,
parent: parent,
}
toolWin = mw
@ -75,7 +77,21 @@ func (ui *ToolWindowImpl) CreateWindow(title string, width, height float32, _ bo
logrus.WithField("appName", appName).Error(err)
}
w.Resize(fyne.NewSize(width, height))
w.SetMaster()
// w.SetMaster()
w.Canvas().SetOnTypedKey(func(ke *fyne.KeyEvent) {
switch ke.Name {
case fyne.KeyEscape:
{
w.Close()
ui.parent.Show()
}
}
})
w.CenterOnScreen()
w.SetCloseIntercept(func() {
ui.parent.Show()
w.Close()
})
w.Show()
}

1
cmd/v2/ui/views/baselistview.go
View File

@ -93,7 +93,6 @@ func (this *ListBaseView) listBtnFun() func() {
// set data
func (this *ListBaseView) reloadListData() {
if this.itemListData != nil {
logrus.Debugf("list record:%v", len(this.itemListData.DataList))
d := this.itemListData.AsInterfaceArray()
this.dataBinding.Set(d)
}

24
cmd/v2/ui/views/rtask_record.go Normal file
View File

@ -0,0 +1,24 @@
package formview
import (
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/pb"
"fyne.io/fyne/v2"
"github.com/sirupsen/logrus"
)
type RtaskRecordView struct {
BaseformView
}
func (this *RtaskRecordView) CreateView(t *model.TestCase) fyne.CanvasObject {
this.form.OnSubmit = func() {
if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskGetrecordReq{}); err != nil {
logrus.Error(err)
}
}
return this.form
}

10
cmd/v2/ui/views/task_activelist.go
View File

@ -22,7 +22,7 @@ import (
type TaskActiveListView struct {
ListBaseView
activeVal int32
activeVal *widget.Label
}
func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject {
@ -46,7 +46,7 @@ func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject
})
//label
activeLabel := widget.NewLabel(fmt.Sprintf("当前活跃度:%d", this.activeVal))
this.activeVal = widget.NewLabel("")
//receive button
receiveBtn := widget.NewButtonWithIcon("领取", theme.ConfirmIcon(), func() {
@ -56,14 +56,14 @@ func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject
}
if err := service.GetPttService().SendToClient(
t.MainType, "activereceive",
&pb.TaskReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
&pb.TaskActiveReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
logrus.Error(err)
return
}
})
// layout
split := container.NewHSplit(this.dataListWidget, container.NewVBox(activeLabel, this.form, taskListBtn, receiveBtn))
split := container.NewHSplit(this.dataListWidget, container.NewVBox(this.activeVal, this.form, taskListBtn, receiveBtn))
split.Offset = 1
//data listener for
@ -86,7 +86,7 @@ func (this *TaskActiveListView) dataListener() {
logrus.Error("unmarshal err")
}
this.activeVal = rsp.Active
this.activeVal.SetText(fmt.Sprintf("当前活跃度:%v", rsp.Active))
this.itemListData = model.NewItemModelList()
for _, v := range rsp.List {

1
modules/hero/api.go
View File

@ -26,6 +26,7 @@ const ( //消息回复的头名称
Awaken = "awaken" // 英雄觉醒
HeroLock = "lock" // 英雄锁定
DrawCard = "drawcard" // 抽卡
DrawCardFloor = "drawcardfloor" // 抽卡保底
)
//组件初始化接口

49
modules/hero/api_drawCard.go
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,27 +61,43 @@ 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)
}
if cfgDraw.BasePoolStar4 != 0 {
sz = append(sz, cfgDraw.BasePoolStar4)
}
if cfgDraw.BasePoolStar5 != 0 {
sz = append(sz, cfgDraw.BasePoolStar5)
}
starIndex := this.module.modelHero.GetRandW(sz)
heroRecord.Star4++
heroRecord.Star5++
if starIndex == 1 {
heroRecord.Star4 = 0
star4Max++
} else if starIndex == 2 {
star5Max++
heroRecord.Star5 = 0
}
if star4Max >= cfgDraw.Draw10Star4Max || star5Max >= cfgDraw.Draw10Star5Max {
starIndex = 0
}
// 普通卡池保底
if cfgDraw.DrawFloorStar4 <= heroRecord.Star4 {
heroRecord.Star4 = 0
starIndex = 1
}
if cfgDraw.DrawFloorStar5 <= heroRecord.Star5 {
heroRecord.Star5 = 0
starIndex = 2
}
szStar = append(szStar, starIndex+3)
if len(szStar) >= int(req.DrawCount) {
break
@ -91,6 +108,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 +121,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 +139,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,28 +178,33 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
}
}
_data := this.module.configure.GetPollByType(pool)
for index, star := range szStar {
_data := this.module.configure.GetPollByType(strPool[index])
if _data == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
for _, star := range szStar { // szStar 转 szHeroId
sz := make([]int32, 0)
for _, v := range _data[int32(star)] {
sz = append(sz, v.Weight)
}
randomIndex := this.module.modelHero.GetRandW(sz)
szCards = append(szCards, _data[int32(star)][randomIndex].Id)
if v, ok := _data[int32(star)]; ok {
if int32(len(v)) > randomIndex {
szCards = append(szCards, v[randomIndex].Id)
}
// 更新record 配置信息
}
}
if req.DrawType == 0 {
update := map[string]interface{}{}
if drawCount != -1 {
drawCount += req.DrawCount
update["star4"] = heroRecord.Star4
update["star5"] = heroRecord.Star5
update["drawcount"] = drawCount
}
this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
}
// 消耗道具
code = this.module.ConsumeRes(session, costRes, true)
if code != pb.ErrorCode_Success {

23
modules/hero/api_drawCardFloor.go Normal file
View File

@ -0,0 +1,23 @@
package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"google.golang.org/protobuf/proto"
)
func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode) {
return
}
//抽卡
func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data proto.Message) {
rsp := &pb.HeroDrawCardFloorResp{}
heroRecord, _ := this.module.modelRecord.GetHeroRecord(session.GetUserId())
rsp.Star4 = heroRecord.Star4
rsp.Star5 = heroRecord.Star5
session.SendMsg(string(this.module.GetType()), DrawCardFloor, rsp)
return
}

2
modules/mail/model_mail.go
View File

@ -32,7 +32,7 @@ func (this *modelMail) Init(service core.IService, module core.IModule, comp cor
func (this *modelMail) MailQueryUserMail(uId string) (mail []*pb.DBMailData, err error) {
if _data, err := this.DB.Find(comm.TableMail, bson.M{"uid": uId}); err == nil {
if _data, err := this.DB.Find(comm.TableMail, bson.M{"uid": uId}, options.Find().SetSort(bson.M{"createtime": -1})); err == nil {
for _data.Next(context.TODO()) {
temp := &pb.DBMailData{}
if err = _data.Decode(temp); err == nil {

9
modules/mainline/api_challengeover.go
View File

@ -101,6 +101,15 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {
this.module.Debugf("DispenseRes err:+%v", res)
}
// 加经验
if req.Report != nil && len(req.Report.Info.Redflist) > 0 {
for _, v := range req.Report.Info.Redflist[0].Team {
if node.Exp > 0 {
this.module.ModuleHero.AddHeroExp(session, v.Oid, node.Exp)
}
}
}
session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline})
return
}

4
modules/pagoda/api_getReward.go
View File

@ -36,7 +36,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar
return
}
// 校验是否能领取
if _cfg.LayerNum >= season.PagodaId {
if _cfg.LayerNum > season.PagodaId {
code = pb.ErrorCode_PagodaConditionErr
return
}
@ -69,7 +69,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar
return
}
// 校验是否能领取
if _cfg.LayerNum >= list.PagodaId {
if _cfg.LayerNum > list.PagodaId {
code = pb.ErrorCode_PagodaConditionErr
return
}

1
modules/rtask/api.go
View File

@ -12,6 +12,7 @@ const (
RtaskSubTypeReward = "getreward" //奖励
RtaskSubTypeBattleStart = "battlestart" //战斗开始
RtaskSubTypeBattleFinish = "battlefinish" //战斗完成
RtaskSubTypeGetrecord = "getrecord" //任务数据
)
type apiComp struct {

25
modules/rtask/api_getrecord.go Normal file
View File

@ -0,0 +1,25 @@
package rtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"google.golang.org/protobuf/proto"
)
func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.RtaskGetrecordReq) (code pb.ErrorCode) {
return
}
func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.RtaskGetrecordReq) (code pb.ErrorCode, data proto.Message) {
rsp := &pb.RtaskGetrecordResp{}
record := this.moduleRtask.modelRtaskRecord.getRecord(session.GetUserId())
if record.Uid != "" && record.Vals != nil {
rsp.Record = record
}
if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeGetrecord, rsp); err != nil {
code = pb.ErrorCode_SystemError
}
return
}

10
modules/rtask/model_record.go
View File

@ -3,6 +3,7 @@ package rtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
@ -32,3 +33,12 @@ func (this *ModelRtaskRecord) GetVerifyData(uid string, condiId int32) (*pb.Rtas
}
return record.Vals[condiId], nil
}
// 获取玩家随机任务记录
func (this *ModelRtaskRecord) getRecord(uid string) *pb.DBRtaskRecord {
record := &pb.DBRtaskRecord{}
if err := this.Get(uid, record); err != nil {
log.Errorf("get rtask record err:%v", err)
}
return record
}

5
modules/rtask/updateHandle.go
View File

@ -71,13 +71,16 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond
// 累计更新 - 招募等
func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData, vals ...int32) (err error) {
record := &pb.DBRtaskRecord{}
record := &pb.DBRtaskRecord{Uid: uid}
err = this.Get(uid, record)
if err != nil {
if err != mongo.ErrNoDocuments {
return errors.Wrapf(err, "获取玩家任务记录 err: %v rtype[%v]", uid, cfg.Id)
}
}
if record.Vals == nil {
record.Id = primitive.NewObjectID().Hex()
data := &pb.RtaskData{
Data: toMap(vals...),
Rtype: cfg.Type,

20
modules/task/api_activereceive.go
View File

@ -63,10 +63,23 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
return
}
update := make(map[string]interface{})
if req.TaskTag == int32(comm.TASK_DAILY) {
if ue.Activeday >= conf.Active {
update := map[string]interface{}{
"received": 1, //标识已领取
update["received"] = 1
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
} else if req.TaskTag == int32(comm.TASK_WEEKLY) {
if ue.Activeweek >= conf.Active {
update["received"] = 1
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
}
if len(update) > 0 {
if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(),
ua.Id,
comm.TaskTag(req.TaskTag),
@ -75,9 +88,6 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
code = pb.ErrorCode_DBError
return
}
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
//派发奖励

11
modules/task/api_receive.go
View File

@ -59,6 +59,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
return
}
// 更新活跃度
if conf.Active > 0 {
//更新活跃度
ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId())
@ -67,7 +68,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
return
}
update := make(map[string]interface{})
if ue != nil {
if ue.Uid != "" {
if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY {
ue.Activeday = ue.Activeday + conf.Active
}
@ -75,14 +76,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
ue.Activeweek = ue.Activeweek + conf.Active
}
update = utils.StructToMap(ue)
} else {
if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY {
update["activeday"] = conf.Active
}
if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY {
update["activeweek"] = conf.Active
}
}
if len(update) > 0 {
if err = this.moduleTask.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil {
code = pb.ErrorCode_DBError

2
modules/task/config.go
View File

@ -168,7 +168,7 @@ func (this *configureComp) getTaskActiveList() (data []*cfg.GameActiveRewardData
}
//获取活跃度奖励list
func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.GameActiveRewardData, err error) {
func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.GameActiveRewardData) {
conf, err := this.getActiveRewardCfg()
if err != nil {
log.Errorf("get conf err:%v", err)

6
modules/task/model_active.go
View File

@ -22,15 +22,15 @@ func (this *ModelTaskActive) Init(service core.IService, module core.IModule, co
}
//初始化活跃度
func (this *ModelTaskActive) initActiveReward(uid string) {
data := this.moduleTask.configure.getTaskActiveList()
func (this *ModelTaskActive) initActiveReward(uid string, taskTag comm.TaskTag) {
data := this.moduleTask.configure.getTaskActiveByTag(int32(taskTag))
for _, conf := range data {
objId := primitive.NewObjectID().Hex()
ta := &pb.DBTaskActive{
Id: objId,
Uid: uid,
Tag: conf.IdTag,
Tag: int32(taskTag),
RId: conf.Key,
}
if err := this.moduleTask.modelTaskActive.AddList(uid, ta.Id, ta); err != nil {

7
modules/task/module.go
View File

@ -58,7 +58,8 @@ func (this *ModuleTask) InitTaskAll(uid string) {
this.modelTask.initTask(uid, comm.TASK_DAILY)
this.modelTask.initTask(uid, comm.TASK_WEEKLY)
this.modelTask.initTask(uid, comm.TASK_ACHIEVE)
this.modelTaskActive.initActiveReward(uid)
this.modelTaskActive.initActiveReward(uid, comm.TASK_DAILY)
this.modelTaskActive.initActiveReward(uid, comm.TASK_WEEKLY)
}
// 初始化指定的任务
@ -66,10 +67,10 @@ func (this *ModuleTask) InitTaskByTag(uid string, taskTag comm.TaskTag) {
switch taskTag {
case comm.TASK_DAILY:
this.modelTask.initTask(uid, comm.TASK_DAILY)
this.modelTaskActive.initActiveReward(uid)
this.modelTaskActive.initActiveReward(uid, comm.TASK_DAILY)
case comm.TASK_WEEKLY:
this.modelTask.initTask(uid, comm.TASK_WEEKLY)
this.modelTaskActive.initActiveReward(uid)
this.modelTaskActive.initActiveReward(uid, comm.TASK_WEEKLY)
case comm.TASK_ACHIEVE:
this.modelTask.initTask(uid, comm.TASK_ACHIEVE)
}

170
pb/hero_msg.pb.go
View File

@ -1592,6 +1592,100 @@ func (x *HeroChangePush) GetList() []*DBHero {
return nil
}
type HeroDrawCardFloorReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *HeroDrawCardFloorReq) Reset() {
*x = HeroDrawCardFloorReq{}
if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[30]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *HeroDrawCardFloorReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*HeroDrawCardFloorReq) ProtoMessage() {}
func (x *HeroDrawCardFloorReq) ProtoReflect() protoreflect.Message {
mi := &file_hero_hero_msg_proto_msgTypes[30]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use HeroDrawCardFloorReq.ProtoReflect.Descriptor instead.
func (*HeroDrawCardFloorReq) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{30}
}
// 获取抽卡保底次数
type HeroDrawCardFloorResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"`
Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"`
}
func (x *HeroDrawCardFloorResp) Reset() {
*x = HeroDrawCardFloorResp{}
if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[31]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *HeroDrawCardFloorResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*HeroDrawCardFloorResp) ProtoMessage() {}
func (x *HeroDrawCardFloorResp) ProtoReflect() protoreflect.Message {
mi := &file_hero_hero_msg_proto_msgTypes[31]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use HeroDrawCardFloorResp.ProtoReflect.Descriptor instead.
func (*HeroDrawCardFloorResp) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{31}
}
func (x *HeroDrawCardFloorResp) GetStar4() int32 {
if x != nil {
return x.Star4
}
return 0
}
func (x *HeroDrawCardFloorResp) GetStar5() int32 {
if x != nil {
return x.Star5
}
return 0
}
var File_hero_hero_msg_proto protoreflect.FileDescriptor
var file_hero_hero_msg_proto_rawDesc = []byte{
@ -1735,8 +1829,14 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48,
0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a,
0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x48, 0x65,
0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52,
0x65, 0x71, 0x22, 0x43, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61,
0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73,
0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72,
0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1751,7 +1851,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
return file_hero_hero_msg_proto_rawDescData
}
var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 32)
var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroInfoReq)(nil), // 0: HeroInfoReq
(*HeroInfoResp)(nil), // 1: HeroInfoResp
@ -1783,30 +1883,32 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroDrawCardReq)(nil), // 27: HeroDrawCardReq
(*HeroDrawCardResp)(nil), // 28: HeroDrawCardResp
(*HeroChangePush)(nil), // 29: HeroChangePush
nil, // 30: HeroPropertyPush.PropertyEntry
nil, // 31: HeroPropertyPush.AddPropertyEntry
(*DBHero)(nil), // 32: DBHero
(*HeroDrawCardFloorReq)(nil), // 30: HeroDrawCardFloorReq
(*HeroDrawCardFloorResp)(nil), // 31: HeroDrawCardFloorResp
nil, // 32: HeroPropertyPush.PropertyEntry
nil, // 33: HeroPropertyPush.AddPropertyEntry
(*DBHero)(nil), // 34: DBHero
}
var file_hero_hero_msg_proto_depIdxs = []int32{
32, // 0: HeroInfoResp.base:type_name -> DBHero
32, // 1: HeroListResp.list:type_name -> DBHero
34, // 0: HeroInfoResp.base:type_name -> DBHero
34, // 1: HeroListResp.list:type_name -> DBHero
5, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32
32, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
34, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
8, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
8, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
32, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
32, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
32, // 8: HeroResonanceResp.hero:type_name -> DBHero
32, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
32, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
34, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
34, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
34, // 8: HeroResonanceResp.hero:type_name -> DBHero
34, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
34, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData
32, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
32, // 13: HeroAwakenResp.hero:type_name -> DBHero
30, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
31, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
32, // 16: HeroLockResp.hero:type_name -> DBHero
32, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
32, // 18: HeroChangePush.list:type_name -> DBHero
34, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
34, // 13: HeroAwakenResp.hero:type_name -> DBHero
32, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
33, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
34, // 16: HeroLockResp.hero:type_name -> DBHero
34, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
34, // 18: HeroChangePush.list:type_name -> DBHero
19, // [19:19] is the sub-list for method output_type
19, // [19:19] is the sub-list for method input_type
19, // [19:19] is the sub-list for extension type_name
@ -2181,6 +2283,30 @@ func file_hero_hero_msg_proto_init() {
return nil
}
}
file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*HeroDrawCardFloorReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*HeroDrawCardFloorResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -2188,7 +2314,7 @@ func file_hero_hero_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 32,
NumMessages: 34,
NumExtensions: 0,
NumServices: 0,
},

296
pb/rtask_msg.pb.go
View File

@ -726,6 +726,92 @@ func (x *RtaskBattleFinishResp) GetIsWin() bool {
return false
}
//获取玩家任务记录
type RtaskGetrecordReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *RtaskGetrecordReq) Reset() {
*x = RtaskGetrecordReq{}
if protoimpl.UnsafeEnabled {
mi := &file_rtask_rtask_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *RtaskGetrecordReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*RtaskGetrecordReq) ProtoMessage() {}
func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message {
mi := &file_rtask_rtask_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use RtaskGetrecordReq.ProtoReflect.Descriptor instead.
func (*RtaskGetrecordReq) Descriptor() ([]byte, []int) {
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13}
}
type RtaskGetrecordResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Record *DBRtaskRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"`
}
func (x *RtaskGetrecordResp) Reset() {
*x = RtaskGetrecordResp{}
if protoimpl.UnsafeEnabled {
mi := &file_rtask_rtask_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *RtaskGetrecordResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*RtaskGetrecordResp) ProtoMessage() {}
func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message {
mi := &file_rtask_rtask_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use RtaskGetrecordResp.ProtoReflect.Descriptor instead.
func (*RtaskGetrecordResp) Descriptor() ([]byte, []int) {
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14}
}
func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord {
if x != nil {
return x.Record
}
return nil
}
// 测试使用
type RtaskTestReq struct {
state protoimpl.MessageState
@ -740,7 +826,7 @@ type RtaskTestReq struct {
func (x *RtaskTestReq) Reset() {
*x = RtaskTestReq{}
if protoimpl.UnsafeEnabled {
mi := &file_rtask_rtask_msg_proto_msgTypes[13]
mi := &file_rtask_rtask_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -753,7 +839,7 @@ func (x *RtaskTestReq) String() string {
func (*RtaskTestReq) ProtoMessage() {}
func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
mi := &file_rtask_rtask_msg_proto_msgTypes[13]
mi := &file_rtask_rtask_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -766,7 +852,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead.
func (*RtaskTestReq) Descriptor() ([]byte, []int) {
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13}
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{15}
}
func (x *RtaskTestReq) GetRtaskType() int32 {
@ -801,7 +887,7 @@ type RtaskTestResp struct {
func (x *RtaskTestResp) Reset() {
*x = RtaskTestResp{}
if protoimpl.UnsafeEnabled {
mi := &file_rtask_rtask_msg_proto_msgTypes[14]
mi := &file_rtask_rtask_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -814,7 +900,7 @@ func (x *RtaskTestResp) String() string {
func (*RtaskTestResp) ProtoMessage() {}
func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
mi := &file_rtask_rtask_msg_proto_msgTypes[14]
mi := &file_rtask_rtask_msg_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -827,7 +913,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead.
func (*RtaskTestResp) Descriptor() ([]byte, []int) {
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14}
return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{16}
}
func (x *RtaskTestResp) GetFlag() bool {
@ -843,75 +929,82 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{
0x0a, 0x15, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x73,
0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65,
0x1a, 0x14, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41,
0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49,
0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52,
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28, 0x0a,
0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a,
0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b,
0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x49, 0x64, 0x73, 0x22, 0x66, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f,
0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x0f,
0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f,
0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f,
0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75,
0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b,
0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69,
0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65,
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49,
0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77,
0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49,
0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c,
0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64,
0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73,
0x22, 0x37, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x57, 0x0a, 0x14, 0x52, 0x74, 0x61,
0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52,
0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a,
0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b,
0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01,
0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x66,
0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71,
0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68,
0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68,
0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53,
0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43,
0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61,
0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12,
0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22,
0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11,
0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52,
0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52,
0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f,
0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74,
0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
0x6e, 0x66, 0x6f, 0x22, 0x57, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72,
0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
0x72, 0x74, 0x22, 0x47, 0x0a, 0x15, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72,
0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x47, 0x0a, 0x15,
0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x69, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x69, 0x73, 0x57, 0x69, 0x6e, 0x22, 0x5e, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65,
0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79,
0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54,
0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20,
0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63,
0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f,
0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65,
0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01,
0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x02,
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x57, 0x69, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x52,
0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b,
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x5e,
0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c,
0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61,
0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18,
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23,
0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66,
0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -926,7 +1019,7 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte {
return file_rtask_rtask_msg_proto_rawDescData
}
var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_rtask_rtask_msg_proto_goTypes = []interface{}{
(*RtaskApplyReq)(nil), // 0: RtaskApplyReq
(*RtaskApplyResp)(nil), // 1: RtaskApplyResp
@ -941,19 +1034,23 @@ var file_rtask_rtask_msg_proto_goTypes = []interface{}{
(*RtaskBattleStartResp)(nil), // 10: RtaskBattleStartResp
(*RtaskBattleFinishReq)(nil), // 11: RtaskBattleFinishReq
(*RtaskBattleFinishResp)(nil), // 12: RtaskBattleFinishResp
(*RtaskTestReq)(nil), // 13: RtaskTestReq
(*RtaskTestResp)(nil), // 14: RtaskTestResp
(*BattleInfo)(nil), // 15: BattleInfo
(*BattleReport)(nil), // 16: BattleReport
(*RtaskGetrecordReq)(nil), // 13: RtaskGetrecordReq
(*RtaskGetrecordResp)(nil), // 14: RtaskGetrecordResp
(*RtaskTestReq)(nil), // 15: RtaskTestReq
(*RtaskTestResp)(nil), // 16: RtaskTestResp
(*BattleInfo)(nil), // 17: BattleInfo
(*BattleReport)(nil), // 18: BattleReport
(*DBRtaskRecord)(nil), // 19: DBRtaskRecord
}
var file_rtask_rtask_msg_proto_depIdxs = []int32{
15, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
16, // 1: RtaskBattleFinishReq.report:type_name -> BattleReport
2, // [2:2] is the sub-list for method output_type
2, // [2:2] is the sub-list for method input_type
2, // [2:2] is the sub-list for extension type_name
2, // [2:2] is the sub-list for extension extendee
0, // [0:2] is the sub-list for field type_name
17, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
18, // 1: RtaskBattleFinishReq.report:type_name -> BattleReport
19, // 2: RtaskGetrecordResp.record:type_name -> DBRtaskRecord
3, // [3:3] is the sub-list for method output_type
3, // [3:3] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
3, // [3:3] is the sub-list for extension extendee
0, // [0:3] is the sub-list for field type_name
}
func init() { file_rtask_rtask_msg_proto_init() }
@ -962,6 +1059,7 @@ func file_rtask_rtask_msg_proto_init() {
return
}
file_battle_battle_msg_proto_init()
file_rtask_rtask_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_rtask_rtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskApplyReq); i {
@ -1120,7 +1218,7 @@ func file_rtask_rtask_msg_proto_init() {
}
}
file_rtask_rtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskTestReq); i {
switch v := v.(*RtaskGetrecordReq); i {
case 0:
return &v.state
case 1:
@ -1132,6 +1230,30 @@ func file_rtask_rtask_msg_proto_init() {
}
}
file_rtask_rtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskGetrecordResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_rtask_rtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskTestReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_rtask_rtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskTestResp); i {
case 0:
return &v.state
@ -1150,7 +1272,7 @@ func file_rtask_rtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_rtask_rtask_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 15,
NumMessages: 17,
NumExtensions: 0,
NumServices: 0,
},

2
sys/configure/structs/Game.MainlineData.go
View File

@ -24,6 +24,7 @@ type GameMainlineData struct {
CaptainId string
Battlescene string
Award []*Gameatn
Exp int32
Title string
Desc string
Stroyid []int32
@ -81,6 +82,7 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{

15
sys/configure/structs/game.heroResonanceData.go
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
}