diff --git a/bin/json/game_battlescore.json b/bin/json/game_battlescore.json index 6d1464dc5..5dfe99e56 100644 --- a/bin/json/game_battlescore.json +++ b/bin/json/game_battlescore.json @@ -1,6 +1,7 @@ [ { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_1", "text": "e-" @@ -12,6 +13,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_2", "text": "e" @@ -23,6 +25,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_3", "text": "e+" @@ -34,6 +37,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_4", "text": "d-" @@ -45,6 +49,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_5", "text": "d" @@ -56,6 +61,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_6", "text": "d+" @@ -67,6 +73,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_7", "text": "c-" @@ -78,6 +85,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_8", "text": "c" @@ -89,6 +97,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_9", "text": "c+" @@ -100,6 +109,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_11", "text": "b" @@ -111,6 +121,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_12", "text": "b+" @@ -122,6 +133,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_14", "text": "a" @@ -133,6 +145,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_15", "text": "a+" @@ -144,6 +157,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_16", "text": "s" @@ -155,6 +169,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_17", "text": "ss" @@ -166,6 +181,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_18", "text": "sss" @@ -177,6 +193,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_19", "text": "sss+" @@ -188,6 +205,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_20", "text": "ex" @@ -199,6 +217,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_21", "text": "ex+" @@ -210,6 +229,7 @@ }, { "id": 1, + "iType": 0, "score_name": { "key": "guild_guild_boss_score_name_22", "text": "ex++" @@ -221,6 +241,7 @@ }, { "id": 2001, + "iType": 0, "score_name": { "key": "", "text": "" @@ -232,6 +253,7 @@ }, { "id": 2001, + "iType": 0, "score_name": { "key": "", "text": "" @@ -243,6 +265,7 @@ }, { "id": 2001, + "iType": 0, "score_name": { "key": "", "text": "" @@ -254,6 +277,7 @@ }, { "id": 2001, + "iType": 0, "score_name": { "key": "", "text": "" @@ -265,6 +289,7 @@ }, { "id": 2002, + "iType": 0, "score_name": { "key": "", "text": "" @@ -276,6 +301,7 @@ }, { "id": 2002, + "iType": 0, "score_name": { "key": "", "text": "" @@ -287,6 +313,7 @@ }, { "id": 2002, + "iType": 0, "score_name": { "key": "", "text": "" @@ -298,6 +325,7 @@ }, { "id": 2002, + "iType": 0, "score_name": { "key": "", "text": "" @@ -309,6 +337,7 @@ }, { "id": 2003, + "iType": 0, "score_name": { "key": "", "text": "" @@ -320,6 +349,7 @@ }, { "id": 2003, + "iType": 0, "score_name": { "key": "", "text": "" @@ -331,6 +361,7 @@ }, { "id": 2003, + "iType": 0, "score_name": { "key": "", "text": "" @@ -342,6 +373,7 @@ }, { "id": 2003, + "iType": 0, "score_name": { "key": "", "text": "" @@ -353,6 +385,7 @@ }, { "id": 2004, + "iType": 0, "score_name": { "key": "", "text": "" @@ -364,6 +397,7 @@ }, { "id": 2004, + "iType": 0, "score_name": { "key": "", "text": "" @@ -375,6 +409,7 @@ }, { "id": 2004, + "iType": 0, "score_name": { "key": "", "text": "" @@ -386,6 +421,7 @@ }, { "id": 2004, + "iType": 0, "score_name": { "key": "", "text": "" @@ -397,6 +433,7 @@ }, { "id": 2005, + "iType": 0, "score_name": { "key": "", "text": "" @@ -408,6 +445,7 @@ }, { "id": 2005, + "iType": 0, "score_name": { "key": "", "text": "" @@ -419,6 +457,7 @@ }, { "id": 2005, + "iType": 0, "score_name": { "key": "", "text": "" @@ -430,6 +469,7 @@ }, { "id": 2005, + "iType": 0, "score_name": { "key": "", "text": "" @@ -441,6 +481,7 @@ }, { "id": 2006, + "iType": 0, "score_name": { "key": "", "text": "" @@ -452,6 +493,7 @@ }, { "id": 2006, + "iType": 0, "score_name": { "key": "", "text": "" @@ -463,6 +505,7 @@ }, { "id": 2006, + "iType": 0, "score_name": { "key": "", "text": "" @@ -474,6 +517,7 @@ }, { "id": 2006, + "iType": 0, "score_name": { "key": "", "text": "" diff --git a/bin/json/game_catchbugsetstage.json b/bin/json/game_catchbugsetstage.json new file mode 100644 index 000000000..48ae86c4e --- /dev/null +++ b/bin/json/game_catchbugsetstage.json @@ -0,0 +1,62 @@ +[ + { + "key": 1, + "id": 1000, + "card": 100001 + }, + { + "key": 2, + "id": 1000, + "card": 100002 + }, + { + "key": 3, + "id": 1000, + "card": 100003 + }, + { + "key": 4, + "id": 1000, + "card": 100004 + }, + { + "key": 5, + "id": 1000, + "card": 100005 + }, + { + "key": 6, + "id": 1000, + "card": 100006 + }, + { + "key": 7, + "id": 1000, + "card": 100005 + }, + { + "key": 8, + "id": 1000, + "card": 100006 + }, + { + "key": 9, + "id": 1000, + "card": 100003 + }, + { + "key": 10, + "id": 1000, + "card": 100004 + }, + { + "key": 11, + "id": 1000, + "card": 100001 + }, + { + "key": 12, + "id": 1000, + "card": 100002 + } +] \ No newline at end of file diff --git a/bin/json/game_guildbossrank.json b/bin/json/game_guildbossrank.json index 25180464f..678c024f9 100644 --- a/bin/json/game_guildbossrank.json +++ b/bin/json/game_guildbossrank.json @@ -12,6 +12,11 @@ "a": "attr", "t": "gold", "n": 1000 + }, + { + "a": "title", + "t": "10001", + "n": 1 } ] }, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 01bcde39a..062fc8eff 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -9643,7 +9643,7 @@ "ip": 7, "sd": 1, "handbook": -1, - "prefab": "13003", + "prefab": "99998", "rotation": "0|0|0", "revolve": 0, "scale": [ diff --git a/bin/json/game_mainachievement.json b/bin/json/game_mainachievement.json index ce26f1399..061fa295a 100644 --- a/bin/json/game_mainachievement.json +++ b/bin/json/game_mainachievement.json @@ -193,6 +193,11 @@ "a": "item", "t": "24011001", "n": 100 + }, + { + "a": "title", + "t": "10004", + "n": 1 } ], "icon": "item_10000001" @@ -413,6 +418,11 @@ "a": "item", "t": "24031001", "n": 100 + }, + { + "a": "title", + "t": "10002", + "n": 1 } ], "icon": "item_10000008" diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index c873efc78..12608a197 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -1122,6 +1122,11 @@ "a": "item", "t": "10000040", "n": 1 + }, + { + "a": "title", + "t": "10004", + "n": 1 } ], "lotteryward": 0, @@ -3355,6 +3360,11 @@ "a": "item", "t": "13003001", "n": 10 + }, + { + "a": "title", + "t": "10003", + "n": 1 } ], "lotteryward": 17110110, @@ -24648,7 +24658,7 @@ "progress": 0, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20300, + "frontstoryid": 203000, "afterstoryid": 0, "maingroupName": { "key": "", @@ -24728,8 +24738,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20302, - "afterstoryid": 0, + "frontstoryid": 203010, + "afterstoryid": 203020, "maingroupName": { "key": "", "text": "" @@ -24793,21 +24803,9 @@ ], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -24856,8 +24854,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20303, - "afterstoryid": 20305, + "frontstoryid": 203030, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -24936,8 +24934,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20310, - "afterstoryid": 20312, + "frontstoryid": 203040, + "afterstoryid": 203050, "maingroupName": { "key": "", "text": "" @@ -25064,8 +25062,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20313, - "afterstoryid": 0, + "frontstoryid": 203060, + "afterstoryid": 203061, "maingroupName": { "key": "", "text": "" @@ -25192,8 +25190,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20314, - "afterstoryid": 20322, + "frontstoryid": 203070, + "afterstoryid": 203071, "maingroupName": { "key": "", "text": "" @@ -25320,8 +25318,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20324, - "afterstoryid": 20325, + "frontstoryid": 203080, + "afterstoryid": 203081, "maingroupName": { "key": "", "text": "" @@ -25448,7 +25446,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203090, "afterstoryid": 0, "maingroupName": { "key": "", @@ -25528,7 +25526,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20330, + "frontstoryid": 203100, "afterstoryid": 0, "maingroupName": { "key": "", @@ -25608,7 +25606,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20331, + "frontstoryid": 203110, "afterstoryid": 0, "maingroupName": { "key": "", @@ -25688,8 +25686,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20334, - "afterstoryid": 20335, + "frontstoryid": 203120, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -25768,7 +25766,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20340, + "frontstoryid": 203130, "afterstoryid": 0, "maingroupName": { "key": "", @@ -25833,21 +25831,9 @@ ], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -25861,7 +25847,7 @@ "buried_type": 0, "buried": 0, "grouptype": [], - "Episodetype": 3, + "Episodetype": 1, "stage_param": 0, "inherit": 0, "battle_fail": 0, @@ -25896,7 +25882,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20342, + "frontstoryid": 203140, "afterstoryid": 0, "maingroupName": { "key": "", @@ -25976,7 +25962,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 20343, + "frontstoryid": 203160, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26056,7 +26042,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203170, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26136,7 +26122,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203180, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26216,8 +26202,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203190, + "afterstoryid": 203200, "maingroupName": { "key": "", "text": "" @@ -26344,7 +26330,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 202310, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26424,7 +26410,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203220, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26552,7 +26538,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203230, "afterstoryid": 0, "maingroupName": { "key": "", @@ -26680,8 +26666,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203240, + "afterstoryid": 203250, "maingroupName": { "key": "", "text": "" @@ -26808,8 +26794,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203260, + "afterstoryid": 203270, "maingroupName": { "key": "", "text": "" @@ -26936,7 +26922,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203280, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27064,8 +27050,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203290, + "afterstoryid": 203300, "maingroupName": { "key": "", "text": "" @@ -27192,7 +27178,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203310, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27272,7 +27258,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203320, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27400,8 +27386,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203330, + "afterstoryid": 203340, "maingroupName": { "key": "", "text": "" @@ -27480,7 +27466,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203350, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27608,7 +27594,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203360, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27688,8 +27674,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203370, + "afterstoryid": 203371, "maingroupName": { "key": "", "text": "" @@ -27816,7 +27802,7 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 203380, "afterstoryid": 0, "maingroupName": { "key": "", @@ -27896,8 +27882,8 @@ "progress": 1, "timelineplayer": 0, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 203390, + "afterstoryid": 203400, "maingroupName": { "key": "", "text": "" diff --git a/bin/json/game_playerinfor_barrage.json b/bin/json/game_playerinfor_barrage.json index cc822da4e..edc40d9d1 100644 --- a/bin/json/game_playerinfor_barrage.json +++ b/bin/json/game_playerinfor_barrage.json @@ -9,7 +9,7 @@ "text": "这好像不是熊猫？" }, "time": 90, - "speed": 11150 + "speed": 12264 }, { "id": "2", @@ -20,8 +20,8 @@ "key": "playerinfor_barrage_2", "text": "看起来像个画家。" }, - "time": 193, - "speed": 8916 + "time": 317, + "speed": 9011 }, { "id": "3", @@ -32,8 +32,8 @@ "key": "playerinfor_barrage_3", "text": "为什么会觉得是熊猫啊？" }, - "time": 297, - "speed": 8724 + "time": 524, + "speed": 10110 }, { "id": "4", @@ -44,8 +44,8 @@ "key": "playerinfor_barrage_4", "text": "从石头里蹦出来的人？怎么感觉有点熟悉……" }, - "time": 481, - "speed": 8068 + "time": 668, + "speed": 7968 }, { "id": "5", @@ -56,8 +56,8 @@ "key": "playerinfor_barrage_5", "text": "你可能是听说过从石头里蹦出来的猴子。" }, - "time": 711, - "speed": 11731 + "time": 873, + "speed": 10282 }, { "id": "6", @@ -68,8 +68,8 @@ "key": "playerinfor_barrage_6", "text": "你是从石头里蹦出来的？！" }, - "time": 812, - "speed": 8064 + "time": 996, + "speed": 10272 }, { "id": "7", @@ -80,8 +80,8 @@ "key": "playerinfor_barrage_7", "text": "不！那不是我！" }, - "time": 964, - "speed": 7483 + "time": 1096, + "speed": 11342 }, { "id": "8", @@ -92,8 +92,8 @@ "key": "playerinfor_barrage_8", "text": "哦，传承之人……" }, - "time": 1196, - "speed": 12899 + "time": 1234, + "speed": 10410 }, { "id": "9", @@ -104,8 +104,8 @@ "key": "playerinfor_barrage_9", "text": "月光能量都汇集在他身上了！" }, - "time": 1399, - "speed": 10416 + "time": 1464, + "speed": 12515 }, { "id": "10", @@ -116,8 +116,8 @@ "key": "playerinfor_barrage_10", "text": "那应该不会爆炸吧？" }, - "time": 1503, - "speed": 11538 + "time": 1666, + "speed": 8088 }, { "id": "11", @@ -128,8 +128,8 @@ "key": "playerinfor_barrage_11", "text": "阿宝，你为什么站那么远？" }, - "time": 1620, - "speed": 10333 + "time": 1843, + "speed": 12569 }, { "id": "312", @@ -141,7 +141,7 @@ "text": "哦！那是什么？" }, "time": 90, - "speed": 9497 + "speed": 12411 }, { "id": "313", @@ -152,8 +152,8 @@ "key": "playerinfor_barrage_313", "text": "我有种被她注视的感觉……" }, - "time": 206, - "speed": 7909 + "time": 223, + "speed": 10607 }, { "id": "314", @@ -164,8 +164,8 @@ "key": "playerinfor_barrage_314", "text": "好像是一种叫做“照相”的魔法……" }, - "time": 421, - "speed": 11501 + "time": 442, + "speed": 9473 }, { "id": "315", @@ -176,8 +176,8 @@ "key": "playerinfor_barrage_315", "text": "我看这魔法不是很疼。" }, - "time": 591, - "speed": 10413 + "time": 636, + "speed": 12893 }, { "id": "316", @@ -188,8 +188,8 @@ "key": "playerinfor_barrage_316", "text": "据说它的作用是封印灵魂？" }, - "time": 816, - "speed": 7927 + "time": 842, + "speed": 10418 }, { "id": "317", @@ -200,8 +200,8 @@ "key": "playerinfor_barrage_317", "text": "月中人的传承居然这么可怕？！" }, - "time": 979, - "speed": 10342 + "time": 1049, + "speed": 8644 }, { "id": "318", @@ -212,8 +212,8 @@ "key": "playerinfor_barrage_318", "text": "哦！你们真是够了！" }, - "time": 1175, - "speed": 12851 + "time": 1286, + "speed": 8771 }, { "id": "319", @@ -224,8 +224,8 @@ "key": "playerinfor_barrage_319", "text": "照相不是魔法！也不能封印灵魂！" }, - "time": 1380, - "speed": 12124 + "time": 1511, + "speed": 12398 }, { "id": "320", @@ -236,8 +236,8 @@ "key": "playerinfor_barrage_320", "text": "那她是在干什么？" }, - "time": 1601, - "speed": 8003 + "time": 1751, + "speed": 10489 }, { "id": "321", @@ -248,8 +248,8 @@ "key": "playerinfor_barrage_321", "text": "……别问。" }, - "time": 1841, - "speed": 8850 + "time": 1955, + "speed": 8701 }, { "id": "322", @@ -260,8 +260,8 @@ "key": "playerinfor_barrage_322", "text": "那可以教我吗？" }, - "time": 2052, - "speed": 8533 + "time": 2058, + "speed": 7459 }, { "id": "323", @@ -272,8 +272,8 @@ "key": "playerinfor_barrage_323", "text": "我也想学。" }, - "time": 2205, - "speed": 7927 + "time": 2213, + "speed": 10095 }, { "id": "324", @@ -284,7 +284,7 @@ "key": "playerinfor_barrage_324", "text": "要不你们问问这个传承者？" }, - "time": 2390, - "speed": 10242 + "time": 2420, + "speed": 12297 } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index 0225952e6..d15933621 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -268,11 +268,11 @@ "mainq": "", "name": { "key": "playerinfor_playerinfor_overview_name_12", - "text": "头像框1" + "text": "翠绿竹林" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_12", - "text": "头像框道具明细1" + "text": "在功夫世界里，与阿宝缔结的友谊证明。" } }, { @@ -291,11 +291,11 @@ "mainq": "", "name": { "key": "playerinfor_playerinfor_overview_name_13", - "text": "头像框2" + "text": "清凉夏日" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_13", - "text": "头像框道具明细2" + "text": "有了这个，炎炎烈暑之下或许会清凉不少。" } }, { @@ -314,11 +314,11 @@ "mainq": "", "name": { "key": "playerinfor_playerinfor_overview_name_14", - "text": "头像框3" + "text": "童话世界" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_14", - "text": "头像框道具明细3" + "text": "魔发精灵与月中人传承者友谊的证明" } }, { @@ -337,11 +337,11 @@ "mainq": "", "name": { "key": "playerinfor_playerinfor_overview_name_15", - "text": "头像框4" + "text": "深入龙穴" }, "txt": { "key": "playerinfor_playerinfor_overview_txt_15", - "text": "头像框道具明细4" + "text": "嘘，别让别让母龙听见。" } } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 594fae91b..7e1b3f782 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -28352,9 +28352,7 @@ 1, -1 ], - "FollowSK": [ - 245004112 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, diff --git a/bin/json/game_tdhero.json b/bin/json/game_tdhero.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/bin/json/game_tdhero.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/bin/json/game_tdweaponskill.json b/bin/json/game_tdweaponskill.json index 481e46249..bd6e12e22 100644 --- a/bin/json/game_tdweaponskill.json +++ b/bin/json/game_tdweaponskill.json @@ -1,6 +1,7 @@ [ { "skill_id": 1001, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -26,6 +27,7 @@ }, { "skill_id": 1002, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -49,6 +51,7 @@ }, { "skill_id": 1003, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -74,6 +77,7 @@ }, { "skill_id": 1004, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -99,6 +103,7 @@ }, { "skill_id": 1005, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -124,6 +129,7 @@ }, { "skill_id": 1006, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -145,6 +151,7 @@ }, { "skill_id": 1007, + "skillGroup": 0, "subSkill_id": 1006, "skill_triggerType": 0, "icon": "", @@ -172,6 +179,7 @@ }, { "skill_id": 1008, + "skillGroup": 0, "subSkill_id": 1006, "skill_triggerType": 0, "icon": "", @@ -193,6 +201,7 @@ }, { "skill_id": 2006, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -220,6 +229,7 @@ }, { "skill_id": 3006, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -243,6 +253,7 @@ }, { "skill_id": 2001, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -268,6 +279,7 @@ }, { "skill_id": 2002, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -293,6 +305,7 @@ }, { "skill_id": 2003, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -320,6 +333,7 @@ }, { "skill_id": 2004, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -345,6 +359,7 @@ }, { "skill_id": 2005, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -370,6 +385,7 @@ }, { "skill_id": 3001, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -395,6 +411,7 @@ }, { "skill_id": 3002, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -420,6 +437,7 @@ }, { "skill_id": 3003, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -441,6 +459,7 @@ }, { "skill_id": 4001, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -466,6 +485,7 @@ }, { "skill_id": 4002, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -491,6 +511,7 @@ }, { "skill_id": 4003, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -516,6 +537,7 @@ }, { "skill_id": 4004, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -543,6 +565,7 @@ }, { "skill_id": 4005, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", @@ -568,6 +591,7 @@ }, { "skill_id": 4006, + "skillGroup": 0, "subSkill_id": 0, "skill_triggerType": 0, "icon": "", diff --git a/bin/json/game_title.json b/bin/json/game_title.json index bd5d872b8..67f36be27 100644 --- a/bin/json/game_title.json +++ b/bin/json/game_title.json @@ -30,7 +30,7 @@ ], "txt": { "key": "title_title_txt_02", - "text": "寻宝学徒" + "text": "你味道宝藏的味道了吗？" } }, { @@ -47,7 +47,7 @@ ], "txt": { "key": "title_title_txt_03", - "text": "泰坦驾驭者" + "text": "感受最古老且原始的力量带来的震撼吧。" } }, { @@ -64,7 +64,7 @@ ], "txt": { "key": "title_title_txt_04", - "text": "龙之气息" + "text": "从今往后，这股气味将与你形影不离。" } }, { @@ -81,7 +81,7 @@ ], "txt": { "key": "title_title_txt_05", - "text": "恐惧驱散者" + "text": "人类古老的感情之一，或许它终将归来，但起码现在你战胜了它。" } } ] \ No newline at end of file diff --git a/modules/whackamole/api_awake.go b/modules/whackamole/api_awake.go new file mode 100644 index 000000000..d72cf0bdd --- /dev/null +++ b/modules/whackamole/api_awake.go @@ -0,0 +1,42 @@ +package whackamole + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +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 + err error + ) + if errdata = this.AwakeCheck(session, req); errdata != nil { + return + } + + if info, err = this.module.model.getModel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + + if info.Fields[req.Index].Hid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Fields on hero", + } + return + } + + session.SendMsg(string(this.module.GetType()), "superior", &pb.WhackamoleSuperiorResp{}) + return +} diff --git a/modules/whackamole/api_superior.go b/modules/whackamole/api_superior.go new file mode 100644 index 000000000..a0f5078b5 --- /dev/null +++ b/modules/whackamole/api_superior.go @@ -0,0 +1,60 @@ +package whackamole + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) SuperiorCheck(session comm.IUserSession, req *pb.WhackamoleSuperiorReq) (errdata *pb.ErrorData) { + + return +} + +// /获取系统公告 +func (this *apiComp) Superior(session comm.IUserSession, req *pb.WhackamoleSuperiorReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBWhackamole + ok bool + err error + ) + if errdata = this.SuperiorCheck(session, req); errdata != nil { + return + } + + if info, err = this.module.model.getModel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + + for _, v := range info.Heros { + if v.Id == req.Hid { + ok = true + } + } + + if !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: fmt.Sprintf("on hero%s", req.Hid), + } + return + } + info.Fields[req.Index].Hid = req.Hid + if err = this.module.model.Change(session.GetUserId(), map[string]interface{}{ + "fields": info.Fields, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + + session.SendMsg(string(this.module.GetType()), "superior", &pb.WhackamoleSuperiorResp{}) + return +} diff --git a/modules/whackamole/api_upgrade.go b/modules/whackamole/api_upgrade.go new file mode 100644 index 000000000..0401253f0 --- /dev/null +++ b/modules/whackamole/api_upgrade.go @@ -0,0 +1,42 @@ +package whackamole + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.WhackamoleUpgradeReq) (errdata *pb.ErrorData) { + + return +} + +// /获取系统公告 +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.WhackamoleUpgradeReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBWhackamole + err error + ) + if errdata = this.UpgradeCheck(session, req); errdata != nil { + return + } + + if info, err = this.module.model.getModel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + + if info.Fields[req.Index].Hid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Fields on hero", + } + return + } + + session.SendMsg(string(this.module.GetType()), "superior", &pb.WhackamoleSuperiorResp{}) + return +} diff --git a/modules/whackamole/configure.go b/modules/whackamole/configure.go index 14b3bdcde..6bd196bb9 100644 --- a/modules/whackamole/configure.go +++ b/modules/whackamole/configure.go @@ -10,6 +10,7 @@ import ( const ( game_tdreward = "game_tdreward.json" + game_tdhero = "game_tdhero.json" ) type configureComp struct { @@ -22,6 +23,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Whackamole) err = this.LoadConfigure(game_tdreward, cfg.NewGameTDReward) + err = this.LoadConfigure(game_tdhero, cfg.NewGameTDHero) return } @@ -41,3 +43,15 @@ func (this *configureComp) getGameTDRewardData(id int32) (conf *cfg.GameTDReward } return } + +// 获取奖励列表 +func (this *configureComp) getGameTDHeroDatas() (confs []*cfg.GameTDHeroData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_tdhero); err != nil { + return + } + confs = v.(*cfg.GameTDHero).GetDataList() + return +} diff --git a/modules/whackamole/model.go b/modules/whackamole/model.go index 8ff015135..40f71a0ec 100644 --- a/modules/whackamole/model.go +++ b/modules/whackamole/model.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -34,12 +35,37 @@ func (this *modelComp) getModel(uid string) (info *pb.DBWhackamole, err error) { return } if err == mgo.MongodbNil { + var confs []*cfg.GameTDHeroData info = &pb.DBWhackamole{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Levels: make(map[int32]int32), + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Levels: make(map[int32]int32), + Fields: make([]*pb.HeroField, 0), + Heros: make([]*pb.DBWHHero, 0), + Lasttime: 0, + } + info.Fields = append(info.Fields, &pb.HeroField{Ftype: pb.HeroFieldType_Type1}, &pb.HeroField{Index: 1, Ftype: pb.HeroFieldType_Type2}, &pb.HeroField{Index: 2, Ftype: pb.HeroFieldType_Type3}) + if confs, err = this.module.configure.getGameTDHeroDatas(); err != nil { + return + } + for _, conf := range confs { + this.addhero(info, conf) } err = this.Add(uid, info) } return } + +///添加英雄 +func (this *modelComp) addhero(info *pb.DBWhackamole, conf *cfg.GameTDHeroData) { + var ( + tdhero *pb.DBWHHero + ) + tdhero = &pb.DBWHHero{ + Id: primitive.NewObjectID().Hex(), + Cid: conf.Id, + Wake: false, + } + info.Heros = append(info.Heros, tdhero) + return +} diff --git a/pb/whackamole_db.pb.go b/pb/whackamole_db.pb.go index 195531957..6c2100079 100644 --- a/pb/whackamole_db.pb.go +++ b/pb/whackamole_db.pb.go @@ -20,21 +20,207 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +type HeroFieldType int32 + +const ( + HeroFieldType_Type1 HeroFieldType = 0 + HeroFieldType_Type2 HeroFieldType = 1 + HeroFieldType_Type3 HeroFieldType = 2 +) + +// Enum value maps for HeroFieldType. +var ( + HeroFieldType_name = map[int32]string{ + 0: "Type1", + 1: "Type2", + 2: "Type3", + } + HeroFieldType_value = map[string]int32{ + "Type1": 0, + "Type2": 1, + "Type3": 2, + } +) + +func (x HeroFieldType) Enum() *HeroFieldType { + p := new(HeroFieldType) + *p = x + return p +} + +func (x HeroFieldType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (HeroFieldType) Descriptor() protoreflect.EnumDescriptor { + return file_whackamole_whackamole_db_proto_enumTypes[0].Descriptor() +} + +func (HeroFieldType) Type() protoreflect.EnumType { + return &file_whackamole_whackamole_db_proto_enumTypes[0] +} + +func (x HeroFieldType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use HeroFieldType.Descriptor instead. +func (HeroFieldType) EnumDescriptor() ([]byte, []int) { + return file_whackamole_whackamole_db_proto_rawDescGZIP(), []int{0} +} + +type HeroField struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + 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 +} + +func (x *HeroField) Reset() { + *x = HeroField{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroField) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroField) ProtoMessage() {} + +func (x *HeroField) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_db_proto_msgTypes[0] + 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 HeroField.ProtoReflect.Descriptor instead. +func (*HeroField) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_db_proto_rawDescGZIP(), []int{0} +} + +func (x *HeroField) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +func (x *HeroField) GetFtype() HeroFieldType { + if x != nil { + return x.Ftype + } + return HeroFieldType_Type1 +} + +func (x *HeroField) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *HeroField) GetHid() string { + if x != nil { + return x.Hid + } + return "" +} + +type DBWHHero struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` //配置id + Wake bool `protobuf:"varint,3,opt,name=wake,proto3" json:"wake"` //是否觉醒 +} + +func (x *DBWHHero) Reset() { + *x = DBWHHero{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBWHHero) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBWHHero) ProtoMessage() {} + +func (x *DBWHHero) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_db_proto_msgTypes[1] + 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 DBWHHero.ProtoReflect.Descriptor instead. +func (*DBWHHero) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_db_proto_rawDescGZIP(), []int{1} +} + +func (x *DBWHHero) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBWHHero) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *DBWHHero) GetWake() bool { + if x != nil { + return x.Wake + } + return false +} + //打豚鼠 type DBWhackamole struct { state protoimpl.MessageState 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"` - Levels map[int32]int32 `protobuf:"bytes,3,rep,name=levels,proto3" json:"levels" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //关卡信息 + 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"` //上次时间 } func (x *DBWhackamole) Reset() { *x = DBWhackamole{} if protoimpl.UnsafeEnabled { - mi := &file_whackamole_whackamole_db_proto_msgTypes[0] + mi := &file_whackamole_whackamole_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +233,7 @@ func (x *DBWhackamole) String() string { func (*DBWhackamole) ProtoMessage() {} func (x *DBWhackamole) ProtoReflect() protoreflect.Message { - mi := &file_whackamole_whackamole_db_proto_msgTypes[0] + mi := &file_whackamole_whackamole_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +246,7 @@ func (x *DBWhackamole) ProtoReflect() protoreflect.Message { // Deprecated: Use DBWhackamole.ProtoReflect.Descriptor instead. func (*DBWhackamole) Descriptor() ([]byte, []int) { - return file_whackamole_whackamole_db_proto_rawDescGZIP(), []int{0} + return file_whackamole_whackamole_db_proto_rawDescGZIP(), []int{2} } func (x *DBWhackamole) GetId() string { @@ -77,6 +263,20 @@ func (x *DBWhackamole) GetUid() string { return "" } +func (x *DBWhackamole) GetFields() []*HeroField { + if x != nil { + return x.Fields + } + return nil +} + +func (x *DBWhackamole) GetHeros() []*DBWHHero { + if x != nil { + return x.Heros + } + return nil +} + func (x *DBWhackamole) GetLevels() map[int32]int32 { if x != nil { return x.Levels @@ -84,22 +284,49 @@ func (x *DBWhackamole) GetLevels() map[int32]int32 { return nil } +func (x *DBWhackamole) GetLasttime() int64 { + if x != nil { + return x.Lasttime + } + return 0 +} + var File_whackamole_whackamole_db_proto protoreflect.FileDescriptor var file_whackamole_whackamole_db_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x77, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x2f, 0x77, 0x68, 0x61, 0x63, 0x6b, 0x61, 0x6d, 0x6f, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x9e, 0x01, 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, 0x12, 0x31, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18, 0x03, 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x69, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x05, 0x66, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x05, 0x66, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x22, 0x40, 0x0a, 0x08, 0x44, + 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, + 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, + 0x12, 0x22, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0a, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, + 0x65, 0x6c, 0x64, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x57, 0x48, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x05, + 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, } @@ -115,18 +342,25 @@ func file_whackamole_whackamole_db_proto_rawDescGZIP() []byte { return file_whackamole_whackamole_db_proto_rawDescData } -var file_whackamole_whackamole_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_whackamole_whackamole_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_whackamole_whackamole_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_whackamole_whackamole_db_proto_goTypes = []interface{}{ - (*DBWhackamole)(nil), // 0: DBWhackamole - nil, // 1: DBWhackamole.LevelsEntry + (HeroFieldType)(0), // 0: HeroFieldType + (*HeroField)(nil), // 1: HeroField + (*DBWHHero)(nil), // 2: DBWHHero + (*DBWhackamole)(nil), // 3: DBWhackamole + nil, // 4: DBWhackamole.LevelsEntry } var file_whackamole_whackamole_db_proto_depIdxs = []int32{ - 1, // 0: DBWhackamole.levels:type_name -> DBWhackamole.LevelsEntry - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 0, // 0: HeroField.ftype:type_name -> HeroFieldType + 1, // 1: DBWhackamole.fields:type_name -> HeroField + 2, // 2: DBWhackamole.heros:type_name -> DBWHHero + 4, // 3: DBWhackamole.levels:type_name -> DBWhackamole.LevelsEntry + 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 } func init() { file_whackamole_whackamole_db_proto_init() } @@ -136,6 +370,30 @@ func file_whackamole_whackamole_db_proto_init() { } if !protoimpl.UnsafeEnabled { file_whackamole_whackamole_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroField); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBWHHero); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBWhackamole); i { case 0: return &v.state @@ -153,13 +411,14 @@ func file_whackamole_whackamole_db_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_whackamole_whackamole_db_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, + NumEnums: 1, + NumMessages: 4, NumExtensions: 0, NumServices: 0, }, GoTypes: file_whackamole_whackamole_db_proto_goTypes, DependencyIndexes: file_whackamole_whackamole_db_proto_depIdxs, + EnumInfos: file_whackamole_whackamole_db_proto_enumTypes, MessageInfos: file_whackamole_whackamole_db_proto_msgTypes, }.Build() File_whackamole_whackamole_db_proto = out.File diff --git a/pb/whackamole_msg.pb.go b/pb/whackamole_msg.pb.go index e8b9aaa2c..80b73ef2a 100644 --- a/pb/whackamole_msg.pb.go +++ b/pb/whackamole_msg.pb.go @@ -20,6 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +//信息读取 type WhackamoleInfoReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -105,6 +106,300 @@ func (x *WhackamoleInfoResp) GetInfo() *DBWhackamole { return nil } +//英雄上阵 +type WhackamoleSuperiorReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hid string `protobuf:"bytes,1,opt,name=hid,proto3" json:"hid"` //英雄id + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` //栏位坐标 +} + +func (x *WhackamoleSuperiorReq) Reset() { + *x = WhackamoleSuperiorReq{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleSuperiorReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleSuperiorReq) ProtoMessage() {} + +func (x *WhackamoleSuperiorReq) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[2] + 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 WhackamoleSuperiorReq.ProtoReflect.Descriptor instead. +func (*WhackamoleSuperiorReq) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *WhackamoleSuperiorReq) GetHid() string { + if x != nil { + return x.Hid + } + return "" +} + +func (x *WhackamoleSuperiorReq) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +type WhackamoleSuperiorResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Field *HeroField `protobuf:"bytes,1,opt,name=field,proto3" json:"field"` +} + +func (x *WhackamoleSuperiorResp) Reset() { + *x = WhackamoleSuperiorResp{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleSuperiorResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleSuperiorResp) ProtoMessage() {} + +func (x *WhackamoleSuperiorResp) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_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 WhackamoleSuperiorResp.ProtoReflect.Descriptor instead. +func (*WhackamoleSuperiorResp) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *WhackamoleSuperiorResp) GetField() *HeroField { + if x != nil { + return x.Field + } + return nil +} + +//升级 +type WhackamoleUpgradeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"` +} + +func (x *WhackamoleUpgradeReq) Reset() { + *x = WhackamoleUpgradeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleUpgradeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleUpgradeReq) ProtoMessage() {} + +func (x *WhackamoleUpgradeReq) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[4] + 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 WhackamoleUpgradeReq.ProtoReflect.Descriptor instead. +func (*WhackamoleUpgradeReq) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *WhackamoleUpgradeReq) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +type WhackamoleUpgradeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Field *HeroField `protobuf:"bytes,1,opt,name=field,proto3" json:"field"` +} + +func (x *WhackamoleUpgradeResp) Reset() { + *x = WhackamoleUpgradeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleUpgradeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleUpgradeResp) ProtoMessage() {} + +func (x *WhackamoleUpgradeResp) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[5] + 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 WhackamoleUpgradeResp.ProtoReflect.Descriptor instead. +func (*WhackamoleUpgradeResp) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *WhackamoleUpgradeResp) GetField() *HeroField { + if x != nil { + return x.Field + } + return nil +} + +//觉醒 +type WhackamoleAwakeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"` +} + +func (x *WhackamoleAwakeReq) Reset() { + *x = WhackamoleAwakeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleAwakeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleAwakeReq) ProtoMessage() {} + +func (x *WhackamoleAwakeReq) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[6] + 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 WhackamoleAwakeReq.ProtoReflect.Descriptor instead. +func (*WhackamoleAwakeReq) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *WhackamoleAwakeReq) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +type WhackamoleAwakeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hero *DBWHHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` +} + +func (x *WhackamoleAwakeResp) Reset() { + *x = WhackamoleAwakeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WhackamoleAwakeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WhackamoleAwakeResp) ProtoMessage() {} + +func (x *WhackamoleAwakeResp) ProtoReflect() protoreflect.Message { + mi := &file_whackamole_whackamole_msg_proto_msgTypes[7] + 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 WhackamoleAwakeResp.ProtoReflect.Descriptor instead. +func (*WhackamoleAwakeResp) Descriptor() ([]byte, []int) { + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *WhackamoleAwakeResp) GetHero() *DBWHHero { + if x != nil { + return x.Hero + } + return nil +} + +//关卡完成 type WhackamoleAwardReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -116,7 +411,7 @@ type WhackamoleAwardReq struct { func (x *WhackamoleAwardReq) Reset() { *x = WhackamoleAwardReq{} if protoimpl.UnsafeEnabled { - mi := &file_whackamole_whackamole_msg_proto_msgTypes[2] + mi := &file_whackamole_whackamole_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -129,7 +424,7 @@ func (x *WhackamoleAwardReq) String() string { func (*WhackamoleAwardReq) ProtoMessage() {} func (x *WhackamoleAwardReq) ProtoReflect() protoreflect.Message { - mi := &file_whackamole_whackamole_msg_proto_msgTypes[2] + mi := &file_whackamole_whackamole_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -142,7 +437,7 @@ func (x *WhackamoleAwardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use WhackamoleAwardReq.ProtoReflect.Descriptor instead. func (*WhackamoleAwardReq) Descriptor() ([]byte, []int) { - return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{2} + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{8} } func (x *WhackamoleAwardReq) GetId() int32 { @@ -164,7 +459,7 @@ type WhackamoleAwardResp struct { func (x *WhackamoleAwardResp) Reset() { *x = WhackamoleAwardResp{} if protoimpl.UnsafeEnabled { - mi := &file_whackamole_whackamole_msg_proto_msgTypes[3] + mi := &file_whackamole_whackamole_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -177,7 +472,7 @@ func (x *WhackamoleAwardResp) String() string { func (*WhackamoleAwardResp) ProtoMessage() {} func (x *WhackamoleAwardResp) ProtoReflect() protoreflect.Message { - mi := &file_whackamole_whackamole_msg_proto_msgTypes[3] + mi := &file_whackamole_whackamole_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -190,7 +485,7 @@ func (x *WhackamoleAwardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use WhackamoleAwardResp.ProtoReflect.Descriptor instead. func (*WhackamoleAwardResp) Descriptor() ([]byte, []int) { - return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{3} + return file_whackamole_whackamole_msg_proto_rawDescGZIP(), []int{9} } func (x *WhackamoleAwardResp) GetId() int32 { @@ -219,15 +514,36 @@ var file_whackamole_whackamole_msg_proto_rawDesc = []byte{ 0x65, 0x71, 0x22, 0x37, 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, 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, + 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, + 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 ( @@ -242,23 +558,34 @@ func file_whackamole_whackamole_msg_proto_rawDescGZIP() []byte { return file_whackamole_whackamole_msg_proto_rawDescData } -var file_whackamole_whackamole_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_whackamole_whackamole_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_whackamole_whackamole_msg_proto_goTypes = []interface{}{ - (*WhackamoleInfoReq)(nil), // 0: WhackamoleInfoReq - (*WhackamoleInfoResp)(nil), // 1: WhackamoleInfoResp - (*WhackamoleAwardReq)(nil), // 2: WhackamoleAwardReq - (*WhackamoleAwardResp)(nil), // 3: WhackamoleAwardResp - (*DBWhackamole)(nil), // 4: DBWhackamole - (*UserAtno)(nil), // 5: UserAtno + (*WhackamoleInfoReq)(nil), // 0: WhackamoleInfoReq + (*WhackamoleInfoResp)(nil), // 1: WhackamoleInfoResp + (*WhackamoleSuperiorReq)(nil), // 2: WhackamoleSuperiorReq + (*WhackamoleSuperiorResp)(nil), // 3: WhackamoleSuperiorResp + (*WhackamoleUpgradeReq)(nil), // 4: WhackamoleUpgradeReq + (*WhackamoleUpgradeResp)(nil), // 5: WhackamoleUpgradeResp + (*WhackamoleAwakeReq)(nil), // 6: WhackamoleAwakeReq + (*WhackamoleAwakeResp)(nil), // 7: WhackamoleAwakeResp + (*WhackamoleAwardReq)(nil), // 8: WhackamoleAwardReq + (*WhackamoleAwardResp)(nil), // 9: WhackamoleAwardResp + (*DBWhackamole)(nil), // 10: DBWhackamole + (*HeroField)(nil), // 11: HeroField + (*DBWHHero)(nil), // 12: DBWHHero + (*UserAtno)(nil), // 13: UserAtno } var file_whackamole_whackamole_msg_proto_depIdxs = []int32{ - 4, // 0: WhackamoleInfoResp.info:type_name -> DBWhackamole - 5, // 1: WhackamoleAwardResp.award:type_name -> UserAtno - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 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 } func init() { file_whackamole_whackamole_msg_proto_init() } @@ -294,7 +621,7 @@ func file_whackamole_whackamole_msg_proto_init() { } } file_whackamole_whackamole_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WhackamoleAwardReq); i { + switch v := v.(*WhackamoleSuperiorReq); i { case 0: return &v.state case 1: @@ -306,6 +633,78 @@ func file_whackamole_whackamole_msg_proto_init() { } } file_whackamole_whackamole_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleSuperiorResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleUpgradeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleUpgradeResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleAwakeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleAwakeResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WhackamoleAwardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_whackamole_whackamole_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WhackamoleAwardResp); i { case 0: return &v.state @@ -324,7 +723,7 @@ func file_whackamole_whackamole_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_whackamole_whackamole_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BattleScoreData.go b/sys/configure/structs/Game.BattleScoreData.go index f59ccee87..0ec86695e 100644 --- a/sys/configure/structs/Game.BattleScoreData.go +++ b/sys/configure/structs/Game.BattleScoreData.go @@ -12,6 +12,7 @@ import "errors" type GameBattleScoreData struct { Id int32 + IType int32 ScoreName string RankLow int32 RankUp int32 @@ -27,6 +28,7 @@ func (*GameBattleScoreData) GetTypeId() int32 { func (_v *GameBattleScoreData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["score_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.CatchbugSetstage.go b/sys/configure/structs/Game.CatchbugSetstage.go new file mode 100644 index 000000000..bdf950c35 --- /dev/null +++ b/sys/configure/structs/Game.CatchbugSetstage.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameCatchbugSetstage struct { + _dataMap map[int32]*GameCatchbugSetstageData + _dataList []*GameCatchbugSetstageData +} + +func NewGameCatchbugSetstage(_buf []map[string]interface{}) (*GameCatchbugSetstage, error) { + _dataList := make([]*GameCatchbugSetstageData, 0, len(_buf)) + dataMap := make(map[int32]*GameCatchbugSetstageData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameCatchbugSetstageData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameCatchbugSetstage{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameCatchbugSetstage) GetDataMap() map[int32]*GameCatchbugSetstageData { + return table._dataMap +} + +func (table *GameCatchbugSetstage) GetDataList() []*GameCatchbugSetstageData { + return table._dataList +} + +func (table *GameCatchbugSetstage) Get(key int32) *GameCatchbugSetstageData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.CatchbugSetstageData.go b/sys/configure/structs/Game.CatchbugSetstageData.go new file mode 100644 index 000000000..68ce37e80 --- /dev/null +++ b/sys/configure/structs/Game.CatchbugSetstageData.go @@ -0,0 +1,39 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameCatchbugSetstageData struct { + Key int32 + Id int32 + Card int32 +} + +const TypeId_GameCatchbugSetstageData = 2046059163 + +func (*GameCatchbugSetstageData) GetTypeId() int32 { + return 2046059163 +} + +func (_v *GameCatchbugSetstageData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["card"].(float64); !_ok_ { err = errors.New("card error"); return }; _v.Card = int32(_tempNum_) } + return +} + +func DeserializeGameCatchbugSetstageData(_buf map[string]interface{}) (*GameCatchbugSetstageData, error) { + v := &GameCatchbugSetstageData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.TDHero.go b/sys/configure/structs/Game.TDHero.go new file mode 100644 index 000000000..d37191ef8 --- /dev/null +++ b/sys/configure/structs/Game.TDHero.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameTDHero struct { + _dataMap map[int32]*GameTDHeroData + _dataList []*GameTDHeroData +} + +func NewGameTDHero(_buf []map[string]interface{}) (*GameTDHero, error) { + _dataList := make([]*GameTDHeroData, 0, len(_buf)) + dataMap := make(map[int32]*GameTDHeroData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameTDHeroData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameTDHero{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameTDHero) GetDataMap() map[int32]*GameTDHeroData { + return table._dataMap +} + +func (table *GameTDHero) GetDataList() []*GameTDHeroData { + return table._dataList +} + +func (table *GameTDHero) Get(key int32) *GameTDHeroData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.TDHeroData.go b/sys/configure/structs/Game.TDHeroData.go new file mode 100644 index 000000000..18b70b000 --- /dev/null +++ b/sys/configure/structs/Game.TDHeroData.go @@ -0,0 +1,68 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameTDHeroData struct { + Id int32 + Name string + Job int32 + Model string + SkillId []int32 + Width float32 + Height float32 + Hp int32 + Atk int32 + AtkSpeed int32 + AtkRange float32 +} + +const TypeId_GameTDHeroData = 1108452528 + +func (*GameTDHeroData) GetTypeId() int32 { + return 1108452528 +} + +func (_v *GameTDHeroData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) } + { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["skillId"].([]interface{}); !_ok_ { err = errors.New("skillId error"); return } + + _v.SkillId = 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.SkillId = append(_v.SkillId, _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_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 +} + +func DeserializeGameTDHeroData(_buf map[string]interface{}) (*GameTDHeroData, error) { + v := &GameTDHeroData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.TDWeaponSkillData.go b/sys/configure/structs/Game.TDWeaponSkillData.go index 8a47cdf91..f044d808e 100644 --- a/sys/configure/structs/Game.TDWeaponSkillData.go +++ b/sys/configure/structs/Game.TDWeaponSkillData.go @@ -12,6 +12,7 @@ import "errors" type GameTDWeaponSkillData struct { SkillId int32 + SkillGroup int32 SubSkillId int32 SkillTriggerType int32 Icon string @@ -34,6 +35,7 @@ func (*GameTDWeaponSkillData) GetTypeId() int32 { func (_v *GameTDWeaponSkillData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillGroup"].(float64); !_ok_ { err = errors.New("skillGroup error"); return }; _v.SkillGroup = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subSkill_id"].(float64); !_ok_ { err = errors.New("subSkill_id error"); return }; _v.SubSkillId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_triggerType"].(float64); !_ok_ { err = errors.New("skill_triggerType error"); return }; _v.SkillTriggerType = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } diff --git a/sys/configure/structs/TD.EHeroAttrType.go b/sys/configure/structs/TD.EHeroAttrType.go new file mode 100644 index 000000000..91c85a01a --- /dev/null +++ b/sys/configure/structs/TD.EHeroAttrType.go @@ -0,0 +1,13 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TDEHeroAttrType_Hp = 0 +) diff --git a/sys/configure/structs/TD.EHeroJobType.go b/sys/configure/structs/TD.EHeroJobType.go new file mode 100644 index 000000000..8da9d43b8 --- /dev/null +++ b/sys/configure/structs/TD.EHeroJobType.go @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +const ( + TDEHeroJobType_Warrior = 0 + TDEHeroJobType_Mage = 1 + TDEHeroJobType_Priest = 2 + TDEHeroJobType_Assassin = 3 + TDEHeroJobType_Shooter = 4 +) diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 1a62d1726..7c00751d3 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -293,6 +293,7 @@ type Tables struct { TDWeapon *GameTDWeapon TDWeaponSkill *GameTDWeaponSkill TDWeaponRandom *GameTDWeaponRandom + TDHero *GameTDHero TDBuff *GameTDBuff PuggsyIsLand *GamePuggsyIsLand PuggsyEvent *GamePuggsyEvent @@ -323,7 +324,7 @@ type Tables struct { IntegralReward *GameIntegralReward IntegralCondition *GameIntegralCondition IntegralTime *GameIntegralTime - Restore *GameRestore + CatchbugSetstage *GameCatchbugSetstage } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2023,6 +2024,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.TDWeaponRandom, err = NewGameTDWeaponRandom(buf) ; err != nil { return nil, err } + if buf, err = loader("game_tdhero") ; err != nil { + return nil, err + } + if tables.TDHero, err = NewGameTDHero(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_tdbuff") ; err != nil { return nil, err } @@ -2203,10 +2210,10 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.IntegralTime, err = NewGameIntegralTime(buf) ; err != nil { return nil, err } - if buf, err = loader("game_restore") ; err != nil { + if buf, err = loader("game_catchbugsetstage") ; err != nil { return nil, err } - if tables.Restore, err = NewGameRestore(buf) ; err != nil { + if tables.CatchbugSetstage, err = NewGameCatchbugSetstage(buf) ; err != nil { return nil, err } return tables, nil