上传捉虫子消耗

This commit is contained in:
liwei1dao 2023-12-07 11:06:32 +08:00
parent fd82051612
commit 4e9bebde19
37 changed files with 49629 additions and 2707 deletions

View File

@ -1839,7 +1839,7 @@
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [
"24008"
"33005"
],
"LockSlots": [],
"HeroCheck": [],
@ -2037,9 +2037,9 @@
"id": 10103010,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"scenesfight_05_01"
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,

View File

@ -1,6 +1,7 @@
[
{
"key": 1001,
"type": 1,
"condition": 15,
"reward": [
{
@ -17,6 +18,7 @@
},
{
"key": 1002,
"type": 1,
"condition": 20,
"reward": [
{
@ -33,6 +35,7 @@
},
{
"key": 1003,
"type": 1,
"condition": 25,
"reward": [
{
@ -49,6 +52,7 @@
},
{
"key": 1004,
"type": 1,
"condition": 30,
"reward": [
{
@ -65,6 +69,7 @@
},
{
"key": 1005,
"type": 1,
"condition": 35,
"reward": [
{
@ -81,6 +86,7 @@
},
{
"key": 1006,
"type": 1,
"condition": 40,
"reward": [
{
@ -97,6 +103,7 @@
},
{
"key": 1007,
"type": 1,
"condition": 45,
"reward": [
{
@ -113,6 +120,143 @@
},
{
"key": 1008,
"type": 1,
"condition": 50,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2001,
"type": 2,
"condition": 15,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2002,
"type": 2,
"condition": 20,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2003,
"type": 2,
"condition": 25,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2004,
"type": 2,
"condition": 30,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2005,
"type": 2,
"condition": 35,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2006,
"type": 2,
"condition": 40,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2007,
"type": 2,
"condition": 45,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2008,
"type": 2,
"condition": 50,
"reward": [
{

View File

@ -3,7 +3,7 @@
"id": 1001,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -23,16 +23,23 @@
"text": "第1关"
},
"stageskill": {
"key": "",
"text": ""
"key": "catchbugs_stage_stageskill_1",
"text": "本周暂无技能"
},
"points": 4
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1002,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -52,16 +59,23 @@
"text": "第2关"
},
"stageskill": {
"key": "",
"key": "catchbugs_stage_stageskill_2",
"text": ""
},
"points": 5
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1003,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -84,13 +98,20 @@
"key": "catchbugs_stage_stageskill_3",
"text": ""
},
"points": 6
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1004,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [
@ -117,13 +138,20 @@
"key": "catchbugs_stage_stageskill_4",
"text": ""
},
"points": 7
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1005,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [
@ -150,173 +178,13 @@
"key": "catchbugs_stage_stageskill_5",
"text": ""
},
"points": 8
},
{
"id": 1006,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
3
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_6",
"text": "第6关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_6",
"text": ""
},
"points": 9
},
{
"id": 1007,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
4
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_7",
"text": "第7关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_7",
"text": ""
},
"points": 10
},
{
"id": 1008,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
1
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_8",
"text": "第8关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_8",
"text": ""
},
"points": 11
},
{
"id": 1009,
"cardnum": {
"k": 4,
"v": 6
},
"stagetime": 120,
"skill": [
2
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_9",
"text": "第9关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_9",
"text": ""
},
"points": 12
},
{
"id": 1010,
"cardnum": {
"k": 4,
"v": 6
},
"stagetime": 120,
"skill": [
3,
4
],
"skilltime": [
20,
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_10",
"text": "第10关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_10",
"text": ""
},
"points": 13
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
}
]

File diff suppressed because it is too large Load Diff

View File

@ -1428,7 +1428,7 @@
"txt": "1000138",
"txtoffset": {
"x": 0,
"y": 0
"y": 100
},
"speakerface": 0,
"sound": "",
@ -1694,7 +1694,7 @@
{
"id": 1000709,
"group": 7,
"type": 1,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
@ -1725,8 +1725,8 @@
},
"speakerface": 0,
"sound": "",
"mask": 1,
"lock": 1,
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,

View File

@ -5020,7 +5020,7 @@
"z": 0
},
"capskillrule": 101,
"skill": 144001011,
"skill": 0,
"skill1": 144001111,
"skill2": 144001211,
"skill3": 144001311,

View File

@ -8410,7 +8410,7 @@
"access": [
125
],
"use_skip": 139,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13000001",
"intr": {
@ -8459,7 +8459,7 @@
"access": [
125
],
"use_skip": 139,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13000002",
"intr": {
@ -8508,7 +8508,7 @@
"access": [
126
],
"use_skip": 139,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13000003",
"intr": {
@ -8557,7 +8557,7 @@
"access": [
122
],
"use_skip": 139,
"use_skip": 1002,
"upper_limit": 0,
"img": "item_13000004",
"intr": {
@ -8604,7 +8604,7 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13000005",
"intr": {
@ -8651,7 +8651,7 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13000006",
"intr": {
@ -8845,7 +8845,7 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13001004",
"intr": {
@ -9039,7 +9039,7 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13002004",
"intr": {
@ -9233,7 +9233,7 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"use_skip": 1001,
"upper_limit": 0,
"img": "item_13003004",
"intr": {
@ -9282,7 +9282,7 @@
"access": [
167
],
"use_skip": 1001,
"use_skip": 1003,
"upper_limit": 0,
"img": "wp_icon_10017",
"intr": {
@ -9331,7 +9331,7 @@
"access": [
167
],
"use_skip": 1001,
"use_skip": 1003,
"upper_limit": 0,
"img": "wp_icon_10018",
"intr": {
@ -9380,7 +9380,7 @@
"access": [
167
],
"use_skip": 1001,
"use_skip": 1002,
"upper_limit": 0,
"img": "icon_st",
"intr": {
@ -12620,7 +12620,7 @@
"upper_limit": 999,
"img": "item_15000102",
"intr": {
"key": "item_item_intr_253",
"key": "item_item_intr_254",
"text": "猎魂头目的初级掉落物,可在守护者界面提升感观之林属性守护者的回响等级。"
},
"describe": {
@ -12681,7 +12681,7 @@
"upper_limit": 999,
"img": "item_15000103",
"intr": {
"key": "item_item_intr_254",
"key": "item_item_intr_253",
"text": "猎魂头目的初级掉落物,可在守护者界面提升包容之水属性守护者的回响等级。"
},
"describe": {
@ -12888,7 +12888,7 @@
"upper_limit": 999,
"img": "item_15000202",
"intr": {
"key": "item_item_intr_257",
"key": "item_item_intr_258",
"text": "猎魂头目的中级掉落物,可在守护者界面提升感观之林属性守护者的回响等级。"
},
"describe": {
@ -12961,7 +12961,7 @@
"upper_limit": 999,
"img": "item_15000203",
"intr": {
"key": "item_item_intr_258",
"key": "item_item_intr_257",
"text": "猎魂头目的中级掉落物,可在守护者界面提升包容之水属性守护者的回响等级。"
},
"describe": {
@ -13156,7 +13156,7 @@
"upper_limit": 999,
"img": "item_15000302",
"intr": {
"key": "item_item_intr_261",
"key": "item_item_intr_262",
"text": "猎魂头目的高级掉落物,可在守护者界面提升感观之林属性守护者的回响等级。"
},
"describe": {
@ -13217,7 +13217,7 @@
"upper_limit": 999,
"img": "item_15000303",
"intr": {
"key": "item_item_intr_262",
"key": "item_item_intr_261",
"text": "猎魂头目的高级掉落物,可在守护者界面提升包容之水属性守护者的回响等级。"
},
"describe": {
@ -21513,5 +21513,46 @@
},
"sale": [],
"gm": 0
},
{
"id": "24022003",
"name": {
"key": "item_item_name_437",
"text": "捉虫子游玩次数"
},
"usetype": 0,
"color": 0,
"bagtype": 0,
"index": 0,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "wp_icon_jjcq",
"intr": {
"key": "item_item_intr_439",
"text": ""
},
"describe": {
"key": "item_item_describe_439",
"text": ""
},
"dialogue": {
"key": "item_item_dialogue_437",
"text": ""
},
"sale": [],
"gm": 0
}
]

View File

@ -23309,7 +23309,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23333,7 +23333,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23357,7 +23357,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23381,7 +23381,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23405,7 +23405,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23429,7 +23429,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23453,7 +23453,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23477,7 +23477,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23501,7 +23501,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23525,7 +23525,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23549,7 +23549,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23573,7 +23573,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 1,
"groupid": 0,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23597,7 +23597,7 @@
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23621,7 +23621,7 @@
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23645,7 +23645,7 @@
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23669,7 +23669,7 @@
"description": "5星感观之林自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 3,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23813,7 +23813,7 @@
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 4,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23837,7 +23837,7 @@
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 4,
"subtype": 2,
"groupnum": 1,
"itemid": {
@ -23861,7 +23861,7 @@
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupid": 2,
"groupid": 4,
"subtype": 2,
"groupnum": 1,
"itemid": {

View File

@ -3290,6 +3290,11 @@
"a": "item",
"t": "10000040",
"n": 1
},
{
"a": "item",
"t": "13003001",
"n": 10
}
],
"lotteryward": 17110110,
@ -9545,7 +9550,7 @@
"destroy": 1,
"progress": 0,
"stroyshow": 0,
"frontstoryid": 10240,
"frontstoryid": 201000,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -9626,8 +9631,8 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"frontstoryid": 201020,
"afterstoryid": 201040,
"maingroupName": {
"key": "",
"text": ""
@ -9677,7 +9682,7 @@
],
"BattleReadyID": 10103007,
"FormatList": [
121011
102011
],
"helphero": [],
"banhero": [],
@ -9743,7 +9748,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201061,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -9824,7 +9829,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201070,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -9905,7 +9910,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201080,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -9956,7 +9961,7 @@
],
"BattleReadyID": 10103007,
"FormatList": [
121021
102021
],
"helphero": [],
"banhero": [],
@ -10002,7 +10007,7 @@
},
"venturetype": 1,
"ventureavatar": [
"Person/13002/13002_q.prefab"
"Person/45003/45003_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
@ -10020,12 +10025,12 @@
"key": "",
"text": ""
},
"hide": 1,
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"frontstoryid": 201100,
"afterstoryid": 201120,
"maingroupName": {
"key": "",
"text": ""
@ -10075,7 +10080,7 @@
],
"BattleReadyID": 10103008,
"FormatList": [
121031
102031
],
"helphero": [],
"banhero": [],
@ -10144,7 +10149,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201130,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10226,7 +10231,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201160,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10345,7 +10350,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201170,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10424,7 +10429,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201240,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10503,7 +10508,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201260,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10755,10 +10760,10 @@
"text": ""
},
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201270,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10818,7 +10823,8 @@
"venturetype": 1,
"ventureavatar": [
"player",
"Person/13002/13002_q.prefab"
"Person/13002/13002_q.prefab",
"Person/45003/45003_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
@ -10837,10 +10843,10 @@
"text": ""
},
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201280,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10892,14 +10898,14 @@
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
"venturemodel": "",
"venturemodel": "Person/34004/34004_q.prefab",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 1,
"ventureavatar": [
"Person/34004/34004_q.prefab"
"player"
],
"scene_effect": [],
"scene_effectfilter": "",
@ -10921,7 +10927,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201310,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -10958,7 +10964,7 @@
{
"id": 1102016,
"chapterid": 11002,
"group_id": 100216,
"group_id": 1002151,
"previous_group_id": [
100215
],
@ -10966,10 +10972,91 @@
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
"venturemodel": "Person/34004/34004_q.prefab",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 1,
"ventureavatar": [
"player"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
"EditorStage": 0,
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"prewarbubbletext": {
"key": "",
"text": ""
},
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
},
"mainlineName": {
"key": "",
"text": ""
},
"title": {
"key": "",
"text": ""
},
"desc": {
"key": "",
"text": ""
},
"exp": 0,
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
"banhero": [],
"star": [],
"star_type": [],
"star_value": [],
"challengeward": 0
},
{
"id": 1102017,
"chapterid": 11002,
"group_id": 100216,
"previous_group_id": [
1002151
],
"previoustage": 0,
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 1,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
"battle_fail": 1,
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
@ -11000,10 +11087,10 @@
"text": ""
},
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201320,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -11076,7 +11163,7 @@
"challengeward": 0
},
{
"id": 1102017,
"id": 1102018,
"chapterid": 11002,
"group_id": 1002161,
"previous_group_id": [
@ -11119,7 +11206,7 @@
"text": ""
},
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
@ -11157,7 +11244,7 @@
"challengeward": 0
},
{
"id": 1102018,
"id": 1102019,
"chapterid": 11002,
"group_id": 100217,
"previous_group_id": [
@ -11202,10 +11289,10 @@
"text": ""
},
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201330,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -11278,7 +11365,7 @@
"challengeward": 0
},
{
"id": 1102019,
"id": 1102020,
"chapterid": 11002,
"group_id": 100218,
"previous_group_id": [
@ -11288,7 +11375,7 @@
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 4,
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
@ -11326,7 +11413,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201350,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -11361,7 +11448,7 @@
"challengeward": 0
},
{
"id": 1102020,
"id": 1102021,
"chapterid": 11002,
"group_id": 100219,
"previous_group_id": [
@ -11405,7 +11492,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 1,
"frontstoryid": 0,
"frontstoryid": 201360,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -11461,7 +11548,7 @@
],
"BattleReadyID": 10103010,
"FormatList": [
121071
102071
],
"helphero": [],
"banhero": [],
@ -11483,7 +11570,7 @@
"challengeward": 0
},
{
"id": 1102021,
"id": 1102022,
"chapterid": 11002,
"group_id": 100220,
"previous_group_id": [
@ -11527,7 +11614,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"frontstoryid": 201390,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -11567,86 +11654,6 @@
"star_value": [],
"challengeward": 0
},
{
"id": 1102022,
"chapterid": 11002,
"group_id": 1002202,
"previous_group_id": [
100217,
100216
],
"previoustage": 0,
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
"venturemodel": "",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
"EditorStage": 0,
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"prewarbubbletext": {
"key": "",
"text": ""
},
"hide": 0,
"destroy": 1,
"progress": 0,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
},
"mainlineName": {
"key": "mainchapter_main_stage_mainlineName_130",
"text": "2-22"
},
"title": {
"key": "mainchapter_main_stage_title_106",
"text": "教程穿装备"
},
"desc": {
"key": "mainchapter_main_stage_desc_108",
"text": "教程穿装备"
},
"exp": 0,
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
"banhero": [],
"star": [],
"star_type": [],
"star_value": [],
"challengeward": 0
},
{
"id": 1102023,
"chapterid": 11002,
@ -11690,7 +11697,7 @@
},
"hide": 0,
"destroy": 1,
"progress": 0,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -11769,7 +11776,7 @@
},
"hide": 0,
"destroy": 1,
"progress": 0,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,

View File

@ -13,11 +13,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -39,11 +39,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -65,11 +65,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -91,11 +91,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -117,11 +117,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -143,11 +143,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -169,11 +169,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -195,11 +195,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -221,11 +221,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -247,11 +247,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,

View File

@ -13,7 +13,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -26,16 +26,12 @@
"k": 1,
"v": 2000
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -48,16 +44,12 @@
"k": 3,
"v": 1000
},
{
"k": 4,
"v": 1500
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -70,16 +62,12 @@
"k": 1,
"v": 2500
},
{
"k": 4,
"v": 1500
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -92,24 +80,12 @@
"k": 3,
"v": 200
},
{
"k": 5,
"v": 600
},
{
"k": 1,
"v": 2000
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -122,20 +98,12 @@
"k": 4,
"v": 3000
},
{
"k": 1,
"v": 2500
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -148,20 +116,12 @@
"k": 3,
"v": 3000
},
{
"k": 4,
"v": 2500
},
{
"k": 1,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -179,7 +139,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -201,7 +161,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -223,7 +183,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -245,7 +205,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -275,7 +235,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -301,7 +261,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -327,7 +287,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -345,7 +305,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -367,7 +327,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -389,7 +349,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -411,7 +371,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -441,7 +401,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -467,7 +427,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -493,7 +453,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -511,7 +471,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -533,7 +493,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -555,7 +515,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -577,7 +537,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -607,7 +567,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -633,7 +593,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -659,7 +619,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -677,7 +637,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -699,7 +659,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -721,7 +681,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -743,7 +703,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -773,7 +733,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -799,7 +759,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -825,7 +785,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -843,7 +803,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -865,7 +825,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -887,7 +847,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -909,7 +869,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -939,7 +899,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -965,7 +925,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -991,7 +951,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1009,7 +969,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1031,7 +991,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1053,7 +1013,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1075,7 +1035,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1105,7 +1065,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1131,7 +1091,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1157,7 +1117,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1175,7 +1135,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1197,7 +1157,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1219,7 +1179,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1241,7 +1201,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1271,7 +1231,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1297,7 +1257,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1323,7 +1283,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1341,7 +1301,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1363,7 +1323,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1385,7 +1345,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1407,7 +1367,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1437,7 +1397,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1463,7 +1423,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1489,7 +1449,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1507,7 +1467,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1529,7 +1489,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1551,7 +1511,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1573,7 +1533,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1603,7 +1563,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1629,7 +1589,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1655,7 +1615,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
}

File diff suppressed because it is too large Load Diff

View File

@ -77,10 +77,7 @@
"shopitem": [
12001,
12002,
12003,
12004,
12005,
12006
12003
]
},
{

File diff suppressed because it is too large Load Diff

View File

@ -32995,7 +32995,7 @@
"Argu": [
1,
1,
6000
1500
],
"FollowSK": [
233005312,
@ -33022,7 +33022,7 @@
"Argu": [
1,
1,
6100
1600
],
"FollowSK": [
233005312,
@ -33049,7 +33049,7 @@
"Argu": [
1,
1,
6200
1700
],
"FollowSK": [
233005312,
@ -33076,7 +33076,7 @@
"Argu": [
1,
1,
6300
1800
],
"FollowSK": [
233005312,
@ -33103,7 +33103,7 @@
"Argu": [
1,
1,
6400
1900
],
"FollowSK": [
233005312,
@ -53606,10 +53606,11 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Type": 3,
"Argu": [
482400323,
-1,
391000108,
1000,
1,
-1
],
"FollowSK": [],
@ -54430,7 +54431,7 @@
391000065,
1000,
1,
1
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -55428,6 +55429,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 845001215,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
3,
1,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 814001211,
"EmitPR": 1000,
@ -57633,7 +57657,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001127,
390001007,
1000,
1,
2
@ -60953,11 +60977,12 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Type": 18,
"Argu": [
494500132,
-1,
-1
1,
1,
1,
1000
],
"FollowSK": [],
"SucFollowSK": [],
@ -62882,7 +62907,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000001,
391000000,
1000,
1,
-1
@ -67056,5 +67081,592 @@
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 823011211,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000079,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 823011212,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
482301131,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 823011213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000099,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 823011214,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000109,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923011311,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000000,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923011312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000043,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923011313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492301121,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923011314,
"EmitPR": 1000,
"From": 12,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001105,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 835003211,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
483500321,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 835003212,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000006,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 835003213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
483500322,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 835003214,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001103,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 835003215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000065,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 935003311,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000000,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 935003312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000031,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 935003313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
483500323,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 833005211,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000110,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 833005212,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
483300521,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 833005213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
1,
-1,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 833005214,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
483300522,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 833005215,
"EmitPR": 1000,
"From": 12,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001107,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933005311,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000000,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933005312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000043,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933005313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933005314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
50
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
}
]

File diff suppressed because it is too large Load Diff

View File

@ -9056,15 +9056,15 @@
"Id": 391000011,
"Name": {
"key": "skill_skill_buff_Name_391000011",
"text": "防御提升"
"text": "攻击提升"
},
"Desc": {
"key": "skill_skill_buff_Desc_391000011",
"text": "增加5%防御。"
"text": "增加5%攻击。"
},
"BuffType": 20,
"EffectArgu": [
23,
22,
50
],
"BufParNum": 1,
@ -12337,5 +12337,108 @@
"buffpos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
{
"Id": 391000108,
"Name": {
"key": "skill_skill_buff_Name_391000108",
"text": "对睡眠状态的敌人造成的伤害提升20%。"
},
"Desc": {
"key": "skill_skill_buff_Desc_391000108",
"text": "对睡眠状态的敌人造成的伤害提升20%。"
},
"BuffType": 119,
"EffectArgu": [
200,
390001118
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
3
],
"AddEffect": false,
"RemoveType": false,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
{
"Id": 391000109,
"Name": {
"key": "skill_skill_buff_Name_391000109",
"text": "对出血状态的敌人造成的伤害提升20%。"
},
"Desc": {
"key": "skill_skill_buff_Desc_391000109",
"text": "对出血状态的敌人造成的伤害提升20%。"
},
"BuffType": 119,
"EffectArgu": [
200,
390001404
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
3
],
"AddEffect": false,
"RemoveType": false,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
{
"Id": 391000110,
"Name": {
"key": "skill_skill_buff_Name_391000110",
"text": "血量低于60%时受到伤害降低10%"
},
"Desc": {
"key": "skill_skill_buff_Desc_391000110",
"text": "血量低于60%时受到伤害降低10%"
},
"BuffType": 33,
"EffectArgu": [
0,
-100,
-600
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
3
],
"AddEffect": false,
"RemoveType": false,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
}
]

View File

@ -7048,10 +7048,10 @@
},
{
"Id": 484300321,
"When": 17,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7251,21 +7251,21 @@
{
"Id": 484500122,
"When": 16,
"FromCheck": "",
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"MainSkillCheck": "SkillPos=1",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 200,
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
145001111
845001215
]
},
{
@ -7855,7 +7855,7 @@
},
{
"Id": 494300331,
"When": 30,
"When": 15,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
@ -7870,8 +7870,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
943003314,
943003315
943003314
]
},
{
@ -8016,12 +8015,12 @@
},
{
"Id": 494500131,
"When": 18,
"When": 20,
"FromCheck": "Target=3",
"TargetCheck": "Target=2",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "Effect=3,Succ=1",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@ -8031,7 +8030,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
945001315
945001314
]
},
{
@ -9359,5 +9358,326 @@
"Callback": [
145004311
]
},
{
"Id": 482301131,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3,Hpproless=500",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 1,
"MaxEmitTimesInRound": 0,
"Callback": [
823011213
]
},
{
"Id": 492301121,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=2,HasBuff=390001404",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
923011314
]
},
{
"Id": 483500321,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3,Hpproless=500",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 1,
"MaxEmitTimesInRound": 0,
"Callback": [
835003212
]
},
{
"Id": 483500322,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3,HasBuff=391000095,OverlayNum=10",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 1,
"MaxEmitTimesInRound": 0,
"Callback": [
835003214
]
},
{
"Id": 483500323,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3,HasBuff=391000095",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 600,
"PasCorrection": 0,
"Type": "BeatBack",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
1,
1000
]
},
{
"Id": 483300521,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3,Hpproless=600",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 1,
"MaxEmitTimesInRound": 0,
"Callback": [
833005213
]
},
{
"Id": 483300522,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=1",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
833005215
]
},
{
"Id": 493300531,
"When": 29,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
933005314
]
},
{
"Id": 451105211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251105213
]
},
{
"Id": 451112211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251112212
]
},
{
"Id": 451305111,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251305113
]
},
{
"Id": 451305211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=151305211",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251305213
]
},
{
"Id": 451312211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251312212
]
},
{
"Id": 451505111,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251505113
]
},
{
"Id": 451505211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=151505211",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251505213
]
},
{
"Id": 451512211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251512212
]
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010101,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14010200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -80,7 +80,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010101,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14010300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -132,7 +132,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14020100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -150,7 +150,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14020200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -186,7 +186,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14020300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -222,7 +222,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15020401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -240,7 +240,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14020500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -276,7 +276,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14020600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -314,7 +314,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000002,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28120801,
"Condition": [
28
]
@ -328,7 +328,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14030100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -346,7 +346,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14030200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -382,7 +382,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14030300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -418,7 +418,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15030401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -436,7 +436,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14030500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -472,7 +472,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14030600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -510,7 +510,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000003,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28130801,
"Condition": [
28
]
@ -524,7 +524,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -542,7 +542,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -578,7 +578,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -614,7 +614,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15040401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -632,7 +632,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -668,7 +668,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -720,7 +720,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15040801,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -738,7 +738,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14040900,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -774,7 +774,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14041000,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -830,7 +830,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000004,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28141201,
"Condition": [
28
]
@ -844,7 +844,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -862,7 +862,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -898,7 +898,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -934,7 +934,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15050401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -952,7 +952,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -988,7 +988,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1040,7 +1040,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15050801,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1058,7 +1058,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14050900,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1094,7 +1094,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14051000,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1150,7 +1150,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000005,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28151201,
"Condition": [
28
]
@ -1164,7 +1164,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1182,7 +1182,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1218,7 +1218,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1254,7 +1254,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15060401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1272,7 +1272,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1308,7 +1308,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1360,7 +1360,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15060801,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1378,7 +1378,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14060900,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1414,7 +1414,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14061000,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1470,7 +1470,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000006,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28161201,
"Condition": [
28
]
@ -1484,7 +1484,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1502,7 +1502,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1538,7 +1538,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1574,7 +1574,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15070401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1592,7 +1592,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1628,7 +1628,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1680,7 +1680,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15070801,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1698,7 +1698,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14070900,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1734,7 +1734,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14071000,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1790,7 +1790,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000007,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28171201,
"Condition": [
28
]
@ -1804,7 +1804,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1822,7 +1822,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080200,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1858,7 +1858,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080300,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1894,7 +1894,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15080401,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1912,7 +1912,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080500,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -1948,7 +1948,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080600,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -2000,7 +2000,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_2",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 15080801,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -2018,7 +2018,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14080900,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -2054,7 +2054,7 @@
"SceneName": "StonehengeScene1",
"PortalName": "portal_1",
"EventrewardGroup": 16010100,
"EventBattleGroup": 14010100,
"EventBattleGroup": 14081000,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
"EventStoreGroup": 0,
@ -2110,7 +2110,7 @@
"EventStoryNpcGroup": 12100001,
"EventTreasureGroup": 10000008,
"EventStoreGroup": 0,
"BossEvent": 28110501,
"BossEvent": 28181201,
"Condition": [
28
]

View File

@ -14,7 +14,15 @@
"t": "10000001",
"n": 1
}
]
],
"describe": {
"key": "td_reward_describe_1",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_1",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
},
{
"id": 2,
@ -31,7 +39,15 @@
"t": "10000001",
"n": 2
}
]
],
"describe": {
"key": "td_reward_describe_2",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_2",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
},
{
"id": 3,
@ -48,7 +64,15 @@
"t": "10000001",
"n": 3
}
]
],
"describe": {
"key": "td_reward_describe_3",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_3",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
},
{
"id": 4,
@ -65,7 +89,15 @@
"t": "10000001",
"n": 4
}
]
],
"describe": {
"key": "td_reward_describe_4",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_4",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
},
{
"id": 5,
@ -82,7 +114,15 @@
"t": "10000001",
"n": 5
}
]
],
"describe": {
"key": "td_reward_describe_5",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_5",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
},
{
"id": 6,
@ -99,6 +139,14 @@
"t": "10000001",
"n": 6
}
]
],
"describe": {
"key": "td_reward_describe_6",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_6",
"text": "会出现敌人:<br>普通豚鼠:最基础敌人。<br>铁甲豚鼠:有铁甲技能。"
}
}
]

