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

枚举定义抽卡类型

Browse Source
This commit is contained in:
meixiongfeng 2023-06-26 20:40:20 +08:00
parent 239c1756ff
commit b66472dc64
21 changed files with 2514 additions and 4601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
bin/json/game_arenarankreward.json
View File

@ -2,16 +2,16 @@
{ {
"id": 1, "id": 1,
"rank_low": 1, "rank_low": 1,
"rank_up": 3, "rank_up": 1,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_1", "key": "arena_rank_reward_rank_display_1",
"text": "1-2名" "text": "1-1名"
}, },
"rank_reward": [ "rank_reward": [
{ {
"a": "attr", "a": "attr",
"t": "arenacoin", "t": "arenacoin",
"n": 800 "n": 1000
}, },
{ {
"a": "attr", "a": "attr",
@ -22,11 +22,53 @@
}, },
{ {
"id": 2, "id": 2,
"rank_low": 2,
"rank_up": 2,
"rank_display": {
"key": "arena_rank_reward_rank_display_2",
"text": "2-2名"
},
"rank_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 900
},
{
"a": "attr",
"t": "diamond",
"n": 550
}
]
},
{
"id": 3,
"rank_low": 3,
"rank_up": 3,
"rank_display": {
"key": "arena_rank_reward_rank_display_3",
"text": "3-3名"
},
"rank_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 800
},
{
"a": "attr",
"t": "diamond",
"n": 500
}
]
},
{
"id": 4,
"rank_low": 4, "rank_low": 4,
"rank_up": 10, "rank_up": 10,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_2", "key": "arena_rank_reward_rank_display_4",
"text": "4-9名" "text": "4-10名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -37,17 +79,17 @@
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 500 "n": 450
} }
] ]
}, },
{ {
"id": 3, "id": 5,
"rank_low": 11, "rank_low": 11,
"rank_up": 20, "rank_up": 20,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_3", "key": "arena_rank_reward_rank_display_5",
"text": "11-19名" "text": "11-20名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -63,12 +105,12 @@
] ]
}, },
{ {
"id": 4, "id": 6,
"rank_low": 21, "rank_low": 21,
"rank_up": 50, "rank_up": 50,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_4", "key": "arena_rank_reward_rank_display_6",
"text": "21-49名" "text": "21-50名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -84,12 +126,12 @@
] ]
}, },
{ {
"id": 5, "id": 7,
"rank_low": 51, "rank_low": 51,
"rank_up": 100, "rank_up": 100,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_5", "key": "arena_rank_reward_rank_display_7",
"text": "51-99名" "text": "51-100名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -105,12 +147,12 @@
] ]
}, },
{ {
"id": 6, "id": 8,
"rank_low": 101, "rank_low": 101,
"rank_up": 200, "rank_up": 200,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_6", "key": "arena_rank_reward_rank_display_8",
"text": "101-199名" "text": "101-200名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -126,12 +168,12 @@
] ]
}, },
{ {
"id": 7, "id": 9,
"rank_low": 201, "rank_low": 201,
"rank_up": 500, "rank_up": 500,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_7", "key": "arena_rank_reward_rank_display_9",
"text": "201-499名" "text": "201-500名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -147,12 +189,12 @@
] ]
}, },
{ {
"id": 8, "id": 10,
"rank_low": 501, "rank_low": 501,
"rank_up": 1000, "rank_up": 1000,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_8", "key": "arena_rank_reward_rank_display_10",
"text": "501-999名" "text": "501-1000名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -168,12 +210,12 @@
] ]
}, },
{ {
"id": 9, "id": 11,
"rank_low": 1001, "rank_low": 1001,
"rank_up": 2000, "rank_up": 2000,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_9", "key": "arena_rank_reward_rank_display_11",
"text": "1001-1999名" "text": "1001-2000名"
}, },
"rank_reward": [ "rank_reward": [
{ {
@ -189,12 +231,12 @@
] ]
}, },
{ {
"id": 10, "id": 12,
"rank_low": 2001, "rank_low": 2001,
"rank_up": 9999, "rank_up": 9999,
"rank_display": { "rank_display": {
"key": "arena_rank_reward_rank_display_10", "key": "arena_rank_reward_rank_display_12",
"text": "2001-9998名" "text": "2001-9999名"
}, },
"rank_reward": [ "rank_reward": [
{ {

4
bin/json/game_buriedcondi.json
View File

@ -16996,7 +16996,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_727", "key": "buried_buried_condi_tasktxt_727",
"text": "完成一次单抽" "text": "完成一次守护者招募"
}, },
"type": 14, "type": 14,
"valid": 0, "valid": 0,
@ -17351,7 +17351,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_742", "key": "buried_buried_condi_tasktxt_742",
"text": "完成十连抽" "text": "完成10连守护者招募"
}, },
"type": 14, "type": 14,
"valid": 0, "valid": 0,

1266
bin/json/game_cardpool.json
View File

File diff suppressed because it is too large Load Diff

252
bin/json/game_drawpool.json
View File

@ -1,32 +1,19 @@
[ [
{ {
"key": 1, "key": 1,
"recruitment_type": [ "recruitment_type": [],
{ "star3w": 940,
"k": 3, "star4w": 52,
"s": "base_pool1" "star5w": 8,
}, "protect": 100,
{ "p3pool": "pro_pool20003",
"k": 6, "p4pool": "pro_pool20004",
"s": "base_pool1" "p5pool": "pro_pool20005",
}, "n3pool": "base_pool20003",
{ "n4pool": "base_pool20004",
"k": 9, "n5pool": "base_pool20005",
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 0,
"p3pool": "base_pool5",
"p4pool": "base_pool6",
"p5pool": "base_pool7",
"n3pool": "base_pool5",
"n4pool": "base_pool6",
"n5pool": "base_pool7",
"baodi4": 10, "baodi4": 10,
"baidi5": 90, "baidi5": 100,
"etime": -1, "etime": -1,
"permission": 1, "permission": 1,
"consumeA": [ "consumeA": [
@ -38,9 +25,9 @@
], ],
"consumeB": [ "consumeB": [
{ {
"a": "item", "a": "attr",
"t": "10000001", "t": "diamond",
"n": 10 "n": 200
} }
] ]
}, },
@ -48,179 +35,168 @@
"key": 2, "key": 2,
"recruitment_type": [ "recruitment_type": [
{ {
"k": 3, "k": 1,
"s": "base_pool1" "s": "inevitable_20001"
}, },
{ {
"k": 6, "k": 10,
"s": "base_pool1" "s": "inevitable_20010"
},
{
"k": 9,
"s": "base_pool1"
} }
], ],
"star3w": 900, "star3w": 940,
"star4w": 94, "star4w": 52,
"star5w": 6, "star5w": 8,
"protect": 50, "protect": 100,
"p3pool": "base_pool6", "p3pool": "pro_pool20003",
"p4pool": "base_pool7", "p4pool": "pro_pool20004",
"p5pool": "base_pool8", "p5pool": "pro_pool20005",
"n3pool": "base_pool6", "n3pool": "base_pool20003",
"n4pool": "base_pool7", "n4pool": "base_pool20004",
"n5pool": "base_pool8", "n5pool": "base_pool20005",
"baodi4": 10, "baodi4": 10,
"baidi5": 0, "baidi5": 100,
"etime": -1, "etime": -1,
"permission": 1, "permission": 1,
"consumeA": [ "consumeA": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000001",
"n": 2 "n": 1
} }
], ],
"consumeB": [ "consumeB": [
{ {
"a": "item", "a": "attr",
"t": "10000001", "t": "diamond",
"n": 11 "n": 200
} }
] ]
}, },
{ {
"key": 3, "key": 3,
"recruitment_type": [ "recruitment_type": [],
{ "star3w": 940,
"k": 3, "star4w": 52,
"s": "base_pool1" "star5w": 8,
}, "protect": 100,
{ "p3pool": "pro_pool30003",
"k": 6, "p4pool": "pro_pool30004",
"s": "base_pool1" "p5pool": "pro_pool30005",
}, "n3pool": "base_pool30003",
{ "n4pool": "base_pool30004",
"k": 9, "n5pool": "base_pool30005",
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool7",
"n4pool": "base_pool8",
"n5pool": "base_pool9",
"baodi4": 10, "baodi4": 10,
"baidi5": 0, "baidi5": 100,
"etime": -1, "etime": -1,
"permission": 1, "permission": 1,
"consumeA": [ "consumeA": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000021",
"n": 3 "n": 1
} }
], ],
"consumeB": [ "consumeB": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000031",
"n": 12 "n": 10
} }
] ]
}, },
{ {
"key": 4, "key": 4,
"recruitment_type": [ "recruitment_type": [],
{ "star3w": 940,
"k": 3, "star4w": 52,
"s": "base_pool1" "star5w": 8,
}, "protect": 100,
{ "p3pool": "pro_pool40003",
"k": 6, "p4pool": "pro_pool40004",
"s": "base_pool1" "p5pool": "pro_pool40005",
}, "n3pool": "base_pool40003",
{ "n4pool": "base_pool40004",
"k": 9, "n5pool": "base_pool40005",
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool8",
"p4pool": "base_pool9",
"p5pool": "base_pool10",
"n3pool": "base_pool8",
"n4pool": "base_pool9",
"n5pool": "base_pool10",
"baodi4": 10, "baodi4": 10,
"baidi5": 0, "baidi5": 100,
"etime": -1, "etime": -1,
"permission": 1, "permission": 1,
"consumeA": [ "consumeA": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000022",
"n": 4 "n": 1
} }
], ],
"consumeB": [ "consumeB": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000032",
"n": 13 "n": 10
} }
] ]
}, },
{ {
"key": 5, "key": 5,
"recruitment_type": [ "recruitment_type": [],
{ "star3w": 940,
"k": 3, "star4w": 52,
"s": "base_pool1" "star5w": 8,
}, "protect": 100,
{ "p3pool": "pro_pool50003",
"k": 6, "p4pool": "pro_pool50004",
"s": "base_pool1" "p5pool": "pro_pool50005",
}, "n3pool": "base_pool50003",
{ "n4pool": "base_pool50004",
"k": 9, "n5pool": "base_pool50005",
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool9",
"p4pool": "base_pool10",
"p5pool": "base_pool11",
"n3pool": "base_pool9",
"n4pool": "base_pool10",
"n5pool": "base_pool11",
"baodi4": 10, "baodi4": 10,
"baidi5": 0, "baidi5": 100,
"etime": -1, "etime": -1,
"permission": 1, "permission": 1,
"consumeA": [ "consumeA": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000023",
"n": 5 "n": 1
} }
], ],
"consumeB": [ "consumeB": [
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000033",
"n": 14 "n": 10
}
]
},
{
"key": 6,
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool60003",
"p4pool": "pro_pool60004",
"p5pool": "pro_pool60005",
"n3pool": "base_pool60003",
"n4pool": "base_pool60004",
"n5pool": "base_pool60005",
"baodi4": 10,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000024",
"n": 1
}
],
"consumeB": [
{
"a": "item",
"t": "10000034",
"n": 10
} }
] ]
} }

