配置更新

This commit is contained in:
meixiongfeng 2023-10-26 12:34:34 +08:00
parent 58898f4d3f
commit 9acdd2b778
25 changed files with 2161 additions and 162 deletions

View File

@ -7,6 +7,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_dhs",
"icon2": "sx_fk_ls",
"weight": 1500,
"score": 1,
"type": 0,
@ -20,6 +21,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_ls",
"icon2": "sx_fk_dhs",
"weight": 1500,
"score": 1,
"type": 0,
@ -33,6 +35,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_lvs",
"icon2": "sx_fk_lvs",
"weight": 1500,
"score": 1,
"type": 0,
@ -46,6 +49,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_zs",
"icon2": "sx_fk_zs",
"weight": 1500,
"score": 1,
"type": 0,
@ -59,6 +63,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_hs",
"icon2": "sx_fk_hs",
"weight": 1500,
"score": 1,
"type": 0,
@ -72,6 +77,7 @@
"belongto": 1,
"open": 1,
"icon": "sx_fk_fhs",
"icon2": "sx_fk_fhs",
"weight": 1500,
"score": 1,
"type": 0,
@ -87,7 +93,8 @@
],
"belongto": 1,
"open": 2,
"icon": "",
"icon": "sx_sjt_dhs",
"icon2": "sx_sjt_ls",
"weight": 840,
"score": 1,
"type": 1,
@ -103,7 +110,8 @@
],
"belongto": 1,
"open": 3,
"icon": "",
"icon": "sx_hjt_dhs",
"icon2": "sx_hjt_ls",
"weight": 840,
"score": 1,
"type": 2,
@ -119,7 +127,8 @@
],
"belongto": 1,
"open": 4,
"icon": "",
"icon": "sx_sjt_ls",
"icon2": "sx_sjt_dhs",
"weight": 840,
"score": 1,
"type": 1,
@ -135,7 +144,8 @@
],
"belongto": 1,
"open": 5,
"icon": "",
"icon": "sx_hjt_ls",
"icon2": "sx_hjt_dhs",
"weight": 840,
"score": 1,
"type": 2,
@ -151,7 +161,8 @@
],
"belongto": 1,
"open": 6,
"icon": "",
"icon": "sx_sjt_lvs",
"icon2": "sx_sjt_lvs",
"weight": 840,
"score": 1,
"type": 1,
@ -167,7 +178,8 @@
],
"belongto": 1,
"open": 7,
"icon": "",
"icon": "sx_hjt_lvs",
"icon2": "sx_hjt_lvs",
"weight": 840,
"score": 1,
"type": 2,
@ -183,7 +195,8 @@
],
"belongto": 1,
"open": 8,
"icon": "",
"icon": "sx_sjt_zs",
"icon2": "sx_sjt_zs",
"weight": 840,
"score": 1,
"type": 1,
@ -199,7 +212,8 @@
],
"belongto": 1,
"open": 9,
"icon": "",
"icon": "sx_hjt_zs",
"icon2": "sx_hjt_zs",
"weight": 840,
"score": 1,
"type": 2,
@ -215,7 +229,8 @@
],
"belongto": 1,
"open": 10,
"icon": "",
"icon": "sx_sjt_hs",
"icon2": "sx_sjt_hs",
"weight": 840,
"score": 1,
"type": 1,
@ -231,7 +246,8 @@
],
"belongto": 1,
"open": 11,
"icon": "",
"icon": "sx_hjt_hs",
"icon2": "sx_hjt_hs",
"weight": 840,
"score": 1,
"type": 2,
@ -247,7 +263,8 @@
],
"belongto": 1,
"open": 12,
"icon": "",
"icon": "sx_sjt_fhs",
"icon2": "sx_sjt_fhs",
"weight": 840,
"score": 1,
"type": 1,
@ -263,7 +280,8 @@
],
"belongto": 1,
"open": 13,
"icon": "",
"icon": "sx_hjt_fhs",
"icon2": "sx_hjt_fhs",
"weight": 840,
"score": 1,
"type": 2,
@ -276,7 +294,8 @@
"direction": [],
"belongto": 1,
"open": 14,
"icon": "",
"icon": "sx_sd_dhs",
"icon2": "sx_sd_ls",
"weight": 1000,
"score": 1,
"type": 3,
@ -289,7 +308,8 @@
"direction": [],
"belongto": 1,
"open": 15,
"icon": "",
"icon": "sx_sd_ls",
"icon2": "sx_sd_dhs",
"weight": 1000,
"score": 1,
"type": 3,
@ -302,7 +322,8 @@
"direction": [],
"belongto": 1,
"open": 16,
"icon": "",
"icon": "sx_sd_lvs",
"icon2": "sx_sd_lvs",
"weight": 1500,
"score": 1,
"type": 3,
@ -315,7 +336,8 @@
"direction": [],
"belongto": 1,
"open": 17,
"icon": "",
"icon": "sx_sd_zs",
"icon2": "sx_sd_zs",
"weight": 1500,
"score": 1,
"type": 3,
@ -328,7 +350,8 @@
"direction": [],
"belongto": 1,
"open": 18,
"icon": "",
"icon": "sx_sd_hs",
"icon2": "sx_sd_hs",
"weight": 2500,
"score": 1,
"type": 3,
@ -341,7 +364,8 @@
"direction": [],
"belongto": 1,
"open": 19,
"icon": "",
"icon": "sx_sd_fhs",
"icon2": "sx_sd_fhs",
"weight": 2500,
"score": 1,
"type": 3,
@ -355,6 +379,7 @@
"belongto": 2,
"open": 1,
"icon": "",
"icon2": "",
"weight": 1000,
"score": 3,
"type": 0,
@ -367,7 +392,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_dhs",
"icon2": "sx_zd_ls",
"weight": 1000,
"score": 1,
"type": 4,
@ -380,7 +406,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_ls",
"icon2": "sx_zd_dhs",
"weight": 1000,
"score": 1,
"type": 4,
@ -393,7 +420,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_lvs",
"icon2": "sx_zd_lvs",
"weight": 1000,
"score": 1,
"type": 4,
@ -406,7 +434,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_zs",
"icon2": "sx_zd_zs",
"weight": 1000,
"score": 1,
"type": 4,
@ -419,7 +448,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_hs",
"icon2": "sx_zd_hs",
"weight": 1000,
"score": 1,
"type": 4,
@ -432,7 +462,8 @@
"direction": [],
"belongto": 3,
"open": 1,
"icon": "",
"icon": "sx_zd_fhs",
"icon2": "sx_zd_fhs",
"weight": 1000,
"score": 1,
"type": 4,
@ -447,7 +478,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_dhs",
"icon2": "sx_syh_ls",
"weight": 1000,
"score": 1,
"type": 5,
@ -462,7 +494,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_dhs",
"icon2": "sx_xyh_ls",
"weight": 1000,
"score": 1,
"type": 6,
@ -477,7 +510,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_dhs",
"icon2": "sx_zyh_ls",
"weight": 1000,
"score": 1,
"type": 7,
@ -492,7 +526,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_dhs",
"icon2": "sx_yyh_ls",
"weight": 1000,
"score": 1,
"type": 8,
@ -507,7 +542,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_ls",
"icon2": "sx_syh_dhs",
"weight": 1000,
"score": 1,
"type": 5,
@ -522,7 +558,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_ls",
"icon2": "sx_xyh_dhs",
"weight": 1000,
"score": 1,
"type": 6,
@ -537,7 +574,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_ls",
"icon2": "sx_zyh_dhs",
"weight": 1000,
"score": 1,
"type": 7,
@ -552,7 +590,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_ls",
"icon2": "sx_yyh_dhs",
"weight": 1000,
"score": 1,
"type": 8,
@ -567,7 +606,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_lvs",
"icon2": "sx_syh_lvs",
"weight": 1000,
"score": 1,
"type": 5,
@ -582,7 +622,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_lvs",
"icon2": "sx_xyh_lvs",
"weight": 1000,
"score": 1,
"type": 6,
@ -597,7 +638,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_lvs",
"icon2": "sx_zyh_lvs",
"weight": 1000,
"score": 1,
"type": 7,
@ -612,7 +654,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_lvs",
"icon2": "sx_yyh_lvs",
"weight": 1000,
"score": 1,
"type": 8,
@ -627,7 +670,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_zs",
"icon2": "sx_syh_zs",
"weight": 1000,
"score": 1,
"type": 5,
@ -642,7 +686,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_zs",
"icon2": "sx_xyh_zs",
"weight": 1000,
"score": 1,
"type": 6,
@ -657,7 +702,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_zs",
"icon2": "sx_zyh_zs",
"weight": 1000,
"score": 1,
"type": 7,
@ -672,7 +718,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_zs",
"icon2": "sx_yyh_zs",
"weight": 1000,
"score": 1,
"type": 8,
@ -687,7 +734,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_hs",
"icon2": "sx_syh_hs",
"weight": 1000,
"score": 1,
"type": 5,
@ -702,7 +750,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_hs",
"icon2": "sx_xyh_hs",
"weight": 1000,
"score": 1,
"type": 6,
@ -717,7 +766,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_hs",
"icon2": "sx_zyh_hs",
"weight": 1000,
"score": 1,
"type": 7,
@ -732,7 +782,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_hs",
"icon2": "sx_yyh_hs",
"weight": 1000,
"score": 1,
"type": 8,
@ -747,7 +798,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_syh_fhs",
"icon2": "sx_syh_fhs",
"weight": 1000,
"score": 1,
"type": 5,
@ -762,7 +814,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_xyh_fhs",
"icon2": "sx_xyh_fhs",
"weight": 1000,
"score": 1,
"type": 6,
@ -777,7 +830,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_zyh_fhs",
"icon2": "sx_zyh_fhs",
"weight": 1000,
"score": 1,
"type": 7,
@ -792,7 +846,8 @@
],
"belongto": 4,
"open": 1,
"icon": "",
"icon": "sx_yyh_fhs",
"icon2": "sx_yyh_fhs",
"weight": 1000,
"score": 1,
"type": 8,

