diff --git a/bin/json/game_battlescore.json b/bin/json/game_battlescore.json index 5dfe99e56..7783e8e4b 100644 --- a/bin/json/game_battlescore.json +++ b/bin/json/game_battlescore.json @@ -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+" diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index 06b5dde8a..afad963f9 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -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,7 +65,7 @@ "x": -2362, "y": 1140 }, - "scale": 0.6, + "scale": 1, "usetext": { "key": "gamesummary_fathernode_usetext_4", "text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…" @@ -83,7 +83,7 @@ "x": -478, "y": 0 }, - "scale": 0.6, + "scale": 1, "usetext": { "key": "gamesummary_fathernode_usetext_5", "text": "当硬摇滚部落的霸女王开始寻找并收集吉他拨片，要摧毁所有其他类型的音乐时，波比和布兰跟朋友们一起试图拯救世界" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index dbb1b9940..f36a8aa68 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -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 } diff --git a/bin/json/game_integralboss.json b/bin/json/game_integralboss.json index 7004fe146..502393abf 100644 --- a/bin/json/game_integralboss.json +++ b/bin/json/game_integralboss.json @@ -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 ], diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 41ae80db4..5eb29108f 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -15136,7 +15136,7 @@ "text": "可以任选一件5星装备。" }, "describe": { - "key": "item_item_describe_303", + "key": "item_item_describe_17010001", "text": "可以任选一件5星装备。" }, "dialogue": { @@ -15185,7 +15185,7 @@ "text": "开启后，可以随机获得一件5星装备。" }, "describe": { - "key": "item_item_describe_304", + "key": "item_item_describe_17020001", "text": "可以随机获得一件5星装备。" }, "dialogue": { @@ -15234,7 +15234,7 @@ "text": "开启后，可以获得一套5星装备。" }, "describe": { - "key": "item_item_describe_305", + "key": "item_item_describe_17030001", "text": "可以获得一套5星装备。" }, "dialogue": { @@ -15281,7 +15281,7 @@ "text": "开启后，可以从5星守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_307", + "key": "item_item_describe_17050001", "text": "5星全守护者自选宝箱。" }, "dialogue": { @@ -15328,7 +15328,7 @@ "text": "开启后，可以从5星热情之火属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_308", + "key": "item_item_describe_17050002", "text": "5星热情之火自选宝箱。" }, "dialogue": { @@ -15375,7 +15375,7 @@ "text": "开启后，可以从5星感观之林属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_309", + "key": "item_item_describe_17050003", "text": "5星感观之林自选宝箱。" }, "dialogue": { @@ -15422,7 +15422,7 @@ "text": "开启后，可以从5星包容之水属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_310", + "key": "item_item_describe_17050004", "text": "5星包容之水自选宝箱。" }, "dialogue": { @@ -15469,7 +15469,7 @@ "text": "开启后，可以从5星荣耀之光属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_311", + "key": "item_item_describe_17050005", "text": "5星荣耀之光自选宝箱。" }, "dialogue": { @@ -15516,7 +15516,7 @@ "text": "开启后，可以从5星光系属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_312", + "key": "item_item_describe_17050006", "text": "5星光系自选宝箱。" }, "dialogue": { @@ -15563,7 +15563,7 @@ "text": "开启后，可以从5星暗系属性守护者中自选一名守护者。" }, "describe": { - "key": "item_item_describe_313", + "key": "item_item_describe_17050007", "text": "5星暗系自选宝箱。" }, "dialogue": { @@ -15610,7 +15610,7 @@ "text": "开启后，可以获得大量的守护者养成资源箱。" }, "describe": { - "key": "item_item_describe_314", + "key": "item_item_describe_17060001", "text": "高级养成资源箱。" }, "dialogue": { @@ -15657,7 +15657,7 @@ "text": "开启后，可以获得热情之火属性守护者的回响材料。" }, "describe": { - "key": "item_item_describe_315", + "key": "item_item_describe_17060002", "text": "热情之火回响材料宝箱。" }, "dialogue": { @@ -15704,7 +15704,7 @@ "text": "开启后，可以获得感观之林属性守护者的回响材料。" }, "describe": { - "key": "item_item_describe_316", + "key": "item_item_describe_17060003", "text": "感观之林回响材料宝箱。" }, "dialogue": { @@ -15751,7 +15751,7 @@ "text": "开启后，可以获得包容之水属性守护者的回响材料。" }, "describe": { - "key": "item_item_describe_317", + "key": "item_item_describe_17060004", "text": "包容之水回响材料宝箱。" }, "dialogue": { @@ -15798,7 +15798,7 @@ "text": "开启后，可以获得荣耀之光属性守护者的回响材料。" }, "describe": { - "key": "item_item_describe_318", + "key": "item_item_describe_17060005", "text": "荣耀之光回响材料宝箱。" }, "dialogue": { @@ -15845,7 +15845,7 @@ "text": "开启后，可获自由选择3星守护者的回响材料" }, "describe": { - "key": "item_item_describe_319", + "key": "item_item_describe_17060006", "text": "初级回响自选箱。" }, "dialogue": { @@ -15892,7 +15892,7 @@ "text": "开启后，可获自由选择4星守护者的回响材料" }, "describe": { - "key": "item_item_describe_320", + "key": "item_item_describe_17060007", "text": "中级回响自选箱。" }, "dialogue": { @@ -15939,7 +15939,7 @@ "text": "开启后，可获自由选择5星守护者的回响材料" }, "describe": { - "key": "item_item_describe_321", + "key": "item_item_describe_17060008", "text": "高级回响自选箱。" }, "dialogue": { @@ -15986,7 +15986,7 @@ "text": "开启后，从宝箱中自选一名橙色守护者的碎片" }, "describe": { - "key": "item_item_describe_322", + "key": "item_item_describe_17060009", "text": "橙色守护者自选箱碎片。" }, "dialogue": { @@ -16033,7 +16033,7 @@ "text": "开启后，从宝箱中自选一名紫色感观之林守护者的碎片" }, "describe": { - "key": "item_item_describe_323", + "key": "item_item_describe_17060010", "text": "紫色感观之林守护者自选箱。" }, "dialogue": { @@ -16080,7 +16080,7 @@ "text": "开启后，从宝箱中自选一名紫色热情之火守护者的碎片" }, "describe": { - "key": "item_item_describe_324", + "key": "item_item_describe_17060011", "text": "紫色热情之火守护者自选箱。" }, "dialogue": { @@ -16127,7 +16127,7 @@ "text": "开启后，从宝箱中自选一名紫色包容之水守护者的碎片" }, "describe": { - "key": "item_item_describe_325", + "key": "item_item_describe_17060012", "text": "紫色包容之水守护者自选箱。" }, "dialogue": { @@ -16176,7 +16176,7 @@ "text": "维京远征挑战券，是进入维京远征的凭证。" }, "describe": { - "key": "item_item_describe_326", + "key": "item_item_describe_18000001", "text": "进入维京远征的凭证。" }, "dialogue": { @@ -16225,7 +16225,7 @@ "text": "猎魂挑战券，是进入猎魂的凭证。" }, "describe": { - "key": "item_item_describe_327", + "key": "item_item_describe_18000002", "text": "进入猎魂的凭证。" }, "dialogue": { @@ -16274,7 +16274,7 @@ "text": "秘境挑战券，是进入秘境的凭证。" }, "describe": { - "key": "item_item_describe_328", + "key": "item_item_describe_18000003", "text": "进入秘境的凭证。" }, "dialogue": { @@ -16323,7 +16323,7 @@ "text": "竞技场挑战券每120分钟恢复一张，是进入竞技场的凭证。" }, "describe": { - "key": "item_item_describe_329", + "key": "item_item_describe_18000004", "text": "这既是对实力的证明，也是试探。谁不想证明自己才是最正统的传承者呢？" }, "dialogue": { @@ -16372,7 +16372,7 @@ "text": "属性挑战券，是进入属性BOSS的凭证。" }, "describe": { - "key": "item_item_describe_330", + "key": "item_item_describe_18000005", "text": "进入阵营BOSS的凭证。" }, "dialogue": { @@ -16421,7 +16421,7 @@ "text": "俱乐部挑战券，是进入俱乐部BOSS的凭证。" }, "describe": { - "key": "item_item_describe_331", + "key": "item_item_describe_18000006", "text": "进入公会BOSS的凭证。" }, "dialogue": { @@ -16470,7 +16470,7 @@ "text": "副本挑战券，是进入属性BOSS的凭证。" }, "describe": { - "key": "item_item_describe_332", + "key": "item_item_describe_18000007", "text": "进入阵营BOSS的凭证。" }, "dialogue": { @@ -16519,7 +16519,7 @@ "text": "副本挑战券，是进入属性BOSS的凭证。" }, "describe": { - "key": "item_item_describe_333", + "key": "item_item_describe_18000008", "text": "进入阵营BOSS的凭证。" }, "dialogue": { @@ -16568,7 +16568,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_334", + "key": "item_item_describe_19001001", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16617,7 +16617,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_335", + "key": "item_item_describe_19001002", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16666,7 +16666,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_336", + "key": "item_item_describe_19001003", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16715,7 +16715,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_337", + "key": "item_item_describe_19001004", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16764,7 +16764,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_338", + "key": "item_item_describe_19002001", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16813,7 +16813,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_339", + "key": "item_item_describe_19002002", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16862,7 +16862,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_340", + "key": "item_item_describe_19002003", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16911,7 +16911,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_341", + "key": "item_item_describe_19002004", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -16960,7 +16960,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_342", + "key": "item_item_describe_19003001", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17009,7 +17009,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_343", + "key": "item_item_describe_19003002", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17058,7 +17058,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_344", + "key": "item_item_describe_19003003", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17107,7 +17107,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_345", + "key": "item_item_describe_19003004", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17156,7 +17156,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_346", + "key": "item_item_describe_19004001", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17205,7 +17205,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_347", + "key": "item_item_describe_19004002", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17254,7 +17254,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_348", + "key": "item_item_describe_19004003", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17303,7 +17303,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_349", + "key": "item_item_describe_19004004", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17352,7 +17352,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_350", + "key": "item_item_describe_19005001", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17401,7 +17401,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_351", + "key": "item_item_describe_19005002", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17450,7 +17450,7 @@ "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "describe": { - "key": "item_item_describe_352", + "key": "item_item_describe_19005003", "text": "食用后可以提升奥术系守护者的觉醒等级。" }, "dialogue": { @@ -17499,7 +17499,7 @@ "text": "在熊猫武馆内，教授功夫时用来进行动作演示的工具。" }, "describe": { - "key": "item_item_describe_353", + "key": "item_item_describe_20000001", "text": "光秃秃的棍子，因为常年用来教习被使用者盘得十分光润。" }, "dialogue": { @@ -17542,13 +17542,13 @@ ], "use_skip": 10006, "upper_limit": 0, - "img": "icon_mcs", + "img": "item_20000002", "intr": { "key": "item_item_intr_20000002", "text": "熊猫武馆升级木桩所需道具。" }, "describe": { - "key": "item_item_describe_354", + "key": "item_item_describe_20000002", "text": "质地坚韧的云杉木，可以在木匠手中很快变身成一个木偶。" }, "dialogue": { @@ -17597,7 +17597,7 @@ "text": "打开后可以随机获得烹饪的食材，可以去找平先生用食材来制作各种美食。" }, "describe": { - "key": "item_item_describe_355", + "key": "item_item_describe_17010000", "text": "打开后可以随机获得烹饪的食材，可以去找平先生用食材来制作各种美食。" }, "dialogue": { @@ -17644,7 +17644,7 @@ "text": "用于商城购买消耗的礼卷" }, "describe": { - "key": "item_item_describe_356", + "key": "item_item_describe_10000035", "text": "用于商城购买消耗的礼券。" }, "dialogue": { @@ -17691,7 +17691,7 @@ "text": "用于巨怪商队内移动列车的消耗品" }, "describe": { - "key": "item_item_describe_357", + "key": "item_item_describe_21000001", "text": "用于巨怪商队内移动列车的消耗品。" }, "dialogue": { @@ -17738,7 +17738,7 @@ "text": "出自宝贝老板,疯狂原始人的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_358", + "key": "item_item_describe_21000002", "text": "超高蛋白，可以提供一家人的营养所需。获取时稍有不慎会成为角鸟的营养所需。" }, "dialogue": { @@ -17785,7 +17785,7 @@ "text": "出自功夫熊猫的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_359", + "key": "item_item_describe_21000003", "text": "完美定格了神龙大侠深藏功与名的身姿，限量发售，先到先得。" }, "dialogue": { @@ -17832,7 +17832,7 @@ "text": "出自坏蛋联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_360", + "key": "item_item_describe_21000004", "text": "纯黄金打造，眼睛用祖母绿镶嵌而成，价值连城的宝物。" }, "dialogue": { @@ -17879,7 +17879,7 @@ "text": "出自疯狂外星人,怪物史莱克的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_361", + "key": "item_item_describe_21000005", "text": "纯天然鼻涕虫黏液制成，使用后会获得和史莱克一样绿莹莹的洁白牙齿。" }, "dialogue": { @@ -17926,7 +17926,7 @@ "text": "出自驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_362", + "key": "item_item_describe_21000006", "text": "最强恶龙碎骨龙的骨片，只有那些最英勇的勇士才能获得。" }, "dialogue": { @@ -17973,7 +17973,7 @@ "text": "出自野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_363", + "key": "item_item_describe_21000007", "text": "名为马鞍，实际是龙鞍，为了避免龙骑士被龙甩下去而发明。" }, "dialogue": { @@ -18020,7 +18020,7 @@ "text": "出自疯狂外星人,魔发精灵的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_364", + "key": "item_item_describe_21000008", "text": "六根闪闪发亮的彩色琴弦，正在合奏一首唯美的乐章。" }, "dialogue": { @@ -18067,7 +18067,7 @@ "text": "出自宝贝老板的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_365", + "key": "item_item_describe_21000009", "text": "轻轻地嘬一口，便可从大人迅速变身穿着尿不湿咿咿呀呀的婴儿，宝贝公司的独门配方。" }, "dialogue": { @@ -18114,7 +18114,7 @@ "text": "出自马达加斯加的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_366", + "key": "item_item_describe_21000010", "text": "滑稽的小丑服，将快乐带给别人，把悲伤留给自己。" }, "dialogue": { @@ -18161,7 +18161,7 @@ "text": "出自疯狂外星人的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_367", + "key": "item_item_describe_21000011", "text": "格尔族人研发的超级芯片，据说有个波波星人偷走了一块。" }, "dialogue": { @@ -18208,7 +18208,7 @@ "text": "出自守护者联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_368", + "key": "item_item_describe_21000012", "text": "金碧辉煌的筒箱中，睡着一颗乳牙。这会是谁的记忆呢？" }, "dialogue": { @@ -18255,7 +18255,7 @@ "text": "出自疯狂外星人,巨怪猎人的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_369", + "key": "item_item_describe_21000013", "text": "特别发行的纪念版徽章，一比一复刻，巨怪商队人手一个。" }, "dialogue": { @@ -18302,7 +18302,7 @@ "text": "出自疯狂原始人,巨怪猎人,驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_370", + "key": "item_item_describe_21000014", "text": "原始时代遗留的巨石，上面还能看见一些红色的涂鸦。" }, "dialogue": { @@ -18349,7 +18349,7 @@ "text": "出自宝贝老板,疯狂外星人,坏蛋联盟,巨怪猎人,守护者联盟,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_371", + "key": "item_item_describe_21000015", "text": "一枝细小的生日蜡烛正在燃烧着，虽然不大，却承载着世间最美好的祝福。" }, "dialogue": { @@ -18396,7 +18396,7 @@ "text": "出自疯狂外星人,疯狂原始人,功夫熊猫,马达加斯加,魔发精灵的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_372", + "key": "item_item_describe_21000016", "text": "丰盛诱人的热带水果，躺在沙滩上，与伙伴们一起享受吧。" }, "dialogue": { @@ -18443,7 +18443,7 @@ "text": "出自疯狂外星人,怪物史莱克,坏蛋联盟,巨怪猎人,守护者联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_373", + "key": "item_item_describe_21000017", "text": "雕饰华丽的宫廷高脚杯，珍藏的葡萄美酒必得要它来配。" }, "dialogue": { @@ -18490,7 +18490,7 @@ "text": "出自宝贝老板,疯狂外星人,魔发精灵的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_374", + "key": "item_item_describe_21000018", "text": "一根棒棒糖，酸中带甜，在口中不断变换。" }, "dialogue": { @@ -18537,7 +18537,7 @@ "text": "出自宝贝老板,疯狂原始人,巨怪猎人,驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_375", + "key": "item_item_describe_21000019", "text": "岩洞天然形成的晶石，在人类诞生之前，就已经存在。" }, "dialogue": { @@ -18584,7 +18584,7 @@ "text": "出自怪物史莱克,坏蛋联盟,魔发精灵,守护者联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_376", + "key": "item_item_describe_21000020", "text": "白雪公主在逃跑，彼得潘总长不大……太多故事组成了童年的美好回忆。" }, "dialogue": { @@ -18631,7 +18631,7 @@ "text": "出自功夫熊猫,驯龙高手,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_377", + "key": "item_item_describe_21000021", "text": "这个木桶因为装过太多东西，闻起来十分动人：牛奶味，酒味，火药味，袜子味……" }, "dialogue": { @@ -18678,7 +18678,7 @@ "text": "出自疯狂原始人,怪物史莱克,巨怪猎人,驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_378", + "key": "item_item_describe_21000022", "text": "饱经风霜的盾牌，上面有数之不尽的战斗痕迹，这些是它光荣过往的证明。" }, "dialogue": { @@ -18725,7 +18725,7 @@ "text": "出自疯狂原始人,功夫熊猫,马达加斯加的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_379", + "key": "item_item_describe_21000023", "text": "找一处安静的湖边，找两颗结实的树，捆绑好，躺上去，度过一个美妙的午后。" }, "dialogue": { @@ -18772,7 +18772,7 @@ "text": "出自宝贝老板,疯狂外星人,巨怪猎人,魔发精灵,守护者联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_380", + "key": "item_item_describe_21000024", "text": "系上溜冰鞋的带子，低调地开始滑行，然后高调地制霸溜冰场。" }, "dialogue": { @@ -18819,7 +18819,7 @@ "text": "出自宝贝老板,疯狂外星人,坏蛋联盟,巨怪猎人,守护者联盟的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_381", + "key": "item_item_describe_21000025", "text": "奶油在舌尖融化的刹那，在炎炎夏日中感受久违的清凉。" }, "dialogue": { @@ -18866,7 +18866,7 @@ "text": "出自功夫熊猫,怪物史莱克,驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_382", + "key": "item_item_describe_21000026", "text": "精准地一击即中，它总能得到它想要的猎物。" }, "dialogue": { @@ -18913,7 +18913,7 @@ "text": "出自怪物史莱克,坏蛋联盟,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_383", + "key": "item_item_describe_21000027", "text": "钢琴曲有可能是月光也有可能是波西米亚狂想曲，弹奏者有可能是绅士也有可能是江洋大盗。" }, "dialogue": { @@ -18960,7 +18960,7 @@ "text": "出自疯狂原始人,马达加斯加,魔发精灵,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_384", + "key": "item_item_describe_21000028", "text": "排齿尖尖，大口朝天。隐于草内，请君笑纳。" }, "dialogue": { @@ -19007,7 +19007,7 @@ "text": "出自宝贝老板,坏蛋联盟,马达加斯加,守护者联盟,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_385", + "key": "item_item_describe_21000029", "text": "“小红帽投诉邻居史莱克夫妇。”“血红爪重出江湖……”可以看到全宇宙琐事的神奇报纸。" }, "dialogue": { @@ -19054,7 +19054,7 @@ "text": "出自功夫熊猫,魔发精灵,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_386", + "key": "item_item_describe_21000030", "text": "咚咚咚，蹦蹦蹦，哒哒哒，咚哒咚哒咚咚哒。" }, "dialogue": { @@ -19101,7 +19101,7 @@ "text": "出自疯狂原始人,马达加斯加,驯龙高手的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_387", + "key": "item_item_describe_21000031", "text": "获取途径成谜的珍惜物品，据说买卖的人在监狱里踩了一辈子缝纫机。" }, "dialogue": { @@ -19148,7 +19148,7 @@ "text": "出自功夫熊猫,驯龙高手,野性精神的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_388", + "key": "item_item_describe_21000032", "text": "岩层中开采出的稀有铁矿，其貌不扬，质地坚韧，可以制成各种铁器。" }, "dialogue": { @@ -19195,7 +19195,7 @@ "text": "出自宝贝老板,疯狂外星人,怪物史莱克,马达加斯加的商品,可以在任意城市售卖。" }, "describe": { - "key": "item_item_describe_389", + "key": "item_item_describe_21000033", "text": "红的蓝的紫的绿的黄的……梦幻轻盈的，飘然易碎的，童真的，幻想的。" }, "dialogue": { @@ -19242,7 +19242,7 @@ "text": "在秘境中获得，可以用于各个事件消耗用。" }, "describe": { - "key": "item_item_describe_390", + "key": "item_item_describe_10000036", "text": "原始社会最常见的货币，在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带，又受人们喜爱。" }, "dialogue": { @@ -19289,7 +19289,7 @@ "text": "在秘境中获得，可以用于强化石阵秘境天赋树。" }, "describe": { - "key": "item_item_describe_391", + "key": "item_item_describe_10000037", "text": "秘境中的美丽水晶，波澜浮光的棕红，是石洞天然形成的瑰宝。它拥有特殊的能量，将它握在手中，能使感官大幅度增强。" }, "dialogue": { @@ -19336,7 +19336,7 @@ "text": "在秘境中获得，积累积分可以在周常阶段领取奖励。" }, "describe": { - "key": "item_item_describe_392", + "key": "item_item_describe_10000038", "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "dialogue": { @@ -19377,13 +19377,13 @@ "access": [], "use_skip": 137, "upper_limit": 999, - "img": "wp_icon_jjcq", + "img": "item_22100001", "intr": { "key": "item_item_intr_22100001", "text": "可以用于联合演练中抽奖。" }, "describe": { - "key": "item_item_describe_393", + "key": "item_item_describe_22100001", "text": "" }, "dialogue": { @@ -19430,7 +19430,7 @@ "text": "可以用于开服活动中抽奖。" }, "describe": { - "key": "item_item_describe_394", + "key": "item_item_describe_23000001", "text": "" }, "dialogue": { @@ -19477,7 +19477,7 @@ "text": "可用于拼图游戏中完成拼图游戏。" }, "describe": { - "key": "item_item_describe_395", + "key": "item_item_describe_23000002", "text": "碎片虽小，窥一斑而知全豹。" }, "dialogue": { @@ -19524,7 +19524,7 @@ "text": "可用于云上行走游戏中。" }, "describe": { - "key": "item_item_describe_396", + "key": "item_item_describe_23000003", "text": "涂抹在脚底板，在云朵上体验平地上行走的快乐。" }, "dialogue": { @@ -19571,7 +19571,7 @@ "text": "可用于黄金矿工游戏中。" }, "describe": { - "key": "item_item_describe_397", + "key": "item_item_describe_23000004", "text": "黄金弥足珍贵，挖掘机会渺茫，且挖且珍惜。" }, "dialogue": { @@ -19618,7 +19618,7 @@ "text": "可用于开启石阵秘境宝箱。" }, "describe": { - "key": "item_item_describe_398", + "key": "item_item_describe_10000039", "text": "一流的开锁者往往只需要一根毛，海豹鸡身上的一小撮毛。 圆滑的触感，锋利的尾端，看似平平无奇，却暗藏玄机。" }, "dialogue": { @@ -19665,7 +19665,7 @@ "text": "可以从中自由选择3种属性招募卷的宝箱。" }, "describe": { - "key": "item_item_describe_399", + "key": "item_item_describe_17110001", "text": "自由选择，完全自由。" }, "dialogue": { @@ -19714,7 +19714,7 @@ "text": "开启后，可以获得一套4星装备。" }, "describe": { - "key": "item_item_describe_400", + "key": "item_item_describe_17040001", "text": "" }, "dialogue": { @@ -19761,7 +19761,7 @@ "text": "剧情道具，剧情探索中获得并使用。" }, "describe": { - "key": "item_item_describe_401", + "key": "item_item_describe_24010001", "text": "尾巴的断处有撕裂的痕迹，显然是经过一番打斗之后留下的。" }, "dialogue": { @@ -19808,7 +19808,7 @@ "text": "剧情道具，剧情探索中获得并使用。" }, "describe": { - "key": "item_item_describe_402", + "key": "item_item_describe_24010002", "text": "非常厚实，温暖，看着就想窝进去让它将自己团团包裹。" }, "dialogue": { @@ -19855,7 +19855,7 @@ "text": "剧情道具，剧情探索中获得并使用。" }, "describe": { - "key": "item_item_describe_403", + "key": "item_item_describe_24010003", "text": "弯曲尖利的长牙，上面还隐隐有一些血迹，稍稍加工就是极好的武器。" }, "dialogue": { @@ -19902,7 +19902,7 @@ "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { - "key": "item_item_describe_404", + "key": "item_item_describe_24011001", "text": "苦寒地带维京人的标志，原名已不可考。因其货币多篆刻龙头纹样被称为龙币。据说这些龙多由维京人驯养。" }, "dialogue": { @@ -19949,7 +19949,7 @@ "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { - "key": "item_item_describe_405", + "key": "item_item_describe_24021001", "text": "扇贝虽然比不上螺贝的美丽，但因更为更常见而价值亲民，交易中使用它也就更为频繁。当然，咕噜一家只对扇贝的肉感兴趣……" }, "dialogue": { @@ -19996,7 +19996,7 @@ "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { - "key": "item_item_describe_406", + "key": "item_item_describe_24031001", "text": "淡黄的纸面，绿色的图案和文字。轻飘飘的外表，与它强大的购买力形成了强烈的对比。据说某个臭名昭著的坏蛋团伙，在行动之前一定会去咖啡店小坐一会，还会给几张钞票当做小费。" }, "dialogue": { @@ -20043,7 +20043,7 @@ "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { - "key": "item_item_describe_407", + "key": "item_item_describe_24041001", "text": "在浪漫的童话世界，先令几乎就是货币的代名词。婚丧嫁娶，人们从生到死都离不开它。抓捕一个怪物或通缉犯，换取的先令更是不可估量。" }, "dialogue": { @@ -20090,7 +20090,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_408", + "key": "item_item_describe_24012001", "text": "" }, "dialogue": { @@ -20137,7 +20137,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_409", + "key": "item_item_describe_24012002", "text": "" }, "dialogue": { @@ -20184,7 +20184,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_410", + "key": "item_item_describe_24012003", "text": "" }, "dialogue": { @@ -20231,7 +20231,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_411", + "key": "item_item_describe_24012004", "text": "" }, "dialogue": { @@ -20278,7 +20278,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_412", + "key": "item_item_describe_24012005", "text": "" }, "dialogue": { @@ -20325,7 +20325,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_413", + "key": "item_item_describe_24012010", "text": "不要靠近那朵艳丽的花儿，它会用冲天的腐臭告诉你，为何要敬畏大自然。" }, "dialogue": { @@ -20372,7 +20372,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_414", + "key": "item_item_describe_24012011", "text": "这，不是普通的鱼。而是经过腌制的罐头鲱鱼，八十一天发酵后那特殊的风味，使人从生到死都不会忘怀。" }, "dialogue": { @@ -20419,7 +20419,7 @@ "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。" }, "describe": { - "key": "item_item_describe_415", + "key": "item_item_describe_24012012", "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，一只？" }, "dialogue": { @@ -20466,7 +20466,7 @@ "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。" }, "describe": { - "key": "item_item_describe_416", + "key": "item_item_describe_24012013", "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，两只？" }, "dialogue": { @@ -20513,7 +20513,7 @@ "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。" }, "describe": { - "key": "item_item_describe_417", + "key": "item_item_describe_24012014", "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，三只！" }, "dialogue": { @@ -20560,7 +20560,7 @@ "text": "果酱教授身体的毛发" }, "describe": { - "key": "item_item_describe_419", + "key": "item_item_describe_24012016", "text": "果酱教授身体的毛发" }, "dialogue": { @@ -20570,6 +20570,94 @@ "sale": [], "gm": 0 }, + { + "id": "24012020", + "name": { + "key": "item_item_name_24012020", + "text": "饼干" + }, + "usetype": 1, + "color": 3, + "bagtype": 0, + "index": 1, + "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": "item_24012020", + "intr": { + "key": "item_item_intr_24012020", + "text": "与驴同行中使用的道具" + }, + "describe": { + "key": "item_item_describe_24012020", + "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，三只！" + }, + "dialogue": { + "key": "item_item_dialogue_24012020", + "text": "【羊羊爱我，我爱羊羊！】" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 + }, + { + "id": "24012021", + "name": { + "key": "item_item_name_24012021", + "text": "马蹄" + }, + "usetype": 1, + "color": 3, + "bagtype": 0, + "index": 1, + "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": "item_24012021", + "intr": { + "key": "item_item_intr_24012021", + "text": "与驴同行中使用的道具" + }, + "describe": { + "key": "item_item_describe_24012021", + "text": "果酱教授身体的毛发" + }, + "dialogue": { + "key": "item_item_dialogue_24012021", + "text": "【这股熟悉的味道！】" + }, + "sale": [], + "gm": 0 + }, { "id": "24022012", "name": { @@ -20601,7 +20689,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_418", + "key": "item_item_describe_24022012", "text": "这，不是普通的香。而是龙之花经由龙腹运转而诞生的结晶。闻一闻，神清气爽。吃一口，脚下生风。" }, "dialogue": { @@ -20648,7 +20736,7 @@ "text": "据说是某种十分珍贵的材料" }, "describe": { - "key": "item_item_describe_419", + "key": "item_item_describe_25000001", "text": "菲奥娜珍藏的材料，可以用来制作某些用于解除诅咒的药水。" }, "dialogue": { @@ -20689,7 +20777,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_420", + "key": "item_item_describe_24013003", "text": "" }, "dialogue": { @@ -20736,7 +20824,7 @@ "text": "骇客蛛编写用来快速完成拼图的脚本程序" }, "describe": { - "key": "item_item_describe_421", + "key": "item_item_describe_26000001", "text": "该脚本绝对没有信息盗取相关的捆绑插件，而且终身免费使用，快来下载吧。" }, "dialogue": { @@ -20783,7 +20871,7 @@ "text": "豺狼小怪的三消英雄卡。" }, "describe": { - "key": "item_item_describe_422", + "key": "item_item_describe_27000001", "text": "豺狼小怪怎么叫？" }, "dialogue": { @@ -20824,7 +20912,7 @@ "text": "小猴子的三消英雄卡。" }, "describe": { - "key": "item_item_describe_423", + "key": "item_item_describe_27000002", "text": "小猴子怎么叫？" }, "dialogue": { @@ -20865,7 +20953,7 @@ "text": "食人鱼的三消英雄卡" }, "describe": { - "key": "item_item_describe_424", + "key": "item_item_describe_27000003", "text": "食人鱼怎么叫？" }, "dialogue": { @@ -20906,7 +20994,7 @@ "text": "胡德先生的三消英雄卡" }, "describe": { - "key": "item_item_describe_425", + "key": "item_item_describe_27000004", "text": "胡德先生怎么叫？" }, "dialogue": { @@ -20947,7 +21035,7 @@ "text": "大大的三消英雄卡" }, "describe": { - "key": "item_item_describe_426", + "key": "item_item_describe_27000005", "text": "大大怎么叫？" }, "dialogue": { @@ -20988,7 +21076,7 @@ "text": "低级三消宝箱,里面的奖励寥寥无几" }, "describe": { - "key": "item_item_describe_427", + "key": "item_item_describe_27000100", "text": "低级三消宝箱,里面的奖励寥寥无几" }, "dialogue": { @@ -21029,7 +21117,7 @@ "text": "中级三消宝箱,里面的奖励稀松平常" }, "describe": { - "key": "item_item_describe_428", + "key": "item_item_describe_27000101", "text": "中级三消宝箱,里面的奖励稀松平常" }, "dialogue": { @@ -21070,7 +21158,7 @@ "text": "高级三消宝箱,里面的奖励值得期待" }, "describe": { - "key": "item_item_describe_429", + "key": "item_item_describe_27000102", "text": "高级三消宝箱,里面的奖励值得期待" }, "dialogue": { @@ -21111,7 +21199,7 @@ "text": "完美三消宝箱,里面的奖励令人垂延" }, "describe": { - "key": "item_item_describe_430", + "key": "item_item_describe_27000103", "text": "完美三消宝箱,里面的奖励令人垂延" }, "dialogue": { @@ -21152,7 +21240,7 @@ "text": "无双三消宝箱,里面的奖励天下无双" }, "describe": { - "key": "item_item_describe_431", + "key": "item_item_describe_27000104", "text": "无双三消宝箱,里面的奖励天下无双" }, "dialogue": { @@ -21193,7 +21281,7 @@ "text": "一个酷似阿宝的玩具，不知道有什么作用。" }, "describe": { - "key": "item_item_describe_432", + "key": "item_item_describe_28000001", "text": "有些污渍在上面，但那张黑白相间的圆脸依旧可爱。" }, "dialogue": { @@ -21234,7 +21322,7 @@ "text": "一个酷似小虎的玩具，不知道有什么作用。" }, "describe": { - "key": "item_item_describe_433", + "key": "item_item_describe_28000002", "text": "看的出来，曾经的主人十分喜爱它。" }, "dialogue": { @@ -21275,7 +21363,7 @@ "text": "一个酷似螳螂的玩具，不知道有什么作用。" }, "describe": { - "key": "item_item_describe_434", + "key": "item_item_describe_28000003", "text": "小东西，大力量。" }, "dialogue": { @@ -21316,7 +21404,7 @@ "text": "一个酷似金猴的玩具，不知道有什么作用。" }, "describe": { - "key": "item_item_describe_435", + "key": "item_item_describe_28000004", "text": "它手里空握着什么，或许是遗失了一根棍子？" }, "dialogue": { @@ -21357,7 +21445,7 @@ "text": "由龙币兑换的宝箱，购买后获得紫色无极套装4件装备。" }, "describe": { - "key": "item_item_describe_436", + "key": "item_item_describe_17011001", "text": "无极，太极？" }, "dialogue": { @@ -21398,7 +21486,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_437", + "key": "item_item_describe_10000040", "text": "" }, "dialogue": { @@ -21439,7 +21527,7 @@ "text": "隐藏于博客岛的藏宝图，已经是一个完整宝藏示意图。" }, "describe": { - "key": "item_item_describe_438", + "key": "item_item_describe_24012015", "text": "在山的那边，海的那边，有一张……藏宝图？" }, "dialogue": { @@ -21480,7 +21568,7 @@ "text": "" }, "describe": { - "key": "item_item_describe_439", + "key": "item_item_describe_24022003", "text": "" }, "dialogue": { diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 12608a197..26f54b39c 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -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": { @@ -24725,7 +24725,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_181", + "key": "main_stage_bubbletext_230", "text": "欢迎~" }, "animation": [], @@ -24803,9 +24803,21 @@ ], "helphero": [], "banhero": [], - "star": [], - "star_type": [], - "star_value": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], "challengeward": 0 }, { @@ -24841,7 +24853,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_182", + "key": "main_stage_bubbletext_231", "text": "嘿嘿嘿，就快要到了~" }, "animation": [], @@ -24921,7 +24933,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_183", + "key": "main_stage_bubbletext_232", "text": "在下靴猫剑客。" }, "animation": [], @@ -25049,7 +25061,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_184", + "key": "main_stage_bubbletext_233", "text": "还差一点，差一点就完成了！我的哈妮，姜饼妹！" }, "animation": [], @@ -25177,7 +25189,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_185", + "key": "main_stage_bubbletext_234", "text": "哦，亲爱的，你让我喘不过气……" }, "animation": [], @@ -25305,7 +25317,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_186", + "key": "main_stage_bubbletext_235", "text": "这片沼泽地有些奇怪……" }, "animation": [], @@ -25433,7 +25445,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_236", "text": "" }, "animation": [], @@ -25513,7 +25525,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_237", "text": "" }, "animation": [], @@ -25593,7 +25605,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_238", "text": "" }, "animation": [], @@ -25673,7 +25685,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_190", + "key": "main_stage_bubbletext_239", "text": "法夸德勋爵还在迫害童话人物！" }, "animation": [], @@ -25753,7 +25765,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_240", "text": "" }, "animation": [], @@ -25831,9 +25843,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 +25871,7 @@ "buried_type": 0, "buried": 0, "grouptype": [], - "Episodetype": 1, + "Episodetype": 3, "stage_param": 0, "inherit": 0, "battle_fail": 0, @@ -25869,7 +25893,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_192", + "key": "main_stage_bubbletext_241", "text": "有关我的传言，也许并不都是真的。" }, "animation": [], @@ -25949,7 +25973,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_242", "text": "" }, "animation": [], @@ -26029,7 +26053,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_243", "text": "" }, "animation": [], @@ -26109,7 +26133,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_244", "text": "" }, "animation": [], @@ -26189,7 +26213,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_245", "text": "" }, "animation": [], @@ -26317,7 +26341,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_246", "text": "" }, "animation": [], @@ -26397,7 +26421,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_247", "text": "" }, "animation": [], @@ -26525,7 +26549,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_248", "text": "" }, "animation": [], @@ -26653,7 +26677,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_249", "text": "" }, "animation": [], @@ -26781,7 +26805,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_250", "text": "" }, "animation": [], @@ -26909,7 +26933,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_251", "text": "" }, "animation": [], @@ -27037,7 +27061,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_252", "text": "" }, "animation": [], @@ -27165,7 +27189,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_253", "text": "" }, "animation": [], @@ -27245,7 +27269,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_254", "text": "" }, "animation": [], @@ -27373,7 +27397,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_255", "text": "" }, "animation": [], @@ -27453,7 +27477,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_256", "text": "" }, "animation": [], @@ -27581,7 +27605,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_257", "text": "" }, "animation": [], @@ -27661,7 +27685,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_258", "text": "" }, "animation": [], @@ -27789,7 +27813,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_259", "text": "" }, "animation": [], @@ -27869,7 +27893,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", + "key": "main_stage_bubbletext_260", "text": "" }, "animation": [], diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index eee77abd1..9c183faa3 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -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", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 7e1b3f782..17debd9af 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -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, @@ -29683,10 +29693,10 @@ 4, 800 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 255007215 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29753,7 +29763,7 @@ "Argu": [ 390001415, 1000, - 5, + 1, -1 ], "FollowSK": [], @@ -29961,6 +29971,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 255007319, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 253003111, "EmitPR": 1000, @@ -40384,7 +40417,7 @@ 390001107, 1000, 1, - 2 + 1 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 46247a66e..ae5ba5976 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -5148,15 +5148,15 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005313, 215005311, - 215005312, - 215005313 + 215005312 ] }, "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_115005311_1", - "text": "提升全体友方20%行动值。治疗全体友方，治疗量为目标最大生命值25%，净化全体友方各1个减益。" + "text": "提升全体友方20%行动值。治疗全体友方，治疗量为目标最大生命值25%，净化全体友方所有减益。" }, "buffid": [], "map": "" @@ -5182,9 +5182,9 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005313, 215005311, - 215005322, - 215005313 + 215005322 ] }, "passSkill": [], @@ -5216,9 +5216,9 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005313, 215005311, - 215005332, - 215005313 + 215005332 ] }, "passSkill": [], @@ -5250,9 +5250,9 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005313, 215005311, - 215005342, - 215005313 + 215005342 ] }, "passSkill": [], @@ -5284,9 +5284,9 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005313, 215005311, - 215005342, - 215005313 + 215005342 ] }, "passSkill": [], @@ -6662,7 +6662,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007311_1", - "text": "攻击敌方全体9次，伤害为自身防御力360%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。" + "text": "攻击敌方全体9次，伤害为自身防御力540%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。" }, "buffid": [ 390001110 @@ -23087,14 +23087,13 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 3, "Where": [], - "Target": 0, + "Target": 2, "ChildSkill": { "Id": [ - 245004211, - 245004212 + 245004211 ] }, "passSkill": [ @@ -23102,7 +23101,7 @@ ], "Desc": { "key": "skill_skill_atk_Desc_145004211_1", - "text": "用连续刺剑攻击当前目标3次造成每次自身攻击力100%的伤害，并各有50%概率为目标附加2回合[color=#e5621b]流血[/color]。有20%概率发动3技能。" + "text": "用连续刺剑攻击当前目标3次造成每次自身攻击力100%的伤害，并各有60%概率为目标附加2回合[color=#e5621b]流血[/color]。有20%概率发动3技能。" }, "buffid": [ 390001404 @@ -23124,14 +23123,13 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 3, "Where": [], - "Target": 0, + "Target": 2, "ChildSkill": { "Id": [ - 245004221, - 245004212 + 245004221 ] }, "passSkill": [ @@ -23161,14 +23159,13 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 3, "Where": [], - "Target": 0, + "Target": 2, "ChildSkill": { "Id": [ - 245004231, - 245004212 + 245004231 ] }, "passSkill": [ @@ -23198,14 +23195,13 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 3, "Where": [], - "Target": 0, + "Target": 2, "ChildSkill": { "Id": [ - 245004241, - 245004212 + 245004241 ] }, "passSkill": [ @@ -23235,14 +23231,13 @@ "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", - "Type": 2, - "CD": 0, + "Type": 1, + "CD": 3, "Where": [], - "Target": 0, + "Target": 2, "ChildSkill": { "Id": [ - 245004251, - 245004212 + 245004251 ] }, "passSkill": [ @@ -24039,7 +24034,9 @@ 255007318 ] }, - "passSkill": [], + "passSkill": [ + 255007312 + ], "Desc": { "key": "skill_skill_atk_Desc_155007311_1", "text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]霜盾冰晶[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#e5621b]急冻深寒[/color]。" @@ -24068,7 +24065,8 @@ "Target": 2, "ChildSkill": { "Id": [ - 255007315 + 255007315, + 255007319 ] }, "passSkill": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index a196ab34f..d33641e9b 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3413,7 +3413,7 @@ }, "BuffType": 74, "EffectArgu": [ - 99 + 150 ], "BufParNum": 1, "RelyCheckArgu": [], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index cba6b84aa..c40099053 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -3482,7 +3482,8 @@ "MaxEmitTimesInRound": 99, "Callback": [ 4, - 255007314 + 255007314, + 155007312 ] }, { diff --git a/bin/json/game_tdhero.json b/bin/json/game_tdhero.json index 0637a088a..8b063fcc3 100644 --- a/bin/json/game_tdhero.json +++ b/bin/json/game_tdhero.json @@ -1 +1,104 @@ -[] \ No newline at end of file +[ + { + "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 + } +] \ No newline at end of file diff --git a/modules/whackamole/api_awake.go b/modules/whackamole/api_awake.go index d72cf0bdd..6564c54b1 100644 --- a/modules/whackamole/api_awake.go +++ b/modules/whackamole/api_awake.go @@ -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 } diff --git a/modules/whackamole/api_info.go b/modules/whackamole/api_info.go index 0c992316b..aefc17478 100644 --- a/modules/whackamole/api_info.go +++ b/modules/whackamole/api_info.go @@ -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 } diff --git a/modules/whackamole/configure.go b/modules/whackamole/configure.go index 6bd196bb9..c570faa8b 100644 --- a/modules/whackamole/configure.go +++ b/modules/whackamole/configure.go @@ -9,8 +9,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 { @@ -55,3 +56,20 @@ 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 +} diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index 69923c441..e69ccbf25 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -41,7 +41,6 @@ type DBFriend struct { Record []*AssistRecord `protobuf:"bytes,14,rep,name=record,proto3" json:"record" bson:"record"` // 助战记录 Weapplyids []string `protobuf:"bytes,15,rep,name=weapplyids,proto3" json:"weapplyids" bson:"weapplyids"` //我申请的用户ID CleanTime int64 `protobuf:"varint,16,opt,name=cleanTime,proto3" json:"cleanTime" bson:"cleanTime"` //清理申请列表时间 - RefreshNum int32 `protobuf:"varint,17,opt,name=refreshNum,proto3" json:"refreshNum"` // 每日刷新次数 } func (x *DBFriend) Reset() { @@ -188,13 +187,6 @@ func (x *DBFriend) GetCleanTime() int64 { return 0 } -func (x *DBFriend) GetRefreshNum() int32 { - if x != nil { - return x.RefreshNum - } - return 0 -} - //助战记录 type AssistRecord struct { state protoimpl.MessageState @@ -347,68 +339,13 @@ func (x *QiecuoRecord) GetEndTime() int64 { return 0 } -type AssistHero struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` - Hero *DBHero `protobuf:"bytes,2,opt,name=hero,proto3" json:"hero"` -} - -func (x *AssistHero) Reset() { - *x = AssistHero{} - if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_db_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AssistHero) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AssistHero) ProtoMessage() {} - -func (x *AssistHero) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_db_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AssistHero.ProtoReflect.Descriptor instead. -func (*AssistHero) Descriptor() ([]byte, []int) { - return file_friend_friend_db_proto_rawDescGZIP(), []int{3} -} - -func (x *AssistHero) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *AssistHero) GetHero() *DBHero { - if x != nil { - return x.Hero - } - return nil -} - var File_friend_friend_db_proto protoreflect.FileDescriptor var file_friend_friend_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, - 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x46, + 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe1, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 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, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, @@ -438,9 +375,7 @@ var file_friend_friend_db_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x77, 0x65, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x69, 0x64, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x77, 0x65, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x69, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x09, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, - 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x22, 0x64, 0x0a, 0x0c, + 0x03, 0x52, 0x09, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x64, 0x0a, 0x0c, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, @@ -457,12 +392,8 @@ var file_friend_friend_db_proto_rawDesc = []byte{ 0x68, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x0a, 0x41, - 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -477,25 +408,23 @@ func file_friend_friend_db_proto_rawDescGZIP() []byte { return file_friend_friend_db_proto_rawDescData } -var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_friend_friend_db_proto_goTypes = []interface{}{ (*DBFriend)(nil), // 0: DBFriend (*AssistRecord)(nil), // 1: AssistRecord (*QiecuoRecord)(nil), // 2: QiecuoRecord - (*AssistHero)(nil), // 3: AssistHero - (*BaseUserInfo)(nil), // 4: BaseUserInfo - (*DBHero)(nil), // 5: DBHero + (*BaseUserInfo)(nil), // 3: BaseUserInfo + (*DBHero)(nil), // 4: DBHero } var file_friend_friend_db_proto_depIdxs = []int32{ - 4, // 0: DBFriend.info:type_name -> BaseUserInfo - 5, // 1: DBFriend.hero:type_name -> DBHero + 3, // 0: DBFriend.info:type_name -> BaseUserInfo + 4, // 1: DBFriend.hero:type_name -> DBHero 1, // 2: DBFriend.record:type_name -> AssistRecord - 5, // 3: AssistHero.hero:type_name -> DBHero - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_friend_friend_db_proto_init() } @@ -542,18 +471,6 @@ func file_friend_friend_db_proto_init() { return nil } } - file_friend_friend_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AssistHero); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -561,7 +478,7 @@ func file_friend_friend_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_friend_friend_db_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 3, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index 62dfdbf8e..c1630366b 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -2349,92 +2349,6 @@ func (x *FriendZanAndReceiveResp) GetAtno() []*UserAtno { return nil } -// 刷新陌生人助战列表 -type FriendRefreshAssistHeroReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *FriendRefreshAssistHeroReq) Reset() { - *x = FriendRefreshAssistHeroReq{} - if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[46] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FriendRefreshAssistHeroReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FriendRefreshAssistHeroReq) ProtoMessage() {} - -func (x *FriendRefreshAssistHeroReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[46] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use FriendRefreshAssistHeroReq.ProtoReflect.Descriptor instead. -func (*FriendRefreshAssistHeroReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{46} -} - -type FriendRefreshAssistHeroResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Hero []*AssistHero `protobuf:"bytes,1,rep,name=hero,proto3" json:"hero"` -} - -func (x *FriendRefreshAssistHeroResp) Reset() { - *x = FriendRefreshAssistHeroResp{} - if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[47] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *FriendRefreshAssistHeroResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*FriendRefreshAssistHeroResp) ProtoMessage() {} - -func (x *FriendRefreshAssistHeroResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[47] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use FriendRefreshAssistHeroResp.ProtoReflect.Descriptor instead. -func (*FriendRefreshAssistHeroResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{47} -} - -func (x *FriendRefreshAssistHeroResp) GetHero() []*AssistHero { - if x != nil { - return x.Hero - } - return nil -} - var File_friend_friend_msg_proto protoreflect.FileDescriptor var file_friend_friend_msg_proto_rawDesc = []byte{ @@ -2620,14 +2534,8 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x41, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, - 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x1c, 0x0a, 0x1a, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, - 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x1b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2642,83 +2550,79 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte { return file_friend_friend_msg_proto_rawDescData } -var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48) +var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 46) var file_friend_friend_msg_proto_goTypes = []interface{}{ - (*FriendBase)(nil), // 0: FriendBase - (*FriendListReq)(nil), // 1: FriendListReq - (*FriendListResp)(nil), // 2: FriendListResp - (*FriendRandlistReq)(nil), // 3: FriendRandlistReq - (*FriendRandlistResp)(nil), // 4: FriendRandlistResp - (*FriendApplyReq)(nil), // 5: FriendApplyReq - (*FriendApplyResp)(nil), // 6: FriendApplyResp - (*FriendDelReq)(nil), // 7: FriendDelReq - (*FriendDelResp)(nil), // 8: FriendDelResp - (*FriendAgreeReq)(nil), // 9: FriendAgreeReq - (*FriendAgreeResp)(nil), // 10: FriendAgreeResp - (*FriendRefuseReq)(nil), // 11: FriendRefuseReq - (*FriendRefuseResp)(nil), // 12: FriendRefuseResp - (*FriendApplyListReq)(nil), // 13: FriendApplyListReq - (*FriendApplyListResp)(nil), // 14: FriendApplyListResp - (*FriendSearchReq)(nil), // 15: FriendSearchReq - (*FriendSearchResp)(nil), // 16: FriendSearchResp - (*FriendBlackListReq)(nil), // 17: FriendBlackListReq - (*FriendBlackListResp)(nil), // 18: FriendBlackListResp - (*FriendAddBlackReq)(nil), // 19: FriendAddBlackReq - (*FriendAddBlackResp)(nil), // 20: FriendAddBlackResp - (*FriendDelBlackReq)(nil), // 21: FriendDelBlackReq - (*FriendDelBlackResp)(nil), // 22: FriendDelBlackResp - (*FriendTotalReq)(nil), // 23: FriendTotalReq - (*FriendTotalResp)(nil), // 24: FriendTotalResp - (*FriendZanlistReq)(nil), // 25: FriendZanlistReq - (*FriendZanlistResp)(nil), // 26: FriendZanlistResp - (*FriendZanReq)(nil), // 27: FriendZanReq - (*FriendZanResp)(nil), // 28: FriendZanResp - (*FriendZanreceiveReq)(nil), // 29: FriendZanreceiveReq - (*FriendZanreceiveResp)(nil), // 30: FriendZanreceiveResp - (*FriendAssistheroReq)(nil), // 31: FriendAssistheroReq - (*FriendAssistheroResp)(nil), // 32: FriendAssistheroResp - (*FriendAssistlistReq)(nil), // 33: FriendAssistlistReq - (*FriendAssistlistResp)(nil), // 34: FriendAssistlistResp - (*FriendGetrewardReq)(nil), // 35: FriendGetrewardReq - (*FriendGetrewardResp)(nil), // 36: FriendGetrewardResp - (*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush - (*FriendAssistHeroListReq)(nil), // 38: FriendAssistHeroListReq - (*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp - (*FriendGetRelationReq)(nil), // 40: FriendGetRelationReq - (*FriendGetRelationResp)(nil), // 41: FriendGetRelationResp - (*FriendAddAgreePush)(nil), // 42: FriendAddAgreePush - (*FriendAddApplyPush)(nil), // 43: FriendAddApplyPush - (*FriendZanAndReceiveReq)(nil), // 44: FriendZanAndReceiveReq - (*FriendZanAndReceiveResp)(nil), // 45: FriendZanAndReceiveResp - (*FriendRefreshAssistHeroReq)(nil), // 46: FriendRefreshAssistHeroReq - (*FriendRefreshAssistHeroResp)(nil), // 47: FriendRefreshAssistHeroResp - (*DBFriend)(nil), // 48: DBFriend - (*AssistRecord)(nil), // 49: AssistRecord - (*UserAtno)(nil), // 50: UserAtno - (*AssistHero)(nil), // 51: AssistHero + (*FriendBase)(nil), // 0: FriendBase + (*FriendListReq)(nil), // 1: FriendListReq + (*FriendListResp)(nil), // 2: FriendListResp + (*FriendRandlistReq)(nil), // 3: FriendRandlistReq + (*FriendRandlistResp)(nil), // 4: FriendRandlistResp + (*FriendApplyReq)(nil), // 5: FriendApplyReq + (*FriendApplyResp)(nil), // 6: FriendApplyResp + (*FriendDelReq)(nil), // 7: FriendDelReq + (*FriendDelResp)(nil), // 8: FriendDelResp + (*FriendAgreeReq)(nil), // 9: FriendAgreeReq + (*FriendAgreeResp)(nil), // 10: FriendAgreeResp + (*FriendRefuseReq)(nil), // 11: FriendRefuseReq + (*FriendRefuseResp)(nil), // 12: FriendRefuseResp + (*FriendApplyListReq)(nil), // 13: FriendApplyListReq + (*FriendApplyListResp)(nil), // 14: FriendApplyListResp + (*FriendSearchReq)(nil), // 15: FriendSearchReq + (*FriendSearchResp)(nil), // 16: FriendSearchResp + (*FriendBlackListReq)(nil), // 17: FriendBlackListReq + (*FriendBlackListResp)(nil), // 18: FriendBlackListResp + (*FriendAddBlackReq)(nil), // 19: FriendAddBlackReq + (*FriendAddBlackResp)(nil), // 20: FriendAddBlackResp + (*FriendDelBlackReq)(nil), // 21: FriendDelBlackReq + (*FriendDelBlackResp)(nil), // 22: FriendDelBlackResp + (*FriendTotalReq)(nil), // 23: FriendTotalReq + (*FriendTotalResp)(nil), // 24: FriendTotalResp + (*FriendZanlistReq)(nil), // 25: FriendZanlistReq + (*FriendZanlistResp)(nil), // 26: FriendZanlistResp + (*FriendZanReq)(nil), // 27: FriendZanReq + (*FriendZanResp)(nil), // 28: FriendZanResp + (*FriendZanreceiveReq)(nil), // 29: FriendZanreceiveReq + (*FriendZanreceiveResp)(nil), // 30: FriendZanreceiveResp + (*FriendAssistheroReq)(nil), // 31: FriendAssistheroReq + (*FriendAssistheroResp)(nil), // 32: FriendAssistheroResp + (*FriendAssistlistReq)(nil), // 33: FriendAssistlistReq + (*FriendAssistlistResp)(nil), // 34: FriendAssistlistResp + (*FriendGetrewardReq)(nil), // 35: FriendGetrewardReq + (*FriendGetrewardResp)(nil), // 36: FriendGetrewardResp + (*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush + (*FriendAssistHeroListReq)(nil), // 38: FriendAssistHeroListReq + (*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp + (*FriendGetRelationReq)(nil), // 40: FriendGetRelationReq + (*FriendGetRelationResp)(nil), // 41: FriendGetRelationResp + (*FriendAddAgreePush)(nil), // 42: FriendAddAgreePush + (*FriendAddApplyPush)(nil), // 43: FriendAddApplyPush + (*FriendZanAndReceiveReq)(nil), // 44: FriendZanAndReceiveReq + (*FriendZanAndReceiveResp)(nil), // 45: FriendZanAndReceiveResp + (*DBFriend)(nil), // 46: DBFriend + (*AssistRecord)(nil), // 47: AssistRecord + (*UserAtno)(nil), // 48: UserAtno } var file_friend_friend_msg_proto_depIdxs = []int32{ 0, // 0: FriendListResp.list:type_name -> FriendBase - 48, // 1: FriendListResp.friend:type_name -> DBFriend + 46, // 1: FriendListResp.friend:type_name -> DBFriend 0, // 2: FriendRandlistResp.list:type_name -> FriendBase 0, // 3: FriendApplyListResp.list:type_name -> FriendBase 0, // 4: FriendSearchResp.friends:type_name -> FriendBase 0, // 5: FriendBlackListResp.friends:type_name -> FriendBase 0, // 6: FriendZanlistResp.list:type_name -> FriendBase 0, // 7: FriendAssistlistResp.list:type_name -> FriendBase - 49, // 8: FriendAssistlistResp.record:type_name -> AssistRecord - 50, // 9: FriendGetrewardResp.atno:type_name -> UserAtno + 47, // 8: FriendAssistlistResp.record:type_name -> AssistRecord + 48, // 9: FriendGetrewardResp.atno:type_name -> UserAtno 0, // 10: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase 0, // 11: FriendAssistHeroListResp.friends:type_name -> FriendBase 0, // 12: FriendAddAgreePush.info:type_name -> FriendBase 0, // 13: FriendAddApplyPush.info:type_name -> FriendBase - 50, // 14: FriendZanAndReceiveResp.atno:type_name -> UserAtno - 51, // 15: FriendRefreshAssistHeroResp.hero:type_name -> AssistHero - 16, // [16:16] is the sub-list for method output_type - 16, // [16:16] is the sub-list for method input_type - 16, // [16:16] is the sub-list for extension type_name - 16, // [16:16] is the sub-list for extension extendee - 0, // [0:16] is the sub-list for field type_name + 48, // 14: FriendZanAndReceiveResp.atno:type_name -> UserAtno + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_friend_friend_msg_proto_init() } @@ -3281,30 +3185,6 @@ func file_friend_friend_msg_proto_init() { return nil } } - file_friend_friend_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendRefreshAssistHeroReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_friend_friend_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendRefreshAssistHeroResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3312,7 +3192,7 @@ func file_friend_friend_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_friend_friend_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 48, + NumMessages: 46, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/whackamole_db.pb.go b/pb/whackamole_db.pb.go index 6c2100079..66ec1ec65 100644 --- a/pb/whackamole_db.pb.go +++ b/pb/whackamole_db.pb.go @@ -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 ( diff --git a/pb/whackamole_msg.pb.go b/pb/whackamole_msg.pb.go index 80b73ef2a..5ffa552eb 100644 --- a/pb/whackamole_msg.pb.go +++ b/pb/whackamole_msg.pb.go @@ -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() } diff --git a/sys/configure/structs/Game.TDHeroData.go b/sys/configure/structs/Game.TDHeroData.go index 18b70b000..6403b5dae 100644 --- a/sys/configure/structs/Game.TDHeroData.go +++ b/sys/configure/structs/Game.TDHeroData.go @@ -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 diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index aaccd810b..a418ea822 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -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