120
bin/json/game_drawweight.json
View File

@ -363,180 +363,240 @@
"id": 61, "id": 61,
"dtype": 1, "dtype": 1,
"key": 61, "key": 61,
"weight": 10 "weight": 0
}, },
{ {
"id": 62, "id": 62,
"dtype": 1, "dtype": 1,
"key": 62, "key": 62,
"weight": 20 "weight": 0
}, },
{ {
"id": 63, "id": 63,
"dtype": 1, "dtype": 1,
"key": 63, "key": 63,
"weight": 30 "weight": 0
}, },
{ {
"id": 64, "id": 64,
"dtype": 1, "dtype": 1,
"key": 64, "key": 64,
"weight": 40 "weight": 0
}, },
{ {
"id": 65, "id": 65,
"dtype": 1, "dtype": 1,
"key": 65, "key": 65,
"weight": 50 "weight": 0
}, },
{ {
"id": 66, "id": 66,
"dtype": 1, "dtype": 1,
"key": 66, "key": 66,
"weight": 60 "weight": 0
}, },
{ {
"id": 67, "id": 67,
"dtype": 1, "dtype": 1,
"key": 67, "key": 67,
"weight": 70 "weight": 0
}, },
{ {
"id": 68, "id": 68,
"dtype": 1, "dtype": 1,
"key": 68, "key": 68,
"weight": 80 "weight": 0
}, },
{ {
"id": 69, "id": 69,
"dtype": 1, "dtype": 1,
"key": 69, "key": 69,
"weight": 90 "weight": 0
}, },
{ {
"id": 70, "id": 70,
"dtype": 1, "dtype": 1,
"key": 70, "key": 70,
"weight": 100 "weight": 0
}, },
{ {
"id": 71, "id": 71,
"dtype": 1, "dtype": 1,
"key": 71, "key": 71,
"weight": 110 "weight": 0
}, },
{ {
"id": 72, "id": 72,
"dtype": 1, "dtype": 1,
"key": 72, "key": 72,
"weight": 120 "weight": 0
}, },
{ {
"id": 73, "id": 73,
"dtype": 1, "dtype": 1,
"key": 73, "key": 73,
"weight": 130 "weight": 0
}, },
{ {
"id": 74, "id": 74,
"dtype": 1, "dtype": 1,
"key": 74, "key": 74,
"weight": 140 "weight": 0
}, },
{ {
"id": 75, "id": 75,
"dtype": 1, "dtype": 1,
"key": 75, "key": 75,
"weight": 150 "weight": 0
}, },
{ {
"id": 76, "id": 76,
"dtype": 1, "dtype": 1,
"key": 76, "key": 76,
"weight": 160 "weight": 0
}, },
{ {
"id": 77, "id": 77,
"dtype": 1, "dtype": 1,
"key": 77, "key": 77,
"weight": 170 "weight": 0
}, },
{ {
"id": 78, "id": 78,
"dtype": 1, "dtype": 1,
"key": 78, "key": 78,
"weight": 180 "weight": 0
}, },
{ {
"id": 79, "id": 79,
"dtype": 1, "dtype": 1,
"key": 79, "key": 79,
"weight": 190 "weight": 0
}, },
{ {
"id": 80, "id": 80,
"dtype": 1, "dtype": 1,
"key": 80, "key": 80,
"weight": 200 "weight": 0
}, },
{ {
"id": 81, "id": 81,
"dtype": 1, "dtype": 1,
"key": 81, "key": 81,
"weight": 210 "weight": 2
}, },
{ {
"id": 82, "id": 82,
"dtype": 1, "dtype": 1,
"key": 82, "key": 82,
"weight": 220 "weight": 12
}, },
{ {
"id": 83, "id": 83,
"dtype": 1, "dtype": 1,
"key": 83, "key": 83,
"weight": 230 "weight": 23
}, },
{ {
"id": 84, "id": 84,
"dtype": 1, "dtype": 1,
"key": 84, "key": 84,
"weight": 240 "weight": 55
}, },
{ {
"id": 85, "id": 85,
"dtype": 1, "dtype": 1,
"key": 85, "key": 85,
"weight": 250 "weight": 127
}, },
{ {
"id": 86, "id": 86,
"dtype": 1, "dtype": 1,
"key": 86, "key": 86,
"weight": 260 "weight": 208
}, },
{ {
"id": 87, "id": 87,
"dtype": 1, "dtype": 1,
"key": 87, "key": 87,
"weight": 270 "weight": 303
}, },
{ {
"id": 88, "id": 88,
"dtype": 1, "dtype": 1,
"key": 88, "key": 88,
"weight": 280 "weight": 414
}, },
{ {
"id": 89, "id": 89,
"dtype": 1, "dtype": 1,
"key": 89, "key": 89,
"weight": 290 "weight": 546
}, },
{ {
"id": 90, "id": 90,
"dtype": 1, "dtype": 1,
"key": 90, "key": 90,
"weight": 300 "weight": 705
},
{
"id": 91,
"dtype": 1,
"key": 91,
"weight": 901
},
{
"id": 92,
"dtype": 1,
"key": 92,
"weight": 1148
},
{
"id": 93,
"dtype": 1,
"key": 93,
"weight": 1468
},
{
"id": 94,
"dtype": 1,
"key": 94,
"weight": 1903
},
{
"id": 95,
"dtype": 1,
"key": 95,
"weight": 2523
},
{
"id": 96,
"dtype": 1,
"key": 96,
"weight": 3481
},
{
"id": 97,
"dtype": 1,
"key": 97,
"weight": 5158
},
{
"id": 98,
"dtype": 1,
"key": 98,
"weight": 8848
},
{
"id": 99,
"dtype": 1,
"key": 99,
"weight": 23608
},
{
"id": 100,
"dtype": 1,
"key": 100,
"weight": 999999
} }
] ]