View File

@ -30992,7 +30992,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101010
],
@ -31019,7 +31019,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101020
],
@ -31046,7 +31046,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101029
],
@ -31073,7 +31073,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101042
],
@ -31100,7 +31100,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101051
],
@ -31127,7 +31127,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101059
],
@ -31154,10 +31154,8 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"filter": [
3
],
"value": 3,
"filter": [],
"filter2": []
},
{
@ -31183,8 +31181,7 @@
"NPC": 0,
"value": 10,
"filter": [
10010,
10
10010
],
"filter2": []
},
@ -31209,7 +31206,7 @@
},
"Npc_event_type": 0,
"NPC": 0,
"value": 0,
"value": 1,
"filter": [
1101087
],

View File

@ -1364,25 +1364,26 @@
},
{
"id": 234,
"insert": 1,
"filter": [
"eq"
]
"insert": 2,
"filter": []
},
{
"id": 235,
"insert": 3,
"insert": 1,
"filter": [
"eq",
"gte"
"eq"
]
},
{
"id": 236,
"insert": 1,
"insert": 2,
"filter": [
"eq",
"eq"
]
},
{
"id": 237,
"insert": 1,
"filter": []
}
]

View File

@ -48,7 +48,7 @@
"days": 10,
"tipstxt": {
"key": "celebration_celebration_tipstxt_3",
"text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征,可以获得[color=#AAFF00]双倍奖励[/color]每名boss每日分别只能挑战[color=#AAFF00]{1}[/color]次"
"text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征,可以获得[color=#AAFF00]双倍奖励[/color]每名boss每日只有前[color=#AAFF00]{1}[/color]次挑战为双倍,后续为正常奖励"
}
}
]

