Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
293002d216
@ -529,6 +529,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c-"
|
||||
@ -540,6 +541,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c"
|
||||
@ -551,6 +553,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c+"
|
||||
@ -562,6 +565,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "b"
|
||||
@ -573,6 +577,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "b+"
|
||||
@ -584,6 +589,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "a"
|
||||
@ -595,6 +601,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "a+"
|
||||
@ -606,6 +613,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "s"
|
||||
@ -617,6 +625,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "ss"
|
||||
@ -628,6 +637,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "sss"
|
||||
@ -639,6 +649,7 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "sss+"
|
||||
@ -650,6 +661,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c-"
|
||||
@ -661,6 +673,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c"
|
||||
@ -672,6 +685,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c+"
|
||||
@ -683,6 +697,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "b"
|
||||
@ -694,6 +709,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "b+"
|
||||
@ -705,6 +721,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "a"
|
||||
@ -716,6 +733,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "a+"
|
||||
@ -727,6 +745,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "s"
|
||||
@ -738,6 +757,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "ss"
|
||||
@ -749,6 +769,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "sss"
|
||||
@ -760,6 +781,7 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "sss+"
|
||||
|
||||
@ -416,5 +416,119 @@
|
||||
"debrisitemid": 11187002,
|
||||
"scenemusic": "scenemusic_leveldemo_fcamer_1_8",
|
||||
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_8"
|
||||
},
|
||||
{
|
||||
"id": 20001,
|
||||
"scene": "leveldemo_chapter_1",
|
||||
"levelname": "Save the holy tree",
|
||||
"maintask": [
|
||||
11187001
|
||||
],
|
||||
"subtask": [
|
||||
0
|
||||
],
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"profectaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 500
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"debrisitemid": 11187002,
|
||||
"scenemusic": "scenemusic_leveldemo_fcamer_1_8",
|
||||
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_8"
|
||||
},
|
||||
{
|
||||
"id": 20002,
|
||||
"scene": "leveldemo_chapter_2",
|
||||
"levelname": "Save the holy tree",
|
||||
"maintask": [
|
||||
11187019
|
||||
],
|
||||
"subtask": [
|
||||
0
|
||||
],
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "exp",
|
||||
"n": 1000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"profectaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 500
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"debrisitemid": 11187020,
|
||||
"scenemusic": "scenemusic_leveldemo_fcamer_1_10",
|
||||
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
|
||||
},
|
||||
{
|
||||
"id": 20003,
|
||||
"scene": "leveldemo_chapter_3",
|
||||
"levelname": "Save the holy tree",
|
||||
"maintask": [
|
||||
11187019
|
||||
],
|
||||
"subtask": [
|
||||
0
|
||||
],
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "exp",
|
||||
"n": 1000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"profectaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 500
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"debrisitemid": 11187020,
|
||||
"scenemusic": "scenemusic_leveldemo_fcamer_1_10",
|
||||
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
|
||||
}
|
||||
]
|
||||
@ -11,7 +11,7 @@
|
||||
"x": 0,
|
||||
"y": 618
|
||||
},
|
||||
"scale": 0.8,
|
||||
"scale": 1,
|
||||
"usetext": {
|
||||
"key": "gamesummary_fathernode_usetext_1",
|
||||
"text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
|
||||
@ -29,7 +29,7 @@
|
||||
"x": -369,
|
||||
"y": 1664
|
||||
},
|
||||
"scale": 0.6,
|
||||
"scale": 1,
|
||||
"usetext": {
|
||||
"key": "gamesummary_fathernode_usetext_2",
|
||||
"text": "探险！这是永远不会停歇的主题！开始你的[color=#ffcc00]冒险之旅[/color]吧！"
|
||||
@ -47,7 +47,7 @@
|
||||
"x": -1827,
|
||||
"y": 1878
|
||||
},
|
||||
"scale": 0.6,
|
||||
"scale": 1,
|
||||
"usetext": {
|
||||
"key": "gamesummary_fathernode_usetext_3",
|
||||
"text": "坏蛋联盟打算设计一场大骗局，让世人都以为他们是真的洗心革面、改邪归正…"
|
||||
@ -65,28 +65,10 @@
|
||||
"x": -2362,
|
||||
"y": 1140
|
||||
},
|
||||
"scale": 0.6,
|
||||
"scale": 1,
|
||||
"usetext": {
|
||||
"key": "gamesummary_fathernode_usetext_4",
|
||||
"text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…"
|
||||
}
|
||||
},
|
||||
{
|
||||
"tabId": 11005,
|
||||
"layer": 1,
|
||||
"name": {
|
||||
"key": "gamesummary_fathernode_name_5",
|
||||
"text": "第五章-魔发篇"
|
||||
},
|
||||
"icon": "hkz_wftj_sl01",
|
||||
"mapPos": {
|
||||
"x": -478,
|
||||
"y": 0
|
||||
},
|
||||
"scale": 0.6,
|
||||
"usetext": {
|
||||
"key": "gamesummary_fathernode_usetext_5",
|
||||
"text": "当硬摇滚部落的霸女王开始寻找并收集吉他拨片，要摧毁所有其他类型的音乐时，波比和布兰跟朋友们一起试图拯救世界"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -776,6 +776,11 @@
|
||||
"friend_help_hero_refresh_num": 5,
|
||||
"td_mainstage_challenge_num": 2,
|
||||
"td_mainstage_challenge_num_max": 10,
|
||||
"td_mainstage_challenge_item": {
|
||||
"a": "item",
|
||||
"t": "24013003",
|
||||
"n": 1
|
||||
},
|
||||
"td_dailystage_challenge_num": 2,
|
||||
"td_dailystage_challenge_num_max": 2
|
||||
}
|
||||
|
||||
@ -126,6 +126,48 @@
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1001901,
|
||||
"group": 19,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtaskexit_submit_20034",
|
||||
"followtj": "OpenNpcOption_支线-烹饪处的阿宝",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"maininterface",
|
||||
"btn_star$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"txtoffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 10000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000201,
|
||||
"group": 2,
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
"drop": 10001001,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420003
|
||||
],
|
||||
@ -76,7 +76,7 @@
|
||||
"drop": 10001002,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420006
|
||||
],
|
||||
@ -120,7 +120,7 @@
|
||||
"drop": 10001003,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420009
|
||||
],
|
||||
@ -159,7 +159,7 @@
|
||||
"drop": 10001004,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420012
|
||||
],
|
||||
@ -203,7 +203,7 @@
|
||||
"drop": 10001005,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420015
|
||||
],
|
||||
@ -242,7 +242,7 @@
|
||||
"drop": 10001006,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420018
|
||||
],
|
||||
@ -281,7 +281,7 @@
|
||||
"drop": 10001006,
|
||||
"heroexp": 10,
|
||||
"spine": "bossShow_bingshuangtaitan",
|
||||
"HeroId": 11009,
|
||||
"HeroId": 55001,
|
||||
"boss": [
|
||||
1420021
|
||||
],
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18598,8 +18598,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_168",
|
||||
"text": "这里可是世界上戒备最森严的地方，一只蚊子都别想跑出去1"
|
||||
"key": "main_stage_bubbletext_171",
|
||||
"text": "这里可是世界上戒备最森严的地方，一只蚊子都别想跑出去！"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -18726,7 +18726,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_172",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -18806,8 +18806,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "main_stage_bubbletext_173",
|
||||
"text": "这些家伙是从哪儿来的？"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -18934,8 +18934,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_169",
|
||||
"text": "哪里来的豚鼠！"
|
||||
"key": "main_stage_bubbletext_174",
|
||||
"text": "清静多了……"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19064,8 +19064,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_170",
|
||||
"text": "哼！打月光原石主意的人我们可见多了！"
|
||||
"key": "main_stage_bubbletext_175",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19144,7 +19144,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_176",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -19227,8 +19227,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "main_stage_bubbletext_177",
|
||||
"text": "嘁嘁——嘁——"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19310,7 +19310,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_171",
|
||||
"key": "main_stage_bubbletext_178",
|
||||
"text": "前面的车辆靠边接受检查！"
|
||||
},
|
||||
"animation": [],
|
||||
@ -19441,7 +19441,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_172",
|
||||
"key": "main_stage_bubbletext_179",
|
||||
"text": "哎哟喂~"
|
||||
},
|
||||
"animation": [],
|
||||
@ -19524,8 +19524,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_173",
|
||||
"text": "这就是卡梅洛特城堡了。"
|
||||
"key": "main_stage_bubbletext_180",
|
||||
"text": "你们终于来了。"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19607,7 +19607,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_181",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -19724,8 +19724,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "main_stage_bubbletext_182",
|
||||
"text": "把东西交出来！"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19855,8 +19855,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_177",
|
||||
"text": "嘿嘿，一群笨蛋，怎么斗得过机智的豚鼠！"
|
||||
"key": "main_stage_bubbletext_183",
|
||||
"text": "想抓住我？没那么容易！"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -19983,8 +19983,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "main_stage_bubbletext_184",
|
||||
"text": "哈哈哈哈……一群笨蛋！"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -20111,8 +20111,8 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "main_stage_bubbletext_185",
|
||||
"text": "希望你带来了好消息，我的仆从。"
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
@ -24637,7 +24637,10 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -24717,7 +24720,10 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -24725,7 +24731,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_181",
|
||||
"key": "main_stage_bubbletext_230",
|
||||
"text": "欢迎~"
|
||||
},
|
||||
"animation": [],
|
||||
@ -24803,9 +24809,21 @@
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
@ -24833,7 +24851,10 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -24841,7 +24862,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_182",
|
||||
"key": "main_stage_bubbletext_231",
|
||||
"text": "嘿嘿嘿，就快要到了~"
|
||||
},
|
||||
"animation": [],
|
||||
@ -24913,7 +24934,10 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -24921,7 +24945,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_183",
|
||||
"key": "main_stage_bubbletext_232",
|
||||
"text": "在下靴猫剑客。"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25041,7 +25065,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25049,7 +25075,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_184",
|
||||
"key": "main_stage_bubbletext_233",
|
||||
"text": "还差一点，差一点就完成了！我的哈妮，姜饼妹！"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25169,7 +25195,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25177,7 +25205,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_185",
|
||||
"key": "main_stage_bubbletext_234",
|
||||
"text": "哦，亲爱的，你让我喘不过气……"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25297,7 +25325,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25305,7 +25335,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_186",
|
||||
"key": "main_stage_bubbletext_235",
|
||||
"text": "这片沼泽地有些奇怪……"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25425,7 +25455,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25433,7 +25465,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_236",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -25505,7 +25537,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25513,7 +25547,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_237",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -25585,7 +25619,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25593,7 +25629,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_238",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -25665,7 +25701,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25673,7 +25711,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_190",
|
||||
"key": "main_stage_bubbletext_239",
|
||||
"text": "法夸德勋爵还在迫害童话人物！"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25745,7 +25783,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25753,7 +25793,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_240",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -25831,9 +25871,21 @@
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
@ -25847,7 +25899,7 @@
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 1,
|
||||
"Episodetype": 3,
|
||||
"stage_param": 0,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
@ -25861,7 +25913,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25869,7 +25923,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_192",
|
||||
"key": "main_stage_bubbletext_241",
|
||||
"text": "有关我的传言，也许并不都是真的。"
|
||||
},
|
||||
"animation": [],
|
||||
@ -25941,7 +25995,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25949,7 +26005,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_242",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26021,7 +26077,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -26029,7 +26087,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_243",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26101,7 +26159,9 @@
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"miwuxiaosan"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -26109,7 +26169,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_244",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26189,7 +26249,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_245",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26317,7 +26377,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_246",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26397,7 +26457,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_247",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26525,7 +26585,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_248",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26653,7 +26713,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_249",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26781,7 +26841,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_250",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -26909,7 +26969,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_251",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27037,7 +27097,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_252",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27165,7 +27225,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_253",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27245,7 +27305,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_254",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27373,7 +27433,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_255",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27453,7 +27513,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_256",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27581,7 +27641,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_257",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27661,7 +27721,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_258",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27733,7 +27793,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10105002,
|
||||
"BattleReadyID": 10400002,
|
||||
"FormatList": [
|
||||
104161
|
||||
],
|
||||
@ -27789,7 +27849,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_259",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
@ -27869,7 +27929,7 @@
|
||||
"herocolor": 1,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"key": "main_stage_bubbletext_260",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
|
||||
@ -3004,7 +3004,8 @@
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
14
|
||||
15,
|
||||
0
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
"tab": 5,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_5",
|
||||
"text": "俱乐专柜"
|
||||
"text": "俱乐部专柜"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_5",
|
||||
@ -226,7 +226,7 @@
|
||||
"tab": 9,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_9",
|
||||
"text": "联盟商店"
|
||||
"text": "坏蛋商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_9",
|
||||
@ -288,7 +288,7 @@
|
||||
"tab": 11,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_11",
|
||||
"text": "第五章商店"
|
||||
"text": "靴猫商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_11",
|
||||
@ -316,7 +316,7 @@
|
||||
"tab": 12,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_12",
|
||||
"text": "第六章商店"
|
||||
"text": "功夫商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_12",
|
||||
@ -347,7 +347,7 @@
|
||||
"tab": 13,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_13",
|
||||
"text": "第七章商店"
|
||||
"text": "守护商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_13",
|
||||
@ -378,7 +378,7 @@
|
||||
"tab": 14,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_14",
|
||||
"text": "第八章商店"
|
||||
"text": "精灵商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "shop_shop_upper_shop_14",
|
||||
|
||||
@ -386,10 +386,10 @@
|
||||
{
|
||||
"Id": 225004311,
|
||||
"EmitPR": 1000,
|
||||
"From": 3,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 3,
|
||||
"Argu": [
|
||||
@ -7020,7 +7020,7 @@
|
||||
"Type": 8,
|
||||
"Argu": [
|
||||
1,
|
||||
1,
|
||||
-1,
|
||||
1000
|
||||
],
|
||||
"FollowSK": [],
|
||||
@ -8769,7 +8769,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
5,
|
||||
380
|
||||
500
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -8792,7 +8792,7 @@
|
||||
"Argu": [
|
||||
1,
|
||||
5,
|
||||
440
|
||||
800
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
@ -28467,7 +28467,9 @@
|
||||
4,
|
||||
1000
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
245004312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -28490,7 +28492,9 @@
|
||||
4,
|
||||
1100
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
245004312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -28513,7 +28517,9 @@
|
||||
4,
|
||||
1200
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
245004312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -28536,7 +28542,9 @@
|
||||
4,
|
||||
1300
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
245004312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -28559,7 +28567,9 @@
|
||||
4,
|
||||
1400
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
245004312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -29567,6 +29577,25 @@
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 255006317,
|
||||
"EmitPR": 1000,
|
||||
"From": 3,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 29,
|
||||
"Argu": [],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 255007111,
|
||||
"EmitPR": 1000,
|
||||
@ -29683,10 +29712,10 @@
|
||||
4,
|
||||
800
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [
|
||||
"FollowSK": [
|
||||
255007215
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
@ -29753,7 +29782,7 @@
|
||||
"Argu": [
|
||||
390001415,
|
||||
1000,
|
||||
5,
|
||||
1,
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
@ -29961,6 +29990,29 @@
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 255007319,
|
||||
"EmitPR": 1000,
|
||||
"From": 15,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
3600
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 253003111,
|
||||
"EmitPR": 1000,
|
||||
@ -36250,6 +36302,29 @@
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 244001111,
|
||||
"EmitPR": 1000,
|
||||
"From": 4,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
3400
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 244001121,
|
||||
"EmitPR": 1000,
|
||||
@ -39798,7 +39873,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000001,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -39822,7 +39897,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000002,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -39846,7 +39921,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000003,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -39870,7 +39945,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000004,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -39894,7 +39969,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000005,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -39918,7 +39993,7 @@
|
||||
},
|
||||
{
|
||||
"Id": 200000006,
|
||||
"EmitPR": 0,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
@ -40334,7 +40409,7 @@
|
||||
"Argu": [
|
||||
390001401,
|
||||
1000,
|
||||
1,
|
||||
3,
|
||||
3
|
||||
],
|
||||
"FollowSK": [],
|
||||
@ -40384,7 +40459,7 @@
|
||||
390001107,
|
||||
1000,
|
||||
1,
|
||||
2
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3413,7 +3413,7 @@
|
||||
},
|
||||
"BuffType": 74,
|
||||
"EffectArgu": [
|
||||
99
|
||||
150
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -3422,7 +3422,7 @@
|
||||
3
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
"RemoveType": false,
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 99,
|
||||
@ -3597,7 +3597,7 @@
|
||||
"OverlayTimes": 1,
|
||||
"SameID": false,
|
||||
"golbalbufficon": "",
|
||||
"buffIcon": "",
|
||||
"buffIcon": "ty_icon_buff_fcyh",
|
||||
"buffeffect": "",
|
||||
"buffpos": "",
|
||||
"forbidFloat": 0,
|
||||
@ -3928,7 +3928,7 @@
|
||||
0
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
"RemoveType": false,
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 99,
|
||||
@ -4453,11 +4453,11 @@
|
||||
"Id": 390001447,
|
||||
"Name": {
|
||||
"key": "skill_skill_buff_Name_390001447",
|
||||
"text": "[color=#37d8a9]受击计数[/color]"
|
||||
"text": "[color=#37d8a9]腐根钻心[/color]"
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_skill_buff_Desc_390001447",
|
||||
"text": "受击计数。"
|
||||
"text": "腐根钻心。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
@ -4471,10 +4471,10 @@
|
||||
"RemoveType": false,
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 0,
|
||||
"OverlayTimes": 7,
|
||||
"SameID": false,
|
||||
"golbalbufficon": "",
|
||||
"buffIcon": "",
|
||||
"buffIcon": "jn_buff_dy",
|
||||
"buffeffect": "",
|
||||
"buffpos": "",
|
||||
"forbidFloat": 0,
|
||||
|
||||
@ -2040,7 +2040,7 @@
|
||||
"Id": 455006312,
|
||||
"When": 19,
|
||||
"FromCheck": "",
|
||||
"TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=8",
|
||||
"TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=7",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
@ -2053,8 +2053,8 @@
|
||||
"MaxEmitTimes": 0,
|
||||
"MaxEmitTimesInRound": 1,
|
||||
"Callback": [
|
||||
155006211,
|
||||
255006315
|
||||
255006315,
|
||||
155006211
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -3482,7 +3482,8 @@
|
||||
"MaxEmitTimesInRound": 99,
|
||||
"Callback": [
|
||||
4,
|
||||
255007314
|
||||
255007314,
|
||||
155007312
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@ -1 +1,104 @@
|
||||
[]
|
||||
[
|
||||
{
|
||||
"id": 24004,
|
||||
"name": {
|
||||
"key": "td_td_hero_name_1",
|
||||
"text": "邦尼兔"
|
||||
},
|
||||
"job": 0,
|
||||
"model": "24004",
|
||||
"skillId": [
|
||||
10001
|
||||
],
|
||||
"skillIdupgrade": [
|
||||
1002,
|
||||
1003,
|
||||
1004,
|
||||
1005
|
||||
],
|
||||
"skillidwaken": 20001,
|
||||
"needlv": 40,
|
||||
"needawake": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000011",
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"width": 10,
|
||||
"height": 10,
|
||||
"hp": 200,
|
||||
"atk": 100,
|
||||
"atk_speed1": 100,
|
||||
"atk_speed": 8000,
|
||||
"atk_range": 0
|
||||
},
|
||||
{
|
||||
"id": 44002,
|
||||
"name": {
|
||||
"key": "td_td_hero_name_2",
|
||||
"text": "蛇先生"
|
||||
},
|
||||
"job": 1,
|
||||
"model": "44002",
|
||||
"skillId": [
|
||||
10001
|
||||
],
|
||||
"skillIdupgrade": [
|
||||
1002,
|
||||
1003,
|
||||
1004,
|
||||
1005
|
||||
],
|
||||
"skillidwaken": 20001,
|
||||
"needlv": 40,
|
||||
"needawake": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000011",
|
||||
"n": 4
|
||||
}
|
||||
],
|
||||
"width": 10,
|
||||
"height": 10,
|
||||
"hp": 200,
|
||||
"atk": 100,
|
||||
"atk_speed1": 100,
|
||||
"atk_speed": 10000,
|
||||
"atk_range": 0
|
||||
},
|
||||
{
|
||||
"id": 13002,
|
||||
"name": {
|
||||
"key": "td_td_hero_name_3",
|
||||
"text": "食人鱼先生"
|
||||
},
|
||||
"job": 2,
|
||||
"model": "13002",
|
||||
"skillId": [
|
||||
10001
|
||||
],
|
||||
"skillIdupgrade": [
|
||||
1002,
|
||||
1003,
|
||||
1004,
|
||||
1005
|
||||
],
|
||||
"skillidwaken": 20001,
|
||||
"needlv": 40,
|
||||
"needawake": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000011",
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"width": 10,
|
||||
"height": 10,
|
||||
"hp": 200,
|
||||
"atk": 100,
|
||||
"atk_speed1": 100,
|
||||
"atk_speed": 10000,
|
||||
"atk_range": 0
|
||||
}
|
||||
]
|
||||
3569
bin/json/game_tdherogrowup.json
Normal file
3569
bin/json/game_tdherogrowup.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -79,7 +79,7 @@ func (this *ModelWeektask) inquireActivations(info *pb.DBWeektask, opencmd map[s
|
||||
if v.Open != "" && opencmd[v.Open] != 2 { //功能未开启
|
||||
continue
|
||||
}
|
||||
if v.IdBefore != 0 && !info.Tcomplete[v.Key] { //前置任务未完成
|
||||
if v.IdBefore != 0 && !info.Tcomplete[v.IdBefore] { //前置任务未完成
|
||||
continue
|
||||
}
|
||||
info.Tasks = append(info.Tasks, v.Key)
|
||||
|
||||
@ -1,22 +1,26 @@
|
||||
package whackamole
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
func (this *apiComp) AwakeCheck(session comm.IUserSession, req *pb.WhackamoleAwakeReq) (errdata *pb.ErrorData) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// /获取系统公告
|
||||
//觉醒
|
||||
func (this *apiComp) Awake(session comm.IUserSession, req *pb.WhackamoleAwakeReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBWhackamole
|
||||
hero *pb.DBWHHero
|
||||
conf *cfg.GameTDHeroData
|
||||
err error
|
||||
)
|
||||
|
||||
if errdata = this.AwakeCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -36,7 +40,48 @@ func (this *apiComp) Awake(session comm.IUserSession, req *pb.WhackamoleAwakeReq
|
||||
}
|
||||
return
|
||||
}
|
||||
for _, v := range info.Heros {
|
||||
if v.Id == info.Fields[req.Index].Hid {
|
||||
hero = v
|
||||
break
|
||||
}
|
||||
}
|
||||
if hero == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Message: fmt.Sprintf("on hero:%s", info.Fields[req.Index].Hid),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if conf, err = this.module.configure.getGameTDHeroData(hero.Cid); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if conf.Needlv > info.Fields[req.Index].Lv {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Message: "field lv notenough",
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if errdata = this.module.ConsumeRes(session, conf.Needawake, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
hero.Wake = true
|
||||
if err = this.module.model.Change(session.GetUserId(), map[string]interface{}{"heros": info.Heros}); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "superior", &pb.WhackamoleSuperiorResp{})
|
||||
return
|
||||
}
|
||||
|
||||
@ -3,6 +3,8 @@ package whackamole
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"go_dreamfactory/utils"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
@ -14,8 +16,10 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.WhackamoleInfo
|
||||
// /获取系统公告
|
||||
func (this *apiComp) Info(session comm.IUserSession, req *pb.WhackamoleInfoReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBWhackamole
|
||||
err error
|
||||
info *pb.DBWhackamole
|
||||
update map[string]interface{} = make(map[string]interface{})
|
||||
atno []*pb.UserAtno
|
||||
err error
|
||||
)
|
||||
if errdata = this.InfoCheck(session, req); errdata != nil {
|
||||
return
|
||||
@ -28,6 +32,31 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WhackamoleInfoReq)
|
||||
}
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "info", &pb.WhackamoleInfoResp{Info: info})
|
||||
|
||||
if !utils.IsToday(info.Lasttime) {
|
||||
if info.Duplicate <= this.module.ModuleTools.GetGlobalConf().TdDailystageChallengeNum {
|
||||
info.Duplicate = this.module.ModuleTools.GetGlobalConf().TdDailystageChallengeNum
|
||||
update["duplicate"] = info.Duplicate
|
||||
}
|
||||
rid := this.module.ModuleTools.GetGlobalConf().TdMainstageChallengeItem.T
|
||||
amount := this.module.ModuleItems.QueryItemAmount(session.GetUserId(), rid)
|
||||
if amount < uint32(this.module.ModuleTools.GetGlobalConf().TdMainstageChallengeNumMax) {
|
||||
n := uint32(this.module.ModuleTools.GetGlobalConf().TdMainstageChallengeNumMax) - amount
|
||||
if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{{A: comm.ItemType, T: rid, N: int32(n)}}, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
if len(update) > 0 {
|
||||
if err = this.module.model.Change(session.GetUserId(), update); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "info", &pb.WhackamoleInfoResp{Info: info, Award: atno})
|
||||
return
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ package whackamole
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
@ -15,6 +16,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.WhackamoleU
|
||||
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.WhackamoleUpgradeReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBWhackamole
|
||||
conf *cfg.GameTDHeroGrowupData
|
||||
err error
|
||||
)
|
||||
if errdata = this.UpgradeCheck(session, req); errdata != nil {
|
||||
@ -36,7 +38,29 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.WhackamoleUpgrad
|
||||
}
|
||||
return
|
||||
}
|
||||
if conf, err = this.module.configure.getGameTDHeroGrowupData(int32(info.Fields[req.Index].Ftype), info.Fields[req.Index].Lv); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if len(conf.Need) == 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Message: "Fields max lv",
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if errdata = this.module.ConsumeRes(session, conf.Need, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
info.Fields[req.Index].Lv++
|
||||
if err = this.module.model.Change(session.GetUserId(), map[string]interface{}{"fields": info.Fields}); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "superior", &pb.WhackamoleSuperiorResp{})
|
||||
return
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package whackamole
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/modules"
|
||||
@ -9,8 +10,9 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
game_tdreward = "game_tdreward.json"
|
||||
game_tdhero = "game_tdhero.json"
|
||||
game_tdreward = "game_tdreward.json"
|
||||
game_tdhero = "game_tdhero.json"
|
||||
game_tdherogrowup = "game_tdherogrowup.json"
|
||||
)
|
||||
|
||||
type configureComp struct {
|
||||
@ -24,6 +26,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
this.module = module.(*Whackamole)
|
||||
err = this.LoadConfigure(game_tdreward, cfg.NewGameTDReward)
|
||||
err = this.LoadConfigure(game_tdhero, cfg.NewGameTDHero)
|
||||
err = this.LoadConfigure(game_tdherogrowup, cfg.NewGameTDHeroGrowup)
|
||||
return
|
||||
}
|
||||
|
||||
@ -55,3 +58,38 @@ func (this *configureComp) getGameTDHeroDatas() (confs []*cfg.GameTDHeroData, er
|
||||
confs = v.(*cfg.GameTDHero).GetDataList()
|
||||
return
|
||||
}
|
||||
|
||||
// 获取奖励列表
|
||||
func (this *configureComp) getGameTDHeroData(id int32) (conf *cfg.GameTDHeroData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_tdhero); err != nil {
|
||||
return
|
||||
}
|
||||
if conf, ok = v.(*cfg.GameTDHero).GetDataMap()[id]; !ok {
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_tdhero, id)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) getGameTDHeroGrowupData(job int32, lv int32) (conf *cfg.GameTDHeroGrowupData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_tdherogrowup); err != nil {
|
||||
return
|
||||
}
|
||||
for _, v := range v.(*cfg.GameTDHeroGrowup).GetDataList() {
|
||||
if v.Job == job && v.Lv == lv {
|
||||
conf = v
|
||||
return
|
||||
}
|
||||
}
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_tdherogrowup, fmt.Sprintf("%d-%d", job, lv))
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
|
||||
@ -44,12 +44,13 @@ func (this *modelComp) getModel(uid string) (info *pb.DBWhackamole, err error) {
|
||||
Heros: make([]*pb.DBWHHero, 0),
|
||||
Lasttime: 0,
|
||||
}
|
||||
info.Fields = append(info.Fields, &pb.HeroField{Ftype: pb.HeroFieldType_Type1}, &pb.HeroField{Index: 1, Ftype: pb.HeroFieldType_Type2}, &pb.HeroField{Index: 2, Ftype: pb.HeroFieldType_Type3})
|
||||
|
||||
if confs, err = this.module.configure.getGameTDHeroDatas(); err != nil {
|
||||
return
|
||||
}
|
||||
for _, conf := range confs {
|
||||
this.addhero(info, conf)
|
||||
for i, conf := range confs {
|
||||
hero := this.addhero(info, conf)
|
||||
info.Fields = append(info.Fields, &pb.HeroField{Index: int32(i), Ftype: pb.HeroFieldType(conf.Job), Lv: 1, Hid: hero.Id})
|
||||
}
|
||||
err = this.Add(uid, info)
|
||||
}
|
||||
@ -57,15 +58,12 @@ func (this *modelComp) getModel(uid string) (info *pb.DBWhackamole, err error) {
|
||||
}
|
||||
|
||||
///添加英雄
|
||||
func (this *modelComp) addhero(info *pb.DBWhackamole, conf *cfg.GameTDHeroData) {
|
||||
var (
|
||||
tdhero *pb.DBWHHero
|
||||
)
|
||||
tdhero = &pb.DBWHHero{
|
||||
func (this *modelComp) addhero(info *pb.DBWhackamole, conf *cfg.GameTDHeroData) (hero *pb.DBWHHero) {
|
||||
hero = &pb.DBWHHero{
|
||||
Id: primitive.NewObjectID().Hex(),
|
||||
Cid: conf.Id,
|
||||
Wake: false,
|
||||
}
|
||||
info.Heros = append(info.Heros, tdhero)
|
||||
info.Heros = append(info.Heros, hero)
|
||||
return
|
||||
}
|
||||
|
||||
@ -76,8 +76,8 @@ type HeroField struct {
|
||||
|
||||
Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"` //位置
|
||||
Ftype HeroFieldType `protobuf:"varint,2,opt,name=ftype,proto3,enum=HeroFieldType" json:"ftype"` //职业类型
|
||||
Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"`
|
||||
Hid string `protobuf:"bytes,4,opt,name=hid,proto3" json:"hid"` //英雄id
|
||||
Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` //等级
|
||||
Hid string `protobuf:"bytes,4,opt,name=hid,proto3" json:"hid"` //英雄id
|
||||
}
|
||||
|
||||
func (x *HeroField) Reset() {
|
||||
@ -209,12 +209,13 @@ type DBWhackamole 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"`
|
||||
Fields []*HeroField `protobuf:"bytes,3,rep,name=fields,proto3" json:"fields"` //上阵栏位
|
||||
Heros []*DBWHHero `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"` //塔防英雄
|
||||
Levels map[int32]int32 `protobuf:"bytes,5,rep,name=levels,proto3" json:"levels" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //关卡信息
|
||||
Lasttime int64 `protobuf:"varint,6,opt,name=lasttime,proto3" json:"lasttime"` //上次时间
|
||||
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"`
|
||||
Fields []*HeroField `protobuf:"bytes,3,rep,name=fields,proto3" json:"fields"` //上阵栏位
|
||||
Heros []*DBWHHero `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"` //塔防英雄
|
||||
Levels map[int32]int32 `protobuf:"bytes,5,rep,name=levels,proto3" json:"levels" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //关卡信息
|
||||
Duplicate int32 `protobuf:"varint,6,opt,name=duplicate,proto3" json:"duplicate"` //副本挑战次数
|
||||
Lasttime int64 `protobuf:"varint,7,opt,name=lasttime,proto3" json:"lasttime"` //上次时间
|
||||
}
|
||||
|
||||
func (x *DBWhackamole) Reset() {
|
||||
@ -284,6 +285,13 @@ func (x *DBWhackamole) GetLevels() map[int32]int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBWhackamole) GetDuplicate() int32 {
|
||||
if x != nil {
|
||||
return x.Duplicate
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBWhackamole) GetLasttime() int64 {
|
||||
if x != nil {
|
||||
return x.Lasttime
|
||||
@ -306,7 +314,7 @@ var file_whackamole_whackamole_db_proto_rawDesc = []byte{
|
||||
0x42, 0x57, 0x48, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x61, 0x6b,
|
||||
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x61, 0x6b, 0x65, 0x22, 0xff, 0x01,
|
||||
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x61, 0x6b, 0x65, 0x22, 0x9d, 0x02,
|
||||
0x0a, 0x0c, 0x44, 0x42, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 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,
|
||||
@ -317,17 +325,18 @@ var file_whackamole_whackamole_db_proto_rawDesc = []byte{
|
||||
0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x31, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18,
|
||||
0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61,
|
||||
0x6d, 0x6f, 0x6c, 0x65, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x65, 0x76, 0x65, 0x6c, 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, 0x2a,
|
||||
0x30, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65,
|
||||
0x12, 0x09, 0x0a, 0x05, 0x54, 0x79, 0x70, 0x65, 0x31, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x54,
|
||||
0x79, 0x70, 0x65, 0x32, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x79, 0x70, 0x65, 0x33, 0x10,
|
||||
0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x75, 0x70, 0x6c,
|
||||
0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x75, 0x70,
|
||||
0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x65, 0x76, 0x65, 0x6c, 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, 0x2a, 0x30, 0x0a,
|
||||
0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09,
|
||||
0x0a, 0x05, 0x54, 0x79, 0x70, 0x65, 0x31, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x79, 0x70,
|
||||
0x65, 0x32, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x79, 0x70, 0x65, 0x33, 0x10, 0x02, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -64,7 +64,8 @@ type WhackamoleInfoResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Info *DBWhackamole `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
|
||||
Info *DBWhackamole `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
|
||||
Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
|
||||
}
|
||||
|
||||
func (x *WhackamoleInfoResp) Reset() {
|
||||
@ -106,6 +107,13 @@ func (x *WhackamoleInfoResp) GetInfo() *DBWhackamole {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *WhackamoleInfoResp) GetAward() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Award
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
//英雄上阵
|
||||
type WhackamoleSuperiorReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -511,39 +519,41 @@ var file_whackamole_whackamole_msg_proto_rawDesc = []byte{
|
||||
0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a,
|
||||
0x11, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x65, 0x71, 0x22, 0x37, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65,
|
||||
0x65, 0x71, 0x22, 0x58, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x57, 0x68, 0x61, 0x63, 0x6b,
|
||||
0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3f, 0x0a, 0x15, 0x57,
|
||||
0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x53, 0x75, 0x70, 0x65, 0x72, 0x69, 0x6f,
|
||||
0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3a, 0x0a, 0x16,
|
||||
0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 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, 0x22, 0x3f, 0x0a, 0x15,
|
||||
0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x53, 0x75, 0x70, 0x65, 0x72, 0x69,
|
||||
0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c,
|
||||
0x64, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x2c, 0x0a, 0x14, 0x57, 0x68, 0x61, 0x63,
|
||||
0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x15, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61,
|
||||
0x6d, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x20, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
|
||||
0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c,
|
||||
0x64, 0x22, 0x2a, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x41,
|
||||
0x77, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x34, 0x0a,
|
||||
0x13, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x6b, 0x65,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x57, 0x48, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68,
|
||||
0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c,
|
||||
0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x13, 0x57, 0x68, 0x61,
|
||||
0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
|
||||
0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
|
||||
0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
0x6f, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3a, 0x0a,
|
||||
0x16, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x53, 0x75, 0x70, 0x65, 0x72,
|
||||
0x69, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65,
|
||||
0x6c, 0x64, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x2c, 0x0a, 0x14, 0x57, 0x68, 0x61,
|
||||
0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65,
|
||||
0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x15, 0x57, 0x68, 0x61, 0x63, 0x6b,
|
||||
0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x20, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0a, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x05, 0x66, 0x69, 0x65,
|
||||
0x6c, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65,
|
||||
0x41, 0x77, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65,
|
||||
0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x34,
|
||||
0x0a, 0x13, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x6b,
|
||||
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x57, 0x48, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
|
||||
0x68, 0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x57, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f,
|
||||
0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x13, 0x57, 0x68,
|
||||
0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69,
|
||||
0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
|
||||
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -571,21 +581,22 @@ var file_whackamole_whackamole_msg_proto_goTypes = []interface{}{
|
||||
(*WhackamoleAwardReq)(nil), // 8: WhackamoleAwardReq
|
||||
(*WhackamoleAwardResp)(nil), // 9: WhackamoleAwardResp
|
||||
(*DBWhackamole)(nil), // 10: DBWhackamole
|
||||
(*HeroField)(nil), // 11: HeroField
|
||||
(*DBWHHero)(nil), // 12: DBWHHero
|
||||
(*UserAtno)(nil), // 13: UserAtno
|
||||
(*UserAtno)(nil), // 11: UserAtno
|
||||
(*HeroField)(nil), // 12: HeroField
|
||||
(*DBWHHero)(nil), // 13: DBWHHero
|
||||
}
|
||||
var file_whackamole_whackamole_msg_proto_depIdxs = []int32{
|
||||
10, // 0: WhackamoleInfoResp.info:type_name -> DBWhackamole
|
||||
11, // 1: WhackamoleSuperiorResp.field:type_name -> HeroField
|
||||
11, // 2: WhackamoleUpgradeResp.field:type_name -> HeroField
|
||||
12, // 3: WhackamoleAwakeResp.hero:type_name -> DBWHHero
|
||||
13, // 4: WhackamoleAwardResp.award:type_name -> UserAtno
|
||||
5, // [5:5] is the sub-list for method output_type
|
||||
5, // [5:5] is the sub-list for method input_type
|
||||
5, // [5:5] is the sub-list for extension type_name
|
||||
5, // [5:5] is the sub-list for extension extendee
|
||||
0, // [0:5] is the sub-list for field type_name
|
||||
11, // 1: WhackamoleInfoResp.award:type_name -> UserAtno
|
||||
12, // 2: WhackamoleSuperiorResp.field:type_name -> HeroField
|
||||
12, // 3: WhackamoleUpgradeResp.field:type_name -> HeroField
|
||||
13, // 4: WhackamoleAwakeResp.hero:type_name -> DBWHHero
|
||||
11, // 5: WhackamoleAwardResp.award:type_name -> UserAtno
|
||||
6, // [6:6] is the sub-list for method output_type
|
||||
6, // [6:6] is the sub-list for method input_type
|
||||
6, // [6:6] is the sub-list for extension type_name
|
||||
6, // [6:6] is the sub-list for extension extendee
|
||||
0, // [0:6] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_whackamole_whackamole_msg_proto_init() }
|
||||
|
||||
@ -16,10 +16,15 @@ type GameTDHeroData struct {
|
||||
Job int32
|
||||
Model string
|
||||
SkillId []int32
|
||||
SkillIdupgrade []int32
|
||||
Skillidwaken int32
|
||||
Needlv int32
|
||||
Needawake []*Gameatn
|
||||
Width float32
|
||||
Height float32
|
||||
Hp int32
|
||||
Atk int32
|
||||
AtkSpeed1 int32
|
||||
AtkSpeed int32
|
||||
AtkRange float32
|
||||
}
|
||||
@ -49,10 +54,41 @@ func (_v *GameTDHeroData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["skillIdupgrade"].([]interface{}); !_ok_ { err = errors.New("skillIdupgrade error"); return }
|
||||
|
||||
_v.SkillIdupgrade = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.SkillIdupgrade = append(_v.SkillIdupgrade, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillidwaken"].(float64); !_ok_ { err = errors.New("skillidwaken error"); return }; _v.Skillidwaken = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needlv"].(float64); !_ok_ { err = errors.New("needlv error"); return }; _v.Needlv = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["needawake"].([]interface{}); !_ok_ { err = errors.New("needawake error"); return }
|
||||
|
||||
_v.Needawake = 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.Needawake = append(_v.Needawake, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["width"].(float64); !_ok_ { err = errors.New("width error"); return }; _v.Width = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["height"].(float64); !_ok_ { err = errors.New("height error"); return }; _v.Height = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_speed1"].(float64); !_ok_ { err = errors.New("atk_speed1 error"); return }; _v.AtkSpeed1 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_speed"].(float64); !_ok_ { err = errors.New("atk_speed error"); return }; _v.AtkSpeed = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_range"].(float64); !_ok_ { err = errors.New("atk_range error"); return }; _v.AtkRange = float32(_tempNum_) }
|
||||
return
|
||||
|
||||
42
sys/configure/structs/Game.TDHeroGrowup.go
Normal file
42
sys/configure/structs/Game.TDHeroGrowup.go
Normal file
@ -0,0 +1,42 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameTDHeroGrowup struct {
|
||||
_dataMap map[int32]*GameTDHeroGrowupData
|
||||
_dataList []*GameTDHeroGrowupData
|
||||
}
|
||||
|
||||
func NewGameTDHeroGrowup(_buf []map[string]interface{}) (*GameTDHeroGrowup, error) {
|
||||
_dataList := make([]*GameTDHeroGrowupData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameTDHeroGrowupData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameTDHeroGrowupData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Id] = _v
|
||||
}
|
||||
}
|
||||
return &GameTDHeroGrowup{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameTDHeroGrowup) GetDataMap() map[int32]*GameTDHeroGrowupData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameTDHeroGrowup) GetDataList() []*GameTDHeroGrowupData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameTDHeroGrowup) Get(key int32) *GameTDHeroGrowupData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
60
sys/configure/structs/Game.TDHeroGrowupData.go
Normal file
60
sys/configure/structs/Game.TDHeroGrowupData.go
Normal file
@ -0,0 +1,60 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameTDHeroGrowupData struct {
|
||||
Id int32
|
||||
Job int32
|
||||
Lv int32
|
||||
Hp int32
|
||||
Atk int32
|
||||
Need []*Gameatn
|
||||
Skillunlock int32
|
||||
}
|
||||
|
||||
const TypeId_GameTDHeroGrowupData = -1790183618
|
||||
|
||||
func (*GameTDHeroGrowupData) GetTypeId() int32 {
|
||||
return -1790183618
|
||||
}
|
||||
|
||||
func (_v *GameTDHeroGrowupData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
|
||||
|
||||
_v.Need = 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.Need = append(_v.Need, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillunlock"].(float64); !_ok_ { err = errors.New("skillunlock error"); return }; _v.Skillunlock = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameTDHeroGrowupData(_buf map[string]interface{}) (*GameTDHeroGrowupData, error) {
|
||||
v := &GameTDHeroGrowupData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@ -294,6 +294,7 @@ type Tables struct {
|
||||
TDWeaponSkill *GameTDWeaponSkill
|
||||
TDWeaponRandom *GameTDWeaponRandom
|
||||
TDHero *GameTDHero
|
||||
TDHeroGrowup *GameTDHeroGrowup
|
||||
TDBuff *GameTDBuff
|
||||
PuggsyIsLand *GamePuggsyIsLand
|
||||
PuggsyEvent *GamePuggsyEvent
|
||||
@ -2030,6 +2031,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.TDHero, err = NewGameTDHero(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_tdherogrowup") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.TDHeroGrowup, err = NewGameTDHeroGrowup(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_tdbuff") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -273,6 +273,7 @@ type GameGlobalData struct {
|
||||
FriendHelpHeroRefreshNum int32
|
||||
TdMainstageChallengeNum int32
|
||||
TdMainstageChallengeNumMax int32
|
||||
TdMainstageChallengeItem *Gameatn
|
||||
TdDailystageChallengeNum int32
|
||||
TdDailystageChallengeNumMax int32
|
||||
}
|
||||
@ -1079,6 +1080,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_help_hero_refresh_num"].(float64); !_ok_ { err = errors.New("friend_help_hero_refresh_num error"); return }; _v.FriendHelpHeroRefreshNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_mainstage_challenge_num"].(float64); !_ok_ { err = errors.New("td_mainstage_challenge_num error"); return }; _v.TdMainstageChallengeNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_mainstage_challenge_num_max"].(float64); !_ok_ { err = errors.New("td_mainstage_challenge_num_max error"); return }; _v.TdMainstageChallengeNumMax = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["td_mainstage_challenge_item"].(map[string]interface{}); !_ok_ { err = errors.New("td_mainstage_challenge_item error"); return }; if _v.TdMainstageChallengeItem, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num error"); return }; _v.TdDailystageChallengeNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num_max"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num_max error"); return }; _v.TdDailystageChallengeNumMax = int32(_tempNum_) }
|
||||
return
|
||||
|
||||
@ -17,6 +17,7 @@ type GameSkillAtkData struct {
|
||||
UnavailablePlayTypes []int32
|
||||
SkillFlag int32
|
||||
EffectFlag int32
|
||||
Priority int32
|
||||
Name string
|
||||
Ico string
|
||||
CorrectPos int32
|
||||
@ -59,6 +60,7 @@ 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["Priority"].(float64); !_ok_ { err = errors.New("Priority error"); return }; _v.Priority = 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_) }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user