108
bin/json/game_global.json
View File

@ -46,7 +46,104 @@
"draw_toplimit": 9999, "draw_toplimit": 9999,
"draw10_star4_max": 8, "draw10_star4_max": 8,
"draw10_star5_max": 2, "draw10_star5_max": 2,
"draw_floor_star4": 20,
"draw_floor_star5": 100,
"duplicate_removal": 1, "duplicate_removal": 1,
"base_pool_cost": {
"a": "item",
"t": "10000001",
"n": 1
},
"camp1_pool_cost": {
"a": "item",
"t": "10000001",
"n": 1
},
"camp2_pool_cost": {
"a": "item",
"t": "10000001",
"n": 1
},
"camp3_pool_cost": {
"a": "item",
"t": "10000001",
"n": 1
},
"camp4_pool_cost": {
"a": "item",
"t": "10000001",
"n": 1
},
"base_pool_10cost": {
"a": "item",
"t": "10000001",
"n": 10
},
"camp1_pool_10cost": {
"a": "item",
"t": "10000001",
"n": 10
},
"camp2_pool_10cost": {
"a": "item",
"t": "10000001",
"n": 10
},
"camp3_pool_10cost": {
"a": "item",
"t": "10000001",
"n": 10
},
"camp4_pool_10cost": {
"a": "item",
"t": "10000001",
"n": 10
},
"camp1_pool1": "camp1_pool",
"camp2_pool1": "camp2_pool",
"camp3_pool1": "camp3_pool",
"camp4_pool1": "camp4_pool",
"base_pool1": {
"s": 1,
"e": 1,
"p": "base_pool1"
},
"base_pool2": {
"s": 2,
"e": 2,
"p": "base_pool2"
},
"base_pool3": {
"s": 3,
"e": 3,
"p": "base_pool3"
},
"base_pool4": {
"s": 4,
"e": 4,
"p": "base_pool4"
},
"base_pool5": {
"s": 5,
"e": 5,
"p": "base_pool5"
},
"base_pool6": {
"s": 6,
"e": 6,
"p": "base_pool6"
},
"base_pool7": {
"s": 7,
"e": 999999999,
"p": "base_pool7"
},
"base_pool_star3": 333,
"base_pool_star4": 333,
"base_pool_star5": 334,
"camp_pool_star3": 9500,
"camp_pool_star4": 900,
"camp_pool_star5": 100,
"gourmet": 36000, "gourmet": 36000,
"smithy_maxplayer": 20, "smithy_maxplayer": 20,
"smithy_maxtime": 36000, "smithy_maxtime": 36000,
@ -293,6 +390,17 @@
7, 7,
10 10
], ],
"DrawCard_5StarsInRange": [
1,
29,
5
],
"DrawCard_5StarsInRange1": [
30,
49,
5
],
"DrawCard_5StarsInRange1_pool": "base_pool7",
"DrawCard_ContinuousRestriction_Star5": 20, "DrawCard_ContinuousRestriction_Star5": 20,
"DrawCard_ContinuousRestriction_Camp": 2, "DrawCard_ContinuousRestriction_Camp": 2,
"EquipmentConsumption": [ "EquipmentConsumption": [

834
bin/json/game_heromethod.json
View File

File diff suppressed because it is too large Load Diff

2494
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

1750
bin/json/game_initial.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_item.json
View File

@ -77,7 +77,7 @@
"key": "item_item_name_3", "key": "item_item_name_3",
"text": "体力药剂" "text": "体力药剂"
}, },
"usetype": 3, "usetype": 6,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 7, "index": 7,