View File

@ -52,7 +52,7 @@
],
"name": {
"key": "treasuremap_map_name_1",
"text": "博岛的藏宝图"
"text": "博岛的藏宝图"
},
"explain": {
"key": "treasuremap_map_explain_1",
@ -76,15 +76,15 @@
],
"name": {
"key": "treasuremap_map_name_2",
"text": "石阵旁的藏宝图"
"text": "博克岛的藏宝图"
},
"explain": {
"key": "treasuremap_map_explain_2",
"text": "所以,这么大一张图就丢在这路边吗?"
"text": "雕像与雕像之间,好像藏着小秘密~要试着去找找吗?"
},
"describe": {
"key": "treasuremap_map_desribe_2",
"text": "雕像与雕像之间,好像藏着小秘密~要试着去找找吗?"
"text": "获得这张藏宝图后,可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现,要根据图片位置好好搜寻哦~"
}
}
]

View File

@ -3,6 +3,7 @@ package catchbugs
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
)
@ -12,12 +13,13 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.CatchbugsAwar
func (this *apiComp) Award(session comm.IUserSession, req *pb.CatchbugsAwardReq) (errdata *pb.ErrorData) {
var (
confs []*cfg.GameCatchbugRewardData
info *pb.DBCatchBugs
res []*cfg.Gameatn
atno []*pb.UserAtno
ok bool
err error
confs []*cfg.GameCatchbugRewardData
info *pb.DBCatchBugs
res []*cfg.Gameatn
atno []*pb.UserAtno
awards map[int32]bool
ok bool
err error
)
if errdata = this.AwardCheck(session, req); errdata != nil {
return
@ -38,20 +40,39 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CatchbugsAwardReq)
return
}
for _, v := range confs {
if _, ok = info.Awards[v.Key]; !ok && info.Integral >= v.Condition {
res = append(res, v.Reward...)
info.Awards[v.Key] = true
for _, conf := range confs {
if req.Atype == conf.Type {
if req.Atype == 1 {
if _, ok = info.Weekaward[conf.Key]; !ok && info.Integral >= conf.Condition {
res = append(res, conf.Reward...)
info.Weekaward[conf.Key] = true
}
} else {
if _, ok = info.Allaward[conf.Key]; !ok && info.Accruedintegral >= conf.Condition {
res = append(res, conf.Reward...)
info.Allaward[conf.Key] = true
}
}
}
}
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return
}
if req.Atype == 1 {
info.Weektime = configure.Now().Unix()
awards = info.Weekaward
} else {
awards = info.Allaward
}
this.module.model.Change(session.GetUserId(), map[string]interface{}{
"award": info.Awards,
"weekaward": info.Weekaward,
"allaward": info.Allaward,
"weektime": info.Weektime,
})
session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsAwardResp{Awardmap: info.Awards, Award: atno})
session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsAwardResp{Atype: req.Atype, Award: atno, Awardmap: awards})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CatchbugsAwardReq", atno)