View File

@ -2,6 +2,14 @@
{
"key": "27000001",
"type": 1,
"skillname": {
"key": "consume_consume_hero_skillname_01",
"text": "大消除"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_01",
"text": "随机消除7个方块"
},
"hero": 44004,
"consume": [
{
@ -18,6 +26,14 @@
{
"key": "27000002",
"type": 2,
"skillname": {
"key": "consume_consume_hero_skillname_02",
"text": "技能名字1"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_02",
"text": "技能描述2"
},
"hero": 25001,
"consume": [
{

View File

@ -0,0 +1,884 @@
[
{
"key": 0,
"type": 1,
"onereward": [],
"rewards": [],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "consume_consume_integral_name_01",
"text": "S1:卧龙凤雏"
}
},
{
"key": 100,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 8000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 200,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 9000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 300,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 400,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 11000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 500,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 12000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 600,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 13000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 700,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 14000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 800,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 15000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 900,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 16000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1000,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 17000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1100,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 18000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 20
},
{
"a": "attr",
"t": "consumemoney",
"n": 100
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1200,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 19000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1300,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1400,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 21000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1500,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 22000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1600,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 23000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1700,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 24000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1800,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 25000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 1900,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 26000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2000,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 27000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2100,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 28000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2200,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 29000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2300,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 30000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2400,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 31000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2500,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 32000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2600,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 33000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2700,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 34000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2800,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 35000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 2900,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 36000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
},
{
"key": 3000,
"type": 2,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 37000
}
],
"rewards": [
{
"a": "attr",
"t": "consumeexp",
"n": 50
},
{
"a": "attr",
"t": "consumemoney",
"n": 200
}
],
"boxid": 0,
"deductrewards": [],
"name": {
"key": "",
"text": ""
}
}
]

View File

@ -4,7 +4,7 @@
"FormatList": [
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",
@ -16,9 +16,9 @@
{
"id": 102,
"FormatList": [
101021
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",
@ -30,9 +30,9 @@
{
"id": 103,
"FormatList": [
101031
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",
@ -44,9 +44,9 @@
{
"id": 104,
"FormatList": [
101041
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",
@ -58,9 +58,9 @@
{
"id": 105,
"FormatList": [
101051
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",
@ -72,9 +72,9 @@
{
"id": 106,
"FormatList": [
101061
101011
],
"BattleReadyID": 126,
"BattleReadyID": 10103001,
"EventList": [],
"playexp": {
"a": "attr",

View File

@ -2,13 +2,7 @@
{
"key": 0,
"type": 1,
"onereward": [
{
"a": "attr",
"t": "gold",
"n": 7000
}
],
"onereward": [],
"rewards": [],
"boxid": 0,
"deductrewards": [],

View File

@ -20680,10 +20680,10 @@
"id": "27000001",
"name": {
"key": "item_item_name_417",
"text": "骇客蛛"
"text": "豺狼小怪"
},
"usetype": 1,
"color": 3,
"color": 2,
"bagtype": 0,
"index": 1,
"special_type": 0,
@ -20701,18 +20701,18 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "tx_js_44004",
"img": "tx_js_51004",
"intr": {
"key": "item_item_intr_412",
"text": "骇客蛛的三消英雄卡,运用黑客的智慧在这里嘎嘎乱杀"
"text": "豺狼小怪的三消英雄卡。"
},
"describe": {
"key": "item_item_describe_412",
"text": "电脑专业户,脚本编写大师,有扎实的三消基础,但运气不怎么好。"
"text": "豺狼小怪怎么叫?"
},
"dialogue": {
"key": "item_item_dialogue_410",
"text": "【脚本,启动!】"
"text": "【启动!】"
},
"sale": [],
"gm": 0
@ -20721,10 +20721,10 @@
"id": "27000002",
"name": {
"key": "item_item_name_418",
"text": "阿宝"
"text": "小猴子"
},
"usetype": 1,
"color": 4,
"color": 2,
"bagtype": 0,
"index": 1,
"special_type": 0,
@ -20742,14 +20742,14 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "tx_js_25001",
"img": "tx_js_51012",
"intr": {
"key": "item_item_intr_413",
"text": "阿宝的三消英雄卡,运用功夫的力量在这里嘎嘎乱杀"
"text": "小猴子的三消英雄卡。"
},
"describe": {
"key": "item_item_describe_413",
"text": "2步专业户三消可能对他有点难度,但架不住运气好。"
"text": "小猴子怎么叫?"
},
"dialogue": {
"key": "item_item_dialogue_411",

File diff suppressed because it is too large Load Diff

View File

@ -5412,13 +5412,13 @@
"equip": [],
"newskill": [],
"lv": 9,
"hppro": 0,
"atkpro": 0,
"defpro": 0,
"hppro": 1.01,
"atkpro": 1.16,
"defpro": 0.72,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 0,
"speed": 66,
"modelsize": 1
},
{

View File

@ -0,0 +1,52 @@
[
{
"id": 1,
"pic": "cbt_sp01_00",
"unlock": [
{
"a": "item",
"t": "24010001",
"n": 1
},
{
"a": "item",
"t": "24010002",
"n": 1
},
{
"a": "item",
"t": "24010003",
"n": 1
}
],
"name": {
"key": "treasuremap_map_name_1",
"text": ""
},
"explain": {
"key": "treasuremap_map_explain_1",
"text": ""
},
"describe": {
"key": "treasuremap_map_desribe_1",
"text": ""
}
},
{
"id": 2,
"pic": "cbt_sp01_00",
"unlock": [],
"name": {
"key": "treasuremap_map_name_2",
"text": ""
},
"explain": {
"key": "treasuremap_map_explain_2",
"text": ""
},
"describe": {
"key": "treasuremap_map_desribe_2",
"text": ""
}
}
]

View File

@ -18,9 +18,10 @@ func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.EntertainRead
func (this *apiComp) Ready(session comm.IUserSession, req *pb.EntertainReadyReq) (errdata *pb.ErrorData) {
this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req)
if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req); errdata == nil {
session.SendMsg(string(this.module.GetType()), "ready", &pb.EntertainReadyResp{
Ready: true,
})
}
return
}

View File

@ -413,6 +413,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
this.curPower = this.player1.Uid
this.player1.Ps = MaxPs
this.player2.Ps = 0
this.module.Debugf("match ai")
if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startgame", &pb.EntertainStartGamePush{
User1: this.player1,
User2: this.player2,
@ -430,6 +431,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
} else if this.player2.Uid == session.GetUserId() {
this.rd2 = true
}
this.module.Debugf("match user1ready:%v,ready2:%v", this.rd1, this.rd2)
if this.rd1 && this.rd2 { // 两个玩家都准备好了 那么就开始游戏
this.NexPower = this.player1.Uid
this.curPower = this.player1.Uid
@ -490,22 +492,15 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
bReward = false
}
}
if conf, err := this.module.configure.GetGameConsumeintegral(this.player1.Score); err == nil {
if bReward { // 发奖
if user, err := this.module.ModuleUser.GetUser(winner); err == nil {
if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil {
res = append(res, conf.Onereward...)
res = append(res, conf.Rewards...)
if bReward { // 发奖
if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil {
return
}
} else { // AI 不发将 构建一个atno对象
for _, v := range res {
atno = append(atno, &pb.UserAtno{
A: v.A,
T: v.T,
N: v.N,
O: "",
})
}
}
}

View File

@ -90,8 +90,8 @@ func (this *MapData) SetMap() {
2, 1, 1, 3, 6, 4, 1,
4, 1, 1, 4, 3, 6, 3,
4, 3, 4, 5, 1, 6, 1,
5, 4, 2, 5, 1, 3, 1,
4, 1, 5, 1, 2, 1, 4,
5, 4, 2, 5, 3, 3, 1,
4, 1, 5, 3, 2, 3, 4,
}
var pos int
for index := Width - 1; index >= 0; index-- {
@ -297,7 +297,7 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
break
}
}
if newElem != 0 {
if newElem == 0 {
newElem = k + 2*Width // 给个默认值
}
@ -581,10 +581,58 @@ func (this *MapData) SkillUp(skillid int32, value int32) (szMap []*pb.MapData) {
}
// 随机生成 不可消除的 地图
// func (this *MapData) CheckInitPlat() {
// this.Plat = make([]*pb.GirdeData, Width*Height)
// for i := 0; i < Width*Height; i++ {
// this.Plat[i] = this.CreateGride(int32(i))
func (this *MapData) CheckInitPlat() {
this.Plat = make([]*pb.GirdeData, Width*Height)
for i := 0; i < Width*Height; i++ {
this.Plat[i] = this.CreateGride(int32(i))
}
}
// 1, 1, 2, 5, 1, 5, 2,
// 3, 2, 3, 1, 2, 4, 4,
// 2, 1, 1, 3, 6, 4, 1,
// 4, 1, 1, 4, 3, 6, 3,
// 4, 3, 4, 5, 1, 6, 1,
// 5, 4, 2, 5, 3, 3, 1,
// 4, 1, 5, 3, 2, 3, 4,
// 校验当前地图 有没有能消除的
// func (this *MapData) CheckAndRefreshPlat() {
// bEliminate := false
// for k, v := range this.Plat {
// if v.Color == 0 {
// continue
// }
// x := int32(k % Height) // x
// y := int32(k / Height) // y
// if x+1 < Height {
// k1 := this.Plat[k].Color
// k2 := this.Plat[k+1].Color
// if k1 == k2 {
// if x > 0 {
// }
// }
// k3 := this.Plat[k+2].Color
// // 找k+3的 上 左 又
// if k1 == k2 && k2 == k3 {
// bEliminate = true
// }
// }
// if k+2*Width < Total {
// k1 := this.Plat[k].Color
// k2 := this.Plat[k+Width].Color
// k3 := this.Plat[k+2*Width].Color
// if k1 == k2 && k2 == k3 {
// bEliminate = true
// }
// }
// }
// if bEliminate {
// this.CheckInitPlat()
// }
// }

View File

@ -259,6 +259,7 @@ type DBXXLMatch struct {
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` //
}
func (x *DBXXLMatch) Reset() {
@ -307,6 +308,13 @@ func (x *DBXXLMatch) GetCardid() string {
return ""
}
func (x *DBXXLMatch) GetConsumeexp() int32 {
if x != nil {
return x.Consumeexp
}
return 0
}
var File_entertain_entertain_db_proto protoreflect.FileDescriptor
var file_entertain_entertain_db_proto_rawDesc = []byte{
@ -335,12 +343,14 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65,
0x72, 0x67, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67,
0x79, 0x22, 0x4f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
0x79, 0x22, 0x6f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
0x29, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61,
0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64,
0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65,
0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
}

View File

@ -161,7 +161,7 @@ type EntertainCancelMatchResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 匹配成功
Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 取消匹配成功
}
func (x *EntertainCancelMatchResp) Reset() {
@ -944,6 +944,148 @@ func (x *EntertainReconnectResp) GetUser2() *PlayerData {
return nil
}
type EntertainRefreshPlatReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
}
func (x *EntertainRefreshPlatReq) Reset() {
*x = EntertainRefreshPlatReq{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainRefreshPlatReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainRefreshPlatReq) ProtoMessage() {}
func (x *EntertainRefreshPlatReq) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_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 EntertainRefreshPlatReq.ProtoReflect.Descriptor instead.
func (*EntertainRefreshPlatReq) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{14}
}
func (x *EntertainRefreshPlatReq) GetRoomid() string {
if x != nil {
return x.Roomid
}
return ""
}
type EntertainRefreshPlatResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据
}
func (x *EntertainRefreshPlatResp) Reset() {
*x = EntertainRefreshPlatResp{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainRefreshPlatResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainRefreshPlatResp) ProtoMessage() {}
func (x *EntertainRefreshPlatResp) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[15]
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 EntertainRefreshPlatResp.ProtoReflect.Descriptor instead.
func (*EntertainRefreshPlatResp) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{15}
}
func (x *EntertainRefreshPlatResp) GetMpadata() *MapData {
if x != nil {
return x.Mpadata
}
return nil
}
// 刷新地图推送
type EntertainRefreshPush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据
}
func (x *EntertainRefreshPush) Reset() {
*x = EntertainRefreshPush{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainRefreshPush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainRefreshPush) ProtoMessage() {}
func (x *EntertainRefreshPush) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[16]
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 EntertainRefreshPush.ProtoReflect.Descriptor instead.
func (*EntertainRefreshPush) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{16}
}
func (x *EntertainRefreshPush) GetMpadata() *MapData {
if x != nil {
return x.Mpadata
}
return nil
}
var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
var file_entertain_entertain_msg_proto_rawDesc = []byte{
@ -1051,8 +1193,19 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
0x72, 0x31, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05,
0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c,
0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22,
0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22,
0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61,
0x74, 0x61, 0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70,
0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61,
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1067,7 +1220,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
return file_entertain_entertain_msg_proto_rawDescData
}
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainMatchReq)(nil), // 0: EntertainMatchReq
(*EntertainMatchResp)(nil), // 1: EntertainMatchResp
@ -1083,31 +1236,36 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainEnterRoomPush)(nil), // 11: EntertainEnterRoomPush
(*EntertainReconnectReq)(nil), // 12: EntertainReconnectReq
(*EntertainReconnectResp)(nil), // 13: EntertainReconnectResp
(*PlayerData)(nil), // 14: PlayerData
(*MapData)(nil), // 15: MapData
(*UserAtno)(nil), // 16: UserAtno
(*EntertainRefreshPlatReq)(nil), // 14: EntertainRefreshPlatReq
(*EntertainRefreshPlatResp)(nil), // 15: EntertainRefreshPlatResp
(*EntertainRefreshPush)(nil), // 16: EntertainRefreshPush
(*PlayerData)(nil), // 17: PlayerData
(*MapData)(nil), // 18: MapData
(*UserAtno)(nil), // 19: UserAtno
}
var file_entertain_entertain_msg_proto_depIdxs = []int32{
14, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
14, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
15, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
15, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
14, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
14, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
14, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
14, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
15, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
16, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
14, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
14, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
15, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
14, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
14, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
15, // [15:15] is the sub-list for method output_type
15, // [15:15] is the sub-list for method input_type
15, // [15:15] is the sub-list for extension type_name
15, // [15:15] is the sub-list for extension extendee
0, // [0:15] is the sub-list for field type_name
17, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
17, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
18, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
18, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
17, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
17, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
17, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
17, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
18, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
19, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
17, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
17, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
18, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
17, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
17, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
18, // 15: EntertainRefreshPlatResp.mpadata:type_name -> MapData
18, // 16: EntertainRefreshPush.mpadata:type_name -> MapData
17, // [17:17] is the sub-list for method output_type
17, // [17:17] is the sub-list for method input_type
17, // [17:17] is the sub-list for extension type_name
17, // [17:17] is the sub-list for extension extendee
0, // [0:17] is the sub-list for field type_name
}
func init() { file_entertain_entertain_msg_proto_init() }
@ -1286,6 +1444,42 @@ func file_entertain_entertain_msg_proto_init() {
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainRefreshPlatReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainRefreshPlatResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainRefreshPush); 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{
@ -1293,7 +1487,7 @@ func file_entertain_entertain_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 14,
NumMessages: 17,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -18,6 +18,7 @@ type GameBlockData struct {
Belongto int32
Open int32
Icon string
Icon2 string
Weight int32
Score int32
Type int32
@ -51,6 +52,7 @@ func (_v *GameBlockData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open"].(float64); !_ok_ { err = errors.New("open error"); return }; _v.Open = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; if _v.Icon2, _ok_ = _buf["icon2"].(string); !_ok_ { err = errors.New("icon2 error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }

View File

@ -13,6 +13,8 @@ import "errors"
type GameConsumeHeroData struct {
Key string
Type int32
Skillname string
Skilltxt string
Hero int32
Consume []*Gameatn
Skilltype int32
@ -30,6 +32,8 @@ func (*GameConsumeHeroData) GetTypeId() int32 {
func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _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["skilltxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilltxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilltxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) }
{
var _arr_ []interface{}

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameConsumeIntegral struct {
_dataMap map[int32]*GameConsumeIntegralData
_dataList []*GameConsumeIntegralData
}
func NewGameConsumeIntegral(_buf []map[string]interface{}) (*GameConsumeIntegral, error) {
_dataList := make([]*GameConsumeIntegralData, 0, len(_buf))
dataMap := make(map[int32]*GameConsumeIntegralData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameConsumeIntegralData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
return &GameConsumeIntegral{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameConsumeIntegral) GetDataMap() map[int32]*GameConsumeIntegralData {
return table._dataMap
}
func (table *GameConsumeIntegral) GetDataList() []*GameConsumeIntegralData {
return table._dataList
}
func (table *GameConsumeIntegral) Get(key int32) *GameConsumeIntegralData {
return table._dataMap[key]
}

View File

@ -0,0 +1,86 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameConsumeIntegralData struct {
Key int32
Type int32
Onereward []*Gameatn
Rewards []*Gameatn
Boxid int32
Deductrewards []*Gameatn
Name string
}
const TypeId_GameConsumeIntegralData = -1538782826
func (*GameConsumeIntegralData) GetTypeId() int32 {
return -1538782826
}
func (_v *GameConsumeIntegralData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["onereward"].([]interface{}); !_ok_ { err = errors.New("onereward error"); return }
_v.Onereward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Onereward = append(_v.Onereward, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["rewards"].([]interface{}); !_ok_ { err = errors.New("rewards error"); return }
_v.Rewards = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Rewards = append(_v.Rewards, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boxid"].(float64); !_ok_ { err = errors.New("boxid error"); return }; _v.Boxid = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["deductrewards"].([]interface{}); !_ok_ { err = errors.New("deductrewards error"); return }
_v.Deductrewards = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Deductrewards = append(_v.Deductrewards, _list_v_)
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGameConsumeIntegralData(_buf map[string]interface{}) (*GameConsumeIntegralData, error) {
v := &GameConsumeIntegralData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -16,6 +16,8 @@ type GameMainStageData struct {
GroupId int32
PreviousGroupId []int32
Previoustage int32
BuriedType int32
Buried int32
Grouptype []int32
Episodetype int32
StageParam int32
@ -89,6 +91,8 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buried_type"].(float64); !_ok_ { err = errors.New("buried_type error"); return }; _v.BuriedType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buried"].(float64); !_ok_ { err = errors.New("buried error"); return }; _v.Buried = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameTreasureMap struct {
_dataMap map[int32]*GameTreasureMapData
_dataList []*GameTreasureMapData
}
func NewGameTreasureMap(_buf []map[string]interface{}) (*GameTreasureMap, error) {
_dataList := make([]*GameTreasureMapData, 0, len(_buf))
dataMap := make(map[int32]*GameTreasureMapData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameTreasureMapData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameTreasureMap{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameTreasureMap) GetDataMap() map[int32]*GameTreasureMapData {
return table._dataMap
}
func (table *GameTreasureMap) GetDataList() []*GameTreasureMapData {
return table._dataList
}
func (table *GameTreasureMap) Get(key int32) *GameTreasureMapData {
return table._dataMap[key]
}

View File

@ -0,0 +1,58 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameTreasureMapData struct {
Id int32
Pic string
Unlock []*Gameatn
Name string
Explain string
Describe string
}
const TypeId_GameTreasureMapData = 1832570747
func (*GameTreasureMapData) GetTypeId() int32 {
return 1832570747
}
func (_v *GameTreasureMapData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Pic, _ok_ = _buf["pic"].(string); !_ok_ { err = errors.New("pic error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["unlock"].([]interface{}); !_ok_ { err = errors.New("unlock error"); return }
_v.Unlock = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Unlock = append(_v.Unlock, _list_v_)
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _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["explain"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Explain error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Explain, _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["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGameTreasureMapData(_buf map[string]interface{}) (*GameTreasureMapData, error) {
v := &GameTreasureMapData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -277,6 +277,8 @@ type Tables struct {
GColorGetfraction *GameGColorGetfraction
GColorReward *GameGColorReward
GColortTmedecay *GameGColortTmedecay
TreasureMap *GameTreasureMap
ConsumeIntegral *GameConsumeIntegral
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -1880,5 +1882,17 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.GColortTmedecay, err = NewGameGColortTmedecay(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_treasuremap") ; err != nil {
return nil, err
}
if tables.TreasureMap, err = NewGameTreasureMap(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_consumeintegral") ; err != nil {
return nil, err
}
if tables.ConsumeIntegral, err = NewGameConsumeIntegral(buf) ; err != nil {
return nil, err
}
return tables, nil
}