2
bin/json/game_opencond.json
View File

@ -31,7 +31,7 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 1 "param": 10
} }
], ],
"wkqbx": 1, "wkqbx": 1,

32
bin/json/game_pandamastjjl.json
View File

@ -5,7 +5,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -16,7 +16,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -27,7 +27,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -38,7 +38,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -49,7 +49,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -60,7 +60,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -71,7 +71,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -82,7 +82,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -93,7 +93,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -104,7 +104,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -115,7 +115,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -126,7 +126,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -137,7 +137,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -148,7 +148,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -159,7 +159,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]
@ -170,7 +170,7 @@
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "18000008", "t": "10000001",
"n": 1 "n": 1
} }
] ]

17
bin/json/game_photofilter.json
View File

@ -9,7 +9,7 @@
"img": "lj_img_tp" "img": "lj_img_tp"
}, },
{ {
"id": 3, "id": 2,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_3", "key": "photoshop_filter_filtername_3",
"text": "功夫早晨" "text": "功夫早晨"
@ -18,7 +18,7 @@
"img": "lj_img_04" "img": "lj_img_04"
}, },
{ {
"id": 4, "id": 3,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_4", "key": "photoshop_filter_filtername_4",
"text": "史莱克回忆" "text": "史莱克回忆"
@ -27,7 +27,7 @@
"img": "lj_img_02" "img": "lj_img_02"
}, },
{ {
"id": 5, "id": 4,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_5", "key": "photoshop_filter_filtername_5",
"text": "波比暖阳" "text": "波比暖阳"
@ -36,21 +36,12 @@
"img": "lj_img_03" "img": "lj_img_03"
}, },
{ {
"id": 6, "id": 5,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_6", "key": "photoshop_filter_filtername_6",
"text": "梦魇降临" "text": "梦魇降临"
}, },
"filter": "效果6", "filter": "效果6",
"img": "lj_img_01" "img": "lj_img_01"
},
{
"id": 7,
"filtername": {
"key": "photoshop_filter_filtername_7",
"text": "佛罗伦萨"
},
"filter": "效果7",
"img": "lj_img_tp"
} }
] ]