View File

@ -3,6 +3,8 @@ package catchbugs
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils"
)
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.CatchbugsInfoReq) (errdata *pb.ErrorData) {
@ -24,6 +26,16 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CatchbugsInfoReq) (
}
return
}
if !utils.IsSameWeek(info.Weektime) {
info.Integral = 0
info.Weekaward = make(map[int32]bool)
info.Weektime = configure.Now().Unix()
this.module.model.Change(session.GetUserId(), map[string]interface{}{
"integral": info.Integral,
"weekaward": info.Weekaward,
"weektime": info.Weektime,
})
}
session.SendMsg(string(this.module.GetType()), "info", &pb.CatchbugsInfoResp{Info: info})
return

View File

@ -26,7 +26,9 @@ func (this *apiComp) PassLevel(session comm.IUserSession, req *pb.CatchbugsPassL
}
return
}
if errdata = this.module.ConsumeRes(session, conf.Consume, true); err != nil {
return
}
if info, err = this.module.model.getModel(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

View File

@ -35,10 +35,12 @@ func (this *modelComp) getModel(uid string) (info *pb.DBCatchBugs, err error) {
}
if err == mgo.MongodbNil {
info = &pb.DBCatchBugs{
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Books: make(map[int32]int32),
Awards: make(map[int32]bool),
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Books: make(map[int32]int32),
Weekaward: make(map[int32]bool),
Allaward: make(map[int32]bool),
Level: make(map[int32]bool),
}
err = this.Add(uid, info)
}

View File

@ -95,12 +95,14 @@ func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string)
}
redplayer = &pb.DBCatchBugsPlayer{
Info: comm.GetUserBaseInfo(reduser),
Integral: redinfo.Integral,
Info: comm.GetUserBaseInfo(reduser),
Integral: redinfo.Integral,
Accruedintegral: redinfo.Accruedintegral,
}
blueplayer = &pb.DBCatchBugsPlayer{
Info: comm.GetUserBaseInfo(blueuser),
Integral: blueinfo.Integral,
Info: comm.GetUserBaseInfo(blueuser),
Integral: blueinfo.Integral,
Accruedintegral: redinfo.Accruedintegral,
}
roomid, err = this.createRoom(rules, redplayer, blueplayer, sessions)