16
bin/json/game_signextra.json
View File

@ -19,7 +19,7 @@
"id": 2, "id": 2,
"txt": { "txt": {
"key": "sign_sign_extra_txt_2", "key": "sign_sign_extra_txt_2",
"text": "累计完成拼图{1}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 14, "day": 14,
"groups": 1, "groups": 1,
@ -35,7 +35,7 @@
"id": 3, "id": 3,
"txt": { "txt": {
"key": "sign_sign_extra_txt_3", "key": "sign_sign_extra_txt_3",
"text": "累计完成拼图{2}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 21, "day": 21,
"groups": 1, "groups": 1,
@ -51,7 +51,7 @@
"id": 4, "id": 4,
"txt": { "txt": {
"key": "sign_sign_extra_txt_4", "key": "sign_sign_extra_txt_4",
"text": "累计完成拼图{3}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 7, "day": 7,
"groups": 2, "groups": 2,
@ -67,7 +67,7 @@
"id": 5, "id": 5,
"txt": { "txt": {
"key": "sign_sign_extra_txt_5", "key": "sign_sign_extra_txt_5",
"text": "累计完成拼图{4}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 14, "day": 14,
"groups": 2, "groups": 2,
@ -83,7 +83,7 @@
"id": 6, "id": 6,
"txt": { "txt": {
"key": "sign_sign_extra_txt_6", "key": "sign_sign_extra_txt_6",
"text": "累计完成拼图{5}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 21, "day": 21,
"groups": 2, "groups": 2,
@ -99,7 +99,7 @@
"id": 7, "id": 7,
"txt": { "txt": {
"key": "sign_sign_extra_txt_7", "key": "sign_sign_extra_txt_7",
"text": "累计完成拼图{6}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 7, "day": 7,
"groups": 3, "groups": 3,
@ -115,7 +115,7 @@
"id": 8, "id": 8,
"txt": { "txt": {
"key": "sign_sign_extra_txt_8", "key": "sign_sign_extra_txt_8",
"text": "累计完成拼图{7}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 14, "day": 14,
"groups": 3, "groups": 3,
@ -131,7 +131,7 @@
"id": 9, "id": 9,
"txt": { "txt": {
"key": "sign_sign_extra_txt_9", "key": "sign_sign_extra_txt_9",
"text": "累计完成拼图{8}次领取" "text": "累计完成拼图{0}次领取"
}, },
"day": 21, "day": 21,
"groups": 3, "groups": 3,

4
bin/json/game_skillafteratk.json
View File

@ -28626,7 +28626,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5000 2500
], ],
"FollowSK": [ "FollowSK": [
255005112 255005112
@ -28937,7 +28937,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1000 300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [

9
comm/const.go
View File

@ -416,6 +416,15 @@ const (
Notify1001 NotifyType = 1001 //铁匠铺炉温达到满值 Notify1001 NotifyType = 1001 //铁匠铺炉温达到满值
) )
const (
DrawCardTypeNew int32 = 1 // 新手卡池
DrawCardType0 int32 = 2 // 普通
DrawCardType1 int32 = 3 // 阵营1
DrawCardType2 int32 = 4 // 阵营2
DrawCardType3 int32 = 5 // 阵营3
DrawCardType4 int32 = 6 // 阵营4
)
// 红点枚举 // 红点枚举
type ReddotType int32 type ReddotType int32

2
modules/hero/api_drawCard.go
View File

@ -51,7 +51,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
} }
// 准备数据 // 准备数据
///////////////////////////////////// /////////////////////////////////////
drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType + 1) // 获取新的抽卡配置 drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType + comm.DrawCardType0) // 获取新的抽卡配置
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,

2
modules/hero/configure_comp.go
View File

@ -437,7 +437,7 @@ func (this *configureComp) GetHeroTalentMaxLv(heroid string) (maxlv int32) {
return 0 return 0
} }
// id: 1 表示普通抽 2表示阵营1 3表示阵营2 ... // id: 1新手卡池 2 表示普通抽 3表示阵营1 4表示阵营2 ...
func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDrawPoolData, err error) { func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDrawPoolData, err error) {
var ( var (
v interface{} v interface{}

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

@ -25,7 +25,6 @@ type GameHoroscopeData struct {
CostItem []*Gameatn CostItem []*Gameatn
AddGroup int32 AddGroup int32
AddClassify int32 AddClassify int32
Text string
Upgrade []*Gameatr Upgrade []*Gameatr
} }
@ -76,7 +75,6 @@ func (_v *GameHoroscopeData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AddGroup"].(float64); !_ok_ { err = errors.New("AddGroup error"); return }; _v.AddGroup = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AddGroup"].(float64); !_ok_ { err = errors.New("AddGroup error"); return }; _v.AddGroup = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AddClassify"].(float64); !_ok_ { err = errors.New("AddClassify error"); return }; _v.AddClassify = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AddClassify"].(float64); !_ok_ { err = errors.New("AddClassify error"); return }; _v.AddClassify = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

7
sys/configure/structs/Tables.go
View File

@ -41,7 +41,6 @@ type Tables struct {
Shopitem *GameShopitem Shopitem *GameShopitem
ActiveReward *GameActiveReward ActiveReward *GameActiveReward
Model *GameModel Model *GameModel
DrawCard *GameDrawCard
ChatChannel *GameChatChannel ChatChannel *GameChatChannel
ChatSystem *GameChatSystem ChatSystem *GameChatSystem
ChatServerGroup *GameChatServerGroup ChatServerGroup *GameChatServerGroup
@ -372,12 +371,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Model, err = NewGameModel(buf) ; err != nil { if tables.Model, err = NewGameModel(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_drawcard") ; err != nil {
return nil, err
}
if tables.DrawCard, err = NewGameDrawCard(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_chatchannel") ; err != nil { if buf, err = loader("game_chatchannel") ; err != nil {
return nil, err return nil, err
} }

90
sys/configure/structs/game.globalData.go
View File

@ -39,7 +39,36 @@ type GameGlobalData struct {
DrawToplimit int32 DrawToplimit int32
Draw10Star4Max int32 Draw10Star4Max int32
Draw10Star5Max int32 Draw10Star5Max int32
DrawFloorStar4 int32
DrawFloorStar5 int32
DuplicateRemoval int32 DuplicateRemoval int32
BasePoolCost *Gameatn
Camp1PoolCost *Gameatn
Camp2PoolCost *Gameatn
Camp3PoolCost *Gameatn
Camp4PoolCost *Gameatn
BasePool10cost *Gameatn
Camp1Pool10cost *Gameatn
Camp2Pool10cost *Gameatn
Camp3Pool10cost *Gameatn
Camp4Pool10cost *Gameatn
Camp1Pool1 string
Camp2Pool1 string
Camp3Pool1 string
Camp4Pool1 string
BasePool1 *Gamebasepool
BasePool2 *Gamebasepool
BasePool3 *Gamebasepool
BasePool4 *Gamebasepool
BasePool5 *Gamebasepool
BasePool6 *Gamebasepool
BasePool7 *Gamebasepool
BasePoolStar3 int32
BasePoolStar4 int32
BasePoolStar5 int32
CampPoolStar3 int32
CampPoolStar4 int32
CampPoolStar5 int32
Gourmet int32 Gourmet int32
SmithyMaxplayer int32 SmithyMaxplayer int32
SmithyMaxtime int32 SmithyMaxtime int32
@ -113,6 +142,9 @@ type GameGlobalData struct {
SkillGetLocation []int32 SkillGetLocation []int32
DrawCardRechargeReward []int32 DrawCardRechargeReward []int32
DrawCardRegressionReward []int32 DrawCardRegressionReward []int32
DrawCard5StarsInRange []int32
DrawCard5StarsInRange1 []int32
DrawCard5StarsInRange1Pool string
DrawCardContinuousRestrictionStar5 int32 DrawCardContinuousRestrictionStar5 int32
DrawCardContinuousRestrictionCamp int32 DrawCardContinuousRestrictionCamp int32
EquipmentConsumption []int32 EquipmentConsumption []int32
@ -295,7 +327,36 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_toplimit"].(float64); !_ok_ { err = errors.New("draw_toplimit error"); return }; _v.DrawToplimit = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_toplimit"].(float64); !_ok_ { err = errors.New("draw_toplimit error"); return }; _v.DrawToplimit = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star4_max"].(float64); !_ok_ { err = errors.New("draw10_star4_max error"); return }; _v.Draw10Star4Max = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star4_max"].(float64); !_ok_ { err = errors.New("draw10_star4_max error"); return }; _v.Draw10Star4Max = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star5_max"].(float64); !_ok_ { err = errors.New("draw10_star5_max error"); return }; _v.Draw10Star5Max = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star5_max"].(float64); !_ok_ { err = errors.New("draw10_star5_max error"); return }; _v.Draw10Star5Max = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star4"].(float64); !_ok_ { err = errors.New("draw_floor_star4 error"); return }; _v.DrawFloorStar4 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star5"].(float64); !_ok_ { err = errors.New("draw_floor_star5 error"); return }; _v.DrawFloorStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duplicate_removal"].(float64); !_ok_ { err = errors.New("duplicate_removal error"); return }; _v.DuplicateRemoval = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duplicate_removal"].(float64); !_ok_ { err = errors.New("duplicate_removal error"); return }; _v.DuplicateRemoval = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_cost error"); return }; if _v.BasePoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_cost error"); return }; if _v.Camp1PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_cost error"); return }; if _v.Camp2PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_cost error"); return }; if _v.Camp3PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_cost error"); return }; if _v.Camp4PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_10cost error"); return }; if _v.BasePool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_10cost error"); return }; if _v.Camp1Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_10cost error"); return }; if _v.Camp2Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_10cost error"); return }; if _v.Camp3Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_10cost error"); return }; if _v.Camp4Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; if _v.Camp1Pool1, _ok_ = _buf["camp1_pool1"].(string); !_ok_ { err = errors.New("camp1_pool1 error"); return } }
{ var _ok_ bool; if _v.Camp2Pool1, _ok_ = _buf["camp2_pool1"].(string); !_ok_ { err = errors.New("camp2_pool1 error"); return } }
{ var _ok_ bool; if _v.Camp3Pool1, _ok_ = _buf["camp3_pool1"].(string); !_ok_ { err = errors.New("camp3_pool1 error"); return } }
{ var _ok_ bool; if _v.Camp4Pool1, _ok_ = _buf["camp4_pool1"].(string); !_ok_ { err = errors.New("camp4_pool1 error"); return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool1"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool1 error"); return }; if _v.BasePool1, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool5"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool5 error"); return }; if _v.BasePool5, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool6"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool6 error"); return }; if _v.BasePool6, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool7"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool7 error"); return }; if _v.BasePool7, err = DeserializeGamebasepool(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star3"].(float64); !_ok_ { err = errors.New("camp_pool_star3 error"); return }; _v.CampPoolStar3 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star4"].(float64); !_ok_ { err = errors.New("camp_pool_star4 error"); return }; _v.CampPoolStar4 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star5"].(float64); !_ok_ { err = errors.New("camp_pool_star5 error"); return }; _v.CampPoolStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gourmet"].(float64); !_ok_ { err = errors.New("gourmet error"); return }; _v.Gourmet = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gourmet"].(float64); !_ok_ { err = errors.New("gourmet error"); return }; _v.Gourmet = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxplayer"].(float64); !_ok_ { err = errors.New("smithy_maxplayer error"); return }; _v.SmithyMaxplayer = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxplayer"].(float64); !_ok_ { err = errors.New("smithy_maxplayer error"); return }; _v.SmithyMaxplayer = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxtime"].(float64); !_ok_ { err = errors.New("smithy_maxtime error"); return }; _v.SmithyMaxtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxtime"].(float64); !_ok_ { err = errors.New("smithy_maxtime error"); return }; _v.SmithyMaxtime = int32(_tempNum_) }
@ -616,6 +677,35 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
} }
} }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["DrawCard_5StarsInRange"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange error"); return }
_v.DrawCard5StarsInRange = 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.DrawCard5StarsInRange = append(_v.DrawCard5StarsInRange, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["DrawCard_5StarsInRange1"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange1 error"); return }
_v.DrawCard5StarsInRange1 = 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.DrawCard5StarsInRange1 = append(_v.DrawCard5StarsInRange1, _list_v_)
}
}
{ var _ok_ bool; if _v.DrawCard5StarsInRange1Pool, _ok_ = _buf["DrawCard_5StarsInRange1_pool"].(string); !_ok_ { err = errors.New("DrawCard_5StarsInRange1_pool error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) }
{ {