View File

@ -328,12 +328,16 @@ func (this *Room) gameover() {
}
this.data.Red.Integral += this.data.Red.Score
this.data.Blue.Integral += this.data.Blue.Score
this.data.Red.Accruedintegral += this.data.Red.Score
this.data.Blue.Accruedintegral += this.data.Blue.Score
this.module.model.Change(this.data.Red.Info.Uid, map[string]interface{}{
"integral": this.data.Red.Integral,
"integral": this.data.Red.Integral,
"accruedintegral": this.data.Red.Accruedintegral,
})
if !this.data.Blue.Isai {
this.module.model.Change(this.data.Blue.Info.Uid, map[string]interface{}{
"integral": this.data.Blue.Integral,
"integral": this.data.Blue.Integral,
"accruedintegral": this.data.Blue.Accruedintegral,
})
}
this.SendAllSessions("gameover", &pb.CatchbugsGameOverPush{

View File

@ -26,13 +26,15 @@ type DBCatchBugs struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`
Books map[int32]int32 `protobuf:"bytes,4,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴
Awards map[int32]bool `protobuf:"bytes,5,rep,name=awards,proto3" json:"awards" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //奖励
Level map[int32]bool `protobuf:"bytes,6,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //通关信息
Weektime int64 `protobuf:"varint,7,opt,name=weektime,proto3" json:"weektime"` //周时长
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`
Accruedintegral int32 `protobuf:"varint,4,opt,name=Accruedintegral,proto3" json:"Accruedintegral"` //累计积分
Books map[int32]int32 `protobuf:"bytes,5,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴
Weekaward map[int32]bool `protobuf:"bytes,6,rep,name=weekaward,proto3" json:"weekaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周奖励
Allaward map[int32]bool `protobuf:"bytes,7,rep,name=allaward,proto3" json:"allaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //累计奖励
Level map[int32]bool `protobuf:"bytes,8,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //通关信息
Weektime int64 `protobuf:"varint,9,opt,name=weektime,proto3" json:"weektime"` //周时长
}
func (x *DBCatchBugs) Reset() {
@ -88,6 +90,13 @@ func (x *DBCatchBugs) GetIntegral() int32 {
return 0
}
func (x *DBCatchBugs) GetAccruedintegral() int32 {
if x != nil {
return x.Accruedintegral
}
return 0
}
func (x *DBCatchBugs) GetBooks() map[int32]int32 {
if x != nil {
return x.Books
@ -95,9 +104,16 @@ func (x *DBCatchBugs) GetBooks() map[int32]int32 {
return nil
}
func (x *DBCatchBugs) GetAwards() map[int32]bool {
func (x *DBCatchBugs) GetWeekaward() map[int32]bool {
if x != nil {
return x.Awards
return x.Weekaward
}
return nil
}
func (x *DBCatchBugs) GetAllaward() map[int32]bool {
if x != nil {
return x.Allaward
}
return nil
}
@ -178,14 +194,15 @@ type DBCatchBugsPlayer struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息
Ready bool `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"`
Isai bool `protobuf:"varint,3,opt,name=isai,proto3" json:"isai"` //是否是ai
Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"`
Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分
Lastopencard int32 `protobuf:"varint,6,opt,name=lastopencard,proto3" json:"lastopencard"`
Cards []int32 `protobuf:"varint,7,rep,packed,name=cards,proto3" json:"cards"`
Coiled int32 `protobuf:"varint,8,opt,name=coiled,proto3" json:"coiled"` //连续成功次数
Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息
Ready bool `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"`
Isai bool `protobuf:"varint,3,opt,name=isai,proto3" json:"isai"` //是否是ai
Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"`
Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分
Accruedintegral int32 `protobuf:"varint,6,opt,name=accruedintegral,proto3" json:"accruedintegral"` //累计积分
Lastopencard int32 `protobuf:"varint,7,opt,name=lastopencard,proto3" json:"lastopencard"`
Cards []int32 `protobuf:"varint,8,rep,packed,name=cards,proto3" json:"cards"`
Coiled int32 `protobuf:"varint,9,opt,name=coiled,proto3" json:"coiled"` //连续成功次数
}
func (x *DBCatchBugsPlayer) Reset() {
@ -255,6 +272,13 @@ func (x *DBCatchBugsPlayer) GetIntegral() int32 {
return 0
}
func (x *DBCatchBugsPlayer) GetAccruedintegral() int32 {
if x != nil {
return x.Accruedintegral
}
return 0
}
func (x *DBCatchBugsPlayer) GetLastopencard() int32 {
if x != nil {
return x.Lastopencard
@ -441,75 +465,88 @@ var File_catchbugs_catchbugs_db_proto protoreflect.FileDescriptor
var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{
0x0a, 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63,
0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a,
0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x03, 0x0a, 0x0b, 0x44,
0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd1, 0x04, 0x0a, 0x0b, 0x44,
0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2d, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b,
0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64,
0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x2d, 0x0a, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74,
0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, 0x6b,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b,
0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74,
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x72,
0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
0x05, 0x52, 0x0f, 0x41, 0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
0x61, 0x6c, 0x12, 0x2d, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e,
0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b,
0x73, 0x12, 0x39, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
0x67, 0x73, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x36, 0x0a, 0x08,
0x61, 0x6c, 0x6c, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a,
0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x6c, 0x6c,
0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61, 0x6c, 0x6c, 0x61,
0x77, 0x61, 0x72, 0x64, 0x12, 0x2d, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x08, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
0x73, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18,
0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x1a,
0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x57, 0x65, 0x65,
0x6b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x6c, 0x6c, 0x61, 0x77,
0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39,
0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76,
0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a,
0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0xe4, 0x01, 0x0a, 0x11,
0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46,
0x0a, 0x10, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c,
0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64,
0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61,
0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x8e, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74,
0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04,
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, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12,
0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20,
0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28,
0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x61,
0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x61, 0x63, 0x63, 0x72, 0x75, 0x65, 0x64, 0x69, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65,
0x6e, 0x63, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73,
0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72,
0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x12,
0x16, 0x0a, 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74,
0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05,
0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64,
0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01,
0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44,
0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10,
0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64,
0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c,
0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64,
0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12,
0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65,
0x72, 0x12, 0x21, 0x0a, 0x04, 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, 0x04,
0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20,
0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73,
0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14,
0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64,
0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e,
0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20,
0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f,
0x69, 0x6c, 0x65, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x69, 0x6c,
0x65, 0x64, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a,
0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72,
0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43,
0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72,
0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50,
0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c,
0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74,
0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c,
0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04,
0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43,
0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61,
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75,
0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75,
0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72,
0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -524,7 +561,7 @@ func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte {
return file_catchbugs_catchbugs_db_proto_rawDescData
}
var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{
(*DBCatchBugs)(nil), // 0: DBCatchBugs
(*DBCatchBugsRules)(nil), // 1: DBCatchBugsRules
@ -532,25 +569,27 @@ var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{
(*DBCatchBugsCard)(nil), // 3: DBCatchBugsCard
(*DBCatchBugsRoom)(nil), // 4: DBCatchBugsRoom
nil, // 5: DBCatchBugs.BooksEntry
nil, // 6: DBCatchBugs.AwardsEntry
nil, // 7: DBCatchBugs.LevelEntry
(*BaseUserInfo)(nil), // 8: BaseUserInfo
nil, // 6: DBCatchBugs.WeekawardEntry
nil, // 7: DBCatchBugs.AllawardEntry
nil, // 8: DBCatchBugs.LevelEntry
(*BaseUserInfo)(nil), // 9: BaseUserInfo
}
var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{
5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry
6, // 1: DBCatchBugs.awards:type_name -> DBCatchBugs.AwardsEntry
7, // 2: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry
8, // 3: DBCatchBugsPlayer.info:type_name -> BaseUserInfo
1, // 4: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
2, // 5: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
2, // 6: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
3, // 7: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard
3, // 8: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
9, // [9:9] is the sub-list for method output_type
9, // [9:9] is the sub-list for method input_type
9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry
6, // 1: DBCatchBugs.weekaward:type_name -> DBCatchBugs.WeekawardEntry
7, // 2: DBCatchBugs.allaward:type_name -> DBCatchBugs.AllawardEntry
8, // 3: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry
9, // 4: DBCatchBugsPlayer.info:type_name -> BaseUserInfo
1, // 5: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
2, // 6: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
2, // 7: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
3, // 8: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard
3, // 9: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension extendee
0, // [0:10] is the sub-list for field type_name
}
func init() { file_catchbugs_catchbugs_db_proto_init() }
@ -627,7 +666,7 @@ func file_catchbugs_catchbugs_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc,
NumEnums: 0,
NumMessages: 8,
NumMessages: 9,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -213,6 +213,8 @@ type CatchbugsAwardReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Atype int32 `protobuf:"varint,1,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
}
func (x *CatchbugsAwardReq) Reset() {
@ -247,13 +249,21 @@ func (*CatchbugsAwardReq) Descriptor() ([]byte, []int) {
return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
}
func (x *CatchbugsAwardReq) GetAtype() int32 {
if x != nil {
return x.Atype
}
return 0
}
type CatchbugsAwardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Awardmap map[int32]bool `protobuf:"bytes,1,rep,name=awardmap,proto3" json:"awardmap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //获取资源
Atype int32 `protobuf:"varint,1,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //获取资源
Awardmap map[int32]bool `protobuf:"bytes,3,rep,name=awardmap,proto3" json:"awardmap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
}
func (x *CatchbugsAwardResp) Reset() {
@ -288,11 +298,11 @@ func (*CatchbugsAwardResp) Descriptor() ([]byte, []int) {
return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
}
func (x *CatchbugsAwardResp) GetAwardmap() map[int32]bool {
func (x *CatchbugsAwardResp) GetAtype() int32 {
if x != nil {
return x.Awardmap
return x.Atype
}
return nil
return 0
}
func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
@ -302,6 +312,13 @@ func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
return nil
}
func (x *CatchbugsAwardResp) GetAwardmap() map[int32]bool {
if x != nil {
return x.Awardmap
}
return nil
}
//游戏准备推送4
type CatchbugsSingleGameReq struct {
state protoimpl.MessageState
@ -1061,83 +1078,86 @@ var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22,
0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72,
0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3d, 0x0a, 0x08, 0x61,
0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e,
0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
0x73, 0x70, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77,
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x41,
0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63,
0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52,
0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52,
0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x43,
0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61,
0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62,
0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68,
0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61,
0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f,
0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63,
0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 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, 0x44, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20,
0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x53, 0x0a, 0x17, 0x43,
0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61,
0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c,
0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e,
0x64, 0x6c, 0x65, 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, 0x12, 0x14,
0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13,
0x29, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72,
0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x12, 0x43,
0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
0x70, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3d, 0x0a, 0x08, 0x61, 0x77, 0x61, 0x72,
0x64, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x43, 0x61, 0x74,
0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e,
0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61,
0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x77, 0x61, 0x72, 0x64,
0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x27,
0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e,
0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73,
0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68,
0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65,
0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47,
0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b,
0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24,
0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44,
0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04,
0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 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, 0x44, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65,
0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x53, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68,
0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75,
0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64,
0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12,
0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52,
0x65, 0x73, 0x70, 0x22, 0xb1, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a,
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e,
0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64,
0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12,
0x16, 0x0a, 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68,
0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 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, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63,
0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65,
0x73, 0x70, 0x22, 0x61, 0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54,
0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12,
0x1e, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12,
0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52,
0x04, 0x63, 0x61, 0x72, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75,
0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f,
0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12,
0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
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, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e,
0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x74, 0x63,
0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22,
0xb1, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4f, 0x70, 0x65,
0x6e, 0x43, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65,
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e,
0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d,
0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x05, 0x20,
0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x63,
0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x69,
0x6c, 0x65, 0x64, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 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, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x61,
0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54, 0x61, 0x62, 0x6c, 0x65,
0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x04, 0x63,
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61,
0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72,
0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f,
0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a, 0x15, 0x43, 0x61,
0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50,
0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72,
0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a,
0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
@ -1183,8 +1203,8 @@ var file_catchbugs_catchbugs_msg_proto_goTypes = []interface{}{
}
var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
21, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
20, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
22, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
22, // 1: CatchbugsAwardResp.award:type_name -> UserAtno
20, // 2: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
23, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules
24, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
25, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard

View File

@ -12,6 +12,7 @@ import "errors"
type GameCatchbugRewardData struct {
Key int32
Type int32
Condition int32
Reward []*Gameatn
}
@ -24,6 +25,7 @@ func (*GameCatchbugRewardData) GetTypeId() int32 {
func (_v *GameCatchbugRewardData)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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
{
var _arr_ []interface{}

View File

@ -21,6 +21,7 @@ type GameCatchbugStageData struct {
Stagedetail string
Stageskill string
Points int32
Consume []*Gameatn
}
const TypeId_GameCatchbugStageData = -494646541
@ -92,6 +93,20 @@ func (_v *GameCatchbugStageData)Deserialize(_buf map[string]interface{}) (err er
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stagedetail"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stagedetail error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stagedetail, _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["stageskill"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stageskill error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stageskill, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["points"].(float64); !_ok_ { err = errors.New("points error"); return }; _v.Points = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
_v.Consume = 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.Consume = append(_v.Consume, _list_v_)
}
}
return
}

View File

@ -14,5 +14,4 @@ const (
GameOpencondType_Maxmapid = 2
GameOpencondType_Worldtaskid = 3
GameOpencondType_Friend = 4
GameOpencondType_MoonLevel = 5
)

View File

@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <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
const (
GameSkillFlagType_None = 0
GameSkillFlagType_Normal = 1
GameSkillFlagType_Passivity = 2
GameSkillFlagType_Active = 3
GameSkillFlagType_Anger = 4
GameSkillFlagType_Single = 5
GameSkillFlagType_AOE = 6
GameSkillFlagType_Control = 7
GameSkillFlagType_Tre = 8
GameSkillFlagType_Debuff = 9
GameSkillFlagType_Buff = 10
)

View File

@ -14,6 +14,8 @@ type GameTDRewardData struct {
Id int32
Reward []*Gameatn
Firstreward []*Gameatn
Describe string
Monstershow string
}
const TypeId_GameTDRewardData = 8107621
@ -52,6 +54,8 @@ func (_v *GameTDRewardData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{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 } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["monstershow"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Monstershow error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Monstershow, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}

View File

@ -15,6 +15,8 @@ type GameSkillAtkData struct {
Level int32
MaxLV int32
UnavailablePlayTypes []int32
SkillFlag int32
EffectFlag int32
Name string
Ico string
CorrectPos int32
@ -55,6 +57,8 @@ func (_v *GameSkillAtkData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SkillFlag"].(float64); !_ok_ { err = errors.New("SkillFlag error"); return }; _v.SkillFlag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EffectFlag"].(float64); !_ok_ { err = errors.New("EffectFlag error"); return }; _v.EffectFlag = int32(_tempNum_) }
{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; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CorrectPos"].(float64); !_ok_ { err = errors.New("CorrectPos error"); return }; _v.CorrectPos = int32(_tempNum_) }