From 0e6aba2b9e9559b03e1272db1ad9830c93c6fce6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Apr 2023 18:01:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_favorability.json | 300 ++++++++++++---------- bin/json/game_friends.json | 30 +-- bin/json/game_gm.json | 10 + bin/json/game_item.json | 8 +- bin/json/game_opencond.json | 12 +- bin/json/game_pandamasjx.json | 64 ++--- bin/json/game_skillafteratk.json | 2 +- modules/hero/model_hero.go | 1 + modules/library/api_activationfetter.go | 21 +- modules/library/api_getreward.go | 35 --- modules/library/api_getstoryreward.go | 97 ++----- modules/library/api_lvreward.go | 26 +- modules/library/api_usegift.go | 19 +- modules/library/comp_configure.go | 178 +++++-------- modules/library/model_fetterstory.go | 21 +- modules/library/module.go | 173 +++++++------ pb/hero_db.pb.go | 173 +++++++------ pb/library_db.pb.go | 139 +++++----- pb/library_msg.pb.go | 112 ++++---- sys/configure/structs/Game.FriendsData.go | 4 +- 20 files changed, 681 insertions(+), 744 deletions(-) diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json index 99fee7d74..675ebb1ef 100644 --- a/bin/json/game_favorability.json +++ b/bin/json/game_favorability.json @@ -6,21 +6,31 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, - "likes_food": [], - "disliking_food": [], + "likes_food": [ + 1001 + ], + "disliking_food": [ + 1001 + ], "likes_txt": { "key": "favorability_favorability_likes_txt_14002", "text": "我很喜欢，谢谢！" @@ -104,10 +114,116 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 1, + "favor_lv": 2, "favor_exp": 200, "lv_name": { - "key": "favorability_favorability_lv_name_1", + "key": "favorability_favorability_lv_name_2", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [ + 1001 + ], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 3, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 3, + "favor_exp": 300, + "lv_name": { + "key": "favorability_favorability_lv_name_3", "text": "点头之交" }, "privilege_type": 0, @@ -201,104 +317,6 @@ } ] }, - { - "id": 3, - "hid": "14002", - "name": { - "key": "hero_14002", - "text": "大龙" - }, - "favor_lv": 2, - "favor_exp": 300, - "lv_name": { - "key": "favorability_favorability_lv_name_2", - "text": "点头之交" - }, - "privilege_type": 0, - "privilege_value": 0, - "return_reward": [], - "return_txt": { - "key": "", - "text": "" - }, - "likes_food": [], - "disliking_food": [], - "likes_txt": { - "key": "favorability_favorability_likes_txt_14002", - "text": "我很喜欢，谢谢！" - }, - "ordinary_txt": { - "key": "favorability_favorability_ordinary_txt_14002", - "text": "送我的？谢谢！" - }, - "disliking_txt": { - "key": "favorability_favorabilit_disliking_txt_14002", - "text": "这味道，一言难尽......" - }, - "favorlv": [ - 1, - 3, - 5 - ], - "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" - ], - "biography_reward1": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward2": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward3": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "plot_unlock": [ - 2, - 4, - 6, - 8 - ], - "startid": 300001, - "endid": [ - 3000015, - 3000017, - 3000018 - ], - "rightend": 3000014, - "stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ], - "special_stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 2000 - } - ] - }, { "id": 4, "hid": "14002", @@ -306,10 +324,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 3, + "favor_lv": 4, "favor_exp": 400, "lv_name": { - "key": "favorability_favorability_lv_name_3", + "key": "favorability_favorability_lv_name_4", "text": "点头之交" }, "privilege_type": 0, @@ -410,18 +428,24 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 4, + "favor_lv": 5, "favor_exp": 500, "lv_name": { - "key": "favorability_favorability_lv_name_4", + "key": "favorability_favorability_lv_name_5", "text": "点头之交" }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -508,10 +532,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 5, + "favor_lv": 6, "favor_exp": 600, "lv_name": { - "key": "favorability_favorability_lv_name_5", + "key": "favorability_favorability_lv_name_6", "text": "点头之交" }, "privilege_type": 0, @@ -612,18 +636,24 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 6, + "favor_lv": 7, "favor_exp": 700, "lv_name": { - "key": "favorability_favorability_lv_name_6", + "key": "favorability_favorability_lv_name_7", "text": "情投意合" }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -710,10 +740,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 7, + "favor_lv": 8, "favor_exp": 800, "lv_name": { - "key": "favorability_favorability_lv_name_7", + "key": "favorability_favorability_lv_name_8", "text": "情投意合" }, "privilege_type": 0, @@ -814,18 +844,24 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 8, + "favor_lv": 9, "favor_exp": 900, "lv_name": { - "key": "favorability_favorability_lv_name_8", + "key": "favorability_favorability_lv_name_9", "text": "情投意合" }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -912,10 +948,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 9, + "favor_lv": 10, "favor_exp": 1000, "lv_name": { - "key": "favorability_favorability_lv_name_9", + "key": "favorability_favorability_lv_name_10", "text": "情投意合" }, "privilege_type": 0, @@ -1016,10 +1052,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 10, + "favor_lv": 11, "favor_exp": 0, "lv_name": { - "key": "favorability_favorability_lv_name_10", + "key": "favorability_favorability_lv_name_11", "text": "情投意合" }, "privilege_type": 0, diff --git a/bin/json/game_friends.json b/bin/json/game_friends.json index 1f3436742..f4f50d05b 100644 --- a/bin/json/game_friends.json +++ b/bin/json/game_friends.json @@ -14,7 +14,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -41,7 +41,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -68,7 +68,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -95,7 +95,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -122,7 +122,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -149,7 +149,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -176,7 +176,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -203,7 +203,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -230,7 +230,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", @@ -257,7 +257,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -284,7 +284,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -311,7 +311,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", @@ -338,7 +338,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -365,7 +365,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -392,7 +392,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index cec0634e2..6ca8d11d0 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -298,5 +298,15 @@ }, "data": "", "prefix": "bingo:{0}" + }, + { + "id": 31, + "type": 1, + "text": { + "key": "GM_31", + "text": "清除踢馆NPC（需刷新）" + }, + "data": "", + "prefix": "bingo:cleannpc" } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index c509b495d..4056f0c89 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -2158,7 +2158,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2188,7 +2188,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2218,7 +2218,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2248,7 +2248,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 4204d2d64..394e64a95 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -235,7 +235,7 @@ "key": "opencond_prompt_trials", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 166, "activateType": 0, "notify": [] }, @@ -283,7 +283,7 @@ "key": "opencond_prompt_story", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 169, "activateType": 0, "notify": [] }, @@ -715,7 +715,7 @@ "key": "opencond_prompt_hunting", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 168, "activateType": 0, "notify": [] }, @@ -907,7 +907,7 @@ "key": "opencond_prompt_arena", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 156, "activateType": 0, "notify": [] }, @@ -1435,7 +1435,7 @@ "key": "opencond_prompt_vikingexpedition_entrance", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 167, "activateType": 0, "notify": [] }, @@ -1555,7 +1555,7 @@ "key": "opencond_prompt_Master_challenges_the_tower", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 10004, "activateType": 0, "notify": [] }, diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index ce582a162..47e193081 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -13,7 +13,7 @@ "heroid": "13002", "img": "sbkp_js_13002", "intr": { - "key": "shirenyu10001", + "key": "miaosushirenyu10001", "text": "作为教习，食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -47,7 +47,7 @@ "heroid": "13001", "img": "sbkp_js_13001", "intr": { - "key": "shirenyu10002", + "key": "miaosushirenyu10002", "text": "作为教习，闪闪一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -81,7 +81,7 @@ "heroid": "44002", "img": "sbkp_js_44002", "intr": { - "key": "shirenyu10003", + "key": "miaosushirenyu10003", "text": "作为教习，蛇先生一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -115,7 +115,7 @@ "heroid": "24005", "img": "sbkp_js_24005", "intr": { - "key": "shirenyu10004", + "key": "miaosushirenyu10004", "text": "作为教习，金猴一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -160,7 +160,7 @@ "heroid": "14005", "img": "sbkp_js_14005", "intr": { - "key": "shirenyu10005", + "key": "miaosushirenyu10005", "text": "作为教习，鹤大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -194,7 +194,7 @@ "heroid": "44006", "img": "sbkp_js_44006", "intr": { - "key": "shirenyu10006", + "key": "miaosushirenyu10006", "text": "作为教习，悍娇虎一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -228,7 +228,7 @@ "heroid": "43001", "img": "sbkp_js_43001", "intr": { - "key": "shirenyu10007", + "key": "miaosushirenyu10007", "text": "作为教习，盖一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -262,7 +262,7 @@ "heroid": "35002", "img": "sbkp_js_35002", "intr": { - "key": "shirenyu10008", + "key": "miaosushirenyu10008", "text": "作为教习，希卡普一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -296,7 +296,7 @@ "heroid": "45004", "img": "sbkp_js_45004", "intr": { - "key": "shirenyu10009", + "key": "miaosushirenyu10009", "text": "作为教习，穿靴猫一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -341,7 +341,7 @@ "heroid": "35001", "img": "sbkp_js_35001", "intr": { - "key": "shirenyu10010", + "key": "miaosushirenyu10010", "text": "作为教习，师父一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -386,7 +386,7 @@ "heroid": "25001", "img": "sbkp_js_25001", "intr": { - "key": "shirenyu10011", + "key": "miaosushirenyu10011", "text": "作为教习，阿宝一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -431,7 +431,7 @@ "heroid": "45001", "img": "sbkp_js_45001", "intr": { - "key": "shirenyu10012", + "key": "miaosushirenyu10012", "text": "作为教习，乌龟大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -476,7 +476,7 @@ "heroid": "", "img": "wg_icon_ss", "intr": { - "key": "shirenyu20001", + "key": "miaosushirenyu20001", "text": "石锁，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -521,7 +521,7 @@ "heroid": "", "img": "wg_icon_kz", "intr": { - "key": "shirenyu20002", + "key": "miaosushirenyu20002", "text": "双头空竹，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -555,7 +555,7 @@ "heroid": "", "img": "wg_icon_pj", "intr": { - "key": "shirenyu20003", + "key": "miaosushirenyu20003", "text": "木爬架，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -589,7 +589,7 @@ "heroid": "", "img": "wg_icon_bdw", "intr": { - "key": "shirenyu20004", + "key": "miaosushirenyu20004", "text": "不倒翁，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -623,7 +623,7 @@ "heroid": "", "img": "wg_icon_pc", "intr": { - "key": "shirenyu20005", + "key": "miaosushirenyu20005", "text": "棒槌，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -657,7 +657,7 @@ "heroid": "", "img": "wg_icon_tl", "intr": { - "key": "shirenyu20006", + "key": "miaosushirenyu20006", "text": "铜铃，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -691,7 +691,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20007", + "key": "miaosushirenyu20007", "text": "尖刺吊环，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -725,7 +725,7 @@ "heroid": "", "img": "wg_icon_tj01", "intr": { - "key": "shirenyu20008", + "key": "miaosushirenyu20008", "text": "陀螺，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -759,7 +759,7 @@ "heroid": "", "img": "wg_icon_zl", "intr": { - "key": "shirenyu20009", + "key": "miaosushirenyu20009", "text": "大转轮，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -804,7 +804,7 @@ "heroid": "", "img": "wg_icon_mp", "intr": { - "key": "shirenyu20010", + "key": "miaosushirenyu20010", "text": "木头牌，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -849,7 +849,7 @@ "heroid": "", "img": "wg_icon_sjg", "intr": { - "key": "shirenyu20011", + "key": "miaosushirenyu20011", "text": "双节棍，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -894,7 +894,7 @@ "heroid": "", "img": "wg_icon_yd", "intr": { - "key": "shirenyu20012", + "key": "miaosushirenyu20012", "text": "练功带，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -939,7 +939,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20013", + "key": "miaosushirenyu20013", "text": "七彩花棍，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -984,7 +984,7 @@ "heroid": "", "img": "wg_icon_fb", "intr": { - "key": "shirenyu20014", + "key": "miaosushirenyu20014", "text": "流星飞镖，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1018,7 +1018,7 @@ "heroid": "", "img": "wg_icon_mxl", "intr": { - "key": "shirenyu20015", + "key": "miaosushirenyu20015", "text": "冥想锣，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1052,7 +1052,7 @@ "heroid": "", "img": "wg_icon_ct", "intr": { - "key": "shirenyu20016", + "key": "miaosushirenyu20016", "text": "彩条龙，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1086,7 +1086,7 @@ "heroid": "", "img": "wg_icon_kqms", "intr": { - "key": "shirenyu20017", + "key": "miaosushirenyu20017", "text": "孔雀毛扇，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1129,7 +1129,7 @@ "heroid": "", "img": "wg_icon_ph", "intr": { - "key": "shirenyu20018", + "key": "miaosushirenyu20018", "text": "平衡木，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1172,7 +1172,7 @@ "heroid": "", "img": "wg_icon_th", "intr": { - "key": "shirenyu20019", + "key": "miaosushirenyu20019", "text": "铁环，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1215,7 +1215,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20020", + "key": "miaosushirenyu20020", "text": "太极球，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 8d4c0aeb6..fe14be47e 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -13566,7 +13566,7 @@ { "Id": 214001112, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 10, diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 43e8a47ba..350f3f13e 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -60,6 +60,7 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero { JuexProperty: make(map[string]int32), TalentProperty: make(map[string]int32), HoroscopeProperty: make(map[string]int32), + Fetters: make(map[string]int32), } this.PropertyCompute(newHero) this.initHeroSkill(newHero) diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index d59d9b97e..8ffca14fc 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -33,26 +33,7 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library fetter.Activation = true mapData := make(map[string]interface{}, 0) mapData["activation"] = fetter.Activation - // 激活的时候算一下 当前羁绊等级 - list := this.module.modelFetter.getHeroFetterList(session.GetUserId()) - conf := this.module.configure.GetLibraryFetter(fetter.Fid, 1) - var minLv int32 - for _, v1 := range conf.Hid { - for _, v := range list { - if v.Heroid == v1 { - if minLv == 0 { - minLv = v.Favorlv - } - if minLv > v.Favorlv { - minLv = v.Favorlv - } - break - } - } - } - fetter.Fetterlv = minLv - mapData["fetterlv"] = fetter.Fetterlv - this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData) + rsp.Data = fetter return } diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index 7cfb4c9bc..bb81178ba 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -26,44 +26,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa code = pb.ErrorCode_LibraryNoData return } - // fetterlv check - var minLv int32 - conf := this.module.configure.GetLibraryFetter(fetter.Fid, req.Fetterlv) - if conf == nil { - code = pb.ErrorCode_ConfigNoFound - } - - for _, v := range conf.Hid { // 获取羁绊等级 - _d := this.module.modelFetter.GetFetterByHeroId(session.GetUserId(), v) - if _d != nil { - if minLv == 0 { - minLv = _d.Favorlv - } - if _d.Favorlv > minLv { - minLv = _d.Favorlv - } - } - } - - if minLv < req.Fetterlv { - code = pb.ErrorCode_LibraryLvReward - return - } - - for k := range fetter.Prize { - if k == req.Fetterlv { - code = pb.ErrorCode_LibraryReward - return - } - } fetter.Prize[req.Fetterlv] = 1 // 发奖 - if len(conf.Prize) != 0 { - if code = this.module.DispenseRes(session, conf.Prize, true); code != pb.ErrorCode_Success { // - return - } - } mapData := make(map[string]interface{}, 0) mapData["prize"] = fetter.Prize diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index f351bfdf6..f6fdfcc65 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -7,104 +7,53 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" - "go_dreamfactory/utils" - "strconv" ) //参数校验 func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode) { - if req.Hid == "" { + if req.Oid == "" { code = pb.ErrorCode_ReqParameterError } return } func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { - + var ( + update map[string]interface{} + ) + update = make(map[string]interface{}, 0) resp := &pb.LibraryGetStoryRewardResp{} code = this.GetStoryRewardCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - _heroFetter := this.module.modelFetter.getOneHeroFetter(session.GetUserId(), req.Hid) + _heroFetter := this.module.modelFetter.getOneHeroFetter(session.GetUserId(), req.Oid) if _heroFetter == nil { code = pb.ErrorCode_ReqParameterError return } - - conf := this.module.configure.GetLibraryHero(_heroFetter.Heroid) - if req.History != 0 { - for index, v := range conf.History { - if utils.ToInt32(v) == req.History && conf.Favorlv[index] >= _heroFetter.Favorlv { - for _, v1 := range _heroFetter.History { - if v1 == req.History { - code = pb.ErrorCode_ReqParameterError - return - } - } + if req.History != 0 { // 领取传记往事id + for _, v := range _heroFetter.History { + if v == req.History { // 已经领取过奖励 + code = pb.ErrorCode_LibraryReward + return } - _heroFetter.History = append(_heroFetter.History, req.History) - // 发奖 - historyConf := this.configure.GetLibraryHistory(strconv.Itoa(int(req.History))) - if historyConf != nil { - this.module.DispenseRes(session, historyConf.Prize, true) - } - mapData := make(map[string]interface{}, 0) - mapData["history"] = _heroFetter.History - this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroFetter.Id, mapData) - resp.Data = _heroFetter - break } - } else if req.Rightend != 0 { // 剧情奖励 - bRepeadGetReawrd := false - sz := conf.Endid - for _, id := range sz { - if req.Rightend == conf.Rightend || req.Rightend == id { - if len(conf.PlotUnlock) >= len(_heroFetter.Stroyprize)+1 { - // 校验等级 - lv := conf.PlotUnlock[len(_heroFetter.Stroyprize)] - if _heroFetter.Favorlv < lv { - code = pb.ErrorCode_LibraryLvReward - return - } - } else { - code = pb.ErrorCode_LibraryLvReward - return - } - for _, v := range _heroFetter.Stroyprize { - if v == req.Rightend { - bRepeadGetReawrd = true - break - } - } - if bRepeadGetReawrd { // 重复领奖 - code = pb.ErrorCode_LibraryReward - return - } - var res []*cfg.Gameatn // - if req.Rightend == conf.Rightend { - res = conf.Stroyprize - } else { - res = conf.SpecialStroyprize - } - - _heroFetter.Stroyprize = append(_heroFetter.Stroyprize, req.Rightend) - // 发奖 - code = this.module.DispenseRes(session, res, true) - if code != pb.ErrorCode_Success { - this.module.Errorf("GetStoryReward err:add item : %v", res) - } - mapData := make(map[string]interface{}, 0) - mapData["stroyprize"] = _heroFetter.Stroyprize - this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroFetter.Id, mapData) - resp.Data = _heroFetter - break + _heroFetter.History = append(_heroFetter.History, req.History) + update["history"] = _heroFetter.History + } else if req.Story != 0 { // 领取故事ID + for _, v := range _heroFetter.Stroyprize { + if v == req.Story { // 已经领取过奖励 + code = pb.ErrorCode_LibraryReward + return } - } - + _heroFetter.Stroyprize = append(_heroFetter.Stroyprize, req.History) + update["stroyprize"] = _heroFetter.Stroyprize } + this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroFetter.Id, update) + resp.Data = _heroFetter + session.SendMsg(string(this.module.GetType()), LibraryGetStoryRewardResp, resp) return } diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 077b87fd4..4434ca2f8 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -17,6 +17,7 @@ func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvR return } +// 英雄回礼 func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { resp := &pb.LibraryLvRewardResp{} @@ -29,28 +30,25 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward code = pb.ErrorCode_ReqParameterError return } - curStar := this.module.configure.GetHeroConfigStar(_heroFetter.Heroid) // 查询原始星级 - if curStar == 0 { - code = pb.ErrorCode_ConfigNoFound + if _heroFetter.Lvprize == nil { + _heroFetter.Lvprize = map[int32]int32{} + } + + if _, ok := _heroFetter.Lvprize[req.Lv]; ok { + code = pb.ErrorCode_LibraryReward // 重复领奖 return } - confData := this.module.configure.GetLibraryFavorData(curStar, req.Lv) - if len(confData.Prize) == 0 { + confData := this.module.configure.GetFavorability(_heroFetter.Heroid, req.Lv) + if confData == nil { code = pb.ErrorCode_ReqParameterError return } - for _, v := range _heroFetter.Lvprize { - if v == req.Lv { - code = pb.ErrorCode_LibraryReward // 重复领奖 - break - } - } - _heroFetter.Lvprize = append(_heroFetter.Lvprize, req.Lv) + _heroFetter.Lvprize[req.Lv] = 1 // 发奖 - code = this.module.DispenseRes(session, confData.Prize, true) + code = this.module.DispenseRes(session, confData.ReturnReward, true) if code != pb.ErrorCode_Success { - this.module.Errorf("GetStoryReward err:add item : %v", confData.Prize) + this.module.Errorf("GetStoryReward err:add item : %v", confData.ReturnReward) } mapData := make(map[string]interface{}, 0) mapData["lvprize"] = _heroFetter.Lvprize diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index a3fbfa515..895c0086e 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -15,6 +15,7 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG return } +// 给英雄赠送美食 func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn @@ -40,8 +41,8 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe code = pb.ErrorCode_ConfigNoFound return } - favorConf := this.configure.GetLibraryFavor(curStar) - maxLv = int32(len(favorConf)) // 获取当前星级羁绊最大等级 + // favorConf := this.configure.GetLibraryFavor(curStar) + // maxLv = int32(len(favorConf)) // 获取当前星级羁绊最大等级 // 达到最大等级不让继续升级 if _heroObj.Favorlv >= maxLv { code = pb.ErrorCode_LibraryMaxLv @@ -73,13 +74,13 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe code = pb.ErrorCode_LibraryMaxLv break } - if favorConf[_heroObj.Favorlv] <= _heroObj.Favorexp { - _heroObj.Favorexp -= favorConf[_heroObj.Favorlv] - _heroObj.Favorlv += 1 - upLv++ - } else { - break - } + // if favorConf[_heroObj.Favorlv] <= _heroObj.Favorexp { + // _heroObj.Favorexp -= favorConf[_heroObj.Favorlv] + // _heroObj.Favorlv += 1 + // upLv++ + // } else { + // break + // } } if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { //真正消耗 return diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index fcef976c6..973ba0b46 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -7,73 +7,102 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "strconv" + "sync" ) const ( - game_libraryhero = "game_libraryhero.json" // 英雄对应的羁绊id信息 - game_libraryfetter = "game_libraryfetter.json" // 羁绊信息表 - game_libraryhistory = "game_libraryhistory.json" // 往事id 对应的奖励 - game_libraryfavor = "game_libraryfavor.json" // 英雄好感度升级所需的经验 - game_librarystory = "game_librarystory.json" // 羁绊id对应剧情奖励 - game_librarycomplot = "game_librarycomplot.json" + // game_libraryhero = "game_libraryhero.json" // 英雄对应的羁绊id信息 + // game_libraryfetter = "game_libraryfetter.json" // 羁绊信息表 + // game_libraryhistory = "game_libraryhistory.json" // 往事id 对应的奖励 + // game_libraryfavor = "game_libraryfavor.json" // 英雄好感度升级所需的经验 + // game_librarystory = "game_librarystory.json" // 羁绊id对应剧情奖励 + // game_librarycomplot = "game_librarycomplot.json" + + game_favorability = "game_favorability.json" // 好感度 + game_friends = "game_friends.json" // 好感度 ) ///配置管理基础组件 type configureComp struct { modules.MCompConfigure - fetter map[int64]*cfg.GameLibraryFetterData - favor map[int64]*cfg.GameLibraryFavorData + hlock sync.RWMutex + // fetter map[int64]*cfg.GameLibraryFetterData + // favor map[int64]*cfg.GameLibraryFavorData + + favorability map[string]*cfg.GameFavorabilityData + favorLvExp map[string][]int32 // key 英雄id value 每级升级所需要的经验值 + friend map[int64][]*cfg.GameFriendsData + heroFetter map[string][]int32 // key 英雄id value 羁绊id + } //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) - err = this.LoadMultiConfigure(map[string]interface{}{ - game_libraryhero: cfg.NewGameLibraryHero, - game_libraryhistory: cfg.NewGameLibraryHistory, - game_libraryfavor: cfg.NewGameLibraryFavor, - game_librarystory: cfg.NewGameLibraryStory, - game_librarycomplot: cfg.NewGameLibraryComplot, - }) + // err = this.LoadMultiConfigure(map[string]interface{}{ + // game_libraryhero: cfg.NewGameLibraryHero, + // game_libraryhistory: cfg.NewGameLibraryHistory, + // game_libraryfavor: cfg.NewGameLibraryFavor, + // game_librarystory: cfg.NewGameLibraryStory, + // game_librarycomplot: cfg.NewGameLibraryComplot, + // }) - this.fetter = make(map[int64]*cfg.GameLibraryFetterData, 0) - configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFetter) - this.favor = make(map[int64]*cfg.GameLibraryFavorData, 0) - configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFavor) + // this.fetter = make(map[int64]*cfg.GameLibraryFetterData, 0) + // configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFetter) + // this.favor = make(map[int64]*cfg.GameLibraryFavorData, 0) + // configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFavor) + + configure.RegisterConfigure(game_favorability, cfg.NewGameFavorability, this.SetFavorability) + configure.RegisterConfigure(game_friends, cfg.NewGameLibraryFetter, this.SetFriendData) return } - -func (this *configureComp) SetLibraryFavor() { - if v, err := this.GetConfigure(game_libraryfavor); err == nil { - if _configure, ok := v.(*cfg.GameLibraryFavor); ok { +func (this *configureComp) SetFavorability() { + if v, err := this.GetConfigure(game_favorability); err == nil { + this.favorability = make(map[string]*cfg.GameFavorabilityData, 0) + this.favorLvExp = make(map[string][]int32) + if _configure, ok := v.(*cfg.GameFavorability); ok { for _, v1 := range _configure.GetDataList() { - this.favor[int64(v1.Star<<8)+int64(v1.Favorlv)] = v1 + lv := strconv.Itoa(int(v1.FavorLv)) + this.favorLvExp[v1.Hid] = append(this.favorLvExp[v1.Hid], v1.FavorExp) + this.favorability[v1.Hid+"-"+lv] = v1 } return } } else { - err = fmt.Errorf("%T no is *cfg.GameLibraryFavor", v) + err = fmt.Errorf("%T no is *cfg.SetFavorability", err) } } -func (this *configureComp) GetLibraryFavorData(star, favorlv int32) (data *cfg.GameLibraryFavorData) { - return this.favor[int64(star<<8)+int64(favorlv)] -} -func (this *configureComp) SetLibraryFetter() { - if v, err := this.GetConfigure(game_libraryfetter); err == nil { - if _configure, ok := v.(*cfg.GameLibraryFetter); ok { - for _, v := range _configure.GetDataList() { - this.fetter[int64(v.Fid<<8)+int64(v.Favorlv)] = v +func (this *configureComp) GetFavorability(hid string, lv int32) *cfg.GameFavorabilityData { + + return this.favorability[hid+"-"+strconv.Itoa(int(lv))] +} +func (this *configureComp) SetFriendData() { + if v, err := this.GetConfigure(game_friends); err == nil { + this.friend = make(map[int64][]*cfg.GameFriendsData, 0) + this.heroFetter = make(map[string][]int32) + if _configure, ok := v.(*cfg.GameFriends); ok { + for _, v1 := range _configure.GetDataList() { + key := int64(v1.FriendId)<<8 + int64(v1.FriendsLv) + this.friend[key] = append(this.friend[key], v1) + this.heroFetter[v1.Hid] = append(this.heroFetter[v1.Hid], v1.FriendId) } return } } else { - err = fmt.Errorf("%T no is *cfg.GameLibraryFetter", v) + err = fmt.Errorf("%T no is *cfg.SetFavorability", err) } } -func (this *configureComp) GetLibraryFetter(fid, favorlv int32) (data *cfg.GameLibraryFetterData) { - return this.fetter[int64(fid<<8)+int64(favorlv)] +// id:羁绊id lv 羁绊等级 +func (this *configureComp) GetFriendData(id int32, lv int32) []*cfg.GameFriendsData { + return this.friend[int64(id)<<8+int64(lv)] +} + +// 通过英雄获取当前英雄的所有羁绊ID +func (this *configureComp) GetHeroFetterID(hid string) []int32 { + return this.heroFetter[hid] } //加载多个配置文件 @@ -93,80 +122,7 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) return configure.GetConfigure(name) } -func (this *configureComp) GetLibraryHero(hid string) (data *cfg.GameLibraryHeroData) { - if v, err := this.GetConfigure(game_libraryhero); err == nil { - if configure, ok := v.(*cfg.GameLibraryHero); ok { - data = configure.Get(hid) - } - } else { - log.Errorf("get GetLibraryHero conf err:%v", err) - } - return -} +func (this *configureComp) GetFavorabilityExp(hid string) []int32 { -// 获取当前星级的好感度 -func (this *configureComp) GetLibraryFavor(star int32) (data []int32) { - if v, err := this.GetConfigure(game_libraryfavor); err == nil { - if configure, ok := v.(*cfg.GameLibraryFavor); ok { - for _, v := range configure.GetDataList() { - if v.Star == star { - data = append(data, v.Expneed) - } - } - } - } else { - log.Errorf("GetLibraryFavor conf err:%v", err) - } - return + return this.favorLvExp[hid] } - -func (this *configureComp) GetLibraryHistory(id string) (data *cfg.GameLibraryHistoryData) { - if v, err := this.GetConfigure(game_libraryhistory); err == nil { - if configure, ok := v.(*cfg.GameLibraryHistory); ok { - data = configure.Get(id) - } - } else { - log.Errorf("GetLibraryHistory conf err:%v", err) - } - return -} - -func (this *configureComp) GetLibraryStory(fid int32) (data *cfg.GameLibraryStoryData) { - if v, err := this.GetConfigure(game_librarystory); err == nil { - if configure, ok := v.(*cfg.GameLibraryStory); ok { - data = configure.Get(fid) - } - } else { - log.Errorf("GetLibraryStory conf err:%v", err) - } - return -} - -func (this *configureComp) getFetterstoryTaskCfg() (data *cfg.GameLibraryComplot, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_librarycomplot); err != nil { - return - } else { - if data, ok = v.(*cfg.GameLibraryComplot); !ok { - err = fmt.Errorf("%T no is *cfg.GameLibraryComplot", v) - return - } - } - return -} - -func(c *configureComp)getMainTaskCfgByFetter(fetterId int32)(list []*cfg.GameLibraryComplotData) { - glc, err := c.getFetterstoryTaskCfg() - if err!=nil{ - return nil - } - for _, v:=range glc.GetDataList(){ - if v.FetterId == fetterId{ - list = append(list, v) - } - } - return -} \ No newline at end of file diff --git a/modules/library/model_fetterstory.go b/modules/library/model_fetterstory.go index 1c9f9ac11..185ecd248 100644 --- a/modules/library/model_fetterstory.go +++ b/modules/library/model_fetterstory.go @@ -6,7 +6,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" - "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -56,17 +55,17 @@ func (this *modelFetterstory) getFetterTasks(uid string, fetterId int32) *pb.Fet // 校验前置任务是否完成 // true完成 false未完成 func (this *modelFetterstory) isPreFinished(finishTasks []int32, taskId int32) bool { - maintaskConf, ok := this.module.confComplot.GetDataMap()[taskId] - if !ok { - return false - } - if maintaskConf.SubTask == 0 { - return true - } + // maintaskConf, ok := this.module.confComplot.GetDataMap()[taskId] + // if !ok { + // return false + // } + // if maintaskConf.SubTask == 0 { + // return true + // } - if _, ok := utils.Findx(finishTasks, maintaskConf.SubTask); ok { - return true - } + // if _, ok := utils.Findx(finishTasks, maintaskConf.SubTask); ok { + // return true + // } return false } diff --git a/modules/library/module.go b/modules/library/module.go index c6701c401..507842228 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -9,7 +9,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/bson/primitive" @@ -23,7 +22,6 @@ type Library struct { modelFetterstory *modelFetterstory api *apiComp configure *configureComp - confComplot *cfg.GameLibraryComplot } func NewModule() core.IModule { @@ -52,9 +50,7 @@ func (this *Library) OnInstallComp() { func (this *Library) Start() (err error) { err = this.ModuleBase.Start() this.service.RegisterFunctionName(string(comm.Rpc_ModuleFetter), this.Rpc_ModuleFetter) - if this.confComplot, err = this.configure.getFetterstoryTaskCfg(); err != nil { - return err - } + return } @@ -83,28 +79,81 @@ func (this *Library) GetLibraryListByFid(uid string, fid int32) *pb.DBLibrary { return nil } +// 通过英雄ID 查询羁绊信息 +func (this *Library) GetLibraryListByHid(uid string, hid string) *pb.DBLibrary { + list := this.modelLibrary.getLibraryList(uid) + for _, v := range list { + if _, ok := v.Herofetter[hid]; ok { + return v + } + } + return nil +} + +// +func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibrary, fetter []*pb.DBHeroFetter) { + + szFid := this.configure.GetHeroFetterID(hid) + for _, fid := range szFid { + conf := this.configure.GetFriendData(fid, 1) + if len(conf) == 0 { + this.modelFetter.module.Errorf("can't foun conf fid:%d", fid) + continue + } + if list := this.GetLibraryListByFid(uid, fid); list == nil { // 没有这条羁绊数据 + tmp := &pb.DBLibrary{ // 创建一条羁绊数据 + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Fid: fid, + Herofetter: map[string]string{}, + Prize: map[int32]int32{}, + } + for _, v := range conf { + if _d := this.CheckHeroFetter(uid, v.Hid); _d != nil { // check DBHeroFetter + tmp.Herofetter[v.Hid] = _d.Id + fetter = append(fetter, _d) + } + } + if err := this.modelLibrary.createLibrary(uid, tmp); err != nil { + this.modelFetter.module.Errorf("createLibrary error: %v,obj:%v", err, tmp) + continue + } + dbLibrary = append(dbLibrary, tmp) + } else { // 有这条羁绊数据 + dbLibrary = append(dbLibrary, list) + for _, v := range conf { + if _, ok := list.Herofetter[v.Hid]; !ok { + if _d := this.CheckHeroFetter(uid, v.Hid); _d == nil { + list.Herofetter[v.Hid] = _d.Id + fetter = append(fetter, _d) + } + mapData := make(map[string]interface{}, 0) + mapData["herofetter"] = list.Herofetter + this.modelLibrary.modifyLibraryDataByObjId(uid, list.Id, mapData) // 更新新的羁绊信息 + } + } + } + } + return +} + //通过羁绊id 创建多个羁绊信息 func (this *Library) CreateLibrary(uid string, fid int32, heroConfId string) (code pb.ErrorCode, obj *pb.DBLibrary) { obj = &pb.DBLibrary{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Fid: fid, - Hero: map[string]int32{}, - Prize: map[int32]int32{}, - Fetterlv: 0, + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Fid: fid, + Herofetter: map[string]string{}, + Prize: map[int32]int32{}, } - conf := this.configure.GetLibraryFetter(fid, 1) + conf := this.configure.GetFriendData(fid, 1) if conf != nil { - for _, v := range conf.Hid { - obj.Hero[v] = 0 // 默认值 - if v == heroConfId { - obj.Hero[heroConfId] = 1 // 获得的英雄好感度等级为1级 - } - } + if err := this.modelLibrary.createLibrary(uid, obj); err != nil { code = pb.ErrorCode_DBError } + obj.Herofetter[heroConfId] = obj.Id } return @@ -120,8 +169,31 @@ func (this *Library) GetHeroFetterList(uid string) []*pb.DBHeroFetter { return this.modelFetter.getHeroFetterList(uid) } +// 校验羁绊数据 如果没有 则创建 +func (this *Library) CheckHeroFetter(uid string, hid string) (obj *pb.DBHeroFetter) { + var ( + sz []*pb.DBHeroFetter + bFound bool + err error + ) + sz = this.modelFetter.getHeroFetterList(uid) + for _, v := range sz { + if v.Heroid == hid { + bFound = true + break + } + } + if !bFound { // 创建一条英雄数据 + if obj, err = this.createHeroFetter(uid, hid); err != nil { + obj = nil + return + } + } + return +} + // 创建一条英雄羁绊信息 -func (this *Library) createHeroFetter(uid string, heroConfId string) (obj *pb.DBHeroFetter, code pb.ErrorCode) { +func (this *Library) createHeroFetter(uid string, heroConfId string) (obj *pb.DBHeroFetter, err error) { this.modelFetter.getHeroFetterList(uid) obj = &pb.DBHeroFetter{ Id: primitive.NewObjectID().Hex(), @@ -130,11 +202,9 @@ func (this *Library) createHeroFetter(uid string, heroConfId string) (obj *pb.DB History: make([]int32, 0), Favorlv: 1, Stroyprize: make([]int32, 0), - Lvprize: make([]int32, 0), - } - if err := this.modelFetter.createHeroFetter(uid, obj); err != nil { - code = pb.ErrorCode_DBError + Lvprize: make(map[int32]int32, 0), } + err = this.modelFetter.createHeroFetter(uid, obj) return } @@ -174,64 +244,9 @@ func (this *Library) SendRpcAddHero(uid string, heroConfId string, serverTag str // 创建一条羁绊信息 func (this *Library) AddHeroFetterData(uid, heroConfId string) (code pb.ErrorCode) { - _conf := this.configure.GetLibraryHero(heroConfId) // 配置表中没有这个英雄数据 直接返回 - if _conf == nil { - return - } - var ( - objFetter *pb.DBHeroFetter // 详细羁绊信息数据 - ) rsp := &pb.LibraryChangePush{} - _data := this.QueryOneHeroFetter(uid, heroConfId) - if _data == nil { - objFetter, code = this.createHeroFetter(uid, heroConfId) - if code == pb.ErrorCode_Success { - rsp.Fetter = append(rsp.Fetter, objFetter) - } else { - this.Errorf("createHeroFetter failed:%v,uid:%s,heroid:%s", code, uid, heroConfId) - } - } - for _, fid := range _conf.Fid { - // 查询是否存在这个羁绊对象 - obj := this.GetLibraryListByFid(uid, fid) - if obj == nil { // 没有羁绊信息 - code, obj = this.CreateLibrary(uid, fid, heroConfId) - if code != pb.ErrorCode_Success { - this.Errorf("CreateLibrary failed: %v,uid:%s,fid:%d", code, uid, fid) - } - rsp.Data = append(rsp.Data, obj) - } else { // 羁绊信息中没有这个heroid 也需要加进来 - // 同步数据 - mapData := make(map[string]interface{}, 0) + rsp.Data, rsp.Fetter = this.CheckFetter(uid, heroConfId) - if obj.Activation { - // 重新计算最低等级 - var minLv int32 - conf := this.configure.GetLibraryFetter(obj.Fid, 1) - list := this.GetHeroFetterList(uid) - for _, v1 := range conf.Hid { - for _, v := range list { - if v.Heroid == v1 { - if minLv == 0 { - minLv = v.Favorlv - } - if minLv > v.Favorlv { - minLv = v.Favorlv - } - break - } - } - } - obj.Fetterlv = minLv - mapData["fetterlv"] = obj.Fetterlv - } - - mapData["hero"] = obj.Hero - this.modelLibrary.modifyLibraryDataByObjId(uid, obj.Id, mapData) - rsp.Data = append(rsp.Data, obj) - - } - } if len(rsp.Data) != 0 || len(rsp.Fetter) != 0 { this.SendMsgToUser(string(this.GetType()), LibraryChangePush, rsp, uid) } diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 82f41742a..5c4207c3d 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -101,6 +101,7 @@ type DBHero struct { HoroscopeProperty map[string]int32 `protobuf:"bytes,28,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成 Fulllvenr int32 `protobuf:"varint,29,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用 KongfuUid string `protobuf:"bytes,30,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功 + Fetters map[string]int32 `protobuf:"bytes,31,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////羁绊属性加成 } func (x *DBHero) Reset() { @@ -345,6 +346,13 @@ func (x *DBHero) GetKongfuUid() string { return "" } +func (x *DBHero) GetFetters() map[string]int32 { + if x != nil { + return x.Fetters + } + return nil +} + //英雄扩展数据 type DBHeroRecord struct { state protoimpl.MessageState @@ -582,7 +590,7 @@ var File_hero_hero_db_proto protoreflect.FileDescriptor var file_hero_hero_db_proto_rawDesc = []byte{ 0x0a, 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, 0xc7, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x22, 0xb3, 0x0b, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, @@ -646,7 +654,10 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x76, 0x65, 0x6e, 0x72, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x6c, 0x76, 0x65, 0x6e, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, 0x55, 0x69, 0x64, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, - 0x55, 0x69, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, + 0x55, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x1f, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x73, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, @@ -666,64 +677,68 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x98, 0x05, 0x0a, 0x0c, 0x44, - 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 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, 0x14, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, - 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, - 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, - 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, - 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, - 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, - 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, - 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, - 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, - 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, - 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, - 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, - 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, - 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, - 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, - 0x52, 0x61, 0x63, 0x65, 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, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, - 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x2f, - 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, - 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x98, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 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, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, + 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, + 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, + 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, + 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, + 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, + 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, + 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, + 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x12, + 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x61, 0x63, + 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x1a, 0x3c, 0x0a, 0x0e, + 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, + 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, + 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, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, + 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, + 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x2f, 0x0a, 0x08, 0x48, 0x65, + 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, + 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, + 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -739,7 +754,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { } var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_hero_hero_db_proto_goTypes = []interface{}{ (HeroType)(0), // 0: HeroType (*DBHero)(nil), // 1: DBHero @@ -750,30 +765,32 @@ var file_hero_hero_db_proto_goTypes = []interface{}{ nil, // 6: DBHero.JuexPropertyEntry nil, // 7: DBHero.TalentPropertyEntry nil, // 8: DBHero.HoroscopePropertyEntry - nil, // 9: DBHeroRecord.ConditionEntry - nil, // 10: DBHeroRecord.Star5HeroEntry - nil, // 11: DBHeroRecord.RaceEntry - nil, // 12: DBHeroTalent.TalentEntry - (*SkillData)(nil), // 13: SkillData + nil, // 9: DBHero.FettersEntry + nil, // 10: DBHeroRecord.ConditionEntry + nil, // 11: DBHeroRecord.Star5HeroEntry + nil, // 12: DBHeroRecord.RaceEntry + nil, // 13: DBHeroTalent.TalentEntry + (*SkillData)(nil), // 14: SkillData } var file_hero_hero_db_proto_depIdxs = []int32{ - 13, // 0: DBHero.normalSkill:type_name -> SkillData + 14, // 0: DBHero.normalSkill:type_name -> SkillData 4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry 5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry 6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry 0, // 4: DBHero.status:type_name -> HeroType 7, // 5: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry - 13, // 6: DBHero.equipSkill:type_name -> SkillData + 14, // 6: DBHero.equipSkill:type_name -> SkillData 8, // 7: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry - 9, // 8: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry - 10, // 9: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry - 11, // 10: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry - 12, // 11: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry - 12, // [12:12] is the sub-list for method output_type - 12, // [12:12] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 9, // 8: DBHero.fetters:type_name -> DBHero.FettersEntry + 10, // 9: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry + 11, // 10: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry + 12, // 11: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry + 13, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_hero_hero_db_proto_init() } @@ -826,7 +843,7 @@ func file_hero_hero_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_db_proto_rawDesc, NumEnums: 1, - NumMessages: 12, + NumMessages: 13, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index 0205777d6..af6df257d 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -25,14 +25,14 @@ type DBLibrary 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" bson:"uid"` //用户ID - Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id - Hero map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: id - Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 - Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 - Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 - Activation bool `protobuf:"varint,8,opt,name=activation,proto3" json:"activation"` // 是否激活 + 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" bson:"uid"` //用户ID + Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id + Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID + Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 + Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 + Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 + Activation bool `protobuf:"varint,8,opt,name=activation,proto3" json:"activation"` // 是否激活 } func (x *DBLibrary) Reset() { @@ -88,9 +88,9 @@ func (x *DBLibrary) GetFid() int32 { return 0 } -func (x *DBLibrary) GetHero() map[string]int32 { +func (x *DBLibrary) GetHerofetter() map[string]string { if x != nil { - return x.Hero + return x.Herofetter } return nil } @@ -129,14 +129,14 @@ type DBHeroFetter 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" bson:"uid"` //用户ID - Heroid string `protobuf:"bytes,3,opt,name=heroid,proto3" json:"heroid"` // 英雄配置表id - History []int32 `protobuf:"varint,4,rep,packed,name=history,proto3" json:"history"` // 传记往事ID - Favorlv int32 `protobuf:"varint,5,opt,name=favorlv,proto3" json:"favorlv"` // 好感度等级 - Favorexp int32 `protobuf:"varint,6,opt,name=favorexp,proto3" json:"favorexp"` // 好感度经验 - Stroyprize []int32 `protobuf:"varint,7,rep,packed,name=stroyprize,proto3" json:"stroyprize"` // 剧情奖励 - Lvprize []int32 `protobuf:"varint,8,rep,packed,name=lvprize,proto3" json:"lvprize"` // 等级奖励 + 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" bson:"uid"` //用户ID + Heroid string `protobuf:"bytes,3,opt,name=heroid,proto3" json:"heroid"` // 英雄配置表id + History []int32 `protobuf:"varint,4,rep,packed,name=history,proto3" json:"history"` // 传记往事ID + Favorlv int32 `protobuf:"varint,5,opt,name=favorlv,proto3" json:"favorlv"` // 好感度等级 + Favorexp int32 `protobuf:"varint,6,opt,name=favorexp,proto3" json:"favorexp"` // 好感度经验 + Stroyprize []int32 `protobuf:"varint,7,rep,packed,name=stroyprize,proto3" json:"stroyprize"` // 剧情奖励 + Lvprize map[int32]int32 `protobuf:"bytes,8,rep,name=lvprize,proto3" json:"lvprize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 等级奖励 } func (x *DBHeroFetter) Reset() { @@ -220,7 +220,7 @@ func (x *DBHeroFetter) GetStroyprize() []int32 { return nil } -func (x *DBHeroFetter) GetLvprize() []int32 { +func (x *DBHeroFetter) GetLvprize() map[int32]int32 { if x != nil { return x.Lvprize } @@ -398,43 +398,50 @@ var File_library_library_db_proto protoreflect.FileDescriptor var file_library_library_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x02, 0x0a, 0x09, 0x44, + 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf7, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 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, 0x10, 0x0a, 0x03, 0x66, 0x69, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x66, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x04, - 0x68, 0x65, 0x72, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x4c, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2b, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, - 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x72, - 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, 0x76, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, 0x76, 0x12, - 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x09, 0x48, 0x65, 0x72, - 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 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, 0x22, 0xd2, 0x01, 0x0a, - 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 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, - 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, - 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, - 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, - 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x72, - 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, - 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, - 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x66, 0x69, 0x64, 0x12, 0x3a, 0x0a, 0x0a, + 0x68, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2e, 0x48, 0x65, 0x72, + 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x68, 0x65, + 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x7a, + 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, + 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, + 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, + 0x76, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x3d, 0x0a, 0x0f, 0x48, + 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, + 0x69, 0x7a, 0x65, 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, 0x22, 0xaa, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, + 0x65, 0x74, 0x74, 0x65, 0x72, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, + 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, + 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, + 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, + 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, + 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2e, + 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x76, + 0x70, 0x72, 0x69, 0x7a, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, + 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, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 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, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, @@ -468,27 +475,29 @@ func file_library_library_db_proto_rawDescGZIP() []byte { return file_library_library_db_proto_rawDescData } -var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_library_library_db_proto_goTypes = []interface{}{ (*DBLibrary)(nil), // 0: DBLibrary (*DBHeroFetter)(nil), // 1: DBHeroFetter (*DBFetterstory)(nil), // 2: DBFetterstory (*FetterTasks)(nil), // 3: FetterTasks (*FetterTask)(nil), // 4: FetterTask - nil, // 5: DBLibrary.HeroEntry + nil, // 5: DBLibrary.HerofetterEntry nil, // 6: DBLibrary.PrizeEntry - nil, // 7: DBFetterstory.FeeterTaskEntry + nil, // 7: DBHeroFetter.LvprizeEntry + nil, // 8: DBFetterstory.FeeterTaskEntry } var file_library_library_db_proto_depIdxs = []int32{ - 5, // 0: DBLibrary.hero:type_name -> DBLibrary.HeroEntry + 5, // 0: DBLibrary.herofetter:type_name -> DBLibrary.HerofetterEntry 6, // 1: DBLibrary.prize:type_name -> DBLibrary.PrizeEntry - 7, // 2: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry - 3, // 3: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTasks - 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 + 7, // 2: DBHeroFetter.lvprize:type_name -> DBHeroFetter.LvprizeEntry + 8, // 3: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry + 3, // 4: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTasks + 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_library_library_db_proto_init() } @@ -564,7 +573,7 @@ func file_library_library_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_library_library_db_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 9, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index d636c5fa8..f79a5ae12 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -301,9 +301,9 @@ type LibraryGetStoryRewardReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Hid string `protobuf:"bytes,1,opt,name=hid,proto3" json:"hid"` // 英雄ID - History int32 `protobuf:"varint,2,opt,name=history,proto3" json:"history"` // 传记往事id - Rightend int32 `protobuf:"varint,3,opt,name=rightend,proto3" json:"rightend"` // 对应配置表 rightend + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` // DBHeroFetter oid + History int32 `protobuf:"varint,2,opt,name=history,proto3" json:"history"` // 传记往事id + Story int32 `protobuf:"varint,3,opt,name=story,proto3" json:"story"` // 剧情id } func (x *LibraryGetStoryRewardReq) Reset() { @@ -338,9 +338,9 @@ func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { return file_library_library_msg_proto_rawDescGZIP(), []int{6} } -func (x *LibraryGetStoryRewardReq) GetHid() string { +func (x *LibraryGetStoryRewardReq) GetOid() string { if x != nil { - return x.Hid + return x.Oid } return "" } @@ -352,9 +352,9 @@ func (x *LibraryGetStoryRewardReq) GetHistory() int32 { return 0 } -func (x *LibraryGetStoryRewardReq) GetRightend() int32 { +func (x *LibraryGetStoryRewardReq) GetStory() int32 { if x != nil { - return x.Rightend + return x.Story } return 0 } @@ -882,59 +882,59 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x72, 0x6c, 0x76, 0x22, 0x36, 0x0a, 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x62, 0x0a, 0x18, 0x4c, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5c, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x65, 0x6e, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, - 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, + 0x6f, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, + 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x9a, 0x01, 0x0a, 0x11, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, + 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x38, 0x0a, 0x0a, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x37, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x9a, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, - 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4c, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, - 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x37, 0x0a, 0x12, - 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, - 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x43, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, - 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, - 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, - 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, - 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, - 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, + 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, + 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, + 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, + 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, + 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, + 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, + 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, + 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, + 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.FriendsData.go b/sys/configure/structs/Game.FriendsData.go index 2bbee09aa..afd00823f 100644 --- a/sys/configure/structs/Game.FriendsData.go +++ b/sys/configure/structs/Game.FriendsData.go @@ -19,7 +19,7 @@ type GameFriendsData struct { Png string FriendsLv int32 FavorabilityLv int32 - Hid int32 + Hid string Attribute []*Gameatr AttributeTxt string } @@ -39,7 +39,7 @@ func (_v *GameFriendsData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friends_lv"].(float64); !_ok_ { err = errors.New("friends_lv error"); return }; _v.FriendsLv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_lv"].(float64); !_ok_ { err = errors.New("favorability_lv error"); return }; _v.FavorabilityLv = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } + { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } { var _arr_ []interface{} var _ok_ bool From 2dd073d135f47ef37e276aa8aeb74d29bc7323c7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Apr 2023 19:43:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=89=A7=E6=83=85=E5=A5=96=E5=8A=B1=20?= =?UTF-8?q?=E4=BC=A0=E8=AE=B0=E7=AD=89=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_camplv.json | 774 +++++++++++++++++- bin/json/game_coin.json | 70 +- bin/json/game_favorability.json | 742 ++++++----------- bin/json/game_global.json | 4 +- bin/json/game_skillafteratk.json | 16 +- bin/json/game_skillbuff.json | 157 +++- bin/json/game_skillpassive.json | 2 +- modules/library/api_getfetterlist.go | 3 +- modules/library/api_getreward.go | 24 +- modules/library/api_getstoryreward.go | 74 +- modules/library/comp_configure.go | 1 + .../structs/Game.FavorabilityData.go | 23 +- sys/configure/structs/game.coinData.go | 2 +- sys/configure/structs/game.globalData.go | 4 + sys/configure/structs/game.skillBuffData.go | 2 + 15 files changed, 1310 insertions(+), 588 deletions(-) diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json index 632ff25d0..b7178514d 100644 --- a/bin/json/game_camplv.json +++ b/bin/json/game_camplv.json @@ -1,9 +1,9 @@ [ { "id": 1, - "reputation_lv": 1, + "reputation_lv": 0, "raceType": 1, - "reputation_exp": 20, + "reputation_exp": 0, "Reward": { "a": "attr", "t": "talent1", @@ -12,6 +12,17 @@ }, { "id": 2, + "reputation_lv": 1, + "raceType": 1, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent1", + "n": 1 + } + }, + { + "id": 3, "reputation_lv": 2, "raceType": 1, "reputation_exp": 30, @@ -22,7 +33,7 @@ } }, { - "id": 3, + "id": 4, "reputation_lv": 3, "raceType": 1, "reputation_exp": 40, @@ -33,7 +44,7 @@ } }, { - "id": 4, + "id": 5, "reputation_lv": 4, "raceType": 1, "reputation_exp": 50, @@ -44,7 +55,7 @@ } }, { - "id": 5, + "id": 6, "reputation_lv": 5, "raceType": 1, "reputation_exp": 60, @@ -55,7 +66,7 @@ } }, { - "id": 6, + "id": 7, "reputation_lv": 6, "raceType": 1, "reputation_exp": 70, @@ -66,7 +77,7 @@ } }, { - "id": 7, + "id": 8, "reputation_lv": 7, "raceType": 1, "reputation_exp": 80, @@ -77,10 +88,10 @@ } }, { - "id": 8, - "reputation_lv": 1, - "raceType": 2, - "reputation_exp": 10, + "id": 9, + "reputation_lv": 8, + "raceType": 1, + "reputation_exp": 90, "Reward": { "a": "attr", "t": "talent2", @@ -88,8 +99,151 @@ } }, { - "id": 9, - "reputation_lv": 2, + "id": 10, + "reputation_lv": 9, + "raceType": 1, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 11, + "reputation_lv": 10, + "raceType": 1, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 12, + "reputation_lv": 11, + "raceType": 1, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 13, + "reputation_lv": 12, + "raceType": 1, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 14, + "reputation_lv": 13, + "raceType": 1, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 15, + "reputation_lv": 14, + "raceType": 1, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 16, + "reputation_lv": 15, + "raceType": 1, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 17, + "reputation_lv": 16, + "raceType": 1, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 18, + "reputation_lv": 17, + "raceType": 1, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 19, + "reputation_lv": 18, + "raceType": 1, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 20, + "reputation_lv": 19, + "raceType": 1, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 21, + "reputation_lv": 20, + "raceType": 1, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 22, + "reputation_lv": 0, + "raceType": 2, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 23, + "reputation_lv": 1, "raceType": 2, "reputation_exp": 20, "Reward": { @@ -99,8 +253,8 @@ } }, { - "id": 10, - "reputation_lv": 3, + "id": 24, + "reputation_lv": 2, "raceType": 2, "reputation_exp": 30, "Reward": { @@ -110,8 +264,8 @@ } }, { - "id": 11, - "reputation_lv": 4, + "id": 25, + "reputation_lv": 3, "raceType": 2, "reputation_exp": 40, "Reward": { @@ -121,8 +275,8 @@ } }, { - "id": 12, - "reputation_lv": 5, + "id": 26, + "reputation_lv": 4, "raceType": 2, "reputation_exp": 50, "Reward": { @@ -132,8 +286,8 @@ } }, { - "id": 13, - "reputation_lv": 6, + "id": 27, + "reputation_lv": 5, "raceType": 2, "reputation_exp": 60, "Reward": { @@ -143,8 +297,8 @@ } }, { - "id": 14, - "reputation_lv": 7, + "id": 28, + "reputation_lv": 6, "raceType": 2, "reputation_exp": 70, "Reward": { @@ -154,8 +308,8 @@ } }, { - "id": 15, - "reputation_lv": 8, + "id": 29, + "reputation_lv": 7, "raceType": 2, "reputation_exp": 80, "Reward": { @@ -165,8 +319,8 @@ } }, { - "id": 16, - "reputation_lv": 9, + "id": 30, + "reputation_lv": 8, "raceType": 2, "reputation_exp": 90, "Reward": { @@ -176,8 +330,8 @@ } }, { - "id": 17, - "reputation_lv": 10, + "id": 31, + "reputation_lv": 9, "raceType": 2, "reputation_exp": 100, "Reward": { @@ -187,8 +341,8 @@ } }, { - "id": 18, - "reputation_lv": 11, + "id": 32, + "reputation_lv": 10, "raceType": 2, "reputation_exp": 110, "Reward": { @@ -198,8 +352,8 @@ } }, { - "id": 19, - "reputation_lv": 12, + "id": 33, + "reputation_lv": 11, "raceType": 2, "reputation_exp": 120, "Reward": { @@ -209,8 +363,8 @@ } }, { - "id": 20, - "reputation_lv": 20, + "id": 34, + "reputation_lv": 12, "raceType": 2, "reputation_exp": 130, "Reward": { @@ -218,5 +372,555 @@ "t": "talent2", "n": 1 } + }, + { + "id": 35, + "reputation_lv": 13, + "raceType": 2, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 36, + "reputation_lv": 14, + "raceType": 2, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 37, + "reputation_lv": 15, + "raceType": 2, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 38, + "reputation_lv": 16, + "raceType": 2, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 39, + "reputation_lv": 17, + "raceType": 2, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 40, + "reputation_lv": 18, + "raceType": 2, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 41, + "reputation_lv": 19, + "raceType": 2, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 42, + "reputation_lv": 20, + "raceType": 2, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 43, + "reputation_lv": 0, + "raceType": 3, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 44, + "reputation_lv": 1, + "raceType": 3, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 45, + "reputation_lv": 2, + "raceType": 3, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 46, + "reputation_lv": 3, + "raceType": 3, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 47, + "reputation_lv": 4, + "raceType": 3, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 48, + "reputation_lv": 5, + "raceType": 3, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 49, + "reputation_lv": 6, + "raceType": 3, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 50, + "reputation_lv": 7, + "raceType": 3, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 51, + "reputation_lv": 8, + "raceType": 3, + "reputation_exp": 90, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 52, + "reputation_lv": 9, + "raceType": 3, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 53, + "reputation_lv": 10, + "raceType": 3, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 54, + "reputation_lv": 11, + "raceType": 3, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 55, + "reputation_lv": 12, + "raceType": 3, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 56, + "reputation_lv": 13, + "raceType": 3, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 57, + "reputation_lv": 14, + "raceType": 3, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 58, + "reputation_lv": 15, + "raceType": 3, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 59, + "reputation_lv": 16, + "raceType": 3, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 60, + "reputation_lv": 17, + "raceType": 3, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 61, + "reputation_lv": 18, + "raceType": 3, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 62, + "reputation_lv": 19, + "raceType": 3, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 63, + "reputation_lv": 20, + "raceType": 3, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 64, + "reputation_lv": 0, + "raceType": 4, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 65, + "reputation_lv": 1, + "raceType": 4, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 66, + "reputation_lv": 2, + "raceType": 4, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 67, + "reputation_lv": 3, + "raceType": 4, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 68, + "reputation_lv": 4, + "raceType": 4, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 69, + "reputation_lv": 5, + "raceType": 4, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 70, + "reputation_lv": 6, + "raceType": 4, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 71, + "reputation_lv": 7, + "raceType": 4, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 72, + "reputation_lv": 8, + "raceType": 4, + "reputation_exp": 90, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 73, + "reputation_lv": 9, + "raceType": 4, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 74, + "reputation_lv": 10, + "raceType": 4, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 75, + "reputation_lv": 11, + "raceType": 4, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 76, + "reputation_lv": 12, + "raceType": 4, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 77, + "reputation_lv": 13, + "raceType": 4, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 78, + "reputation_lv": 14, + "raceType": 4, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 79, + "reputation_lv": 15, + "raceType": 4, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 80, + "reputation_lv": 16, + "raceType": 4, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 81, + "reputation_lv": 17, + "raceType": 4, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 82, + "reputation_lv": 18, + "raceType": 4, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 83, + "reputation_lv": 19, + "raceType": 4, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 84, + "reputation_lv": 20, + "raceType": 4, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } } ] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index fa92196a0..e7dfcdbb9 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -6,7 +6,10 @@ "effects": "", "access": 123, "img": "wp_icon_10035", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_gold", + "text": "可以用来购买各种道具的基础货币" + } }, { "key": "diamond", @@ -15,7 +18,10 @@ "effects": "", "access": 158, "img": "wp_icon_10036", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_diamond", + "text": "珍惜的高级货币，可以用来购买各种稀有道具" + } }, { "key": "exp", @@ -24,7 +30,10 @@ "effects": "", "access": 113, "img": "icon_hy", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_exp", + "text": "可用于提升角色等级" + } }, { "key": "friendPoint", @@ -33,7 +42,10 @@ "effects": "", "access": 115, "img": "wp_icon_10014", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_friendPoint", + "text": "好友赠送的友情点，可以用于有情商店兑换各种道具" + } }, { "key": "palyexp", @@ -42,7 +54,10 @@ "effects": "", "access": 113, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_palyexp", + "text": "可用于提升角色等级" + } }, { "key": "guildexp", @@ -51,7 +66,10 @@ "effects": "", "access": 157, "img": "wp_icon_10024", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildexp", + "text": "有多种功能的基础货币" + } }, { "key": "guildactive", @@ -60,7 +78,10 @@ "effects": "", "access": 157, "img": "wp_icon_0001", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildactive", + "text": "有多种功能的基础货币" + } }, { "key": "guildcoin", @@ -69,7 +90,10 @@ "effects": "", "access": 157, "img": "wp_icon_10017", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildcoin", + "text": "有多种功能的基础货币" + } }, { "key": "starcoin", @@ -78,7 +102,10 @@ "effects": "", "access": 158, "img": "wp_icon_10017", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_starcoin", + "text": "有多种功能的基础货币" + } }, { "key": "vipexp", @@ -87,7 +114,10 @@ "effects": "", "access": 158, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_vipexp", + "text": "有多种功能的基础货币" + } }, { "key": "arenacoin", @@ -96,7 +126,10 @@ "effects": "", "access": 156, "img": "icon_ry", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_arenacoin", + "text": "有多种功能的基础货币" + } }, { "key": "ps", @@ -105,7 +138,10 @@ "effects": "", "access": 156, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_ps", + "text": "有多种功能的基础货币" + } }, { "key": "heroexp", @@ -114,7 +150,10 @@ "effects": "", "access": 0, "img": "wp_icon_10009", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_heroexp", + "text": "有多种功能的基础货币" + } }, { "key": "moongold", @@ -123,6 +162,9 @@ "effects": "", "access": 107, "img": "wp_icon_10009", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_moongold", + "text": "有多种功能的基础货币" + } } ] \ No newline at end of file diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json index 675ebb1ef..07f09b7ac 100644 --- a/bin/json/game_favorability.json +++ b/bin/json/game_favorability.json @@ -1,13 +1,13 @@ [ { - "id": 1, + "id": 2, "hid": "14002", "name": { "key": "hero_14002", "text": "大龙" }, "favor_lv": 1, - "favor_exp": 100, + "favor_exp": 200, "lv_name": { "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" @@ -19,123 +19,18 @@ "a": "item", "t": "30001", "n": 1 + }, + { + "a": "item", + "t": "30001", + "n": 2 } ], "return_txt": { "key": "favorability_favorability_return_txt", "text": "达到好感度{0}级可领取" }, - "likes_food": [ - 1001 - ], - "disliking_food": [ - 1001 - ], - "likes_txt": { - "key": "favorability_favorability_likes_txt_14002", - "text": "我很喜欢，谢谢！" - }, - "ordinary_txt": { - "key": "favorability_favorability_ordinary_txt_14002", - "text": "送我的？谢谢！" - }, - "disliking_txt": { - "key": "favorability_favorabilit_disliking_txt_14002", - "text": "这味道，一言难尽......" - }, - "favorlv": [ - 1, - 3, - 5 - ], - "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" - ], - "biography_reward1": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward2": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward3": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "plot_unlock": [ - 2, - 4, - 6, - 8 - ], - "startid": 300001, - "endid": [ - 3000015, - 3000017, - 3000018 - ], - "rightend": 3000014, - "stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ], - "special_stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 2000 - } - ] - }, - { - "id": 2, - "hid": "14002", - "name": { - "key": "hero_14002", - "text": "大龙" - }, - "favor_lv": 2, - "favor_exp": 200, - "lv_name": { - "key": "favorability_favorability_lv_name_2", - "text": "点头之交" - }, - "privilege_type": 0, - "privilege_value": 0, - "return_reward": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "return_txt": { - "key": "favorability_favorability_return_txt", - "text": "达到好感度{0}级可领取" - }, - "likes_food": [ - 1001 - ], + "likes_food": [], "disliking_food": [], "likes_txt": { "key": "favorability_favorability_likes_txt_14002", @@ -155,14 +50,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -220,10 +110,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 3, + "favor_lv": 2, "favor_exp": 300, "lv_name": { - "key": "favorability_favorability_lv_name_3", + "key": "favorability_favorability_lv_name_2", "text": "点头之交" }, "privilege_type": 0, @@ -232,7 +122,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 2 + }, + { + "a": "item", + "t": "30001", + "n": 3 } ], "return_txt": { @@ -259,14 +154,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -324,10 +214,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 4, + "favor_lv": 3, "favor_exp": 400, "lv_name": { - "key": "favorability_favorability_lv_name_4", + "key": "favorability_favorability_lv_name_3", "text": "点头之交" }, "privilege_type": 0, @@ -336,7 +226,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 3 + }, + { + "a": "item", + "t": "30001", + "n": 4 } ], "return_txt": { @@ -363,14 +258,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -428,10 +318,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 5, + "favor_lv": 4, "favor_exp": 500, "lv_name": { - "key": "favorability_favorability_lv_name_5", + "key": "favorability_favorability_lv_name_4", "text": "点头之交" }, "privilege_type": 0, @@ -440,7 +330,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 4 + }, + { + "a": "item", + "t": "30001", + "n": 5 } ], "return_txt": { @@ -467,14 +362,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -532,10 +422,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 6, + "favor_lv": 5, "favor_exp": 600, "lv_name": { - "key": "favorability_favorability_lv_name_6", + "key": "favorability_favorability_lv_name_5", "text": "点头之交" }, "privilege_type": 0, @@ -544,7 +434,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 5 + }, + { + "a": "item", + "t": "30001", + "n": 6 } ], "return_txt": { @@ -571,14 +466,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -636,10 +526,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 7, + "favor_lv": 6, "favor_exp": 700, "lv_name": { - "key": "favorability_favorability_lv_name_7", + "key": "favorability_favorability_lv_name_6", "text": "情投意合" }, "privilege_type": 0, @@ -648,7 +538,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 6 + }, + { + "a": "item", + "t": "30001", + "n": 7 } ], "return_txt": { @@ -675,14 +570,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -740,10 +630,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 8, + "favor_lv": 7, "favor_exp": 800, "lv_name": { - "key": "favorability_favorability_lv_name_8", + "key": "favorability_favorability_lv_name_7", "text": "情投意合" }, "privilege_type": 0, @@ -752,7 +642,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 7 + }, + { + "a": "item", + "t": "30001", + "n": 8 } ], "return_txt": { @@ -779,14 +674,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -844,10 +734,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 9, + "favor_lv": 8, "favor_exp": 900, "lv_name": { - "key": "favorability_favorability_lv_name_9", + "key": "favorability_favorability_lv_name_8", "text": "情投意合" }, "privilege_type": 0, @@ -856,7 +746,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 8 + }, + { + "a": "item", + "t": "30001", + "n": 9 } ], "return_txt": { @@ -883,14 +778,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -948,10 +838,10 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 10, + "favor_lv": 9, "favor_exp": 1000, "lv_name": { - "key": "favorability_favorability_lv_name_10", + "key": "favorability_favorability_lv_name_9", "text": "情投意合" }, "privilege_type": 0, @@ -960,7 +850,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 9 + }, + { + "a": "item", + "t": "30001", + "n": 10 } ], "return_txt": { @@ -987,14 +882,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -1052,18 +942,29 @@ "key": "hero_14002", "text": "大龙" }, - "favor_lv": 11, + "favor_lv": 10, "favor_exp": 0, "lv_name": { - "key": "favorability_favorability_lv_name_11", + "key": "favorability_favorability_lv_name_10", "text": "情投意合" }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 10 + }, + { + "a": "item", + "t": "30001", + "n": 11 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -1085,14 +986,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -1150,10 +1046,10 @@ "key": "hero_14005", "text": "鹤大师" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1183,14 +1079,9 @@ 3 ], "biography_name": [ - "140051", - "140052", - "140053" - ], - "biography_txt": [ - "140051", - "140052", - "140053" + 140051, + 140052, + 140053 ], "biography_reward1": [ { @@ -1248,10 +1139,10 @@ "key": "hero_14006", "text": "布兰奇" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1281,14 +1172,9 @@ 3 ], "biography_name": [ - "140061", - "140062", - "140063" - ], - "biography_txt": [ - "140061", - "140062", - "140063" + 140061, + 140062, + 140063 ], "biography_reward1": [ { @@ -1346,10 +1232,10 @@ "key": "hero_15004", "text": "小欧" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1379,14 +1265,9 @@ 3 ], "biography_name": [ - "150041", - "150042", - "150043" - ], - "biography_txt": [ - "150041", - "150042", - "150043" + 150041, + 150042, + 150043 ], "biography_reward1": [ { @@ -1444,10 +1325,10 @@ "key": "hero_24002", "text": "牙仙" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1477,14 +1358,9 @@ 3 ], "biography_name": [ - "240021", - "240022", - "240023" - ], - "biography_txt": [ - "240021", - "240022", - "240023" + 240021, + 240022, + 240023 ], "biography_reward1": [ { @@ -1542,10 +1418,10 @@ "key": "hero_24003", "text": "睡神沙人" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1575,14 +1451,9 @@ 3 ], "biography_name": [ - "240031", - "240032", - "240033" - ], - "biography_txt": [ - "240031", - "240032", - "240033" + 240031, + 240032, + 240033 ], "biography_reward1": [ { @@ -1640,10 +1511,10 @@ "key": "hero_24004", "text": "邦尼兔" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1673,14 +1544,9 @@ 3 ], "biography_name": [ - "240041", - "240042", - "240043" - ], - "biography_txt": [ - "240041", - "240042", - "240043" + 240041, + 240042, + 240043 ], "biography_reward1": [ { @@ -1738,10 +1604,10 @@ "key": "hero_24005", "text": "金猴" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1771,14 +1637,9 @@ 3 ], "biography_name": [ - "240051", - "240052", - "240053" - ], - "biography_txt": [ - "240051", - "240052", - "240053" + 240051, + 240052, + 240053 ], "biography_reward1": [ { @@ -1836,10 +1697,10 @@ "key": "hero_24008", "text": "暴芙那特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1869,14 +1730,9 @@ 3 ], "biography_name": [ - "240081", - "240082", - "240083" - ], - "biography_txt": [ - "240081", - "240082", - "240083" + 240081, + 240082, + 240083 ], "biography_reward1": [ { @@ -1934,10 +1790,10 @@ "key": "hero_25001", "text": "阿宝" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1967,14 +1823,9 @@ 3 ], "biography_name": [ - "250011", - "250012", - "250013" - ], - "biography_txt": [ - "250011", - "250012", - "250013" + 250011, + 250012, + 250013 ], "biography_reward1": [ { @@ -2032,10 +1883,10 @@ "key": "hero_25003", "text": "羊仙姑" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2065,14 +1916,9 @@ 3 ], "biography_name": [ - "250031", - "250032", - "250033" - ], - "biography_txt": [ - "250031", - "250032", - "250033" + 250031, + 250032, + 250033 ], "biography_reward1": [ { @@ -2130,10 +1976,10 @@ "key": "hero_25004", "text": "波比" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2163,14 +2009,9 @@ 3 ], "biography_name": [ - "250041", - "250042", - "250043" - ], - "biography_txt": [ - "250041", - "250042", - "250043" + 250041, + 250042, + 250043 ], "biography_reward1": [ { @@ -2228,10 +2069,10 @@ "key": "hero_34001", "text": "贫嘴驴" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2261,14 +2102,9 @@ 3 ], "biography_name": [ - "340011", - "340012", - "340013" - ], - "biography_txt": [ - "340011", - "340012", - "340013" + 340011, + 340012, + 340013 ], "biography_reward1": [ { @@ -2326,10 +2162,10 @@ "key": "hero_34003", "text": "圣诞老人" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2359,14 +2195,9 @@ 3 ], "biography_name": [ - "340031", - "340032", - "340033" - ], - "biography_txt": [ - "340031", - "340032", - "340033" + 340031, + 340032, + 340033 ], "biography_reward1": [ { @@ -2424,10 +2255,10 @@ "key": "hero_34004", "text": "瓜哥" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2457,14 +2288,9 @@ 3 ], "biography_name": [ - "340041", - "340042", - "340043" - ], - "biography_txt": [ - "340041", - "340042", - "340043" + 340041, + 340042, + 340043 ], "biography_reward1": [ { @@ -2522,10 +2348,10 @@ "key": "hero_34006", "text": "冰霜杰克" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2555,14 +2381,9 @@ 3 ], "biography_name": [ - "340061", - "340062", - "340063" - ], - "biography_txt": [ - "340061", - "340062", - "340063" + 340061, + 340062, + 340063 ], "biography_reward1": [ { @@ -2620,10 +2441,10 @@ "key": "hero_34008", "text": "悍夫那特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2653,14 +2474,9 @@ 3 ], "biography_name": [ - "340081", - "340082", - "340083" - ], - "biography_txt": [ - "340081", - "340082", - "340083" + 340081, + 340082, + 340083 ], "biography_reward1": [ { @@ -2718,10 +2534,10 @@ "key": "hero_35001", "text": "师父" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2751,14 +2567,9 @@ 3 ], "biography_name": [ - "350011", - "350012", - "350013" - ], - "biography_txt": [ - "350011", - "350012", - "350013" + 350011, + 350012, + 350013 ], "biography_reward1": [ { @@ -2816,10 +2627,10 @@ "key": "hero_35002", "text": "希卡普" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2849,14 +2660,9 @@ 3 ], "biography_name": [ - "350021", - "350022", - "350023" - ], - "biography_txt": [ - "350021", - "350022", - "350023" + 350021, + 350022, + 350023 ], "biography_reward1": [ { @@ -2914,10 +2720,10 @@ "key": "hero_35003", "text": "漆黑" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2947,14 +2753,9 @@ 3 ], "biography_name": [ - "350031", - "350032", - "350033" - ], - "biography_txt": [ - "350031", - "350032", - "350033" + 350031, + 350032, + 350033 ], "biography_reward1": [ { @@ -3012,10 +2813,10 @@ "key": "hero_35004", "text": "黛安·福克斯顿" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3045,14 +2846,9 @@ 3 ], "biography_name": [ - "350041", - "350042", - "350043" - ], - "biography_txt": [ - "350041", - "350042", - "350043" + 350041, + 350042, + 350043 ], "biography_reward1": [ { @@ -3110,10 +2906,10 @@ "key": "hero_35006", "text": "平先生" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3143,14 +2939,9 @@ 3 ], "biography_name": [ - "350061", - "350062", - "350063" - ], - "biography_txt": [ - "350061", - "350062", - "350063" + 350061, + 350062, + 350063 ], "biography_reward1": [ { @@ -3208,10 +2999,10 @@ "key": "hero_43005", "text": "瓦希尔指挥官" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3241,12 +3032,8 @@ 3 ], "biography_name": [ - "430051", - "430052" - ], - "biography_txt": [ - "430051", - "430052" + 430051, + 430052 ], "biography_reward1": [ { @@ -3304,10 +3091,10 @@ "key": "hero_43007", "text": "戈伯" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3337,14 +3124,9 @@ 3 ], "biography_name": [ - "430071", - "430072", - "430073" - ], - "biography_txt": [ - "430071", - "430072", - "430073" + 430071, + 430072, + 430073 ], "biography_reward1": [ { @@ -3402,10 +3184,10 @@ "key": "hero_44006", "text": "悍娇虎" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3435,14 +3217,9 @@ 3 ], "biography_name": [ - "440061", - "440062", - "440063" - ], - "biography_txt": [ - "440061", - "440062", - "440063" + 440061, + 440062, + 440063 ], "biography_reward1": [ { @@ -3500,10 +3277,10 @@ "key": "hero_45001", "text": "乌龟大师" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3533,14 +3310,9 @@ 3 ], "biography_name": [ - "450011", - "450012", - "450013" - ], - "biography_txt": [ - "450011", - "450012", - "450013" + 450011, + 450012, + 450013 ], "biography_reward1": [ { @@ -3598,10 +3370,10 @@ "key": "hero_53001", "text": "埃雷特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3631,14 +3403,9 @@ 3 ], "biography_name": [ - "530011", - "530012", - "530013" - ], - "biography_txt": [ - "530011", - "530012", - "530013" + 530011, + 530012, + 530013 ], "biography_reward1": [ { @@ -3696,10 +3463,10 @@ "key": "hero_54005", "text": "无牙仔" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3729,14 +3496,9 @@ 3 ], "biography_name": [ - "540051", - "540052", - "540053" - ], - "biography_txt": [ - "540051", - "540052", - "540053" + 540051, + 540052, + 540053 ], "biography_reward1": [ { diff --git a/bin/json/game_global.json b/bin/json/game_global.json index b810bdc20..3e9776337 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -682,6 +682,8 @@ "business_maxint": 1000, "business_bag": 20, "business_rewardday": 1, - "business_renovatething": 180 + "business_renovatething": 180, + "favorability_likes": 1500, + "favorability_dislikes": 500 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index fe14be47e..9f777ec87 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6192,7 +6192,7 @@ { "Id": 224004311, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6215,7 +6215,7 @@ { "Id": 224004312, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6239,7 +6239,7 @@ { "Id": 224004313, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6263,7 +6263,7 @@ { "Id": 224004321, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6286,7 +6286,7 @@ { "Id": 224004331, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6309,7 +6309,7 @@ { "Id": 224004341, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6332,7 +6332,7 @@ { "Id": 224004351, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6355,7 +6355,7 @@ { "Id": 224004361, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 1dced6dff..e5e119e09 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -21,6 +21,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z009", "buffeffect": "", "buffpos": "根节点" @@ -47,6 +48,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z003", "buffeffect": "", "buffpos": "根节点" @@ -73,6 +75,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z011", "buffeffect": "", "buffpos": "根节点" @@ -99,6 +102,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -125,6 +129,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z008", "buffeffect": "", "buffpos": "根节点" @@ -151,6 +156,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j016", "buffeffect": "", "buffpos": "根节点" @@ -177,6 +183,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j001", "buffeffect": "", "buffpos": "根节点" @@ -203,6 +210,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j006", "buffeffect": "", "buffpos": "根节点" @@ -229,6 +237,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -255,6 +264,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -281,6 +291,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -307,6 +318,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -333,6 +345,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j009", "buffeffect": "", "buffpos": "根节点" @@ -359,6 +372,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j005", "buffeffect": "", "buffpos": "根节点" @@ -383,6 +397,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z007", "buffeffect": "", "buffpos": "根节点" @@ -409,6 +424,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z002", "buffeffect": "", "buffpos": "根节点" @@ -433,6 +449,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j007", "buffeffect": "effect_debuff_yun", "buffpos": "根节点" @@ -457,8 +474,9 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j008", - "buffeffect": "effect_jiaoxia_jiaobing\u00A0", + "buffeffect": "effect_jiaoxia_jiaobing", "buffpos": "脚底" }, { @@ -481,6 +499,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j012", "buffeffect": "", "buffpos": "根节点" @@ -505,6 +524,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j015", "buffeffect": "", "buffpos": "根节点" @@ -529,6 +549,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j004", "buffeffect": "", "buffpos": "根节点" @@ -553,6 +574,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j010", "buffeffect": "", "buffpos": "根节点" @@ -577,6 +599,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z005", "buffeffect": "", "buffpos": "根节点" @@ -605,9 +628,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "effect_hudun_1", - "buffpos": "根节点" + "buffpos": "胸" }, { "Id": 390001113, @@ -629,6 +653,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -653,6 +678,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -677,6 +703,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j013", "buffeffect": "", "buffpos": "根节点" @@ -701,6 +728,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -725,6 +753,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -749,6 +778,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j014", "buffeffect": "effect_debuff_sleep", "buffpos": "根节点" @@ -773,6 +803,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts003", "buffeffect": "", "buffpos": "根节点" @@ -797,6 +828,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts004", "buffeffect": "", "buffpos": "根节点" @@ -821,6 +853,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts005", "buffeffect": "", "buffpos": "根节点" @@ -849,9 +882,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001123, @@ -877,9 +911,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001124, @@ -901,6 +936,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -929,6 +965,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -953,6 +990,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -977,6 +1015,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z004", "buffeffect": "effect_34002_skill_1_hit", "buffpos": "胸" @@ -1001,6 +1040,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z001", "buffeffect": "", "buffpos": "根节点" @@ -1029,9 +1069,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001130, @@ -1057,9 +1098,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001201, @@ -1081,6 +1123,7 @@ "RemoveType": false, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts003", "buffeffect": "", "buffpos": "根节点" @@ -1108,6 +1151,7 @@ "RemoveType": false, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts004", "buffeffect": "effect_14001_skill_2", "buffpos": "根节点" @@ -1132,6 +1176,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts005", "buffeffect": "", "buffpos": "根节点" @@ -1156,6 +1201,7 @@ "RemoveType": false, "OverlayTimes": 8, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1180,6 +1226,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1204,6 +1251,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts007", "buffeffect": "", "buffpos": "根节点" @@ -1230,6 +1278,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts007", "buffeffect": "", "buffpos": "根节点" @@ -1254,6 +1303,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts001", "buffeffect": "", "buffpos": "根节点" @@ -1280,6 +1330,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts002", "buffeffect": "", "buffpos": "根节点" @@ -1304,6 +1355,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1331,6 +1383,7 @@ "RemoveType": false, "OverlayTimes": 50, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts008", "buffeffect": "", "buffpos": "根节点" @@ -1357,6 +1410,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j002", "buffeffect": "", "buffpos": "根节点" @@ -1381,6 +1435,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1407,6 +1462,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z011", "buffeffect": "", "buffpos": "根节点" @@ -1431,6 +1487,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1455,6 +1512,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1481,6 +1539,7 @@ "RemoveType": false, "OverlayTimes": 8, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1507,6 +1566,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1533,6 +1593,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1559,6 +1620,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1585,6 +1647,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1611,6 +1674,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1637,6 +1701,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1663,6 +1728,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1689,6 +1755,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1715,6 +1782,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1741,6 +1809,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1767,6 +1836,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1793,6 +1863,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1819,6 +1890,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1845,6 +1917,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1871,6 +1944,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1897,6 +1971,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1923,6 +1998,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1949,6 +2025,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1975,6 +2052,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2001,6 +2079,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2027,6 +2106,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2053,6 +2133,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2079,6 +2160,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2105,6 +2187,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2131,6 +2214,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2157,6 +2241,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2183,6 +2268,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2209,6 +2295,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j003", "buffeffect": "effect_debuff_zhongdu", "buffpos": "Bip001" @@ -2235,6 +2322,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2261,6 +2349,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2285,6 +2374,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2312,6 +2402,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2338,6 +2429,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2364,6 +2456,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2391,6 +2484,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2417,6 +2511,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2443,6 +2538,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2469,6 +2565,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2495,6 +2592,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2519,6 +2617,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2545,6 +2644,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2571,6 +2671,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2595,6 +2696,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2621,6 +2723,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2647,6 +2750,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2675,9 +2779,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001421, @@ -2699,6 +2804,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2725,6 +2831,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2751,6 +2858,7 @@ "RemoveType": true, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2775,6 +2883,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2801,6 +2910,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2825,6 +2935,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2851,6 +2962,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2877,6 +2989,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2901,6 +3014,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2925,6 +3039,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2951,6 +3066,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -2975,6 +3091,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2999,6 +3116,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -3027,9 +3145,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001435, @@ -3051,6 +3170,7 @@ "RemoveType": false, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -3077,6 +3197,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -3103,6 +3224,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3129,6 +3251,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z003", "buffeffect": "", "buffpos": "根节点" @@ -3155,6 +3278,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -3181,6 +3305,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z008", "buffeffect": "", "buffpos": "根节点" @@ -3207,6 +3332,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3233,6 +3359,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3260,6 +3387,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -3286,6 +3414,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index c202cd671..aae9609c8 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -778,7 +778,7 @@ "When": 3, "FromCheck": "Target=3,HasBuff=390001202,OverlayNum=10", "TargetCheck": "Target=2", - "MainSkillCheck": "114001311", + "MainSkillCheck": "MainSkillID=114001311", "AfterSkillCheck": "", "BuffCheck": "", "AddCon": [], diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index 3abb2142a..1fcd15d19 100644 --- a/modules/library/api_getfetterlist.go +++ b/modules/library/api_getfetterlist.go @@ -13,8 +13,7 @@ func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.Libra func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode, data *pb.ErrorData) { - code = this.GetFetterListCheck(session, req) - if code != pb.ErrorCode_Success { + if code = this.GetFetterListCheck(session, req); code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } rsp := &pb.LibraryGetFetterListResp{} diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index bb81178ba..c33ce3519 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -13,20 +13,39 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.LibraryGe return } +// 羁绊等级奖励 func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetRewardCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } + // 配置校验 + rsp := &pb.LibraryGetRewardResp{} - defer session.SendMsg(string(this.module.GetType()), LibraryGetRewardResp, rsp) fetter := this.module.getLibraryByObjID(session.GetUserId(), req.ObjId) if fetter == nil { code = pb.ErrorCode_LibraryNoData return } - + if conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv); len(conf) == 0 { + code = pb.ErrorCode_ConfigNoFound + return + } else { + if conf[0].FavorabilityLv > fetter.Fetterlv { + code = pb.ErrorCode_LibraryLvReward + return + } + } + if _, ok := fetter.Prize[req.Fetterlv]; ok { + code = pb.ErrorCode_LibraryReward + return + } + // 等级校验 + if req.Fetterlv > fetter.Fetterlv { + code = pb.ErrorCode_LibraryLvReward + return + } fetter.Prize[req.Fetterlv] = 1 // 发奖 @@ -34,5 +53,6 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa mapData["prize"] = fetter.Prize this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 rsp.Data = fetter + session.SendMsg(string(this.module.GetType()), LibraryGetRewardResp, rsp) return } diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index f6fdfcc65..da36717d5 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -7,6 +7,7 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -32,6 +33,11 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe code = pb.ErrorCode_ReqParameterError return } + favorConf := this.module.configure.GetFavorability(_heroFetter.Heroid, 1) // 取1级的就可以 + if favorConf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } if req.History != 0 { // 领取传记往事id for _, v := range _heroFetter.History { if v == req.History { // 已经领取过奖励 @@ -39,6 +45,40 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe return } } + // 等级规则校验 + l := len(_heroFetter.History) + if len(favorConf.Favorlv) < l { + if favorConf.Favorlv[l] > _heroFetter.Favorlv { // 等级不够 + code = pb.ErrorCode_LibraryLvReward + return + } + } + for iPos, v := range favorConf.BiographyName { + + var res []*cfg.Gameatn + if v == req.History { + switch iPos { + case 1: + res = append(res, favorConf.BiographyReward1...) + case 2: + res = append(res, favorConf.BiographyReward2...) + case 3: + res = append(res, favorConf.BiographyReward3...) + } + break + } + if len(res) > 0 { + if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { + return + } + } else { + this.module.Errorf("领取奖励配置错误:%d", req.History) + code = pb.ErrorCode_LibraryLvReward + return + } + + } + _heroFetter.History = append(_heroFetter.History, req.History) update["history"] = _heroFetter.History } else if req.Story != 0 { // 领取故事ID @@ -48,7 +88,39 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe return } } - _heroFetter.Stroyprize = append(_heroFetter.Stroyprize, req.History) + // 等级规则校验 + l := len(_heroFetter.Stroyprize) + if len(favorConf.PlotUnlock) < l { + if favorConf.PlotUnlock[l] > _heroFetter.Favorlv { // 等级不够 + code = pb.ErrorCode_LibraryLvReward + return + } + } + + if favorConf.Rightend == req.Story { // 完美结局 + if code = this.module.DispenseRes(session, favorConf.SpecialStroyprize, true); code != pb.ErrorCode_Success { + return + } + } else { // 普通结局 + bFound := false + for _, v := range favorConf.Endid { + + if v == req.Story { + if code = this.module.DispenseRes(session, favorConf.Stroyprize, true); code != pb.ErrorCode_Success { + return + } + bFound = true + break + } + } + if !bFound { + this.module.Errorf("领取奖励配置错误:%d", req.Story) + code = pb.ErrorCode_LibraryLvReward + return + } + } + + _heroFetter.Stroyprize = append(_heroFetter.Stroyprize, req.Story) update["stroyprize"] = _heroFetter.Stroyprize } this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroFetter.Id, update) diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index 973ba0b46..ebc006435 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -78,6 +78,7 @@ func (this *configureComp) GetFavorability(hid string, lv int32) *cfg.GameFavora return this.favorability[hid+"-"+strconv.Itoa(int(lv))] } + func (this *configureComp) SetFriendData() { if v, err := this.GetConfigure(game_friends); err == nil { this.friend = make(map[int64][]*cfg.GameFriendsData, 0) diff --git a/sys/configure/structs/Game.FavorabilityData.go b/sys/configure/structs/Game.FavorabilityData.go index 2b5fffaae..bae6ca2f1 100644 --- a/sys/configure/structs/Game.FavorabilityData.go +++ b/sys/configure/structs/Game.FavorabilityData.go @@ -27,8 +27,7 @@ type GameFavorabilityData struct { OrdinaryTxt string DislikingTxt string Favorlv []int32 - BiographyName []string - BiographyTxt []string + BiographyName []int32 BiographyReward1 []*Gameatn BiographyReward2 []*Gameatn BiographyReward3 []*Gameatn @@ -120,29 +119,15 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err var _ok_ bool if _arr_, _ok_ = _buf["biography_name"].([]interface{}); !_ok_ { err = errors.New("biography_name error"); return } - _v.BiographyName = make([]string, 0, len(_arr_)) + _v.BiographyName = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + 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.BiographyName = append(_v.BiographyName, _list_v_) } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["biography_txt"].([]interface{}); !_ok_ { err = errors.New("biography_txt error"); return } - - _v.BiographyTxt = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.BiographyTxt = append(_v.BiographyTxt, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go index b72ccc6e7..9066ab081 100644 --- a/sys/configure/structs/game.coinData.go +++ b/sys/configure/structs/game.coinData.go @@ -33,7 +33,7 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } - { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 5cc3afaef..22c982fca 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -212,6 +212,8 @@ type GameGlobalData struct { BusinessBag int32 BusinessRewardday int32 BusinessRenovatething int32 + FavorabilityLikes int32 + FavorabilityDislikes int32 } const TypeId_GameGlobalData = 477542761 @@ -838,6 +840,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_bag"].(float64); !_ok_ { err = errors.New("business_bag error"); return }; _v.BusinessBag = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rewardday"].(float64); !_ok_ { err = errors.New("business_rewardday error"); return }; _v.BusinessRewardday = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go index 48d5715db..0ad0b1d91 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -24,6 +24,7 @@ type GameSkillBuffData struct { RemoveType bool OverlayTimes byte SameID bool + Golbalbufficon string BuffIcon string Buffeffect string Buffpos string @@ -88,6 +89,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.RemoveType, _ok_ = _buf["RemoveType"].(bool); !_ok_ { err = errors.New("RemoveType error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OverlayTimes"].(float64); !_ok_ { err = errors.New("OverlayTimes error"); return }; _v.OverlayTimes = byte(_tempNum_) } { var _ok_ bool; if _v.SameID, _ok_ = _buf["SameID"].(bool); !_ok_ { err = errors.New("SameID error"); return } } + { var _ok_ bool; if _v.Golbalbufficon, _ok_ = _buf["golbalbufficon"].(string); !_ok_ { err = errors.New("golbalbufficon error"); return } } { var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["buffIcon"].(string); !_ok_ { err = errors.New("buffIcon error"); return } } { var _ok_ bool; if _v.Buffeffect, _ok_ = _buf["buffeffect"].(string); !_ok_ { err = errors.New("buffeffect error"); return } } { var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } } From 702375e8b3a134b8ef1197fa4f9ac6c0293f8114 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 20 Apr 2023 11:58:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B5=A0=E9=80=81=E7=BE=8E=E9=A3=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_coin.json | 88 +++-- bin/json/game_dispatch_task.json | 146 +++---- bin/json/game_global.json | 16 +- bin/json/game_msgdistrib.json | 6 + bin/json/game_pandamasmryl.json | 48 +-- bin/json/game_skillafteratk.json | 111 ++++-- bin/json/game_skillatk.json | 3 +- bin/json/game_skillpassive.json | 14 + modules/hero/hero_test.go | 12 + modules/library/api_getfetterlist.go | 15 + modules/library/api_getlist.go | 1 + modules/library/api_usegift.go | 97 +++-- modules/user/model_expand.go | 3 + pb/errorcode.pb.go | 371 +++++++++--------- pb/library_db.pb.go | 71 ++-- pb/library_msg.pb.go | 144 +++---- .../structs/Game.FavorabilityData.go | 16 +- sys/configure/structs/Game.kv.go | 37 ++ sys/configure/structs/game.coinData.go | 2 +- .../structs/game.equipAttrlibrary.go | 14 +- sys/configure/structs/game.globalData.go | 15 + 21 files changed, 746 insertions(+), 484 deletions(-) create mode 100644 sys/configure/structs/Game.kv.go diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index e7dfcdbb9..1b24c43cb 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -1,7 +1,10 @@ [ { "key": "gold", - "name": "gold", + "name": { + "key": "item_coin_name_gold", + "text": "金币" + }, "color": 1, "effects": "", "access": 123, @@ -13,7 +16,10 @@ }, { "key": "diamond", - "name": "Diamond ", + "name": { + "key": "item_coin_name_diamond", + "text": "钻石" + }, "color": 2, "effects": "", "access": 158, @@ -25,7 +31,10 @@ }, { "key": "exp", - "name": "exp", + "name": { + "key": "item_coin_name_exp", + "text": "角色经验" + }, "color": 3, "effects": "", "access": 113, @@ -37,7 +46,10 @@ }, { "key": "friendPoint", - "name": "Friendship point", + "name": { + "key": "item_coin_name_friendPoint", + "text": "友情点" + }, "color": 1, "effects": "", "access": 115, @@ -49,7 +61,10 @@ }, { "key": "palyexp", - "name": "palyexp", + "name": { + "key": "item_coin_name_palyexp", + "text": "废弃角色经验" + }, "color": 3, "effects": "", "access": 113, @@ -61,110 +76,137 @@ }, { "key": "guildexp", - "name": "guildexp", + "name": { + "key": "item_coin_name_guildexp", + "text": "公会经验" + }, "color": 1, "effects": "", "access": 157, "img": "wp_icon_10024", "intr": { "key": "item_coin_intr_guildexp", - "text": "有多种功能的基础货币" + "text": "可以用于提升公会等级" } }, { "key": "guildactive", - "name": "guildactive", + "name": { + "key": "item_coin_name_guildactive", + "text": "公会活跃度" + }, "color": 1, "effects": "", "access": 157, "img": "wp_icon_0001", "intr": { "key": "item_coin_intr_guildactive", - "text": "有多种功能的基础货币" + "text": "通过公会任务获取，达到一定活跃度公会成员都可以在公会任务界面领取奖励" } }, { "key": "guildcoin", - "name": "guildcoin", + "name": { + "key": "item_coin_name_guildcoin", + "text": "公会币" + }, "color": 3, "effects": "", "access": 157, "img": "wp_icon_10017", "intr": { "key": "item_coin_intr_guildcoin", - "text": "有多种功能的基础货币" + "text": "可以用于在公会商店兑换各种道具" } }, { "key": "starcoin", - "name": "starcoin", + "name": { + "key": "item_coin_name_starcoin", + "text": "星图币" + }, "color": 3, "effects": "", "access": 158, "img": "wp_icon_10017", "intr": { "key": "item_coin_intr_starcoin", - "text": "有多种功能的基础货币" + "text": "点亮星图的必要道具" } }, { "key": "vipexp", - "name": "vipexp", + "name": { + "key": "item_coin_name_vipexp", + "text": "商会经验" + }, "color": 3, "effects": "", "access": 158, "img": "wp_icon_0002", "intr": { "key": "item_coin_intr_vipexp", - "text": "有多种功能的基础货币" + "text": "商会地位的象征，积累一定声望可以提升商会等级" } }, { "key": "arenacoin", - "name": "arenacoin", + "name": { + "key": "item_coin_name_arenacoin", + "text": "竞技场币" + }, "color": 3, "effects": "", "access": 156, "img": "icon_ry", "intr": { "key": "item_coin_intr_arenacoin", - "text": "有多种功能的基础货币" + "text": "向竞技比赛强者发放的兑换币，可以在竞技商店兑换多种奖励" } }, { "key": "ps", - "name": "ps", + "name": { + "key": "item_coin_name_ps", + "text": "体力值" + }, "color": 3, "effects": "", "access": 156, "img": "wp_icon_0002", "intr": { "key": "item_coin_intr_ps", - "text": "有多种功能的基础货币" + "text": "挑战关卡必备" } }, { "key": "heroexp", - "name": "heroexp", + "name": { + "key": "item_coin_name_heroexp", + "text": "英雄经验" + }, "color": 3, "effects": "", "access": 0, "img": "wp_icon_10009", "intr": { "key": "item_coin_intr_heroexp", - "text": "有多种功能的基础货币" + "text": "累积到一定值会提升英雄等级" } }, { "key": "moongold", - "name": "Badge of honor", + "name": { + "key": "item_coin_name_moongold", + "text": "荣耀值" + }, "color": 5, "effects": "", "access": 107, "img": "wp_icon_10009", "intr": { "key": "item_coin_intr_moongold", - "text": "有多种功能的基础货币" + "text": "月亮币" } } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 724d80405..5520cd8b2 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 140, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 73, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 137, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 132, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 126, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 82, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 166, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 79, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 124, + "tasktime": 144, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 158, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 168, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 170, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 83, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 124, + "tasktime": 61, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 141, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 92, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 128, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 136, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 132, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 122, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 84, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 122, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 124, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 159, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 88, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 94, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 132, + "tasktime": 86, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 169, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 147, + "tasktime": 146, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 61, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 130, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 160, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 109, + "tasktime": 177, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 60, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 105, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 103, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 122, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 76, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 140, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 89, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 81, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 166, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 180, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 95, + "tasktime": 86, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 146, + "tasktime": 60, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 153, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 113, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 70, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 69, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 160, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 141, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 143, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 91, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 120, + "tasktime": 136, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 119, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 129, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 76, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 84, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 68, + "tasktime": 172, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 152, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 129, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 105, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 73, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 144, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 124, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 88, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 123, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 152, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 62, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 132, + "tasktime": 72, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 64, + "tasktime": 134, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 70, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 71, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 3e9776337..17e2b416b 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -684,6 +684,20 @@ "business_rewardday": 1, "business_renovatething": 180, "favorability_likes": 1500, - "favorability_dislikes": 500 + "favorability_dislikes": 500, + "favorability_attenuation": [ + { + "k": 3, + "v": 1000 + }, + { + "k": 6, + "v": 500 + }, + { + "k": 9, + "v": 250 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 0cdc521cf..c9666b435 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -118,5 +118,11 @@ "open": true, "routrules": "~/worker", "describe": "好友排行" + }, + { + "msgid": "parkour", + "open": true, + "routrules": "~/worker", + "describe": "捕羊大赛" } ] \ No newline at end of file diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json index c70c9a078..505123a29 100644 --- a/bin/json/game_pandamasmryl.json +++ b/bin/json/game_pandamasmryl.json @@ -5,9 +5,9 @@ "key": "wuguandongzuo_101", "text": "开合跳" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。" }, "ticks": 3, @@ -23,9 +23,9 @@ "key": "wuguandongzuo_102", "text": "手臂环绕" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。" }, "ticks": 3, @@ -41,9 +41,9 @@ "key": "wuguandongzuo_103", "text": "肩部拉伸" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "一只手臂放于胸前,与地面平行，另一只手臂将它拉向胸部。\n坚持一会儿，再拉伸另一侧肩膀，重复练习。" }, "ticks": 3, @@ -59,9 +59,9 @@ "key": "wuguandongzuo_104", "text": "波比" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "双脚与肩同宽，然后下蹲并双手着地,同时双腿向后蹬直。\n快速做一个俯卧撑的动作，然后起身向上跳起。重复这套动作。" }, "ticks": 3, @@ -77,9 +77,9 @@ "key": "wuguandongzuo_105", "text": "交错俯卧撑" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "从标准的俯卧撑姿势开始，但两只手一前一后。\n双臂做一个俯卧撑的动作，然后换另一只手靠前。注意身体要保持成一条直线的状态。" }, "ticks": 3, @@ -95,9 +95,9 @@ "key": "wuguandongzuo_106", "text": "钻石俯卧撑" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "四肢着地,双手的食指和拇指分别相对,放于脸颊下方。\n身体保持呈一条直线，然后做俯卧撑动作。" }, "ticks": 3, @@ -113,9 +113,9 @@ "key": "wuguandongzuo_107", "text": "掌上压后转身" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "从标准的俯卧撑姿势开始。向下做一个俯卧撑动作,起身的同时，旋转上半身，并将右臂向上伸直。\n然后换另一条手臂重复这一动作。这个动作能够锻炼你的胸部、肩膀和手臂,同时也能锻炼腹部肌肉。" }, "ticks": 3, @@ -131,9 +131,9 @@ "key": "wuguandongzuo_108", "text": "眼镜蛇式拉伸" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "腹部向下俯卧，肘部弯曲，双手放置在肩膀下方。\n然后胸部离地,尽量伸展。保持这个姿势数秒。" }, "ticks": 3, @@ -149,9 +149,9 @@ "key": "wuguandongzuo_109", "text": "胸部拉伸" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "站在门前，腿部呈弓步姿势，两臂倚在门框上，两肘略低于肩膀,胸部慢慢向前移。\n坚持30至40秒。慢慢还原姿势,手臂自然放下，再做几圈摆臂练习。" }, "ticks": 3, @@ -167,9 +167,9 @@ "key": "wuguandongzuo_110", "text": "原地跑" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "原地跑" }, "ticks": 3, @@ -185,9 +185,9 @@ "key": "wuguandongzuo_111", "text": "深蹲" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "深蹲" }, "ticks": 3, @@ -203,9 +203,9 @@ "key": "wuguandongzuo_112", "text": "仰卧起坐" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "仰卧起坐" }, "ticks": 3, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 9f777ec87..c4f6feea0 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -4176,36 +4176,10 @@ { "Id": 225001311, "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 3, - "Type": 1, - "Argu": [ - 1, - 4, - 400, - 1, - 5, - 500 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 225001312, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -4224,12 +4198,12 @@ "RevisiParams": [] }, { - "Id": 225001313, + "Id": 225001312, "EmitPR": 1000, "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -4247,6 +4221,32 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 225001313, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 400, + 1, + 5, + 500 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 225001321, "EmitPR": 1000, @@ -22504,7 +22504,9 @@ 1, 1 ], - "FollowSK": [], + "FollowSK": [ + 255002212 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -22537,6 +22539,55 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 255002213, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 455002211, + -1, + 0 + ], + "FollowSK": [ + 255002214 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 255002214, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001116, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 255002311, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 86deceed7..1fbaedad5 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -11757,7 +11757,8 @@ "Target": 0, "ChildSkill": { "Id": [ - 255002211 + 255002211, + 255002213 ] }, "Desc": { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index aae9609c8..5359eac4d 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1728,6 +1728,20 @@ 255002212 ] }, + { + "Id": 455002212, + "When": 2, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "AddCon": [], + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [] + }, { "Id": 414002212, "When": 12, diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index da707a3d5..de388f4b5 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -112,7 +112,19 @@ type sumy struct { } func Test_Main(t *testing.T) { + c := map[int32]int32{ + 3: 100, + 6: 250, + 9: 100, + } + out := make(map[int32]int32) + last := 1 + for iPos, v := range c { + for ; int32(last) <= iPos; last++ { + out[int32(last)] = v + } + } // 值包装结构体 d := reflect.ValueOf(sumy{ next: &sumy{}, diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index 1fcd15d19..f9aa5f030 100644 --- a/modules/library/api_getfetterlist.go +++ b/modules/library/api_getfetterlist.go @@ -3,6 +3,8 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + "go_dreamfactory/utils" ) //参数校验 @@ -19,6 +21,19 @@ func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGet rsp := &pb.LibraryGetFetterListResp{} rsp.Data = this.module.GetHeroFetterList(session.GetUserId()) + for _, v := range rsp.Data { + if !utils.IsToday(v.Ctime) { + update := map[string]interface{}{} + v.Ctime = configure.Now().Unix() + v.Givecount = 0 + update["givecount"] = 0 + update["ctime"] = v.Ctime + + if err := this.module.modelFetter.ChangeList(session.GetUserId(), v.Id, update); err != nil { + this.module.Errorf("modelFetter ChangeList error: %v", err) + } + } + } session.SendMsg(string(this.module.GetType()), LibraryGetFetterListResp, rsp) return diff --git a/modules/library/api_getlist.go b/modules/library/api_getlist.go index 1d25a74da..8104872a3 100644 --- a/modules/library/api_getlist.go +++ b/modules/library/api_getlist.go @@ -20,6 +20,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListRe rsp := &pb.LibraryGetListResp{} rsp.Data = this.module.GetLibraryList(session.GetUserId()) + session.SendMsg(string(this.module.GetType()), LibraryGetListResp, rsp) return diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 895c0086e..786ba2af3 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -9,7 +9,7 @@ import ( //参数校验 func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode) { - if req.Heroid == "" || len(req.Items) == 0 { + if req.Heroid == "" || req.Items == "" || req.Counts == 0 { code = pb.ErrorCode_ReqParameterError } return @@ -18,12 +18,15 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG // 给英雄赠送美食 func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( - res []*cfg.Gameatn - totalExp int32 - curStar int32 // 配置表星级 - maxLv int32 // 羁绊最大等级 - upLv int32 + res []*cfg.Gameatn + totalExp int32 + maxLv int32 // 羁绊最大等级 + upLv int32 + attenuation map[int32]int32 + likeStates int32 // 0 普通食物 1 喜欢 2 不喜欢 + add int32 ) + attenuation = make(map[int32]int32, 0) code = this.UseGiftCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 @@ -34,53 +37,83 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe code = pb.ErrorCode_HeroNoExist // 没找到对应的英雄信息 return } - // 查询该英雄原始的星级 - curStar = this.module.configure.GetHeroConfigStar(_heroObj.Heroid) - if curStar == 0 { + _exp := this.module.configure.GetFavorabilityExp(req.Heroid) + if len(_exp) == 0 { code = pb.ErrorCode_ConfigNoFound return } - // favorConf := this.configure.GetLibraryFavor(curStar) - // maxLv = int32(len(favorConf)) // 获取当前星级羁绊最大等级 + maxLv = int32(len(_exp)) // 获取当前星级羁绊最大等级 // 达到最大等级不让继续升级 if _heroObj.Favorlv >= maxLv { code = pb.ErrorCode_LibraryMaxLv return } - for k, v := range req.Items { // 校验数量 - res = append(res, &cfg.Gameatn{ - A: "item", - T: k, - N: v, - }) - conf, err := this.module.configure.GetItemConfigureData(k) - if err != nil { - this.module.Errorf("err:%v", err) - return - } - - totalExp += conf.SpecialType * v + // 获取当天最大的次数 + c := this.module.ModuleTools.GetGlobalConf().FavorabilityAttenuation + maxCoun := c[len(c)-1].K + 1 + if _heroObj.Givecount+req.Counts > maxCoun { // 当天赠送次数 + code = pb.ErrorCode_LibraryGiveMaxCount + return } + last := 1 + for iPos, v := range c { + for ; last <= iPos; last++ { + attenuation[int32(last)] = v.V // 3,1000|6,500|9,250 + } + } + for i := _heroObj.Givecount; i <= _heroObj.Givecount+req.Counts; i++ { + add += attenuation[i] + } + + // 校验是否是自己喜欢的食物 + _c := this.module.configure.GetFavorability(req.Heroid, _heroObj.Favorlv) + if _c != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + for _, v := range _c.LikesFood { // 喜欢的食物 + if v == req.Items { + likeStates = 1 + add += this.module.ModuleTools.GetGlobalConf().FavorabilityLikes * req.Counts + } + } + for _, v := range _c.DislikingFood { //不喜欢 + if v == req.Items { + likeStates = 2 + add += this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes * req.Counts + } + } + if likeStates == 0 { + add += req.Counts + } + res = append(res, &cfg.Gameatn{ + A: "item", + T: req.Items, + N: req.Counts, + }) + if code = this.module.CheckRes(session, res); code != pb.ErrorCode_Success { // 道具不够直接返回 return } - + // 100*1 + 100*0.25 + 100*0.5 + totalExp = add _heroObj.Favorexp += totalExp + // 折算出等级 for { if _heroObj.Favorlv >= maxLv { // 达到最大等级不让继续升级 code = pb.ErrorCode_LibraryMaxLv break } - // if favorConf[_heroObj.Favorlv] <= _heroObj.Favorexp { - // _heroObj.Favorexp -= favorConf[_heroObj.Favorlv] - // _heroObj.Favorlv += 1 - // upLv++ - // } else { - // break - // } + if _exp[_heroObj.Favorlv] <= _heroObj.Favorexp { + _heroObj.Favorexp -= _exp[_heroObj.Favorlv] + _heroObj.Favorlv += 1 + upLv++ + } else { + break + } } if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { //真正消耗 return diff --git a/modules/user/model_expand.go b/modules/user/model_expand.go index e3c6af25c..0dc3c2626 100644 --- a/modules/user/model_expand.go +++ b/modules/user/model_expand.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" "go_dreamfactory/sys/db" "go_dreamfactory/utils" @@ -51,6 +52,8 @@ func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err "sociatyTicket": globalConf.GuildBossInitialNum, //公会BOSS挑战券 "expitem": make(map[string]int32, 0), // 初始化 "mline": make(map[string]int32, 0), + "race": make(map[string]int32, 0), + "givetime": configure.Now().Unix(), } result.SociatyTicket = globalConf.GuildBossInitialNum if err = this.module.modelExpand.ChangeUserExpand(uid, initUpdate); err != nil { diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 705762dfd..318787427 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -233,6 +233,7 @@ const ( ErrorCode_LibraryLvReward ErrorCode = 2805 // 领奖等级没达到 ErrorCode_LibraryFetterTaskNoFound ErrorCode = 2806 //未找到羁绊任务数据 ErrorCode_LibraryPreTaskNoFinished ErrorCode = 2807 //前置任务未完成 + ErrorCode_LibraryGiveMaxCount ErrorCode = 2808 //送礼达到最大次数 // Battle ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败 ErrorCode_BattleNoWin ErrorCode = 2902 //战斗失败 @@ -563,6 +564,7 @@ var ( 2805: "LibraryLvReward", 2806: "LibraryFetterTaskNoFound", 2807: "LibraryPreTaskNoFinished", + 2808: "LibraryGiveMaxCount", 2901: "BattleValidationFailed", 2902: "BattleNoWin", 2903: "BattleCreateFailed", @@ -874,6 +876,7 @@ var ( "LibraryLvReward": 2805, "LibraryFetterTaskNoFound": 2806, "LibraryPreTaskNoFinished": 2807, + "LibraryGiveMaxCount": 2808, "BattleValidationFailed": 2901, "BattleNoWin": 2902, "BattleCreateFailed": 2903, @@ -1026,7 +1029,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xa8, 0x38, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xc2, 0x38, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1296,188 +1299,190 @@ var file_errorcode_proto_rawDesc = []byte{ 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, - 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, - 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, - 0x10, 0xd6, 0x16, 0x12, 0x17, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16, 0x0a, 0x11, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x10, 0xd8, 0x16, 0x12, 0x12, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x4f, 0x66, 0x66, 0x10, 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x43, 0x61, 0x70, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x46, - 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xda, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x4e, 0x6f, 0x4b, 0x65, 0x65, 0x70, 0x10, 0xdb, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, - 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, - 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, - 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, - 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, - 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, - 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x15, - 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x10, 0xc2, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xc3, 0x17, 0x12, - 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xc4, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc5, 0x17, 0x12, 0x14, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, - 0xc6, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, - 0x6e, 0x10, 0xc7, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, - 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc8, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc9, 0x17, 0x12, 0x14, 0x0a, - 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, - 0x10, 0xca, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, - 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xcb, 0x17, 0x12, 0x1c, 0x0a, 0x17, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xcc, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x64, 0x10, 0xcd, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, - 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x10, 0xcf, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xd1, 0x17, 0x12, 0x13, 0x0a, - 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, - 0xd2, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, - 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd3, 0x17, 0x12, 0x1a, - 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, - 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd4, 0x17, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd5, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x10, 0xd6, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xd7, 0x17, 0x12, 0x15, 0x0a, 0x10, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, - 0x10, 0xd8, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, - 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd9, 0x17, 0x12, 0x14, - 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, - 0x72, 0x10, 0xda, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, - 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xdb, 0x17, 0x12, 0x1b, 0x0a, - 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, - 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdc, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, - 0x74, 0x10, 0xdd, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xde, 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x10, 0xdf, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, - 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xe0, 0x17, 0x12, 0x1a, 0x0a, 0x15, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe1, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, - 0xe2, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, - 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, - 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, - 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, - 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, - 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, - 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, - 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, - 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, - 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, - 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, - 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, - 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, - 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, - 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, - 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, - 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, - 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, - 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, - 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, - 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, - 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, - 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, - 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, - 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, - 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, - 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, - 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, - 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, - 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, - 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, - 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, - 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, - 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, - 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, - 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1e, 0x0a, 0x19, - 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, - 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, - 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, - 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, - 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, - 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, - 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, - 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, - 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, - 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, - 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, - 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, - 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, - 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, - 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, - 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, - 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, - 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, - 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, - 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, - 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, - 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, - 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, - 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, - 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, - 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, - 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, - 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, - 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, - 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, - 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x51, 0x69, 0x65, - 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, - 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, - 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, - 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x10, 0xf7, 0x15, 0x12, 0x18, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, + 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xf8, 0x15, 0x12, 0x1b, + 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x17, 0x0a, + 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x16, 0x12, 0x12, + 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x66, 0x66, 0x10, + 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x61, 0x70, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, + 0xda, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x4b, 0x65, + 0x65, 0x70, 0x10, 0xdb, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, + 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, + 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, + 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, + 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, + 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, + 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, + 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, + 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xc2, 0x17, 0x12, + 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, + 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xc3, 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xc4, + 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x10, 0xc5, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xc6, 0x17, 0x12, 0x10, 0x0a, 0x0b, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xc7, 0x17, 0x12, 0x12, + 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, + 0xc8, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc9, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xca, 0x17, 0x12, 0x17, 0x0a, + 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x10, 0xcb, 0x17, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, + 0x74, 0x10, 0xcc, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xcd, 0x17, + 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xcf, + 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, + 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xd1, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xd2, 0x17, 0x12, 0x1a, 0x0a, 0x15, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, + 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd3, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x10, 0xd4, 0x17, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, + 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xd5, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, + 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xd6, 0x17, 0x12, + 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, + 0x73, 0x65, 0x64, 0x10, 0xd7, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd8, 0x17, 0x12, 0x19, 0x0a, + 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, + 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd9, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xda, 0x17, 0x12, 0x17, + 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xdb, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, + 0x68, 0x10, 0xdc, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, 0x74, 0x10, 0xdd, 0x17, 0x12, 0x15, + 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, + 0x6e, 0x64, 0x10, 0xde, 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xdf, 0x17, 0x12, 0x17, 0x0a, + 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xe0, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, + 0xe1, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xe2, 0x17, 0x12, 0x15, 0x0a, 0x10, + 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, + 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, + 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, + 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, + 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, + 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, + 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, + 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, + 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, + 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, + 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, + 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, + 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, + 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, + 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, + 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, + 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, + 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, + 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, + 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, + 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, + 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, + 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, + 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, + 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, + 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, + 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, + 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, + 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, + 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, + 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, + 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, + 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, + 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, + 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, + 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, + 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, + 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, + 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, + 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, + 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, + 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, + 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, + 0x65, 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, + 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, + 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, + 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, + 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, + 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, + 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, + 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, + 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, + 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, + 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, + 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, + 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, + 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, + 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, + 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, + 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, + 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, + 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, + 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, + 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, + 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, + 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, + 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, + 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, + 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, + 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, + 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, + 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, + 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, + 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, + 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, + 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, + 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, + 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, + 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index af6df257d..09df22432 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -30,7 +30,7 @@ type DBLibrary struct { Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 - Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 + Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级综合 Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 Activation bool `protobuf:"varint,8,opt,name=activation,proto3" json:"activation"` // 是否激活 } @@ -137,6 +137,8 @@ type DBHeroFetter struct { Favorexp int32 `protobuf:"varint,6,opt,name=favorexp,proto3" json:"favorexp"` // 好感度经验 Stroyprize []int32 `protobuf:"varint,7,rep,packed,name=stroyprize,proto3" json:"stroyprize"` // 剧情奖励 Lvprize map[int32]int32 `protobuf:"bytes,8,rep,name=lvprize,proto3" json:"lvprize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 等级奖励 + Givecount int32 `protobuf:"varint,9,opt,name=givecount,proto3" json:"givecount"` // 赠送次数 + Ctime int64 `protobuf:"varint,10,opt,name=ctime,proto3" json:"ctime"` // 送礼物时间 } func (x *DBHeroFetter) Reset() { @@ -227,6 +229,20 @@ func (x *DBHeroFetter) GetLvprize() map[int32]int32 { return nil } +func (x *DBHeroFetter) GetGivecount() int32 { + if x != nil { + return x.Givecount + } + return 0 +} + +func (x *DBHeroFetter) GetCtime() int64 { + if x != nil { + return x.Ctime + } + return 0 +} + //羁绊剧情 type DBFetterstory struct { state protoimpl.MessageState @@ -422,7 +438,7 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x69, 0x7a, 0x65, 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, 0x22, 0xaa, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0xde, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, @@ -437,30 +453,33 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x76, - 0x70, 0x72, 0x69, 0x7a, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, - 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, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, - 0x6f, 0x72, 0x79, 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, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, - 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, - 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, - 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, - 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, - 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, - 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, + 0x72, 0x69, 0x7a, 0x65, 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, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 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, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, + 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, + 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, + 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, + 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, + 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, + 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index f79a5ae12..e661b72f4 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -192,13 +192,13 @@ func (x *LibraryGetFetterListResp) GetData() []*DBHeroFetter { return nil } -// 领取奖励 +// 领取羁绊等级奖励 type LibraryGetRewardReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` + ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // DBLibrary 的ObjID Fetterlv int32 `protobuf:"varint,2,opt,name=fetterlv,proto3" json:"fetterlv"` // 羁绊等级 } @@ -412,8 +412,9 @@ type LibraryUseGiftReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 英雄id - Items map[string]int32 `protobuf:"bytes,2,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 道具ID value 数量 + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 英雄id + Items string `protobuf:"bytes,2,opt,name=items,proto3" json:"items"` // 道具ID + Counts int32 `protobuf:"varint,3,opt,name=counts,proto3" json:"counts"` //道具 数量 } func (x *LibraryUseGiftReq) Reset() { @@ -455,11 +456,18 @@ func (x *LibraryUseGiftReq) GetHeroid() string { return "" } -func (x *LibraryUseGiftReq) GetItems() map[string]int32 { +func (x *LibraryUseGiftReq) GetItems() string { if x != nil { return x.Items } - return nil + return "" +} + +func (x *LibraryUseGiftReq) GetCounts() int32 { + if x != nil { + return x.Counts + } + return 0 } type LibraryUseGiftResp struct { @@ -892,49 +900,45 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x9a, 0x01, 0x0a, 0x11, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, - 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x38, 0x0a, 0x0a, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0x37, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, - 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, - 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, - 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, - 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, - 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, - 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, - 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, + 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, + 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, + 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, + 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, + 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, + 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, + 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, + 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -949,7 +953,7 @@ func file_library_library_msg_proto_rawDescGZIP() []byte { return file_library_library_msg_proto_rawDescData } -var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_library_library_msg_proto_goTypes = []interface{}{ (*LibraryGetListReq)(nil), // 0: LibraryGetListReq (*LibraryGetListResp)(nil), // 1: LibraryGetListResp @@ -968,28 +972,26 @@ var file_library_library_msg_proto_goTypes = []interface{}{ (*LibraryLvRewardResp)(nil), // 14: LibraryLvRewardResp (*LibraryFetterstoryTaskReq)(nil), // 15: LibraryFetterstoryTaskReq (*LibraryFetterstoryTaskResp)(nil), // 16: LibraryFetterstoryTaskResp - nil, // 17: LibraryUseGiftReq.ItemsEntry - (*DBLibrary)(nil), // 18: DBLibrary - (*DBHeroFetter)(nil), // 19: DBHeroFetter - (*FetterTask)(nil), // 20: FetterTask + (*DBLibrary)(nil), // 17: DBLibrary + (*DBHeroFetter)(nil), // 18: DBHeroFetter + (*FetterTask)(nil), // 19: FetterTask } var file_library_library_msg_proto_depIdxs = []int32{ - 18, // 0: LibraryGetListResp.data:type_name -> DBLibrary - 19, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter - 18, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary - 19, // 3: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter - 17, // 4: LibraryUseGiftReq.items:type_name -> LibraryUseGiftReq.ItemsEntry - 19, // 5: LibraryUseGiftResp.data:type_name -> DBHeroFetter - 18, // 6: LibraryActivationFetterResp.data:type_name -> DBLibrary - 18, // 7: LibraryChangePush.data:type_name -> DBLibrary - 19, // 8: LibraryChangePush.fetter:type_name -> DBHeroFetter - 19, // 9: LibraryLvRewardResp.data:type_name -> DBHeroFetter - 20, // 10: LibraryFetterstoryTaskResp.list:type_name -> FetterTask - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 17, // 0: LibraryGetListResp.data:type_name -> DBLibrary + 18, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter + 17, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary + 18, // 3: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter + 18, // 4: LibraryUseGiftResp.data:type_name -> DBHeroFetter + 17, // 5: LibraryActivationFetterResp.data:type_name -> DBLibrary + 17, // 6: LibraryChangePush.data:type_name -> DBLibrary + 18, // 7: LibraryChangePush.fetter:type_name -> DBHeroFetter + 18, // 8: LibraryLvRewardResp.data:type_name -> DBHeroFetter + 19, // 9: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_library_library_msg_proto_init() } @@ -1210,7 +1212,7 @@ func file_library_library_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_library_library_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 18, + NumMessages: 17, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.FavorabilityData.go b/sys/configure/structs/Game.FavorabilityData.go index bae6ca2f1..1b5549207 100644 --- a/sys/configure/structs/Game.FavorabilityData.go +++ b/sys/configure/structs/Game.FavorabilityData.go @@ -21,8 +21,8 @@ type GameFavorabilityData struct { PrivilegeValue int32 ReturnReward []*Gameatn ReturnTxt string - LikesFood []int32 - DislikingFood []int32 + LikesFood []string + DislikingFood []string LikesTxt string OrdinaryTxt string DislikingTxt string @@ -74,11 +74,11 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err var _ok_ bool if _arr_, _ok_ = _buf["likes_food"].([]interface{}); !_ok_ { err = errors.New("likes_food error"); return } - _v.LikesFood = make([]int32, 0, len(_arr_)) + _v.LikesFood = make([]string, 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_) } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.LikesFood = append(_v.LikesFood, _list_v_) } } @@ -88,11 +88,11 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err var _ok_ bool if _arr_, _ok_ = _buf["disliking_food"].([]interface{}); !_ok_ { err = errors.New("disliking_food error"); return } - _v.DislikingFood = make([]int32, 0, len(_arr_)) + _v.DislikingFood = make([]string, 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_) } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.DislikingFood = append(_v.DislikingFood, _list_v_) } } diff --git a/sys/configure/structs/Game.kv.go b/sys/configure/structs/Game.kv.go new file mode 100644 index 000000000..ed2445c3b --- /dev/null +++ b/sys/configure/structs/Game.kv.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// 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 Gamekv struct { + K int32 + V int32 +} + +const TypeId_Gamekv = 1468999879 + +func (*Gamekv) GetTypeId() int32 { + return 1468999879 +} + +func (_v *Gamekv)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["k"].(float64); !_ok_ { err = errors.New("k error"); return }; _v.K = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["v"].(float64); !_ok_ { err = errors.New("v error"); return }; _v.V = int32(_tempNum_) } + return +} + +func DeserializeGamekv(_buf map[string]interface{}) (*Gamekv, error) { + v := &Gamekv{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go index 9066ab081..2ea0aa957 100644 --- a/sys/configure/structs/game.coinData.go +++ b/sys/configure/structs/game.coinData.go @@ -28,7 +28,7 @@ func (*GameCoinData) GetTypeId() int32 { func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } - { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + {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["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go index a6f783bec..b91463458 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -9,34 +9,26 @@ package cfg type GameEquipAttrlibrary struct { - _dataMap map[int32]*GameEquipAttrlibraryData _dataList []*GameEquipAttrlibraryData } func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibrary, error) { _dataList := make([]*GameEquipAttrlibraryData, 0, len(_buf)) - dataMap := make(map[int32]*GameEquipAttrlibraryData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameEquipAttrlibraryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v } } - return &GameEquipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { - return table._dataMap + return &GameEquipAttrlibrary{_dataList:_dataList}, nil } func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { return table._dataList } -func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { - return table._dataMap[key] +func (table *GameEquipAttrlibrary) Get(index int) *GameEquipAttrlibraryData { + return table._dataList[index] } - diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 22c982fca..2d85ebe1d 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -214,6 +214,7 @@ type GameGlobalData struct { BusinessRenovatething int32 FavorabilityLikes int32 FavorabilityDislikes int32 + FavorabilityAttenuation []*Gamekv } const TypeId_GameGlobalData = 477542761 @@ -842,6 +843,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["favorability_attenuation"].([]interface{}); !_ok_ { err = errors.New("favorability_attenuation error"); return } + + _v.FavorabilityAttenuation = make([]*Gamekv, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gamekv + { 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 = DeserializeGamekv(_x_); err != nil { return } } + _v.FavorabilityAttenuation = append(_v.FavorabilityAttenuation, _list_v_) + } + } + return } From 8811db5c1b866c017b296d8e9d453e73af8a52ba Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 20 Apr 2023 16:22:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=BE=81=E7=BB=8A=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 ++ modules/hero/model_hero.go | 29 +++++++++++++++++++ modules/hero/module.go | 21 ++++++++++++++ modules/library/api_getreward.go | 17 ++++++++++- modules/library/api_usegift.go | 12 +++++--- modules/library/module.go | 4 +-- .../structs/game.equipAttrlibrary.go | 18 ++++++++---- 7 files changed, 90 insertions(+), 13 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index 382b2312d..c30c3bd2e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -107,6 +107,8 @@ type ( // 跨服查询英雄详细信息 QueryCrossMultipleHeroinfo(oid []string) (hero []*pb.DBHero, err error) + + AddHeroFetterAttribute(session IUserSession, attr map[string][]*cfg.Gameatr) } //玩家 diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 350f3f13e..1f15f0cde 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -959,3 +959,32 @@ func (this *ModelHero) checkHeroAllSkillMax(hero *pb.DBHero) bool { } return true } +func (this *ModelHero) SetHeroFetterProperty(hero *pb.DBHero, attr []*cfg.Gameatr) { + if hero == nil || len(attr) == 0 { + return + } + if hero.Fetters == nil { + hero.Fetters = make(map[string]int32, 0) + } + for _, key := range attr { + value := key.N + switch key.A { + case comm.Hp: + hero.Fetters[comm.Hp] += int32(value) + case comm.Def: + hero.Fetters[comm.Def] += int32(value) + case comm.Atk: + hero.Fetters[comm.Atk] += int32(value) + case comm.Speed: + hero.Fetters[comm.Speed] += int32(value) + case comm.HpPro: + hero.Fetters[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp]))) + case comm.AtkPro: + hero.Fetters[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk]))) + case comm.DefPro: + hero.Fetters[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def]))) + default: + this.moduleHero.Errorf("unkonw hero fetter property:%v", key) + } + } +} diff --git a/modules/hero/module.go b/modules/hero/module.go index f8f99f29f..bfa7f0aba 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -977,3 +977,24 @@ func (this *Hero) QueryCrossMultipleHeroinfo(oid []string) (hero []*pb.DBHero, e return } + +func (this *Hero) AddHeroFetterAttribute(session comm.IUserSession, attr map[string][]*cfg.Gameatr) { + chanegCard := make([]*pb.DBHero, 0) + heroList := this.GetHeroList(session.GetUserId()) + for _, v := range heroList { + if v1, ok := attr[v.HeroID]; ok { // 找到对应的英雄ID + _heroMap := make(map[string]interface{}, 0) + this.modelHero.SetHeroFetterProperty(v, v1) + _heroMap["fetters"] = v.Fetters + // 保存数据 + err := this.modelHero.ChangeList(session.GetUserId(), v.Id, _heroMap) + if err != nil { + + this.Errorf("SetHeroFetterProperty failed:%v", err) + continue + } + chanegCard = append(chanegCard, v) + } + } + session.SendMsg(string(this.GetType()), "change", &pb.HeroChangePush{List: chanegCard}) +} diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index c33ce3519..265029643 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -3,6 +3,7 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -28,7 +29,8 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa code = pb.ErrorCode_LibraryNoData return } - if conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv); len(conf) == 0 { + conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv) + if len(conf) == 0 { code = pb.ErrorCode_ConfigNoFound return } else { @@ -49,6 +51,19 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa fetter.Prize[req.Fetterlv] = 1 // 发奖 + h := make(map[string][]*cfg.Gameatr, 0) + for _, v := range conf { + var sz []*cfg.Gameatr + for _, v1 := range v.Attribute { + b := &cfg.Gameatr{ + A: v1.A, + N: v1.N, + } + sz = append(sz, b) + } + h[v.Hid] = sz + } + this.module.ModuleHero.AddHeroFetterAttribute(session, h) mapData := make(map[string]interface{}, 0) mapData["prize"] = fetter.Prize this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 786ba2af3..17b73ab13 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -19,7 +19,6 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn - totalExp int32 maxLv int32 // 羁绊最大等级 upLv int32 attenuation map[int32]int32 @@ -97,14 +96,19 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe if code = this.module.CheckRes(session, res); code != pb.ErrorCode_Success { // 道具不够直接返回 return } + itemConf, err1 := this.module.configure.GetItemConfigureData(req.Items) // 获取食物的 + if err1 != nil { + this.module.Errorf("赠送菜品配置没找到：%s", req.Items) + code = pb.ErrorCode_ConfigNoFound + return + } // 100*1 + 100*0.25 + 100*0.5 - totalExp = add - _heroObj.Favorexp += totalExp + _heroObj.Favorexp += add * itemConf.SpecialType / 1000 // 折算出等级 for { if _heroObj.Favorlv >= maxLv { // 达到最大等级不让继续升级 - code = pb.ErrorCode_LibraryMaxLv + _heroObj.Favorexp = 0 break } if _exp[_heroObj.Favorlv] <= _heroObj.Favorexp { diff --git a/modules/library/module.go b/modules/library/module.go index 507842228..00d2a98ac 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -120,7 +120,6 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr } dbLibrary = append(dbLibrary, tmp) } else { // 有这条羁绊数据 - dbLibrary = append(dbLibrary, list) for _, v := range conf { if _, ok := list.Herofetter[v.Hid]; !ok { if _d := this.CheckHeroFetter(uid, v.Hid); _d == nil { @@ -130,6 +129,7 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr mapData := make(map[string]interface{}, 0) mapData["herofetter"] = list.Herofetter this.modelLibrary.modifyLibraryDataByObjId(uid, list.Id, mapData) // 更新新的羁绊信息 + dbLibrary = append(dbLibrary, list) } } } @@ -194,7 +194,7 @@ func (this *Library) CheckHeroFetter(uid string, hid string) (obj *pb.DBHeroFett // 创建一条英雄羁绊信息 func (this *Library) createHeroFetter(uid string, heroConfId string) (obj *pb.DBHeroFetter, err error) { - this.modelFetter.getHeroFetterList(uid) + obj = &pb.DBHeroFetter{ Id: primitive.NewObjectID().Hex(), Uid: uid, diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go index b91463458..968f74f27 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -9,26 +9,32 @@ package cfg type GameEquipAttrlibrary struct { - _dataList []*GameEquipAttrlibraryData + _dataMap map[int32]*GameEquipAttrlibraryData + _dataList []*GameEquipAttrlibraryData } func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibrary, error) { _dataList := make([]*GameEquipAttrlibraryData, 0, len(_buf)) + dataMap := make(map[int32]*GameEquipAttrlibraryData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameEquipAttrlibraryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v } } - return &GameEquipAttrlibrary{_dataList:_dataList}, nil + return &GameEquipAttrlibrary{_dataList: _dataList, _dataMap: dataMap}, nil +} + +func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { + return table._dataMap } func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { - return table._dataList + return table._dataList } -func (table *GameEquipAttrlibrary) Get(index int) *GameEquipAttrlibraryData { - return table._dataList[index] +func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { + return table._dataMap[key] } - From d8cb4f78affce66af5547dbb015a500baa17521e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 20 Apr 2023 16:27:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=98=B5=E8=90=A5?= =?UTF-8?q?=E6=80=BB=E5=A5=BD=E6=84=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/library/api_usegift.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 17b73ab13..399229462 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -133,6 +133,14 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe // 任务统计 //赠送英雄礼物并增加N点好感度 if upLv > 0 { + if rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 修改阵营累计好感度 + if heroCfg := this.module.configure.GetHeroConfig(req.Heroid); heroCfg != nil { + rst.Race[heroCfg.Race] += upLv + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ + "race": rst.Race, + }) + } + } // this.module.ModuleRtask.SendToRtask(session, comm.Rtype134, utils.ToInt32(_heroObj.Heroid), upLv) go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype134, utils.ToInt32(_heroObj.Heroid), upLv)) } From 5969eb80cd6c63573fb1652d5e3968ed3f0d0006 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 20 Apr 2023 18:32:04 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_friends.json | 12 +++++------ modules/library/comp_configure.go | 22 ++++++------------- modules/library/module.go | 35 +++++++++++++------------------ pb/hero_db.pb.go | 2 +- 4 files changed, 28 insertions(+), 43 deletions(-) diff --git a/bin/json/game_friends.json b/bin/json/game_friends.json index f4f50d05b..521416256 100644 --- a/bin/json/game_friends.json +++ b/bin/json/game_friends.json @@ -41,7 +41,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": "35001", + "hid": "14002", "attribute": [ { "a": "atk", @@ -49,7 +49,7 @@ } ], "attribute_txt": { - "key": "favorability_friends_friend_name_350011", + "key": "favorability_friends_friend_name_140021", "text": "攻击力+{0}" } }, @@ -95,7 +95,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": "35001", + "hid": "14002", "attribute": [ { "a": "atk", @@ -103,7 +103,7 @@ } ], "attribute_txt": { - "key": "favorability_friends_friend_name_350012", + "key": "favorability_friends_friend_name_140022", "text": "攻击力+{0}" } }, @@ -149,7 +149,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": "35001", + "hid": "14002", "attribute": [ { "a": "atk", @@ -157,7 +157,7 @@ } ], "attribute_txt": { - "key": "favorability_friends_friend_name_350013", + "key": "favorability_friends_friend_name_140023", "text": "攻击力+{0}" } }, diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index ebc006435..29e314f57 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -27,8 +27,6 @@ const ( type configureComp struct { modules.MCompConfigure hlock sync.RWMutex - // fetter map[int64]*cfg.GameLibraryFetterData - // favor map[int64]*cfg.GameLibraryFavorData favorability map[string]*cfg.GameFavorabilityData favorLvExp map[string][]int32 // key 英雄id value 每级升级所需要的经验值 @@ -40,25 +38,15 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) - // err = this.LoadMultiConfigure(map[string]interface{}{ - // game_libraryhero: cfg.NewGameLibraryHero, - // game_libraryhistory: cfg.NewGameLibraryHistory, - // game_libraryfavor: cfg.NewGameLibraryFavor, - // game_librarystory: cfg.NewGameLibraryStory, - // game_librarycomplot: cfg.NewGameLibraryComplot, - // }) - - // this.fetter = make(map[int64]*cfg.GameLibraryFetterData, 0) - // configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFetter) - // this.favor = make(map[int64]*cfg.GameLibraryFavorData, 0) - // configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFavor) configure.RegisterConfigure(game_favorability, cfg.NewGameFavorability, this.SetFavorability) - configure.RegisterConfigure(game_friends, cfg.NewGameLibraryFetter, this.SetFriendData) + configure.RegisterConfigure(game_friends, cfg.NewGameFriends, this.SetFriendData) return } func (this *configureComp) SetFavorability() { if v, err := this.GetConfigure(game_favorability); err == nil { + this.hlock.Lock() + defer this.hlock.Unlock() this.favorability = make(map[string]*cfg.GameFavorabilityData, 0) this.favorLvExp = make(map[string][]int32) if _configure, ok := v.(*cfg.GameFavorability); ok { @@ -81,6 +69,8 @@ func (this *configureComp) GetFavorability(hid string, lv int32) *cfg.GameFavora func (this *configureComp) SetFriendData() { if v, err := this.GetConfigure(game_friends); err == nil { + this.hlock.Lock() + defer this.hlock.Unlock() this.friend = make(map[int64][]*cfg.GameFriendsData, 0) this.heroFetter = make(map[string][]int32) if _configure, ok := v.(*cfg.GameFriends); ok { @@ -89,11 +79,11 @@ func (this *configureComp) SetFriendData() { this.friend[key] = append(this.friend[key], v1) this.heroFetter[v1.Hid] = append(this.heroFetter[v1.Hid], v1.FriendId) } - return } } else { err = fmt.Errorf("%T no is *cfg.SetFavorability", err) } + return } // id:羁绊id lv 羁绊等级 diff --git a/modules/library/module.go b/modules/library/module.go index 00d2a98ac..af1c08aa6 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -95,11 +95,7 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr szFid := this.configure.GetHeroFetterID(hid) for _, fid := range szFid { - conf := this.configure.GetFriendData(fid, 1) - if len(conf) == 0 { - this.modelFetter.module.Errorf("can't foun conf fid:%d", fid) - continue - } + if list := this.GetLibraryListByFid(uid, fid); list == nil { // 没有这条羁绊数据 tmp := &pb.DBLibrary{ // 创建一条羁绊数据 Id: primitive.NewObjectID().Hex(), @@ -108,29 +104,28 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr Herofetter: map[string]string{}, Prize: map[int32]int32{}, } - for _, v := range conf { - if _d := this.CheckHeroFetter(uid, v.Hid); _d != nil { // check DBHeroFetter - tmp.Herofetter[v.Hid] = _d.Id - fetter = append(fetter, _d) - } + + if _d := this.CheckHeroFetter(uid, hid); _d != nil { // check DBHeroFetter + tmp.Herofetter[hid] = _d.Id + fetter = append(fetter, _d) } + if err := this.modelLibrary.createLibrary(uid, tmp); err != nil { this.modelFetter.module.Errorf("createLibrary error: %v,obj:%v", err, tmp) continue } dbLibrary = append(dbLibrary, tmp) } else { // 有这条羁绊数据 - for _, v := range conf { - if _, ok := list.Herofetter[v.Hid]; !ok { - if _d := this.CheckHeroFetter(uid, v.Hid); _d == nil { - list.Herofetter[v.Hid] = _d.Id - fetter = append(fetter, _d) - } - mapData := make(map[string]interface{}, 0) - mapData["herofetter"] = list.Herofetter - this.modelLibrary.modifyLibraryDataByObjId(uid, list.Id, mapData) // 更新新的羁绊信息 - dbLibrary = append(dbLibrary, list) + + if _, ok := list.Herofetter[hid]; !ok { + if _d := this.CheckHeroFetter(uid, hid); _d == nil { + list.Herofetter[hid] = _d.Id + fetter = append(fetter, _d) } + mapData := make(map[string]interface{}, 0) + mapData["herofetter"] = list.Herofetter + this.modelLibrary.modifyLibraryDataByObjId(uid, list.Id, mapData) // 更新新的羁绊信息 + dbLibrary = append(dbLibrary, list) } } } diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 5c4207c3d..5e3988c4e 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -101,7 +101,7 @@ type DBHero struct { HoroscopeProperty map[string]int32 `protobuf:"bytes,28,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成 Fulllvenr int32 `protobuf:"varint,29,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用 KongfuUid string `protobuf:"bytes,30,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功 - Fetters map[string]int32 `protobuf:"bytes,31,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////羁绊属性加成 + Fetters map[string]int32 `protobuf:"bytes,31,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成 } func (x *DBHero) Reset() { From 6c3cf0b0138e6b2b5d108744e71a5bd0b3308e20 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 21 Apr 2023 18:46:43 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_activereward.json | 134 +- bin/json/game_camplv.json | 294 +- bin/json/game_favorability.json | 9 +- bin/json/game_global.json | 36 +- bin/json/game_huntingboss.json | 160 +- bin/json/game_initial.json | 10 + bin/json/game_item.json | 6 +- bin/json/game_mainstage.json | 24 + bin/json/game_monsterformat.json | 66 +- bin/json/game_opencond.json | 28 +- bin/json/game_rdtaskcondi.json | 8 +- bin/json/game_rdtasknpc.json | 172 +- bin/json/game_skillafteratk.json | 42 +- bin/json/game_skillatk.json | 16 +- bin/json/game_skillbuff.json | 2 +- bin/json/game_smithyatlas.json | 216 +- bin/json/game_taskactivereward.json | 134 +- bin/json/game_taskround.json | 3055 +---------------- bin/json/game_vikingboss.json | 248 +- bin/json/game_worldall.json | 26 +- bin/json/game_worldtask.json | 202 +- modules/library/api_getreward.go | 6 +- modules/library/api_usegift.go | 26 +- sys/configure/structs/Game.MainStageData.go | 2 + .../structs/game.activeRewardData.go | 4 + sys/configure/structs/game.globalData.go | 68 + .../structs/game.taskActiveRewardData.go | 4 + 27 files changed, 904 insertions(+), 4094 deletions(-) diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json index fb555e24c..4174a8a5c 100644 --- a/bin/json/game_activereward.json +++ b/bin/json/game_activereward.json @@ -1,110 +1,34 @@ [ { "key": 1, - "id_tag": 1, - "active": 20, + "id_tag": 2, + "active": 40, "reword": [ { "a": "attr", "t": "diamond", - "n": 5 + "n": 10 } - ] + ], + "action": "Skill_2", + "stage": 1 }, { "key": 2, - "id_tag": 1, - "active": 40, + "id_tag": 2, + "active": 80, "reword": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "diamond", + "n": 10 } - ] + ], + "action": "Skill_2", + "stage": 2 }, { "key": 3, - "id_tag": 1, - "active": 60, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 4, - "id_tag": 1, - "active": 80, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "key": 5, - "id_tag": 1, - "active": 100, - "reword": [ - { - "a": "item", - "t": "30001", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "key": 6, - "id_tag": 2, - "active": 40, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 25000 - } - ] - }, - { - "key": 7, - "id_tag": 2, - "active": 80, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 25000 - } - ] - }, - { - "key": 8, "id_tag": 2, "active": 120, "reword": [ @@ -113,10 +37,12 @@ "t": "diamond", "n": 20 } - ] + ], + "action": "Skill_2", + "stage": 3 }, { - "key": 9, + "key": 4, "id_tag": 2, "active": 160, "reword": [ @@ -124,29 +50,9 @@ "a": "attr", "t": "diamond", "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 75000 } - ] - }, - { - "key": 10, - "id_tag": 2, - "active": 200, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 200000 - } - ] + ], + "action": "Skill_2", + "stage": 4 } ] \ No newline at end of file diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json index b7178514d..adad29886 100644 --- a/bin/json/game_camplv.json +++ b/bin/json/game_camplv.json @@ -1,9 +1,9 @@ [ { "id": 1, - "reputation_lv": 0, + "reputation_lv": 1, "raceType": 1, - "reputation_exp": 0, + "reputation_exp": 20, "Reward": { "a": "attr", "t": "talent1", @@ -12,9 +12,9 @@ }, { "id": 2, - "reputation_lv": 1, + "reputation_lv": 2, "raceType": 1, - "reputation_exp": 20, + "reputation_exp": 30, "Reward": { "a": "attr", "t": "talent1", @@ -23,9 +23,9 @@ }, { "id": 3, - "reputation_lv": 2, + "reputation_lv": 3, "raceType": 1, - "reputation_exp": 30, + "reputation_exp": 40, "Reward": { "a": "attr", "t": "talent1", @@ -34,9 +34,9 @@ }, { "id": 4, - "reputation_lv": 3, + "reputation_lv": 4, "raceType": 1, - "reputation_exp": 40, + "reputation_exp": 50, "Reward": { "a": "attr", "t": "talent1", @@ -45,9 +45,9 @@ }, { "id": 5, - "reputation_lv": 4, + "reputation_lv": 5, "raceType": 1, - "reputation_exp": 50, + "reputation_exp": 60, "Reward": { "a": "attr", "t": "talent1", @@ -56,9 +56,9 @@ }, { "id": 6, - "reputation_lv": 5, + "reputation_lv": 6, "raceType": 1, - "reputation_exp": 60, + "reputation_exp": 70, "Reward": { "a": "attr", "t": "talent1", @@ -67,9 +67,9 @@ }, { "id": 7, - "reputation_lv": 6, + "reputation_lv": 7, "raceType": 1, - "reputation_exp": 70, + "reputation_exp": 80, "Reward": { "a": "attr", "t": "talent1", @@ -78,20 +78,20 @@ }, { "id": 8, - "reputation_lv": 7, + "reputation_lv": 8, "raceType": 1, - "reputation_exp": 80, + "reputation_exp": 90, "Reward": { "a": "attr", - "t": "talent1", + "t": "talent2", "n": 1 } }, { "id": 9, - "reputation_lv": 8, + "reputation_lv": 9, "raceType": 1, - "reputation_exp": 90, + "reputation_exp": 100, "Reward": { "a": "attr", "t": "talent2", @@ -100,9 +100,9 @@ }, { "id": 10, - "reputation_lv": 9, + "reputation_lv": 10, "raceType": 1, - "reputation_exp": 100, + "reputation_exp": 110, "Reward": { "a": "attr", "t": "talent2", @@ -111,9 +111,9 @@ }, { "id": 11, - "reputation_lv": 10, + "reputation_lv": 11, "raceType": 1, - "reputation_exp": 110, + "reputation_exp": 120, "Reward": { "a": "attr", "t": "talent2", @@ -122,9 +122,9 @@ }, { "id": 12, - "reputation_lv": 11, + "reputation_lv": 12, "raceType": 1, - "reputation_exp": 120, + "reputation_exp": 130, "Reward": { "a": "attr", "t": "talent2", @@ -133,9 +133,9 @@ }, { "id": 13, - "reputation_lv": 12, + "reputation_lv": 13, "raceType": 1, - "reputation_exp": 130, + "reputation_exp": 140, "Reward": { "a": "attr", "t": "talent2", @@ -144,9 +144,9 @@ }, { "id": 14, - "reputation_lv": 13, + "reputation_lv": 14, "raceType": 1, - "reputation_exp": 140, + "reputation_exp": 150, "Reward": { "a": "attr", "t": "talent2", @@ -155,9 +155,9 @@ }, { "id": 15, - "reputation_lv": 14, + "reputation_lv": 15, "raceType": 1, - "reputation_exp": 150, + "reputation_exp": 160, "Reward": { "a": "attr", "t": "talent2", @@ -166,9 +166,9 @@ }, { "id": 16, - "reputation_lv": 15, + "reputation_lv": 16, "raceType": 1, - "reputation_exp": 160, + "reputation_exp": 170, "Reward": { "a": "attr", "t": "talent2", @@ -177,9 +177,9 @@ }, { "id": 17, - "reputation_lv": 16, + "reputation_lv": 17, "raceType": 1, - "reputation_exp": 170, + "reputation_exp": 180, "Reward": { "a": "attr", "t": "talent2", @@ -188,9 +188,9 @@ }, { "id": 18, - "reputation_lv": 17, + "reputation_lv": 18, "raceType": 1, - "reputation_exp": 180, + "reputation_exp": 190, "Reward": { "a": "attr", "t": "talent2", @@ -199,9 +199,9 @@ }, { "id": 19, - "reputation_lv": 18, + "reputation_lv": 19, "raceType": 1, - "reputation_exp": 190, + "reputation_exp": 200, "Reward": { "a": "attr", "t": "talent2", @@ -210,9 +210,9 @@ }, { "id": 20, - "reputation_lv": 19, + "reputation_lv": 20, "raceType": 1, - "reputation_exp": 200, + "reputation_exp": 210, "Reward": { "a": "attr", "t": "talent2", @@ -221,9 +221,9 @@ }, { "id": 21, - "reputation_lv": 20, - "raceType": 1, - "reputation_exp": 210, + "reputation_lv": 1, + "raceType": 2, + "reputation_exp": 20, "Reward": { "a": "attr", "t": "talent2", @@ -232,9 +232,9 @@ }, { "id": 22, - "reputation_lv": 0, + "reputation_lv": 2, "raceType": 2, - "reputation_exp": 0, + "reputation_exp": 30, "Reward": { "a": "attr", "t": "talent2", @@ -243,9 +243,9 @@ }, { "id": 23, - "reputation_lv": 1, + "reputation_lv": 3, "raceType": 2, - "reputation_exp": 20, + "reputation_exp": 40, "Reward": { "a": "attr", "t": "talent2", @@ -254,9 +254,9 @@ }, { "id": 24, - "reputation_lv": 2, + "reputation_lv": 4, "raceType": 2, - "reputation_exp": 30, + "reputation_exp": 50, "Reward": { "a": "attr", "t": "talent2", @@ -265,9 +265,9 @@ }, { "id": 25, - "reputation_lv": 3, + "reputation_lv": 5, "raceType": 2, - "reputation_exp": 40, + "reputation_exp": 60, "Reward": { "a": "attr", "t": "talent2", @@ -276,9 +276,9 @@ }, { "id": 26, - "reputation_lv": 4, + "reputation_lv": 6, "raceType": 2, - "reputation_exp": 50, + "reputation_exp": 70, "Reward": { "a": "attr", "t": "talent2", @@ -287,9 +287,9 @@ }, { "id": 27, - "reputation_lv": 5, + "reputation_lv": 7, "raceType": 2, - "reputation_exp": 60, + "reputation_exp": 80, "Reward": { "a": "attr", "t": "talent2", @@ -298,9 +298,9 @@ }, { "id": 28, - "reputation_lv": 6, + "reputation_lv": 8, "raceType": 2, - "reputation_exp": 70, + "reputation_exp": 90, "Reward": { "a": "attr", "t": "talent2", @@ -309,9 +309,9 @@ }, { "id": 29, - "reputation_lv": 7, + "reputation_lv": 9, "raceType": 2, - "reputation_exp": 80, + "reputation_exp": 100, "Reward": { "a": "attr", "t": "talent2", @@ -320,9 +320,9 @@ }, { "id": 30, - "reputation_lv": 8, + "reputation_lv": 10, "raceType": 2, - "reputation_exp": 90, + "reputation_exp": 110, "Reward": { "a": "attr", "t": "talent2", @@ -331,9 +331,9 @@ }, { "id": 31, - "reputation_lv": 9, + "reputation_lv": 11, "raceType": 2, - "reputation_exp": 100, + "reputation_exp": 120, "Reward": { "a": "attr", "t": "talent2", @@ -342,9 +342,9 @@ }, { "id": 32, - "reputation_lv": 10, + "reputation_lv": 12, "raceType": 2, - "reputation_exp": 110, + "reputation_exp": 130, "Reward": { "a": "attr", "t": "talent2", @@ -353,9 +353,9 @@ }, { "id": 33, - "reputation_lv": 11, + "reputation_lv": 13, "raceType": 2, - "reputation_exp": 120, + "reputation_exp": 140, "Reward": { "a": "attr", "t": "talent2", @@ -364,9 +364,9 @@ }, { "id": 34, - "reputation_lv": 12, + "reputation_lv": 14, "raceType": 2, - "reputation_exp": 130, + "reputation_exp": 150, "Reward": { "a": "attr", "t": "talent2", @@ -375,9 +375,9 @@ }, { "id": 35, - "reputation_lv": 13, + "reputation_lv": 15, "raceType": 2, - "reputation_exp": 140, + "reputation_exp": 160, "Reward": { "a": "attr", "t": "talent2", @@ -386,9 +386,9 @@ }, { "id": 36, - "reputation_lv": 14, + "reputation_lv": 16, "raceType": 2, - "reputation_exp": 150, + "reputation_exp": 170, "Reward": { "a": "attr", "t": "talent2", @@ -397,9 +397,9 @@ }, { "id": 37, - "reputation_lv": 15, + "reputation_lv": 17, "raceType": 2, - "reputation_exp": 160, + "reputation_exp": 180, "Reward": { "a": "attr", "t": "talent2", @@ -408,9 +408,9 @@ }, { "id": 38, - "reputation_lv": 16, + "reputation_lv": 18, "raceType": 2, - "reputation_exp": 170, + "reputation_exp": 190, "Reward": { "a": "attr", "t": "talent2", @@ -419,9 +419,9 @@ }, { "id": 39, - "reputation_lv": 17, + "reputation_lv": 19, "raceType": 2, - "reputation_exp": 180, + "reputation_exp": 200, "Reward": { "a": "attr", "t": "talent2", @@ -430,9 +430,9 @@ }, { "id": 40, - "reputation_lv": 18, + "reputation_lv": 20, "raceType": 2, - "reputation_exp": 190, + "reputation_exp": 210, "Reward": { "a": "attr", "t": "talent2", @@ -441,9 +441,9 @@ }, { "id": 41, - "reputation_lv": 19, - "raceType": 2, - "reputation_exp": 200, + "reputation_lv": 1, + "raceType": 3, + "reputation_exp": 20, "Reward": { "a": "attr", "t": "talent2", @@ -452,9 +452,9 @@ }, { "id": 42, - "reputation_lv": 20, - "raceType": 2, - "reputation_exp": 210, + "reputation_lv": 2, + "raceType": 3, + "reputation_exp": 30, "Reward": { "a": "attr", "t": "talent2", @@ -463,39 +463,6 @@ }, { "id": 43, - "reputation_lv": 0, - "raceType": 3, - "reputation_exp": 0, - "Reward": { - "a": "attr", - "t": "talent2", - "n": 1 - } - }, - { - "id": 44, - "reputation_lv": 1, - "raceType": 3, - "reputation_exp": 20, - "Reward": { - "a": "attr", - "t": "talent2", - "n": 1 - } - }, - { - "id": 45, - "reputation_lv": 2, - "raceType": 3, - "reputation_exp": 30, - "Reward": { - "a": "attr", - "t": "talent2", - "n": 1 - } - }, - { - "id": 46, "reputation_lv": 3, "raceType": 3, "reputation_exp": 40, @@ -506,7 +473,7 @@ } }, { - "id": 47, + "id": 44, "reputation_lv": 4, "raceType": 3, "reputation_exp": 50, @@ -517,7 +484,7 @@ } }, { - "id": 48, + "id": 45, "reputation_lv": 5, "raceType": 3, "reputation_exp": 60, @@ -528,7 +495,7 @@ } }, { - "id": 49, + "id": 46, "reputation_lv": 6, "raceType": 3, "reputation_exp": 70, @@ -539,7 +506,7 @@ } }, { - "id": 50, + "id": 47, "reputation_lv": 7, "raceType": 3, "reputation_exp": 80, @@ -550,7 +517,7 @@ } }, { - "id": 51, + "id": 48, "reputation_lv": 8, "raceType": 3, "reputation_exp": 90, @@ -561,7 +528,7 @@ } }, { - "id": 52, + "id": 49, "reputation_lv": 9, "raceType": 3, "reputation_exp": 100, @@ -572,7 +539,7 @@ } }, { - "id": 53, + "id": 50, "reputation_lv": 10, "raceType": 3, "reputation_exp": 110, @@ -583,7 +550,7 @@ } }, { - "id": 54, + "id": 51, "reputation_lv": 11, "raceType": 3, "reputation_exp": 120, @@ -594,7 +561,7 @@ } }, { - "id": 55, + "id": 52, "reputation_lv": 12, "raceType": 3, "reputation_exp": 130, @@ -605,7 +572,7 @@ } }, { - "id": 56, + "id": 53, "reputation_lv": 13, "raceType": 3, "reputation_exp": 140, @@ -616,7 +583,7 @@ } }, { - "id": 57, + "id": 54, "reputation_lv": 14, "raceType": 3, "reputation_exp": 150, @@ -627,7 +594,7 @@ } }, { - "id": 58, + "id": 55, "reputation_lv": 15, "raceType": 3, "reputation_exp": 160, @@ -638,7 +605,7 @@ } }, { - "id": 59, + "id": 56, "reputation_lv": 16, "raceType": 3, "reputation_exp": 170, @@ -649,7 +616,7 @@ } }, { - "id": 60, + "id": 57, "reputation_lv": 17, "raceType": 3, "reputation_exp": 180, @@ -660,7 +627,7 @@ } }, { - "id": 61, + "id": 58, "reputation_lv": 18, "raceType": 3, "reputation_exp": 190, @@ -671,7 +638,7 @@ } }, { - "id": 62, + "id": 59, "reputation_lv": 19, "raceType": 3, "reputation_exp": 200, @@ -682,7 +649,7 @@ } }, { - "id": 63, + "id": 60, "reputation_lv": 20, "raceType": 3, "reputation_exp": 210, @@ -693,18 +660,7 @@ } }, { - "id": 64, - "reputation_lv": 0, - "raceType": 4, - "reputation_exp": 0, - "Reward": { - "a": "attr", - "t": "talent2", - "n": 1 - } - }, - { - "id": 65, + "id": 61, "reputation_lv": 1, "raceType": 4, "reputation_exp": 20, @@ -715,7 +671,7 @@ } }, { - "id": 66, + "id": 62, "reputation_lv": 2, "raceType": 4, "reputation_exp": 30, @@ -726,7 +682,7 @@ } }, { - "id": 67, + "id": 63, "reputation_lv": 3, "raceType": 4, "reputation_exp": 40, @@ -737,7 +693,7 @@ } }, { - "id": 68, + "id": 64, "reputation_lv": 4, "raceType": 4, "reputation_exp": 50, @@ -748,7 +704,7 @@ } }, { - "id": 69, + "id": 65, "reputation_lv": 5, "raceType": 4, "reputation_exp": 60, @@ -759,7 +715,7 @@ } }, { - "id": 70, + "id": 66, "reputation_lv": 6, "raceType": 4, "reputation_exp": 70, @@ -770,7 +726,7 @@ } }, { - "id": 71, + "id": 67, "reputation_lv": 7, "raceType": 4, "reputation_exp": 80, @@ -781,7 +737,7 @@ } }, { - "id": 72, + "id": 68, "reputation_lv": 8, "raceType": 4, "reputation_exp": 90, @@ -792,7 +748,7 @@ } }, { - "id": 73, + "id": 69, "reputation_lv": 9, "raceType": 4, "reputation_exp": 100, @@ -803,7 +759,7 @@ } }, { - "id": 74, + "id": 70, "reputation_lv": 10, "raceType": 4, "reputation_exp": 110, @@ -814,7 +770,7 @@ } }, { - "id": 75, + "id": 71, "reputation_lv": 11, "raceType": 4, "reputation_exp": 120, @@ -825,7 +781,7 @@ } }, { - "id": 76, + "id": 72, "reputation_lv": 12, "raceType": 4, "reputation_exp": 130, @@ -836,7 +792,7 @@ } }, { - "id": 77, + "id": 73, "reputation_lv": 13, "raceType": 4, "reputation_exp": 140, @@ -847,7 +803,7 @@ } }, { - "id": 78, + "id": 74, "reputation_lv": 14, "raceType": 4, "reputation_exp": 150, @@ -858,7 +814,7 @@ } }, { - "id": 79, + "id": 75, "reputation_lv": 15, "raceType": 4, "reputation_exp": 160, @@ -869,7 +825,7 @@ } }, { - "id": 80, + "id": 76, "reputation_lv": 16, "raceType": 4, "reputation_exp": 170, @@ -880,7 +836,7 @@ } }, { - "id": 81, + "id": 77, "reputation_lv": 17, "raceType": 4, "reputation_exp": 180, @@ -891,7 +847,7 @@ } }, { - "id": 82, + "id": 78, "reputation_lv": 18, "raceType": 4, "reputation_exp": 190, @@ -902,7 +858,7 @@ } }, { - "id": 83, + "id": 79, "reputation_lv": 19, "raceType": 4, "reputation_exp": 200, @@ -913,7 +869,7 @@ } }, { - "id": 84, + "id": 80, "reputation_lv": 20, "raceType": 4, "reputation_exp": 210, diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json index 07f09b7ac..457ef0b40 100644 --- a/bin/json/game_favorability.json +++ b/bin/json/game_favorability.json @@ -30,8 +30,13 @@ "key": "favorability_favorability_return_txt", "text": "达到好感度{0}级可领取" }, - "likes_food": [], - "disliking_food": [], + "likes_food": [ + "132000", + "132001" + ], + "disliking_food": [ + "132002" + ], "likes_txt": { "key": "favorability_favorability_likes_txt_14002", "text": "我很喜欢，谢谢！" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 17e2b416b..edd6f3ae3 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -685,6 +685,38 @@ "business_renovatething": 180, "favorability_likes": 1500, "favorability_dislikes": 500, + "buzkashi_time": 180, + "buzkashi_schedule": 200, + "buzkashi_stime": 300, + "buzkashi_vreward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "buzkashi_freward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "buzkashi_vintegral": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "buzkashi_fintegral": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "buzkashi_resurrection": 10, "favorability_attenuation": [ { "k": 3, @@ -692,11 +724,11 @@ }, { "k": 6, - "v": 500 + "v": 800 }, { "k": 9, - "v": 250 + "v": 500 } ] } diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index ff585981d..98053e46a 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -7,7 +7,7 @@ "text": "巨型猩猩" }, "difficulty": 1, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -25,8 +25,6 @@ "drop": 1001, "bossmodel": 53001, "boss": [ - 401001, - 401002, 401003 ], "ps_consume": [ @@ -52,7 +50,7 @@ "text": "巨型猩猩" }, "difficulty": 2, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -75,8 +73,6 @@ "drop": 1002, "bossmodel": 53001, "boss": [ - 401004, - 401005, 401006 ], "ps_consume": [ @@ -102,7 +98,7 @@ "text": "巨型猩猩" }, "difficulty": 3, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -125,8 +121,6 @@ "drop": 1003, "bossmodel": 53001, "boss": [ - 401007, - 401008, 401009 ], "ps_consume": [ @@ -152,7 +146,7 @@ "text": "巨型猩猩" }, "difficulty": 4, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -175,8 +169,6 @@ "drop": 1004, "bossmodel": 53001, "boss": [ - 401010, - 401011, 401012 ], "ps_consume": [ @@ -202,7 +194,7 @@ "text": "巨型猩猩" }, "difficulty": 5, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -230,8 +222,6 @@ "drop": 1005, "bossmodel": 53001, "boss": [ - 401013, - 401014, 401015 ], "ps_consume": [ @@ -257,7 +247,7 @@ "text": "巨型猩猩" }, "difficulty": 6, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -285,8 +275,6 @@ "drop": 1006, "bossmodel": 53001, "boss": [ - 401016, - 401017, 401018 ], "ps_consume": [ @@ -312,7 +300,7 @@ "text": "巨型猩猩" }, "difficulty": 7, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -340,8 +328,6 @@ "drop": 1007, "bossmodel": 53001, "boss": [ - 401019, - 401020, 401021 ], "ps_consume": [ @@ -367,7 +353,7 @@ "text": "巨型猩猩" }, "difficulty": 8, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -395,8 +381,6 @@ "drop": 1008, "bossmodel": 53001, "boss": [ - 401022, - 401023, 401024 ], "ps_consume": [ @@ -422,7 +406,7 @@ "text": "巨型猩猩" }, "difficulty": 9, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -450,8 +434,6 @@ "drop": 1009, "bossmodel": 53001, "boss": [ - 401025, - 401026, 401027 ], "ps_consume": [ @@ -477,7 +459,7 @@ "text": "巨型猩猩" }, "difficulty": 10, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -505,8 +487,6 @@ "drop": 1010, "bossmodel": 53001, "boss": [ - 401028, - 401029, 401030 ], "ps_consume": [ @@ -532,7 +512,7 @@ "text": "火龙" }, "difficulty": 1, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -550,8 +530,6 @@ "drop": 1011, "bossmodel": 51004, "boss": [ - 402001, - 402002, 402003 ], "ps_consume": [ @@ -577,7 +555,7 @@ "text": "火龙" }, "difficulty": 2, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -600,8 +578,6 @@ "drop": 1012, "bossmodel": 51004, "boss": [ - 402004, - 402005, 402006 ], "ps_consume": [ @@ -627,7 +603,7 @@ "text": "火龙" }, "difficulty": 3, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -650,8 +626,6 @@ "drop": 1013, "bossmodel": 51004, "boss": [ - 402007, - 402008, 402009 ], "ps_consume": [ @@ -677,7 +651,7 @@ "text": "火龙" }, "difficulty": 4, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -700,8 +674,6 @@ "drop": 1014, "bossmodel": 51004, "boss": [ - 402010, - 402011, 402012 ], "ps_consume": [ @@ -727,7 +699,7 @@ "text": "火龙" }, "difficulty": 5, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -755,8 +727,6 @@ "drop": 1015, "bossmodel": 51004, "boss": [ - 402013, - 402014, 402015 ], "ps_consume": [ @@ -782,7 +752,7 @@ "text": "火龙" }, "difficulty": 6, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -810,8 +780,6 @@ "drop": 1016, "bossmodel": 51004, "boss": [ - 402016, - 402017, 402018 ], "ps_consume": [ @@ -837,7 +805,7 @@ "text": "火龙" }, "difficulty": 7, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -865,8 +833,6 @@ "drop": 1017, "bossmodel": 51004, "boss": [ - 402019, - 402020, 402021 ], "ps_consume": [ @@ -892,7 +858,7 @@ "text": "火龙" }, "difficulty": 8, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -920,8 +886,6 @@ "drop": 1018, "bossmodel": 51004, "boss": [ - 402022, - 402023, 402024 ], "ps_consume": [ @@ -947,7 +911,7 @@ "text": "火龙" }, "difficulty": 9, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -975,8 +939,6 @@ "drop": 1019, "bossmodel": 51004, "boss": [ - 402025, - 402026, 402027 ], "ps_consume": [ @@ -1002,7 +964,7 @@ "text": "火龙" }, "difficulty": 10, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1030,8 +992,6 @@ "drop": 1020, "bossmodel": 51004, "boss": [ - 402028, - 402029, 402030 ], "ps_consume": [ @@ -1057,7 +1017,7 @@ "text": "大厨" }, "difficulty": 1, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1075,8 +1035,6 @@ "drop": 1021, "bossmodel": 51005, "boss": [ - 403001, - 403002, 403003 ], "ps_consume": [ @@ -1102,7 +1060,7 @@ "text": "大厨" }, "difficulty": 2, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1125,8 +1083,6 @@ "drop": 1022, "bossmodel": 51005, "boss": [ - 403004, - 403005, 403006 ], "ps_consume": [ @@ -1152,7 +1108,7 @@ "text": "大厨" }, "difficulty": 3, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1175,8 +1131,6 @@ "drop": 1023, "bossmodel": 51005, "boss": [ - 403007, - 403008, 403009 ], "ps_consume": [ @@ -1202,7 +1156,7 @@ "text": "大厨" }, "difficulty": 4, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1225,8 +1179,6 @@ "drop": 1024, "bossmodel": 51005, "boss": [ - 403010, - 403011, 403012 ], "ps_consume": [ @@ -1252,7 +1204,7 @@ "text": "大厨" }, "difficulty": 5, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1280,8 +1232,6 @@ "drop": 1025, "bossmodel": 51005, "boss": [ - 403013, - 403014, 403015 ], "ps_consume": [ @@ -1307,7 +1257,7 @@ "text": "大厨" }, "difficulty": 6, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1335,8 +1285,6 @@ "drop": 1026, "bossmodel": 51005, "boss": [ - 403016, - 403017, 403018 ], "ps_consume": [ @@ -1362,7 +1310,7 @@ "text": "大厨" }, "difficulty": 7, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1390,8 +1338,6 @@ "drop": 1027, "bossmodel": 51005, "boss": [ - 403019, - 403020, 403021 ], "ps_consume": [ @@ -1417,7 +1363,7 @@ "text": "大厨" }, "difficulty": 8, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1445,8 +1391,6 @@ "drop": 1028, "bossmodel": 51005, "boss": [ - 403022, - 403023, 403024 ], "ps_consume": [ @@ -1472,7 +1416,7 @@ "text": "大厨" }, "difficulty": 9, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1500,8 +1444,6 @@ "drop": 1029, "bossmodel": 51005, "boss": [ - 403025, - 403026, 403027 ], "ps_consume": [ @@ -1527,7 +1469,7 @@ "text": "大厨" }, "difficulty": 10, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1555,8 +1497,6 @@ "drop": 1030, "bossmodel": 51005, "boss": [ - 403028, - 403029, 403030 ], "ps_consume": [ @@ -1582,7 +1522,7 @@ "text": "太空海星" }, "difficulty": 1, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1600,8 +1540,6 @@ "drop": 1021, "bossmodel": 51002, "boss": [ - 404001, - 404002, 404003 ], "ps_consume": [ @@ -1627,7 +1565,7 @@ "text": "太空海星" }, "difficulty": 2, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1650,8 +1588,6 @@ "drop": 1022, "bossmodel": 51002, "boss": [ - 404004, - 404005, 404006 ], "ps_consume": [ @@ -1677,7 +1613,7 @@ "text": "太空海星" }, "difficulty": 3, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1700,8 +1636,6 @@ "drop": 1023, "bossmodel": 51002, "boss": [ - 404007, - 404008, 404009 ], "ps_consume": [ @@ -1727,7 +1661,7 @@ "text": "太空海星" }, "difficulty": 4, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1750,8 +1684,6 @@ "drop": 1024, "bossmodel": 51002, "boss": [ - 404010, - 404011, 404012 ], "ps_consume": [ @@ -1777,7 +1709,7 @@ "text": "太空海星" }, "difficulty": 5, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1805,8 +1737,6 @@ "drop": 1025, "bossmodel": 51002, "boss": [ - 404013, - 404014, 404015 ], "ps_consume": [ @@ -1832,7 +1762,7 @@ "text": "太空海星" }, "difficulty": 6, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1860,8 +1790,6 @@ "drop": 1026, "bossmodel": 51002, "boss": [ - 404016, - 404017, 404018 ], "ps_consume": [ @@ -1887,7 +1815,7 @@ "text": "太空海星" }, "difficulty": 7, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1915,8 +1843,6 @@ "drop": 1027, "bossmodel": 51002, "boss": [ - 404019, - 404020, 404021 ], "ps_consume": [ @@ -1942,7 +1868,7 @@ "text": "太空海星" }, "difficulty": 8, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -1970,8 +1896,6 @@ "drop": 1028, "bossmodel": 51002, "boss": [ - 404022, - 404023, 404024 ], "ps_consume": [ @@ -1997,7 +1921,7 @@ "text": "太空海星" }, "difficulty": 9, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -2025,8 +1949,6 @@ "drop": 1029, "bossmodel": 51002, "boss": [ - 404025, - 404026, 404027 ], "ps_consume": [ @@ -2052,7 +1974,7 @@ "text": "太空海星" }, "difficulty": 10, - "BattleReadyID": 107, + "BattleReadyID": 120, "firstprize": [ { "a": "attr", @@ -2080,8 +2002,6 @@ "drop": 1030, "bossmodel": 51002, "boss": [ - 404028, - 404029, 404030 ], "ps_consume": [ diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 062e56559..d6bc75abb 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -1588,5 +1588,15 @@ "n": 1 } ] + }, + { + "index": "325", + "var": [ + { + "a": "mts", + "t": "20030001", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 4056f0c89..69c0a7839 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -7741,7 +7741,7 @@ "color": 1, "bagtype": 1, "index": 99, - "special_type": 0, + "special_type": 1000, "time": 0, "reddottype": 0, "effects": "", @@ -7777,7 +7777,7 @@ "color": 3, "bagtype": 1, "index": 99, - "special_type": 0, + "special_type": 800, "time": 0, "reddottype": 0, "effects": "", @@ -7813,7 +7813,7 @@ "color": 4, "bagtype": 1, "index": 1, - "special_type": 0, + "special_type": 900, "time": 0, "reddottype": 0, "effects": "", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 0b8c643c4..05bf8907d 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -11,6 +11,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 618, "afterstoryid": 0, "mainlineName": { @@ -93,6 +94,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 619, "afterstoryid": 0, "mainlineName": { @@ -180,6 +182,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 621, "afterstoryid": 0, "mainlineName": { @@ -267,6 +270,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 623, "afterstoryid": 0, "mainlineName": { @@ -354,6 +358,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 626, "afterstoryid": 628, "mainlineName": { @@ -441,6 +446,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 636, "afterstoryid": 637, "mainlineName": { @@ -528,6 +534,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -615,6 +622,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -702,6 +710,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -790,6 +799,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -878,6 +888,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -966,6 +977,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1054,6 +1066,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1141,6 +1154,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1228,6 +1242,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1316,6 +1331,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1404,6 +1420,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1492,6 +1509,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1580,6 +1598,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1667,6 +1686,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1754,6 +1774,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1842,6 +1863,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -1930,6 +1952,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { @@ -2018,6 +2041,7 @@ "z": 0 }, "EditorStage": 0, + "detailwindow": "effect_chezhan", "frontstoryid": 0, "afterstoryid": 0, "mainlineName": { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index aa08e35ad..1cbb44c01 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -15122,9 +15122,9 @@ "Id": 301013, "pos": 4, "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "monster": -1, + "IsBoss": 1, + "bossHpCnt": 4, + "monster": 550025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -15319,7 +15319,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -15514,7 +15514,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -15709,7 +15709,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -15904,7 +15904,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -16099,7 +16099,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -16294,7 +16294,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -16489,7 +16489,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -16684,7 +16684,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -16879,7 +16879,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -17074,7 +17074,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -17269,7 +17269,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -17464,7 +17464,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -17659,7 +17659,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -17854,7 +17854,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -18049,7 +18049,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -18244,7 +18244,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -18439,7 +18439,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -18634,7 +18634,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -18829,7 +18829,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -19024,7 +19024,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 35, "hppro": 0.6, "atkpro": 1, @@ -19219,7 +19219,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 40, "hppro": 0.6, "atkpro": 1, @@ -19414,7 +19414,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 45, "hppro": 0.6, "atkpro": 1, @@ -19609,7 +19609,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 50, "hppro": 0.6, "atkpro": 1, @@ -19804,7 +19804,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 55, "hppro": 0.6, "atkpro": 1, @@ -19999,7 +19999,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 60, "hppro": 0.6, "atkpro": 1, @@ -20194,7 +20194,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 65, "hppro": 0.6, "atkpro": 1, @@ -20389,7 +20389,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 70, "hppro": 0.6, "atkpro": 1, @@ -20584,7 +20584,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 75, "hppro": 0.6, "atkpro": 1, @@ -20779,7 +20779,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 80, "hppro": 0.6, "atkpro": 1, @@ -89315,7 +89315,7 @@ "captainId": 0, "IsBoss": 1, "bossHpCnt": 4, - "monster": 110215, + "monster": 550025, "lv": 60, "hppro": 0.6, "atkpro": 1, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 394e64a95..e25a3d30d 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -919,8 +919,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", @@ -1636,5 +1636,29 @@ "notify": [ "practice" ] + }, + { + "id": "practice_Kick", + "name": { + "key": "", + "text": "" + }, + "main": [ + { + "key": 1, + "param": 2 + } + ], + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": 0, + "notify": [] } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 2d97599b4..b2c93a270 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1176,7 +1176,7 @@ }, "type": 70, "valid": 0, - "NPC": 10031, + "NPC": 10022, "data1": 1, "data2": 101, "data3": 0, @@ -1688,7 +1688,7 @@ }, "type": 73, "valid": 0, - "NPC": 10071, + "NPC": 70022, "data1": 1, "data2": 1, "data3": 1, @@ -1736,7 +1736,7 @@ }, "type": 70, "valid": 0, - "NPC": 10101, + "NPC": 10120, "data1": 1, "data2": 102, "data3": 0, @@ -5752,7 +5752,7 @@ }, "type": 20001, "valid": 1, - "NPC": 10011, + "NPC": 10012, "data1": 1, "data2": 602, "data3": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index e44700ed4..8fd159d5d 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -32,7 +32,7 @@ "heroid": 45001, "datas": [ "WuGuanScene", - "乌龟大师", + "总教习", "137" ], "event": [ @@ -51,7 +51,7 @@ ], "event": [ 2, - 500 + 333 ], "goto": 0 }, @@ -79,7 +79,7 @@ ], "event": [ 2, - 602 + 601 ], "goto": 0 }, @@ -93,7 +93,7 @@ ], "event": [ 2, - 603 + 602 ], "goto": 0 }, @@ -107,7 +107,7 @@ ], "event": [ 2, - 604 + 603 ], "goto": 0 }, @@ -127,10 +127,10 @@ }, { "id": 10022, - "heroid": 25001, + "heroid": 24004, "datas": [ "GameMain", - "20020_熊猫_2", + "20020_邦尼兔_1", "901" ], "event": [ @@ -169,15 +169,15 @@ }, { "id": 10032, - "heroid": 24004, + "heroid": 25001, "datas": [ "GameMain", - "20020_邦尼兔_1", + "20020_熊猫_2", "901" ], "event": [ 2, - 609 + 610 ], "goto": 0 }, @@ -253,6 +253,20 @@ }, { "id": 10070, + "heroid": 44004, + "datas": [ + "GameMain", + "20010_骇客蛛_1", + "901" + ], + "event": [ + 2, + 617 + ], + "goto": 0 + }, + { + "id": 10080, "heroid": 43007, "datas": [ "SmithyScene", @@ -266,21 +280,7 @@ "goto": 0 }, { - "id": 10071, - "heroid": 14001, - "datas": [ - "GameMain", - "功能入口-维京远征", - "901" - ], - "event": [ - 10, - 167 - ], - "goto": 0 - }, - { - "id": 10072, + "id": 10081, "heroid": 43007, "datas": [ "SmithyScene", @@ -294,7 +294,7 @@ "goto": 0 }, { - "id": 10080, + "id": 10090, "heroid": 44004, "datas": [ "GameMain", @@ -307,101 +307,17 @@ ], "goto": 0 }, - { - "id": 10081, - "heroid": 14003, - "datas": [ - "GameMain", - "功能入口-主线", - "901" - ], - "event": [ - 10, - 166 - ], - "goto": 0 - }, - { - "id": 10082, - "heroid": 13002, - "datas": [ - "GameMain", - "20080_食人鱼_1", - "901" - ], - "event": [ - 2, - 637 - ], - "goto": 0 - }, - { - "id": 10090, - "heroid": 25001, - "datas": [ - "GameMain", - "20020_熊猫_2", - "901" - ], - "event": [ - 2, - 638 - ], - "goto": 0 - }, - { - "id": 10091, - "heroid": 45001, - "datas": [ - "GameMain", - "功能入口-招募", - "901" - ], - "event": [ - 10, - 107 - ], - "goto": 0 - }, { "id": 10100, - "heroid": 25001, + "heroid": 44004, "datas": [ "GameMain", - "20020_熊猫_2", + "20010_骇客蛛_1", "901" ], "event": [ 2, - 640 - ], - "goto": 0 - }, - { - "id": 10101, - "heroid": 35003, - "datas": [ - "GameMain", - "20100_梦魇_1", - "901" - ], - "event": [ - 2, - 642 - ], - "goto": 0 - }, - { - "id": 10102, - "heroid": 24004, - "datas": [ - "GameMain", - "20020_邦尼兔_1", - "901" - ], - "event": [ - 2, - 641 + 501 ], "goto": 0 }, @@ -415,7 +331,35 @@ ], "event": [ 2, - 99999 + 639 + ], + "goto": 0 + }, + { + "id": 10120, + "heroid": 25001, + "datas": [ + "GameMain", + "20020_熊猫_2", + "901" + ], + "event": [ + 2, + 640 + ], + "goto": 0 + }, + { + "id": 10130, + "heroid": 25001, + "datas": [ + "GameMain", + "20020_熊猫_2", + "901" + ], + "event": [ + 2, + 641 ], "goto": 0 }, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index c4f6feea0..4ccff658b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -10819,10 +10819,10 @@ { "Id": 214003213, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 2, "Type": 1, "Argu": [ @@ -10844,10 +10844,10 @@ { "Id": 214003214, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -13102,7 +13102,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 3, "Type": 1, "Argu": [ @@ -13569,7 +13569,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -13901,7 +13901,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -14147,7 +14147,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -14629,7 +14629,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -14774,7 +14774,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -14798,7 +14798,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 10, "Argu": [ @@ -15462,7 +15462,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 2, "Argu": [ @@ -15487,7 +15487,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -15960,7 +15960,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 14, "Argu": [ @@ -20396,7 +20396,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -25739,7 +25739,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -25885,7 +25885,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -25934,7 +25934,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 8, "Argu": [ @@ -25983,7 +25983,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 12, "Argu": [ @@ -26004,7 +26004,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -26031,7 +26031,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 5, "Argu": [ diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 1fbaedad5..fd7602430 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -2550,9 +2550,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 225001321, + 225001311, 225001312, - 225001313 + 225001321 ] }, "Desc": { @@ -2580,9 +2580,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 225001331, + 225001311, 225001312, - 225001313 + 225001331 ] }, "Desc": { @@ -2610,9 +2610,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 225001331, + 225001311, 225001312, - 225001313 + 225001341 ] }, "Desc": { @@ -2640,9 +2640,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 225001341, + 225001311, 225001312, - 225001313 + 225001341 ] }, "Desc": { diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index e5e119e09..c59822aad 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1153,7 +1153,7 @@ "SameID": false, "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts004", - "buffeffect": "effect_14001_skill_2", + "buffeffect": "effect_14001_qiuzhangzhinu", "buffpos": "根节点" }, { diff --git a/bin/json/game_smithyatlas.json b/bin/json/game_smithyatlas.json index b7e995d95..5fefd5b77 100644 --- a/bin/json/game_smithyatlas.json +++ b/bin/json/game_smithyatlas.json @@ -8,7 +8,7 @@ "text": "无极神功套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10110", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装1】的故事。" }, "atlas_score": 0, @@ -27,7 +27,7 @@ "text": "无极神功套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10111", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装2】的故事。" }, "atlas_score": 0, @@ -46,7 +46,7 @@ "text": "无极神功套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10112", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装3】的故事。" }, "atlas_score": 0, @@ -65,7 +65,7 @@ "text": "无极神功套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10113", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装4】的故事。" }, "atlas_score": 0, @@ -84,7 +84,7 @@ "text": "无极神功套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10114", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装5】的故事。" }, "atlas_score": 0, @@ -103,7 +103,7 @@ "text": "无极神功套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10115", + "key": "equip_skillintr_1", "text": "这里会有一段关于【无极神功套装6】的故事。" }, "atlas_score": 0, @@ -122,7 +122,7 @@ "text": "驯龙套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10210", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装1】的故事。" }, "atlas_score": 0, @@ -141,7 +141,7 @@ "text": "驯龙套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10211", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装2】的故事。" }, "atlas_score": 0, @@ -160,7 +160,7 @@ "text": "驯龙套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10212", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装3】的故事。" }, "atlas_score": 0, @@ -179,7 +179,7 @@ "text": "驯龙套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10213", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装4】的故事。" }, "atlas_score": 0, @@ -198,7 +198,7 @@ "text": "驯龙套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10214", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装5】的故事。" }, "atlas_score": 0, @@ -217,7 +217,7 @@ "text": "驯龙套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10215", + "key": "equip_skillintr_2", "text": "这里会有一段关于【驯龙套装6】的故事。" }, "atlas_score": 0, @@ -236,7 +236,7 @@ "text": "雪精灵套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10310", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装1】的故事。" }, "atlas_score": 0, @@ -255,7 +255,7 @@ "text": "雪精灵套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10311", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装2】的故事。" }, "atlas_score": 0, @@ -274,7 +274,7 @@ "text": "雪精灵套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10312", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装3】的故事。" }, "atlas_score": 0, @@ -293,7 +293,7 @@ "text": "雪精灵套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10313", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装4】的故事。" }, "atlas_score": 0, @@ -312,7 +312,7 @@ "text": "雪精灵套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10314", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装5】的故事。" }, "atlas_score": 0, @@ -331,7 +331,7 @@ "text": "雪精灵套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10315", + "key": "equip_skillintr_3", "text": "这里会有一段关于【雪精灵套装6】的故事。" }, "atlas_score": 0, @@ -350,7 +350,7 @@ "text": "噩梦漩涡套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10410", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装1】的故事。" }, "atlas_score": 0, @@ -369,7 +369,7 @@ "text": "噩梦漩涡套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10411", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装2】的故事。" }, "atlas_score": 0, @@ -388,7 +388,7 @@ "text": "噩梦漩涡套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10412", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装3】的故事。" }, "atlas_score": 0, @@ -407,7 +407,7 @@ "text": "噩梦漩涡套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10413", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装4】的故事。" }, "atlas_score": 0, @@ -426,7 +426,7 @@ "text": "噩梦漩涡套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10414", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装5】的故事。" }, "atlas_score": 0, @@ -445,7 +445,7 @@ "text": "噩梦漩涡套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10415", + "key": "equip_skillintr_4", "text": "这里会有一段关于【噩梦漩涡套装6】的故事。" }, "atlas_score": 0, @@ -464,7 +464,7 @@ "text": "音乐精灵套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10510", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装1】的故事。" }, "atlas_score": 0, @@ -483,7 +483,7 @@ "text": "音乐精灵套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10511", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装2】的故事。" }, "atlas_score": 0, @@ -502,7 +502,7 @@ "text": "音乐精灵套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10512", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装3】的故事。" }, "atlas_score": 0, @@ -521,7 +521,7 @@ "text": "音乐精灵套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10513", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装4】的故事。" }, "atlas_score": 0, @@ -540,7 +540,7 @@ "text": "音乐精灵套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10514", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装5】的故事。" }, "atlas_score": 0, @@ -559,7 +559,7 @@ "text": "音乐精灵套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10515", + "key": "equip_skillintr_5", "text": "这里会有一段关于【音乐精灵套装6】的故事。" }, "atlas_score": 0, @@ -578,7 +578,7 @@ "text": "永恒萌狗套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10610", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装1】的故事。" }, "atlas_score": 0, @@ -597,7 +597,7 @@ "text": "永恒萌狗套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10611", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装2】的故事。" }, "atlas_score": 0, @@ -616,7 +616,7 @@ "text": "永恒萌狗套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10612", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装3】的故事。" }, "atlas_score": 0, @@ -635,7 +635,7 @@ "text": "永恒萌狗套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10613", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装4】的故事。" }, "atlas_score": 0, @@ -654,7 +654,7 @@ "text": "永恒萌狗套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10614", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装5】的故事。" }, "atlas_score": 0, @@ -673,7 +673,7 @@ "text": "永恒萌狗套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10615", + "key": "equip_skillintr_6", "text": "这里会有一段关于【永恒萌狗套装6】的故事。" }, "atlas_score": 0, @@ -692,7 +692,7 @@ "text": "原始狩猎套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10710", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装1】的故事。" }, "atlas_score": 0, @@ -711,7 +711,7 @@ "text": "原始狩猎套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10711", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装2】的故事。" }, "atlas_score": 0, @@ -730,7 +730,7 @@ "text": "原始狩猎套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10712", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装3】的故事。" }, "atlas_score": 0, @@ -749,7 +749,7 @@ "text": "原始狩猎套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10713", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装4】的故事。" }, "atlas_score": 0, @@ -768,7 +768,7 @@ "text": "原始狩猎套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10714", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装5】的故事。" }, "atlas_score": 0, @@ -787,7 +787,7 @@ "text": "原始狩猎套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10715", + "key": "equip_skillintr_7", "text": "这里会有一段关于【原始狩猎套装6】的故事。" }, "atlas_score": 0, @@ -806,7 +806,7 @@ "text": "气功大师套装1" }, "content_text": { - "key": "newsmithy_tool_content_text10810", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装1】的故事。" }, "atlas_score": 0, @@ -825,7 +825,7 @@ "text": "气功大师套装2" }, "content_text": { - "key": "newsmithy_tool_content_text10811", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装2】的故事。" }, "atlas_score": 0, @@ -844,7 +844,7 @@ "text": "气功大师套装3" }, "content_text": { - "key": "newsmithy_tool_content_text10812", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装3】的故事。" }, "atlas_score": 0, @@ -863,7 +863,7 @@ "text": "气功大师套装4" }, "content_text": { - "key": "newsmithy_tool_content_text10813", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装4】的故事。" }, "atlas_score": 0, @@ -882,7 +882,7 @@ "text": "气功大师套装5" }, "content_text": { - "key": "newsmithy_tool_content_text10814", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装5】的故事。" }, "atlas_score": 0, @@ -901,7 +901,7 @@ "text": "气功大师套装6" }, "content_text": { - "key": "newsmithy_tool_content_text10815", + "key": "equip_skillintr_8", "text": "这里会有一段关于【气功大师套装6】的故事。" }, "atlas_score": 0, @@ -920,7 +920,7 @@ "text": "马术套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11010", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装1】的故事。" }, "atlas_score": 0, @@ -939,7 +939,7 @@ "text": "马术套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11011", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装2】的故事。" }, "atlas_score": 0, @@ -958,7 +958,7 @@ "text": "马术套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11012", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装3】的故事。" }, "atlas_score": 0, @@ -977,7 +977,7 @@ "text": "马术套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11013", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装4】的故事。" }, "atlas_score": 0, @@ -996,7 +996,7 @@ "text": "马术套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11014", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装5】的故事。" }, "atlas_score": 0, @@ -1015,7 +1015,7 @@ "text": "马术套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11015", + "key": "equip_skillintr_10", "text": "这里会有一段关于【马术套装6】的故事。" }, "atlas_score": 0, @@ -1034,7 +1034,7 @@ "text": "波波星套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11110", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装1】的故事。" }, "atlas_score": 0, @@ -1053,7 +1053,7 @@ "text": "波波星套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11111", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装2】的故事。" }, "atlas_score": 0, @@ -1072,7 +1072,7 @@ "text": "波波星套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11112", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装3】的故事。" }, "atlas_score": 0, @@ -1091,7 +1091,7 @@ "text": "波波星套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11113", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装4】的故事。" }, "atlas_score": 0, @@ -1110,7 +1110,7 @@ "text": "波波星套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11114", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装5】的故事。" }, "atlas_score": 0, @@ -1129,7 +1129,7 @@ "text": "波波星套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11115", + "key": "equip_skillintr_11", "text": "这里会有一段关于【波波星套装6】的故事。" }, "atlas_score": 0, @@ -1148,7 +1148,7 @@ "text": "穴居人套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11210", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装1】的故事。" }, "atlas_score": 0, @@ -1167,7 +1167,7 @@ "text": "穴居人套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11211", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装2】的故事。" }, "atlas_score": 0, @@ -1186,7 +1186,7 @@ "text": "穴居人套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11212", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装3】的故事。" }, "atlas_score": 0, @@ -1205,7 +1205,7 @@ "text": "穴居人套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11213", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装4】的故事。" }, "atlas_score": 0, @@ -1224,7 +1224,7 @@ "text": "穴居人套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11214", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装5】的故事。" }, "atlas_score": 0, @@ -1243,7 +1243,7 @@ "text": "穴居人套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11215", + "key": "equip_skillintr_12", "text": "这里会有一段关于【穴居人套装6】的故事。" }, "atlas_score": 0, @@ -1262,7 +1262,7 @@ "text": "文明人套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11310", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装1】的故事。" }, "atlas_score": 0, @@ -1281,7 +1281,7 @@ "text": "文明人套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11311", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装2】的故事。" }, "atlas_score": 0, @@ -1300,7 +1300,7 @@ "text": "文明人套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11312", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装3】的故事。" }, "atlas_score": 0, @@ -1319,7 +1319,7 @@ "text": "文明人套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11313", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装4】的故事。" }, "atlas_score": 0, @@ -1338,7 +1338,7 @@ "text": "文明人套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11314", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装5】的故事。" }, "atlas_score": 0, @@ -1357,7 +1357,7 @@ "text": "文明人套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11315", + "key": "equip_skillintr_13", "text": "这里会有一段关于【文明人套装6】的故事。" }, "atlas_score": 0, @@ -1376,7 +1376,7 @@ "text": "马戏团套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11410", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装1】的故事。" }, "atlas_score": 0, @@ -1395,7 +1395,7 @@ "text": "马戏团套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11411", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装2】的故事。" }, "atlas_score": 0, @@ -1414,7 +1414,7 @@ "text": "马戏团套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11412", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装3】的故事。" }, "atlas_score": 0, @@ -1433,7 +1433,7 @@ "text": "马戏团套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11413", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装4】的故事。" }, "atlas_score": 0, @@ -1452,7 +1452,7 @@ "text": "马戏团套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11414", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装5】的故事。" }, "atlas_score": 0, @@ -1471,7 +1471,7 @@ "text": "马戏团套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11415", + "key": "equip_skillintr_14", "text": "这里会有一段关于【马戏团套装6】的故事。" }, "atlas_score": 0, @@ -1490,7 +1490,7 @@ "text": "泰坦套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11510", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装1】的故事。" }, "atlas_score": 0, @@ -1509,7 +1509,7 @@ "text": "泰坦套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11511", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装2】的故事。" }, "atlas_score": 0, @@ -1528,7 +1528,7 @@ "text": "泰坦套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11512", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装3】的故事。" }, "atlas_score": 0, @@ -1547,7 +1547,7 @@ "text": "泰坦套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11513", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装4】的故事。" }, "atlas_score": 0, @@ -1566,7 +1566,7 @@ "text": "泰坦套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11514", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装5】的故事。" }, "atlas_score": 0, @@ -1585,7 +1585,7 @@ "text": "泰坦套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11515", + "key": "equip_skillintr_15", "text": "这里会有一段关于【泰坦套装6】的故事。" }, "atlas_score": 0, @@ -1604,7 +1604,7 @@ "text": "巨怪猎人套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11610", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装1】的故事。" }, "atlas_score": 0, @@ -1623,7 +1623,7 @@ "text": "巨怪猎人套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11611", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装2】的故事。" }, "atlas_score": 0, @@ -1642,7 +1642,7 @@ "text": "巨怪猎人套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11612", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装3】的故事。" }, "atlas_score": 0, @@ -1661,7 +1661,7 @@ "text": "巨怪猎人套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11613", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装4】的故事。" }, "atlas_score": 0, @@ -1680,7 +1680,7 @@ "text": "巨怪猎人套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11614", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装5】的故事。" }, "atlas_score": 0, @@ -1699,7 +1699,7 @@ "text": "巨怪猎人套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11615", + "key": "equip_skillintr_16", "text": "这里会有一段关于【巨怪猎人套装6】的故事。" }, "atlas_score": 0, @@ -1718,7 +1718,7 @@ "text": "天外陨石套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11710", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装1】的故事。" }, "atlas_score": 0, @@ -1737,7 +1737,7 @@ "text": "天外陨石套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11711", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装2】的故事。" }, "atlas_score": 0, @@ -1756,7 +1756,7 @@ "text": "天外陨石套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11712", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装3】的故事。" }, "atlas_score": 0, @@ -1775,7 +1775,7 @@ "text": "天外陨石套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11713", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装4】的故事。" }, "atlas_score": 0, @@ -1794,7 +1794,7 @@ "text": "天外陨石套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11714", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装5】的故事。" }, "atlas_score": 0, @@ -1813,7 +1813,7 @@ "text": "天外陨石套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11715", + "key": "equip_skillintr_17", "text": "这里会有一段关于【天外陨石套装6】的故事。" }, "atlas_score": 0, @@ -1832,7 +1832,7 @@ "text": "沼泽怪物套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11810", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装1】的故事。" }, "atlas_score": 0, @@ -1851,7 +1851,7 @@ "text": "沼泽怪物套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11811", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装2】的故事。" }, "atlas_score": 0, @@ -1870,7 +1870,7 @@ "text": "沼泽怪物套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11812", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装3】的故事。" }, "atlas_score": 0, @@ -1889,7 +1889,7 @@ "text": "沼泽怪物套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11813", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装4】的故事。" }, "atlas_score": 0, @@ -1908,7 +1908,7 @@ "text": "沼泽怪物套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11814", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装5】的故事。" }, "atlas_score": 0, @@ -1927,7 +1927,7 @@ "text": "沼泽怪物套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11815", + "key": "equip_skillintr_18", "text": "这里会有一段关于【沼泽怪物套装6】的故事。" }, "atlas_score": 0, @@ -1946,7 +1946,7 @@ "text": "守护神套装1" }, "content_text": { - "key": "newsmithy_tool_content_text11910", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装1】的故事。" }, "atlas_score": 0, @@ -1965,7 +1965,7 @@ "text": "守护神套装2" }, "content_text": { - "key": "newsmithy_tool_content_text11911", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装2】的故事。" }, "atlas_score": 0, @@ -1984,7 +1984,7 @@ "text": "守护神套装3" }, "content_text": { - "key": "newsmithy_tool_content_text11912", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装3】的故事。" }, "atlas_score": 0, @@ -2003,7 +2003,7 @@ "text": "守护神套装4" }, "content_text": { - "key": "newsmithy_tool_content_text11913", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装4】的故事。" }, "atlas_score": 0, @@ -2022,7 +2022,7 @@ "text": "守护神套装5" }, "content_text": { - "key": "newsmithy_tool_content_text11914", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装5】的故事。" }, "atlas_score": 0, @@ -2041,7 +2041,7 @@ "text": "守护神套装6" }, "content_text": { - "key": "newsmithy_tool_content_text11915", + "key": "equip_skillintr_19", "text": "这里会有一段关于【守护神套装6】的故事。" }, "atlas_score": 0, diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json index fb555e24c..4174a8a5c 100644 --- a/bin/json/game_taskactivereward.json +++ b/bin/json/game_taskactivereward.json @@ -1,110 +1,34 @@ [ { "key": 1, - "id_tag": 1, - "active": 20, + "id_tag": 2, + "active": 40, "reword": [ { "a": "attr", "t": "diamond", - "n": 5 + "n": 10 } - ] + ], + "action": "Skill_2", + "stage": 1 }, { "key": 2, - "id_tag": 1, - "active": 40, + "id_tag": 2, + "active": 80, "reword": [ { "a": "attr", - "t": "gold", - "n": 10000 + "t": "diamond", + "n": 10 } - ] + ], + "action": "Skill_2", + "stage": 2 }, { "key": 3, - "id_tag": 1, - "active": 60, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 4, - "id_tag": 1, - "active": 80, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "key": 5, - "id_tag": 1, - "active": 100, - "reword": [ - { - "a": "item", - "t": "30001", - "n": 1 - }, - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "key": 6, - "id_tag": 2, - "active": 40, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 25000 - } - ] - }, - { - "key": 7, - "id_tag": 2, - "active": 80, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 25000 - } - ] - }, - { - "key": 8, "id_tag": 2, "active": 120, "reword": [ @@ -113,10 +37,12 @@ "t": "diamond", "n": 20 } - ] + ], + "action": "Skill_2", + "stage": 3 }, { - "key": 9, + "key": 4, "id_tag": 2, "active": 160, "reword": [ @@ -124,29 +50,9 @@ "a": "attr", "t": "diamond", "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 75000 } - ] - }, - { - "key": 10, - "id_tag": 2, - "active": 200, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 200000 - } - ] + ], + "action": "Skill_2", + "stage": 4 } ] \ No newline at end of file diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index edeb0cd42..eda75a7a0 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -1,100 +1,10 @@ [ - { - "key": 10001, - "id_list": 1, - "id_tag": 1, - "task_display": { - "key": "task_10001", - "text": "进行1次普通招募" - }, - "type_id": 2018001, - "active": 20, - "id_after": 0, - "jump_interface": 107, - "icon": "wp_icon_0001", - "reword": [] - }, - { - "key": 10002, - "id_list": 2, - "id_tag": 1, - "task_display": { - "key": "task_10002", - "text": "为任意英雄提升1次等级" - }, - "type_id": 2024001, - "active": 20, - "id_after": 0, - "jump_interface": 103, - "icon": "wp_icon_0001", - "reword": [] - }, - { - "key": 10004, - "id_list": 4, - "id_tag": 1, - "task_display": { - "key": "task_10004", - "text": "强化任意装备成功1次" - }, - "type_id": 2047001, - "active": 20, - "id_after": 0, - "jump_interface": 102, - "icon": "wp_icon_0001", - "reword": [] - }, - { - "key": 10006, - "id_list": 6, - "id_tag": 1, - "task_display": { - "key": "task_10006", - "text": "在商店购买任意1件商品" - }, - "type_id": 2064001, - "active": 20, - "id_after": 0, - "jump_interface": 122, - "icon": "wp_icon_0001", - "reword": [] - }, - { - "key": 10007, - "id_list": 7, - "id_tag": 1, - "task_display": { - "key": "task_10007", - "text": "使用好友助战英雄战斗1次" - }, - "type_id": 2012001, - "active": 20, - "id_after": 0, - "jump_interface": 113, - "icon": "wp_icon_0001", - "reword": [] - }, { "key": 20001, - "id_list": 8, - "id_tag": 1, - "task_display": { - "key": "task_20001", - "text": "进行竞技场挑战1次" - }, - "type_id": 2130001, - "active": 20, - "id_after": 0, - "jump_interface": 156, - "icon": "wp_icon_0001", - "reword": [] - }, - { - "key": 20002, - "id_list": 9, + "id_list": 1, "id_tag": 2, "task_display": { - "key": "task_20002", + "key": "task_20001", "text": "进行10次普通招募" }, "type_id": 3018001, @@ -105,11 +15,11 @@ "reword": [] }, { - "key": 20003, - "id_list": 10, + "key": 20002, + "id_list": 2, "id_tag": 2, "task_display": { - "key": "task_20003", + "key": "task_20002", "text": "为任意英雄提升10次等级" }, "type_id": 3024001, @@ -120,11 +30,11 @@ "reword": [] }, { - "key": 20005, - "id_list": 12, + "key": 20003, + "id_list": 3, "id_tag": 2, "task_display": { - "key": "task_20005", + "key": "task_20003", "text": "强化任意装备成功6次" }, "type_id": 3047001, @@ -135,11 +45,11 @@ "reword": [] }, { - "key": 20007, - "id_list": 14, + "key": 20004, + "id_list": 4, "id_tag": 2, "task_display": { - "key": "task_20007", + "key": "task_20004", "text": "在商店购买任意7件商品" }, "type_id": 3064001, @@ -150,11 +60,11 @@ "reword": [] }, { - "key": 20008, - "id_list": 15, + "key": 20005, + "id_list": 5, "id_tag": 2, "task_display": { - "key": "task_20008", + "key": "task_20005", "text": "使用好友助战英雄战斗7次" }, "type_id": 3012001, @@ -165,11 +75,11 @@ "reword": [] }, { - "key": 20010, - "id_list": 17, + "key": 20006, + "id_list": 6, "id_tag": 2, "task_display": { - "key": "task_20010", + "key": "task_20006", "text": "刷新商店10次" }, "type_id": 3105001, @@ -180,11 +90,11 @@ "reword": [] }, { - "key": 20011, - "id_list": 18, + "key": 20007, + "id_list": 7, "id_tag": 2, "task_display": { - "key": "task_20011", + "key": "task_20007", "text": "消费1000颗钻石" }, "type_id": 3104001, @@ -195,11 +105,11 @@ "reword": [] }, { - "key": 20012, - "id_list": 19, + "key": 20008, + "id_list": 8, "id_tag": 2, "task_display": { - "key": "task_20012", + "key": "task_20008", "text": "进行30场竞技场挑战" }, "type_id": 3130001, @@ -208,2924 +118,5 @@ "jump_interface": 156, "icon": "wp_icon_0001", "reword": [] - }, - { - "key": 30011, - "id_list": 30, - "id_tag": 3, - "task_display": { - "key": "task_30011", - "text": "拥有1个好友" - }, - "type_id": 4010001, - "active": 0, - "id_after": 4010002, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30012, - "id_list": 31, - "id_tag": 3, - "task_display": { - "key": "task_30012", - "text": "拥有5个好友" - }, - "type_id": 4010002, - "active": 0, - "id_after": 4010003, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30013, - "id_list": 32, - "id_tag": 3, - "task_display": { - "key": "task_30013", - "text": "拥有10个好友" - }, - "type_id": 4010003, - "active": 0, - "id_after": 4010004, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30014, - "id_list": 33, - "id_tag": 3, - "task_display": { - "key": "task_30014", - "text": "拥有20个好友" - }, - "type_id": 4010004, - "active": 0, - "id_after": 4010005, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30015, - "id_list": 34, - "id_tag": 3, - "task_display": { - "key": "task_30015", - "text": "拥有30个好友" - }, - "type_id": 4010005, - "active": 0, - "id_after": 4010006, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30016, - "id_list": 35, - "id_tag": 3, - "task_display": { - "key": "task_30016", - "text": "拥有50个好友" - }, - "type_id": 4010006, - "active": 0, - "id_after": 0, - "jump_interface": 117, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30017, - "id_list": 36, - "id_tag": 3, - "task_display": { - "key": "task_30017", - "text": "赠送5次友情点" - }, - "type_id": 4011001, - "active": 0, - "id_after": 4011002, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30018, - "id_list": 37, - "id_tag": 3, - "task_display": { - "key": "task_30018", - "text": "赠送10次友情点" - }, - "type_id": 4011002, - "active": 0, - "id_after": 4011003, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30019, - "id_list": 38, - "id_tag": 3, - "task_display": { - "key": "task_30019", - "text": "赠送30次友情点" - }, - "type_id": 4011003, - "active": 0, - "id_after": 4011004, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30020, - "id_list": 39, - "id_tag": 3, - "task_display": { - "key": "task_30020", - "text": "赠送50次友情点" - }, - "type_id": 4011004, - "active": 0, - "id_after": 4011005, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30021, - "id_list": 40, - "id_tag": 3, - "task_display": { - "key": "task_30021", - "text": "赠送100次友情点" - }, - "type_id": 4011005, - "active": 0, - "id_after": 4011006, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30022, - "id_list": 41, - "id_tag": 3, - "task_display": { - "key": "task_30022", - "text": "赠送300次友情点" - }, - "type_id": 4011006, - "active": 0, - "id_after": 4011007, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30023, - "id_list": 42, - "id_tag": 3, - "task_display": { - "key": "task_30023", - "text": "赠送500次友情点" - }, - "type_id": 4011007, - "active": 0, - "id_after": 4011008, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30024, - "id_list": 43, - "id_tag": 3, - "task_display": { - "key": "task_30024", - "text": "赠送1000次友情点" - }, - "type_id": 4011008, - "active": 0, - "id_after": 4011009, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30025, - "id_list": 44, - "id_tag": 3, - "task_display": { - "key": "task_30025", - "text": "赠送3000次友情点" - }, - "type_id": 4011009, - "active": 0, - "id_after": 4011010, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30026, - "id_list": 45, - "id_tag": 3, - "task_display": { - "key": "task_30026", - "text": "赠送5000次友情点" - }, - "type_id": 4011010, - "active": 0, - "id_after": 4011011, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30027, - "id_list": 46, - "id_tag": 3, - "task_display": { - "key": "task_30027", - "text": "赠送10000次友情点" - }, - "type_id": 4011011, - "active": 0, - "id_after": 0, - "jump_interface": 115, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 110 - } - ] - }, - { - "key": 30028, - "id_list": 47, - "id_tag": 3, - "task_display": { - "key": "task_30028", - "text": "使用好友助战英雄1次" - }, - "type_id": 4012001, - "active": 0, - "id_after": 4012002, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30029, - "id_list": 48, - "id_tag": 3, - "task_display": { - "key": "task_30029", - "text": "使用好友助战英雄5次" - }, - "type_id": 4012002, - "active": 0, - "id_after": 4012003, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30030, - "id_list": 49, - "id_tag": 3, - "task_display": { - "key": "task_30030", - "text": "使用好友助战英雄10次" - }, - "type_id": 4012003, - "active": 0, - "id_after": 4012004, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30031, - "id_list": 50, - "id_tag": 3, - "task_display": { - "key": "task_30031", - "text": "使用好友助战英雄30次" - }, - "type_id": 4012004, - "active": 0, - "id_after": 4012005, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30032, - "id_list": 51, - "id_tag": 3, - "task_display": { - "key": "task_30032", - "text": "使用好友助战英雄50次" - }, - "type_id": 4012005, - "active": 0, - "id_after": 4012006, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30033, - "id_list": 52, - "id_tag": 3, - "task_display": { - "key": "task_30033", - "text": "使用好友助战英雄100次" - }, - "type_id": 4012006, - "active": 0, - "id_after": 4012007, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30034, - "id_list": 53, - "id_tag": 3, - "task_display": { - "key": "task_30034", - "text": "使用好友助战英雄300次" - }, - "type_id": 4012007, - "active": 0, - "id_after": 4012008, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30035, - "id_list": 54, - "id_tag": 3, - "task_display": { - "key": "task_30035", - "text": "使用好友助战英雄500次" - }, - "type_id": 4012008, - "active": 0, - "id_after": 4012009, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30036, - "id_list": 55, - "id_tag": 3, - "task_display": { - "key": "task_30036", - "text": "使用好友助战英雄1000次" - }, - "type_id": 4012009, - "active": 0, - "id_after": 0, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30037, - "id_list": 56, - "id_tag": 3, - "task_display": { - "key": "task_30037", - "text": "招募获得个15星以上品质英雄" - }, - "type_id": 4016001, - "active": 0, - "id_after": 4016002, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30038, - "id_list": 57, - "id_tag": 3, - "task_display": { - "key": "task_30038", - "text": "招募获得个25星以上品质英雄" - }, - "type_id": 4016002, - "active": 0, - "id_after": 4016003, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30039, - "id_list": 58, - "id_tag": 3, - "task_display": { - "key": "task_30039", - "text": "招募获得个35星以上品质英雄" - }, - "type_id": 4016003, - "active": 0, - "id_after": 4016004, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30040, - "id_list": 59, - "id_tag": 3, - "task_display": { - "key": "task_30040", - "text": "招募获得个55星以上品质英雄" - }, - "type_id": 4016004, - "active": 0, - "id_after": 4016005, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30041, - "id_list": 60, - "id_tag": 3, - "task_display": { - "key": "task_30041", - "text": "招募获得个105星以上品质英雄" - }, - "type_id": 4016005, - "active": 0, - "id_after": 4016006, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30042, - "id_list": 61, - "id_tag": 3, - "task_display": { - "key": "task_30042", - "text": "招募获得个155星以上品质英雄" - }, - "type_id": 4016006, - "active": 0, - "id_after": 4016007, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30043, - "id_list": 62, - "id_tag": 3, - "task_display": { - "key": "task_30043", - "text": "招募获得个205星以上品质英雄" - }, - "type_id": 4016007, - "active": 0, - "id_after": 4016008, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30044, - "id_list": 63, - "id_tag": 3, - "task_display": { - "key": "task_30044", - "text": "招募获得个305星以上品质英雄" - }, - "type_id": 4016008, - "active": 0, - "id_after": 4016009, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30045, - "id_list": 64, - "id_tag": 3, - "task_display": { - "key": "task_30045", - "text": "招募获得个505星以上品质英雄" - }, - "type_id": 4016009, - "active": 0, - "id_after": 0, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30046, - "id_list": 65, - "id_tag": 3, - "task_display": { - "key": "task_30046", - "text": "累计进行10次普通招募" - }, - "type_id": 4018001, - "active": 0, - "id_after": 4018002, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30047, - "id_list": 66, - "id_tag": 3, - "task_display": { - "key": "task_30047", - "text": "累计进行20次普通招募" - }, - "type_id": 4018002, - "active": 0, - "id_after": 4018003, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30048, - "id_list": 67, - "id_tag": 3, - "task_display": { - "key": "task_30048", - "text": "累计进行30次普通招募" - }, - "type_id": 4018003, - "active": 0, - "id_after": 4018004, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30049, - "id_list": 68, - "id_tag": 3, - "task_display": { - "key": "task_30049", - "text": "累计进行50次普通招募" - }, - "type_id": 4018004, - "active": 0, - "id_after": 4018005, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30050, - "id_list": 69, - "id_tag": 3, - "task_display": { - "key": "task_30050", - "text": "累计进行100次普通招募" - }, - "type_id": 4018005, - "active": 0, - "id_after": 4018006, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30051, - "id_list": 70, - "id_tag": 3, - "task_display": { - "key": "task_30051", - "text": "累计进行200次普通招募" - }, - "type_id": 4018006, - "active": 0, - "id_after": 4018007, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30052, - "id_list": 71, - "id_tag": 3, - "task_display": { - "key": "task_30052", - "text": "累计进行300次普通招募" - }, - "type_id": 4018007, - "active": 0, - "id_after": 4018008, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30053, - "id_list": 72, - "id_tag": 3, - "task_display": { - "key": "task_30053", - "text": "累计进行500次普通招募" - }, - "type_id": 4018008, - "active": 0, - "id_after": 4018009, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30054, - "id_list": 73, - "id_tag": 3, - "task_display": { - "key": "task_30054", - "text": "累计进行1000次普通招募" - }, - "type_id": 4018009, - "active": 0, - "id_after": 4018010, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30055, - "id_list": 74, - "id_tag": 3, - "task_display": { - "key": "task_30055", - "text": "累计进行2000次普通招募" - }, - "type_id": 4018010, - "active": 0, - "id_after": 4018011, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30056, - "id_list": 75, - "id_tag": 3, - "task_display": { - "key": "task_30056", - "text": "累计进行5000次普通招募" - }, - "type_id": 4018011, - "active": 0, - "id_after": 4018012, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 110 - } - ] - }, - { - "key": 30057, - "id_list": 76, - "id_tag": 3, - "task_display": { - "key": "task_30057", - "text": "累计进行10000次普通招募" - }, - "type_id": 4018012, - "active": 0, - "id_after": 0, - "jump_interface": 107, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 120 - } - ] - }, - { - "key": 30058, - "id_list": 77, - "id_tag": 3, - "task_display": { - "key": "task_30058", - "text": "账号等级达到10级" - }, - "type_id": 4020001, - "active": 0, - "id_after": 4020002, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30059, - "id_list": 78, - "id_tag": 3, - "task_display": { - "key": "task_30059", - "text": "账号等级达到20级" - }, - "type_id": 4020002, - "active": 0, - "id_after": 4020003, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30060, - "id_list": 79, - "id_tag": 3, - "task_display": { - "key": "task_30060", - "text": "账号等级达到30级" - }, - "type_id": 4020003, - "active": 0, - "id_after": 4020004, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30061, - "id_list": 80, - "id_tag": 3, - "task_display": { - "key": "task_30061", - "text": "账号等级达到40级" - }, - "type_id": 4020004, - "active": 0, - "id_after": 4020005, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30062, - "id_list": 81, - "id_tag": 3, - "task_display": { - "key": "task_30062", - "text": "账号等级达到50级" - }, - "type_id": 4020005, - "active": 0, - "id_after": 4020006, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30063, - "id_list": 82, - "id_tag": 3, - "task_display": { - "key": "task_30063", - "text": "账号等级达到60级" - }, - "type_id": 4020006, - "active": 0, - "id_after": 0, - "jump_interface": 113, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30064, - "id_list": 83, - "id_tag": 3, - "task_display": { - "key": "task_30064", - "text": "件装备强化至15级1" - }, - "type_id": 4043001, - "active": 0, - "id_after": 4043002, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30065, - "id_list": 84, - "id_tag": 3, - "task_display": { - "key": "task_30065", - "text": "件装备强化至15级2" - }, - "type_id": 4043002, - "active": 0, - "id_after": 4043003, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30066, - "id_list": 85, - "id_tag": 3, - "task_display": { - "key": "task_30066", - "text": "件装备强化至15级4" - }, - "type_id": 4043003, - "active": 0, - "id_after": 4043004, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30067, - "id_list": 86, - "id_tag": 3, - "task_display": { - "key": "task_30067", - "text": "件装备强化至15级6" - }, - "type_id": 4043004, - "active": 0, - "id_after": 4043005, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30068, - "id_list": 87, - "id_tag": 3, - "task_display": { - "key": "task_30068", - "text": "件装备强化至15级12" - }, - "type_id": 4043005, - "active": 0, - "id_after": 4043006, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30069, - "id_list": 88, - "id_tag": 3, - "task_display": { - "key": "task_30069", - "text": "件装备强化至15级18" - }, - "type_id": 4043006, - "active": 0, - "id_after": 4043007, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30070, - "id_list": 89, - "id_tag": 3, - "task_display": { - "key": "task_30070", - "text": "件装备强化至15级24" - }, - "type_id": 4043007, - "active": 0, - "id_after": 4043008, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30071, - "id_list": 90, - "id_tag": 3, - "task_display": { - "key": "task_30071", - "text": "件装备强化至15级30" - }, - "type_id": 4043008, - "active": 0, - "id_after": 4043009, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30072, - "id_list": 91, - "id_tag": 3, - "task_display": { - "key": "task_30072", - "text": "件装备强化至15级60" - }, - "type_id": 4043009, - "active": 0, - "id_after": 4043010, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30073, - "id_list": 92, - "id_tag": 3, - "task_display": { - "key": "task_30073", - "text": "件装备强化至15级120" - }, - "type_id": 4043010, - "active": 0, - "id_after": 0, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30074, - "id_list": 93, - "id_tag": 3, - "task_display": { - "key": "task_30074", - "text": "累计强化装备成功10次" - }, - "type_id": 4047001, - "active": 0, - "id_after": 4047002, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30075, - "id_list": 94, - "id_tag": 3, - "task_display": { - "key": "task_30075", - "text": "累计强化装备成功20次" - }, - "type_id": 4047002, - "active": 0, - "id_after": 4047003, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30076, - "id_list": 95, - "id_tag": 3, - "task_display": { - "key": "task_30076", - "text": "累计强化装备成功30次" - }, - "type_id": 4047003, - "active": 0, - "id_after": 4047004, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30077, - "id_list": 96, - "id_tag": 3, - "task_display": { - "key": "task_30077", - "text": "累计强化装备成功50次" - }, - "type_id": 4047004, - "active": 0, - "id_after": 4047005, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30078, - "id_list": 97, - "id_tag": 3, - "task_display": { - "key": "task_30078", - "text": "累计强化装备成功100次" - }, - "type_id": 4047005, - "active": 0, - "id_after": 4047006, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30079, - "id_list": 98, - "id_tag": 3, - "task_display": { - "key": "task_30079", - "text": "累计强化装备成功200次" - }, - "type_id": 4047006, - "active": 0, - "id_after": 4047007, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30080, - "id_list": 99, - "id_tag": 3, - "task_display": { - "key": "task_30080", - "text": "累计强化装备成功300次" - }, - "type_id": 4047007, - "active": 0, - "id_after": 4047008, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30081, - "id_list": 100, - "id_tag": 3, - "task_display": { - "key": "task_30081", - "text": "累计强化装备成功500次" - }, - "type_id": 4047008, - "active": 0, - "id_after": 4047009, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30082, - "id_list": 101, - "id_tag": 3, - "task_display": { - "key": "task_30082", - "text": "累计强化装备成功1000次" - }, - "type_id": 4047009, - "active": 0, - "id_after": 4047010, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30083, - "id_list": 102, - "id_tag": 3, - "task_display": { - "key": "task_30083", - "text": "累计强化装备成功2000次" - }, - "type_id": 4047010, - "active": 0, - "id_after": 4047011, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30084, - "id_list": 103, - "id_tag": 3, - "task_display": { - "key": "task_30084", - "text": "累计强化装备成功3000次" - }, - "type_id": 4047011, - "active": 0, - "id_after": 4047012, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 110 - } - ] - }, - { - "key": 30085, - "id_list": 104, - "id_tag": 3, - "task_display": { - "key": "task_30085", - "text": "累计强化装备成功5000次" - }, - "type_id": 4047012, - "active": 0, - "id_after": 4047013, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 120 - } - ] - }, - { - "key": 30086, - "id_list": 105, - "id_tag": 3, - "task_display": { - "key": "task_30086", - "text": "累计强化装备成功10000次" - }, - "type_id": 4047013, - "active": 0, - "id_after": 0, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 130 - } - ] - }, - { - "key": 30087, - "id_list": 106, - "id_tag": 3, - "task_display": { - "key": "task_30087", - "text": "在商店购买5份商品" - }, - "type_id": 4064001, - "active": 0, - "id_after": 4064002, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30088, - "id_list": 107, - "id_tag": 3, - "task_display": { - "key": "task_30088", - "text": "在商店购买10份商品" - }, - "type_id": 4064002, - "active": 0, - "id_after": 4064003, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30089, - "id_list": 108, - "id_tag": 3, - "task_display": { - "key": "task_30089", - "text": "在商店购买20份商品" - }, - "type_id": 4064003, - "active": 0, - "id_after": 4064004, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30090, - "id_list": 109, - "id_tag": 3, - "task_display": { - "key": "task_30090", - "text": "在商店购买50份商品" - }, - "type_id": 4064004, - "active": 0, - "id_after": 4064005, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30091, - "id_list": 110, - "id_tag": 3, - "task_display": { - "key": "task_30091", - "text": "在商店购买100份商品" - }, - "type_id": 4064005, - "active": 0, - "id_after": 4064006, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30092, - "id_list": 111, - "id_tag": 3, - "task_display": { - "key": "task_30092", - "text": "在商店购买200份商品" - }, - "type_id": 4064006, - "active": 0, - "id_after": 4064007, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30093, - "id_list": 112, - "id_tag": 3, - "task_display": { - "key": "task_30093", - "text": "在商店购买500份商品" - }, - "type_id": 4064007, - "active": 0, - "id_after": 0, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30094, - "id_list": 113, - "id_tag": 3, - "task_display": { - "key": "task_30094", - "text": "累计消费50000金币" - }, - "type_id": 4068001, - "active": 0, - "id_after": 4068002, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30095, - "id_list": 114, - "id_tag": 3, - "task_display": { - "key": "task_30095", - "text": "累计消费500000金币" - }, - "type_id": 4068002, - "active": 0, - "id_after": 4068003, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30096, - "id_list": 115, - "id_tag": 3, - "task_display": { - "key": "task_30096", - "text": "累计消费5000000金币" - }, - "type_id": 4068003, - "active": 0, - "id_after": 4068004, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30097, - "id_list": 116, - "id_tag": 3, - "task_display": { - "key": "task_30097", - "text": "累计消费50000000金币" - }, - "type_id": 4068004, - "active": 0, - "id_after": 0, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30098, - "id_list": 117, - "id_tag": 3, - "task_display": { - "key": "task_30098", - "text": "普通塔达到10层" - }, - "type_id": 4084001, - "active": 0, - "id_after": 4084002, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30099, - "id_list": 118, - "id_tag": 3, - "task_display": { - "key": "task_30099", - "text": "普通塔达到20层" - }, - "type_id": 4084002, - "active": 0, - "id_after": 4084003, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30100, - "id_list": 119, - "id_tag": 3, - "task_display": { - "key": "task_30100", - "text": "普通塔达到50层" - }, - "type_id": 4084003, - "active": 0, - "id_after": 4084004, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30101, - "id_list": 120, - "id_tag": 3, - "task_display": { - "key": "task_30101", - "text": "普通塔达到100层" - }, - "type_id": 4084004, - "active": 0, - "id_after": 0, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30102, - "id_list": 121, - "id_tag": 3, - "task_display": { - "key": "task_30102", - "text": "赛季塔达到5层" - }, - "type_id": 4085001, - "active": 0, - "id_after": 4085002, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30103, - "id_list": 122, - "id_tag": 3, - "task_display": { - "key": "task_30103", - "text": "赛季塔达到10层" - }, - "type_id": 4085002, - "active": 0, - "id_after": 4085003, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30104, - "id_list": 123, - "id_tag": 3, - "task_display": { - "key": "task_30104", - "text": "赛季塔达到20层" - }, - "type_id": 4085003, - "active": 0, - "id_after": 4085004, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30105, - "id_list": 124, - "id_tag": 3, - "task_display": { - "key": "task_30105", - "text": "赛季塔达到30层" - }, - "type_id": 4085004, - "active": 0, - "id_after": 4085005, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30106, - "id_list": 125, - "id_tag": 3, - "task_display": { - "key": "task_30106", - "text": "赛季塔达到50层" - }, - "type_id": 4085005, - "active": 0, - "id_after": 0, - "jump_interface": 120, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30107, - "id_list": 126, - "id_tag": 3, - "task_display": { - "key": "task_30107", - "text": "装备累计强化失败10次" - }, - "type_id": 4096001, - "active": 0, - "id_after": 4096002, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30108, - "id_list": 127, - "id_tag": 3, - "task_display": { - "key": "task_30108", - "text": "装备累计强化失败20次" - }, - "type_id": 4096002, - "active": 0, - "id_after": 4096003, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30109, - "id_list": 128, - "id_tag": 3, - "task_display": { - "key": "task_30109", - "text": "装备累计强化失败50次" - }, - "type_id": 4096003, - "active": 0, - "id_after": 4096004, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30110, - "id_list": 129, - "id_tag": 3, - "task_display": { - "key": "task_30110", - "text": "装备累计强化失败100次" - }, - "type_id": 4096004, - "active": 0, - "id_after": 4096005, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30111, - "id_list": 130, - "id_tag": 3, - "task_display": { - "key": "task_30111", - "text": "装备累计强化失败200次" - }, - "type_id": 4096005, - "active": 0, - "id_after": 4096006, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30112, - "id_list": 131, - "id_tag": 3, - "task_display": { - "key": "task_30112", - "text": "装备累计强化失败300次" - }, - "type_id": 4096006, - "active": 0, - "id_after": 4096007, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30113, - "id_list": 132, - "id_tag": 3, - "task_display": { - "key": "task_30113", - "text": "装备累计强化失败500次" - }, - "type_id": 4096007, - "active": 0, - "id_after": 4096008, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30114, - "id_list": 133, - "id_tag": 3, - "task_display": { - "key": "task_30114", - "text": "装备累计强化失败1000次" - }, - "type_id": 4096008, - "active": 0, - "id_after": 4096009, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30115, - "id_list": 134, - "id_tag": 3, - "task_display": { - "key": "task_30115", - "text": "装备累计强化失败2000次" - }, - "type_id": 4096009, - "active": 0, - "id_after": 4096010, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30116, - "id_list": 135, - "id_tag": 3, - "task_display": { - "key": "task_30116", - "text": "装备累计强化失败3000次" - }, - "type_id": 4096010, - "active": 0, - "id_after": 4096011, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30117, - "id_list": 136, - "id_tag": 3, - "task_display": { - "key": "task_30117", - "text": "装备累计强化失败5000次" - }, - "type_id": 4096011, - "active": 0, - "id_after": 4096012, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 110 - } - ] - }, - { - "key": 30118, - "id_list": 137, - "id_tag": 3, - "task_display": { - "key": "task_30118", - "text": "装备累计强化失败10000次" - }, - "type_id": 4096012, - "active": 0, - "id_after": 0, - "jump_interface": 102, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 120 - } - ] - }, - { - "key": 30119, - "id_list": 138, - "id_tag": 3, - "task_display": { - "key": "task_30119", - "text": "累计消费500钻石" - }, - "type_id": 4104001, - "active": 0, - "id_after": 4104002, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30120, - "id_list": 139, - "id_tag": 3, - "task_display": { - "key": "task_30120", - "text": "累计消费1000钻石" - }, - "type_id": 4104002, - "active": 0, - "id_after": 4104003, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30121, - "id_list": 140, - "id_tag": 3, - "task_display": { - "key": "task_30121", - "text": "累计消费3000钻石" - }, - "type_id": 4104003, - "active": 0, - "id_after": 4104004, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30122, - "id_list": 141, - "id_tag": 3, - "task_display": { - "key": "task_30122", - "text": "累计消费5000钻石" - }, - "type_id": 4104004, - "active": 0, - "id_after": 4104005, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30123, - "id_list": 142, - "id_tag": 3, - "task_display": { - "key": "task_30123", - "text": "累计消费10000钻石" - }, - "type_id": 4104005, - "active": 0, - "id_after": 4104006, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30124, - "id_list": 143, - "id_tag": 3, - "task_display": { - "key": "task_30124", - "text": "累计消费20000钻石" - }, - "type_id": 4104006, - "active": 0, - "id_after": 4104007, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30125, - "id_list": 144, - "id_tag": 3, - "task_display": { - "key": "task_30125", - "text": "累计消费30000钻石" - }, - "type_id": 4104007, - "active": 0, - "id_after": 4104008, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30126, - "id_list": 145, - "id_tag": 3, - "task_display": { - "key": "task_30126", - "text": "累计消费50000钻石" - }, - "type_id": 4104008, - "active": 0, - "id_after": 4104009, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30127, - "id_list": 146, - "id_tag": 3, - "task_display": { - "key": "task_30127", - "text": "累计消费100000钻石" - }, - "type_id": 4104009, - "active": 0, - "id_after": 4104010, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30128, - "id_list": 147, - "id_tag": 3, - "task_display": { - "key": "task_30128", - "text": "累计消费200000钻石" - }, - "type_id": 4104010, - "active": 0, - "id_after": 4104011, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30129, - "id_list": 148, - "id_tag": 3, - "task_display": { - "key": "task_30129", - "text": "累计消费500000钻石" - }, - "type_id": 4104011, - "active": 0, - "id_after": 0, - "jump_interface": 122, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 110 - } - ] - }, - { - "key": 30130, - "id_list": 149, - "id_tag": 3, - "task_display": { - "key": "task_30130", - "text": "竞技场积分达到1100分" - }, - "type_id": 4128001, - "active": 0, - "id_after": 4128002, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30131, - "id_list": 150, - "id_tag": 3, - "task_display": { - "key": "task_30131", - "text": "竞技场积分达到1200分" - }, - "type_id": 4128002, - "active": 0, - "id_after": 4128003, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30132, - "id_list": 151, - "id_tag": 3, - "task_display": { - "key": "task_30132", - "text": "竞技场积分达到1300分" - }, - "type_id": 4128003, - "active": 0, - "id_after": 4128004, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30133, - "id_list": 152, - "id_tag": 3, - "task_display": { - "key": "task_30133", - "text": "竞技场积分达到1400分" - }, - "type_id": 4128004, - "active": 0, - "id_after": 4128005, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30134, - "id_list": 153, - "id_tag": 3, - "task_display": { - "key": "task_30134", - "text": "竞技场积分达到1500分" - }, - "type_id": 4128005, - "active": 0, - "id_after": 4128006, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30135, - "id_list": 154, - "id_tag": 3, - "task_display": { - "key": "task_30135", - "text": "竞技场积分达到1600分" - }, - "type_id": 4128006, - "active": 0, - "id_after": 4128007, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30136, - "id_list": 155, - "id_tag": 3, - "task_display": { - "key": "task_30136", - "text": "竞技场积分达到1700分" - }, - "type_id": 4128007, - "active": 0, - "id_after": 4128008, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30137, - "id_list": 156, - "id_tag": 3, - "task_display": { - "key": "task_30137", - "text": "竞技场积分达到1800分" - }, - "type_id": 4128008, - "active": 0, - "id_after": 4128009, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30138, - "id_list": 157, - "id_tag": 3, - "task_display": { - "key": "task_30138", - "text": "竞技场积分达到1900分" - }, - "type_id": 4128009, - "active": 0, - "id_after": 4128010, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30139, - "id_list": 158, - "id_tag": 3, - "task_display": { - "key": "task_30139", - "text": "竞技场积分达到2000分" - }, - "type_id": 4128010, - "active": 0, - "id_after": 0, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] - }, - { - "key": 30140, - "id_list": 159, - "id_tag": 3, - "task_display": { - "key": "task_30140", - "text": "竞技场累计获胜5场" - }, - "type_id": 4131001, - "active": 0, - "id_after": 4131002, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 30141, - "id_list": 160, - "id_tag": 3, - "task_display": { - "key": "task_30141", - "text": "竞技场累计获胜10场" - }, - "type_id": 4131002, - "active": 0, - "id_after": 4131003, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ] - }, - { - "key": 30142, - "id_list": 161, - "id_tag": 3, - "task_display": { - "key": "task_30142", - "text": "竞技场累计获胜20场" - }, - "type_id": 4131003, - "active": 0, - "id_after": 4131004, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 30 - } - ] - }, - { - "key": 30143, - "id_list": 162, - "id_tag": 3, - "task_display": { - "key": "task_30143", - "text": "竞技场累计获胜30场" - }, - "type_id": 4131004, - "active": 0, - "id_after": 4131005, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 40 - } - ] - }, - { - "key": 30144, - "id_list": 163, - "id_tag": 3, - "task_display": { - "key": "task_30144", - "text": "竞技场累计获胜50场" - }, - "type_id": 4131005, - "active": 0, - "id_after": 4131006, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 50 - } - ] - }, - { - "key": 30145, - "id_list": 164, - "id_tag": 3, - "task_display": { - "key": "task_30145", - "text": "竞技场累计获胜100场" - }, - "type_id": 4131006, - "active": 0, - "id_after": 4131007, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ] - }, - { - "key": 30146, - "id_list": 165, - "id_tag": 3, - "task_display": { - "key": "task_30146", - "text": "竞技场累计获胜200场" - }, - "type_id": 4131007, - "active": 0, - "id_after": 4131008, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 70 - } - ] - }, - { - "key": 30147, - "id_list": 166, - "id_tag": 3, - "task_display": { - "key": "task_30147", - "text": "竞技场累计获胜300场" - }, - "type_id": 4131008, - "active": 0, - "id_after": 4131009, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 80 - } - ] - }, - { - "key": 30148, - "id_list": 167, - "id_tag": 3, - "task_display": { - "key": "task_30148", - "text": "竞技场累计获胜500场" - }, - "type_id": 4131009, - "active": 0, - "id_after": 4131010, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 90 - } - ] - }, - { - "key": 30149, - "id_list": 168, - "id_tag": 3, - "task_display": { - "key": "task_30149", - "text": "竞技场累计获胜1000场" - }, - "type_id": 4131010, - "active": 0, - "id_after": 0, - "jump_interface": 156, - "icon": "rw_cj_icon10", - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ] } ] \ No newline at end of file diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 091aa4b21..231ed9d81 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -8,7 +8,7 @@ "text": "火焰泰坦" }, "difficulty": 1, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -45,8 +45,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301011, - 301012, 301013 ], "ps_consume": [ @@ -73,7 +71,7 @@ "text": "火焰泰坦" }, "difficulty": 2, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -110,8 +108,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301014, - 301015, 301016 ], "ps_consume": [ @@ -138,7 +134,7 @@ "text": "火焰泰坦" }, "difficulty": 3, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -175,8 +171,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301017, - 301018, 301019 ], "ps_consume": [ @@ -203,7 +197,7 @@ "text": "火焰泰坦" }, "difficulty": 4, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -240,8 +234,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301020, - 301021, 301022 ], "ps_consume": [ @@ -268,7 +260,7 @@ "text": "火焰泰坦" }, "difficulty": 5, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -305,8 +297,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301023, - 301024, 301025 ], "ps_consume": [ @@ -333,7 +323,7 @@ "text": "火焰泰坦" }, "difficulty": 6, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -370,8 +360,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301026, - 301027, 301028 ], "ps_consume": [ @@ -398,7 +386,7 @@ "text": "火焰泰坦" }, "difficulty": 7, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -435,8 +423,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301029, - 301030, 301031 ], "ps_consume": [ @@ -463,7 +449,7 @@ "text": "火焰泰坦" }, "difficulty": 8, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -500,8 +486,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301032, - 301033, 301034 ], "ps_consume": [ @@ -528,7 +512,7 @@ "text": "火焰泰坦" }, "difficulty": 9, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -565,8 +549,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301035, - 301036, 301037 ], "ps_consume": [ @@ -593,7 +575,7 @@ "text": "火焰泰坦" }, "difficulty": 10, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -630,8 +612,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301038, - 301039, 301040 ], "ps_consume": [ @@ -658,7 +638,7 @@ "text": "冰之泰坦" }, "difficulty": 1, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -695,8 +675,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302011, - 302012, 302013 ], "ps_consume": [ @@ -723,7 +701,7 @@ "text": "冰之泰坦" }, "difficulty": 2, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -760,8 +738,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302014, - 302015, 302016 ], "ps_consume": [ @@ -788,7 +764,7 @@ "text": "冰之泰坦" }, "difficulty": 3, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -825,8 +801,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302017, - 302018, 302019 ], "ps_consume": [ @@ -853,7 +827,7 @@ "text": "冰之泰坦" }, "difficulty": 4, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -890,8 +864,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302020, - 302021, 302022 ], "ps_consume": [ @@ -918,7 +890,7 @@ "text": "冰之泰坦" }, "difficulty": 5, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -955,8 +927,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302023, - 302024, 302025 ], "ps_consume": [ @@ -983,7 +953,7 @@ "text": "冰之泰坦" }, "difficulty": 6, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1020,8 +990,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302026, - 302027, 302028 ], "ps_consume": [ @@ -1048,7 +1016,7 @@ "text": "冰之泰坦" }, "difficulty": 7, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1085,8 +1053,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302029, - 302030, 302031 ], "ps_consume": [ @@ -1113,7 +1079,7 @@ "text": "冰之泰坦" }, "difficulty": 8, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1150,8 +1116,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302032, - 302033, 302034 ], "ps_consume": [ @@ -1178,7 +1142,7 @@ "text": "冰之泰坦" }, "difficulty": 9, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1215,8 +1179,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302035, - 302036, 302037 ], "ps_consume": [ @@ -1243,7 +1205,7 @@ "text": "冰之泰坦" }, "difficulty": 10, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1280,8 +1242,6 @@ "bossmodel": 11003, "boss_skill": 51004, "boss": [ - 302038, - 302039, 302040 ], "ps_consume": [ @@ -1308,7 +1268,7 @@ "text": "森林泰坦" }, "difficulty": 1, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1345,8 +1305,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303011, - 303012, 303013 ], "ps_consume": [ @@ -1373,7 +1331,7 @@ "text": "森林泰坦" }, "difficulty": 2, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1410,8 +1368,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303014, - 303015, 303016 ], "ps_consume": [ @@ -1438,7 +1394,7 @@ "text": "森林泰坦" }, "difficulty": 3, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1475,8 +1431,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303017, - 303018, 303019 ], "ps_consume": [ @@ -1503,7 +1457,7 @@ "text": "森林泰坦" }, "difficulty": 4, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1540,8 +1494,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303020, - 303021, 303022 ], "ps_consume": [ @@ -1568,7 +1520,7 @@ "text": "森林泰坦" }, "difficulty": 5, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1605,8 +1557,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303023, - 303024, 303025 ], "ps_consume": [ @@ -1633,7 +1583,7 @@ "text": "森林泰坦" }, "difficulty": 6, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1670,8 +1620,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303026, - 303027, 303028 ], "ps_consume": [ @@ -1698,7 +1646,7 @@ "text": "森林泰坦" }, "difficulty": 7, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1735,8 +1683,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303029, - 303030, 303031 ], "ps_consume": [ @@ -1763,7 +1709,7 @@ "text": "森林泰坦" }, "difficulty": 8, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1800,8 +1746,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303032, - 303033, 303034 ], "ps_consume": [ @@ -1828,7 +1772,7 @@ "text": "森林泰坦" }, "difficulty": 9, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1865,8 +1809,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303035, - 303036, 303037 ], "ps_consume": [ @@ -1893,7 +1835,7 @@ "text": "森林泰坦" }, "difficulty": 10, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -1930,8 +1872,6 @@ "bossmodel": 11018, "boss_skill": 51004, "boss": [ - 303038, - 303039, 303040 ], "ps_consume": [ @@ -1958,7 +1898,7 @@ "text": "武器BOSS" }, "difficulty": 1, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2000,8 +1940,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301011, - 301012, 301013 ], "ps_consume": [ @@ -2028,7 +1966,7 @@ "text": "武器BOSS" }, "difficulty": 2, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2070,8 +2008,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301014, - 301015, 301016 ], "ps_consume": [ @@ -2098,7 +2034,7 @@ "text": "武器BOSS" }, "difficulty": 3, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2140,8 +2076,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301017, - 301018, 301019 ], "ps_consume": [ @@ -2168,7 +2102,7 @@ "text": "武器BOSS" }, "difficulty": 4, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2210,8 +2144,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301020, - 301021, 301022 ], "ps_consume": [ @@ -2238,7 +2170,7 @@ "text": "武器BOSS" }, "difficulty": 5, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2280,8 +2212,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301023, - 301024, 301025 ], "ps_consume": [ @@ -2308,7 +2238,7 @@ "text": "武器BOSS" }, "difficulty": 6, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2350,8 +2280,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301026, - 301027, 301028 ], "ps_consume": [ @@ -2378,7 +2306,7 @@ "text": "武器BOSS" }, "difficulty": 7, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2420,8 +2348,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301029, - 301030, 301031 ], "ps_consume": [ @@ -2448,7 +2374,7 @@ "text": "武器BOSS" }, "difficulty": 8, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2490,8 +2416,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301032, - 301033, 301034 ], "ps_consume": [ @@ -2518,7 +2442,7 @@ "text": "武器BOSS" }, "difficulty": 9, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2560,8 +2484,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301035, - 301036, 301037 ], "ps_consume": [ @@ -2588,7 +2510,7 @@ "text": "武器BOSS" }, "difficulty": 10, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2630,8 +2552,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301038, - 301039, 301040 ], "ps_consume": [ @@ -2658,7 +2578,7 @@ "text": "饰品BOSS" }, "difficulty": 1, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2700,8 +2620,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301011, - 301012, 301013 ], "ps_consume": [ @@ -2728,7 +2646,7 @@ "text": "饰品BOSS" }, "difficulty": 2, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2770,8 +2688,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301014, - 301015, 301016 ], "ps_consume": [ @@ -2798,7 +2714,7 @@ "text": "饰品BOSS" }, "difficulty": 3, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2840,8 +2756,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301017, - 301018, 301019 ], "ps_consume": [ @@ -2868,7 +2782,7 @@ "text": "饰品BOSS" }, "difficulty": 4, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2910,8 +2824,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301020, - 301021, 301022 ], "ps_consume": [ @@ -2938,7 +2850,7 @@ "text": "饰品BOSS" }, "difficulty": 5, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -2980,8 +2892,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301023, - 301024, 301025 ], "ps_consume": [ @@ -3008,7 +2918,7 @@ "text": "饰品BOSS" }, "difficulty": 6, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3050,8 +2960,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301026, - 301027, 301028 ], "ps_consume": [ @@ -3078,7 +2986,7 @@ "text": "饰品BOSS" }, "difficulty": 7, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3120,8 +3028,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301029, - 301030, 301031 ], "ps_consume": [ @@ -3148,7 +3054,7 @@ "text": "饰品BOSS" }, "difficulty": 8, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3190,8 +3096,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301032, - 301033, 301034 ], "ps_consume": [ @@ -3218,7 +3122,7 @@ "text": "饰品BOSS" }, "difficulty": 9, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3260,8 +3164,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301035, - 301036, 301037 ], "ps_consume": [ @@ -3288,7 +3190,7 @@ "text": "饰品BOSS" }, "difficulty": 10, - "BattleReadyID": 104, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3330,8 +3232,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 301038, - 301039, 301040 ], "ps_consume": [ @@ -3358,7 +3258,7 @@ "text": "火焰泰坦" }, "difficulty": 1, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3405,8 +3305,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3433,7 +3331,7 @@ "text": "火焰泰坦" }, "difficulty": 2, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3480,8 +3378,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3508,7 +3404,7 @@ "text": "火焰泰坦" }, "difficulty": 3, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3555,8 +3451,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3583,7 +3477,7 @@ "text": "火焰泰坦" }, "difficulty": 4, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3630,8 +3524,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3658,7 +3550,7 @@ "text": "火焰泰坦" }, "difficulty": 5, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3705,8 +3597,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3733,7 +3623,7 @@ "text": "火焰泰坦" }, "difficulty": 6, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3780,8 +3670,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3808,7 +3696,7 @@ "text": "火焰泰坦" }, "difficulty": 7, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3855,8 +3743,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3883,7 +3769,7 @@ "text": "火焰泰坦" }, "difficulty": 8, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -3930,8 +3816,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -3958,7 +3842,7 @@ "text": "火焰泰坦" }, "difficulty": 9, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -4005,8 +3889,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -4033,7 +3915,7 @@ "text": "火焰泰坦" }, "difficulty": 10, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -4080,8 +3962,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -4108,7 +3988,7 @@ "text": "火焰泰坦" }, "difficulty": 11, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -4155,8 +4035,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ @@ -4183,7 +4061,7 @@ "text": "火焰泰坦" }, "difficulty": 12, - "BattleReadyID": 112, + "BattleReadyID": 121, "captionrecommend": [ 25001, 25004, @@ -4230,8 +4108,6 @@ "bossmodel": 11009, "boss_skill": 51004, "boss": [ - 710001, - 710001, 710001 ], "ps_consume": [ diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 297268950..f2ff54061 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -2,7 +2,7 @@ { "id": 210, "name": { - "key": "mainline_name_10001", + "key": "Mainline_Tasks1", "text": "章节1全部任务" }, "task_icon": "", @@ -21,8 +21,8 @@ { "id": 310, "name": { - "key": "Side_Quest", - "text": "武馆支线1" + "key": "Side_Quest1", + "text": "武馆内勤奋的身影是？" }, "task_icon": "", "task_txt": { @@ -45,8 +45,8 @@ { "id": 320, "name": { - "key": "Side_Quest", - "text": "铁匠铺支线1" + "key": "Side_Quest2", + "text": "铁匠铺门口身影是?" }, "task_icon": "", "task_txt": { @@ -69,8 +69,8 @@ { "id": 330, "name": { - "key": "Side_Quest", - "text": "铁匠铺支线2" + "key": "Side_Quest3", + "text": "戈伯的嘱托" }, "task_icon": "", "task_txt": { @@ -93,8 +93,8 @@ { "id": 340, "name": { - "key": "Side_Quest", - "text": "武馆支线2" + "key": "Side_Quest4", + "text": "武馆秘闻" }, "task_icon": "", "task_txt": { @@ -117,8 +117,8 @@ { "id": 350, "name": { - "key": "Side_Quest", - "text": "武馆支线3" + "key": "Side_Quest5", + "text": "好像有人再看我？" }, "task_icon": "", "task_txt": { @@ -141,8 +141,8 @@ { "id": 360, "name": { - "key": "Side_Quest", - "text": "铁匠铺支线3" + "key": "Side_Quest6", + "text": "戈伯的委托" }, "task_icon": "", "task_txt": { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 92e23681f..6472d86c1 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -32,7 +32,7 @@ "key": "Mainline_Tasks1_1_Receiving", "text": "寻找熊猫" }, - "deliver_npc": 10012, + "deliver_npc": 0, "auto_accept": 1, "reword": [ { @@ -70,13 +70,13 @@ "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, "completetask": [ - 20002 + 0 ], "deliver_npctxt": { "key": "Mainline_Tasks1_2_Receiving", "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, - "deliver_npc": 10022, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -108,7 +108,7 @@ "key": "Mainline_Tasks1_3_Receiving", "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, - "npc": 10030, + "npc": 10021, "completetasktxt": { "key": "Mainline_Tasks1_3_Receiving", "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" @@ -120,7 +120,7 @@ "key": "Mainline_Tasks1_3_Receiving", "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, - "deliver_npc": 10032, + "deliver_npc": 10030, "auto_accept": 0, "reword": [ { @@ -152,7 +152,7 @@ "key": "Mainline_Tasks1_4_Receiving", "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, - "npc": 10040, + "npc": 10031, "completetasktxt": { "key": "Mainline_Tasks1_4_Receiving", "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" @@ -164,7 +164,7 @@ "key": "Mainline_Tasks1_4_Receiving", "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, - "deliver_npc": 10041, + "deliver_npc": 10032, "auto_accept": 0, "reword": [ { @@ -246,13 +246,13 @@ "text": "被月中人选中之人，终将为守护而生。" }, "completetask": [ - 161 + 0 ], "deliver_npctxt": { "key": "Mainline_Tasks1_6_Receiving", "text": "被月中人选中之人，终将为守护而生。" }, - "deliver_npc": 10061, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -290,13 +290,13 @@ "text": "试炼的终点，是名为勇者的觉醒。" }, "completetask": [ - 304 + 161 ], "deliver_npctxt": { "key": "Mainline_Tasks1_7_Receiving", "text": "试炼的终点，是名为勇者的觉醒。" }, - "deliver_npc": 10072, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -344,13 +344,13 @@ "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "completetask": [ - 305 + 304 ], "deliver_npctxt": { "key": "Mainline_Tasks1_8_Receiving", "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, - "deliver_npc": 10082, + "deliver_npc": 10081, "auto_accept": 0, "reword": [ { @@ -376,23 +376,23 @@ }, "task_name": { "key": "Mainline_Tasks1_9", - "text": "召唤英雄" + "text": "试炼再起" }, "npctxt": { "key": "Mainline_Tasks1_9_Receiving", - "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + "text": "这就是维京人的工艺技术吗，我现在感觉自己的实力确实增长不少。" }, "npc": 10090, "completetasktxt": { "key": "Mainline_Tasks1_9_Receiving", - "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + "text": "我迫不及待的想要体验新获得的历练了" }, "completetask": [ - 306 + 305 ], "deliver_npctxt": { "key": "Mainline_Tasks1_9_Receiving", - "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + "text": "我迫不及待的想要体验新获得的历练了" }, "deliver_npc": 0, "auto_accept": 0, @@ -420,25 +420,25 @@ }, "task_name": { "key": "Mainline_Tasks1_10", - "text": "梦魇的诞生" + "text": "归还原石" }, "npctxt": { "key": "Mainline_Tasks1_10_Receiving", - "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + "text": "月光原石回到了它应该在的位置。" }, "npc": 10100, "completetasktxt": { "key": "Mainline_Tasks1_10_Receiving", - "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + "text": "月光原石回到了它应该在的位置。" }, "completetask": [ - 307 + 0 ], "deliver_npctxt": { "key": "Mainline_Tasks1_10_Receiving", - "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + "text": "月光原石回到了它应该在的位置。" }, - "deliver_npc": 10102, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -454,7 +454,7 @@ "lock": 1, "lockend": 0, "ontxe": 20100, - "id_after": 0, + "id_after": 20120, "group": 210, "des": 2, "icon": "", @@ -464,25 +464,157 @@ }, "task_name": { "key": "Mainline_Tasks1_11", + "text": "召唤英雄" + }, + "npctxt": { + "key": "Mainline_Tasks1_11_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + }, + "npc": 10110, + "completetasktxt": { + "key": "Mainline_Tasks1_11_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + }, + "completetask": [ + 306 + ], + "deliver_npctxt": { + "key": "Mainline_Tasks1_11_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" + }, + "deliver_npc": 0, + "auto_accept": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "module": [] + }, + { + "key": 20120, + "lock": 1, + "lockend": 0, + "ontxe": 20110, + "id_after": 20130, + "group": 210, + "des": 2, + "icon": "", + "task_Tname": { + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" + }, + "task_name": { + "key": "Mainline_Tasks1_12", + "text": "梦魇的诞生" + }, + "npctxt": { + "key": "Mainline_Tasks1_12_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + }, + "npc": 10120, + "completetasktxt": { + "key": "Mainline_Tasks1_12_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + }, + "completetask": [ + 307 + ], + "deliver_npctxt": { + "key": "Mainline_Tasks1_12_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" + }, + "deliver_npc": 0, + "auto_accept": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "module": [] + }, + { + "key": 20130, + "lock": 1, + "lockend": 0, + "ontxe": 20120, + "id_after": 20140, + "group": 210, + "des": 2, + "icon": "", + "task_Tname": { + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" + }, + "task_name": { + "key": "Mainline_Tasks1_13", + "text": "消失的阴影" + }, + "npctxt": { + "key": "Mainline_Tasks1_13_Receiving", + "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。" + }, + "npc": 10130, + "completetasktxt": { + "key": "Mainline_Tasks1_13_Receiving", + "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。" + }, + "completetask": [ + 0 + ], + "deliver_npctxt": { + "key": "Mainline_Tasks1_13_Receiving", + "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。" + }, + "deliver_npc": 0, + "auto_accept": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "module": [] + }, + { + "key": 20140, + "lock": 1, + "lockend": 0, + "ontxe": 20130, + "id_after": 0, + "group": 210, + "des": 2, + "icon": "", + "task_Tname": { + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" + }, + "task_name": { + "key": "Mainline_Tasks1_999", "text": "敬请期待" }, "npctxt": { - "key": "Mainline_Tasks1_11", + "key": "Mainline_Tasks1_999", "text": "敬请期待" }, "npc": 10110, "completetasktxt": { - "key": "Mainline_Tasks1_11", + "key": "Mainline_Tasks1_999", "text": "敬请期待！" }, "completetask": [ 193 ], "deliver_npctxt": { - "key": "Mainline_Tasks1_11", + "key": "Mainline_Tasks1_999", "text": "敬请期待！" }, - "deliver_npc": 10110, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -520,7 +652,7 @@ "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "completetask": [ - 30001 + 0 ], "deliver_npctxt": { "key": "Side_Quest1_1_Receiving", @@ -564,7 +696,7 @@ "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "completetask": [ - 30002 + 0 ], "deliver_npctxt": { "key": "Side_Quest2_1_Receiving", @@ -652,7 +784,7 @@ "text": "戈伯有事情找我，我或许该去看看。" }, "completetask": [ - 30003 + 0 ], "deliver_npctxt": { "key": "Side_Quest3_1_Receiving", @@ -740,7 +872,7 @@ "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "completetask": [ - 30004 + 0 ], "deliver_npctxt": { "key": "Side_Quest4_1_Receiving", @@ -784,7 +916,7 @@ "text": "那不是小伊吗，她是在.....练武吗？" }, "completetask": [ - 30005 + 0 ], "deliver_npctxt": { "key": "Side_Quest5_1_Receiving", @@ -828,7 +960,7 @@ "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "completetask": [ - 30006 + 0 ], "deliver_npctxt": { "key": "Side_Quest6_1_Receiving", diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index 265029643..66da2588b 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -51,7 +51,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa fetter.Prize[req.Fetterlv] = 1 // 发奖 - h := make(map[string][]*cfg.Gameatr, 0) + hProperty := make(map[string][]*cfg.Gameatr, 0) for _, v := range conf { var sz []*cfg.Gameatr for _, v1 := range v.Attribute { @@ -61,9 +61,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa } sz = append(sz, b) } - h[v.Hid] = sz + hProperty[v.Hid] = sz } - this.module.ModuleHero.AddHeroFetterAttribute(session, h) + this.module.ModuleHero.AddHeroFetterAttribute(session, hProperty) mapData := make(map[string]interface{}, 0) mapData["prize"] = fetter.Prize this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 399229462..a24b82b3a 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -23,7 +23,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe upLv int32 attenuation map[int32]int32 likeStates int32 // 0 普通食物 1 喜欢 2 不喜欢 - add int32 + addExp int32 // 获得的经验 ) attenuation = make(map[int32]int32, 0) code = this.UseGiftCheck(session, req) @@ -63,7 +63,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe } } for i := _heroObj.Givecount; i <= _heroObj.Givecount+req.Counts; i++ { - add += attenuation[i] + addExp += attenuation[i] } // 校验是否是自己喜欢的食物 @@ -75,17 +75,21 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe for _, v := range _c.LikesFood { // 喜欢的食物 if v == req.Items { likeStates = 1 - add += this.module.ModuleTools.GetGlobalConf().FavorabilityLikes * req.Counts + addExp *= this.module.ModuleTools.GetGlobalConf().FavorabilityLikes * req.Counts + break } } - for _, v := range _c.DislikingFood { //不喜欢 - if v == req.Items { - likeStates = 2 - add += this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes * req.Counts + if likeStates != 1 { + for _, v := range _c.DislikingFood { //不喜欢 + if v == req.Items { + likeStates = 2 + addExp *= this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes * req.Counts + break + } } } if likeStates == 0 { - add += req.Counts + addExp *= req.Counts } res = append(res, &cfg.Gameatn{ A: "item", @@ -102,8 +106,9 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe code = pb.ErrorCode_ConfigNoFound return } - // 100*1 + 100*0.25 + 100*0.5 - _heroObj.Favorexp += add * itemConf.SpecialType / 1000 + // 100*1 + 100*0.5 + 100*0.25 + addExp *= itemConf.SpecialType / 1000 + _heroObj.Favorexp += addExp // 折算出等级 for { @@ -133,6 +138,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe // 任务统计 //赠送英雄礼物并增加N点好感度 if upLv > 0 { + this.module.Errorf("英雄好感度等级提升,英雄ID:%s,增加经验:%s,提升的等级:%d", req.Heroid, addExp, upLv) if rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 修改阵营累计好感度 if heroCfg := this.module.configure.GetHeroConfig(req.Heroid); heroCfg != nil { rst.Race[heroCfg.Race] += upLv diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go index 68dd64ce0..8a6ebc062 100644 --- a/sys/configure/structs/Game.MainStageData.go +++ b/sys/configure/structs/Game.MainStageData.go @@ -19,6 +19,7 @@ type GameMainStageData struct { Openlevel int32 Episodelocation serialization.Vector3 EditorStage int32 + Detailwindow string Frontstoryid int32 Afterstoryid int32 MainlineName string @@ -59,6 +60,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EditorStage"].(float64); !_ok_ { err = errors.New("EditorStage error"); return }; _v.EditorStage = int32(_tempNum_) } + { var _ok_ bool; if _v.Detailwindow, _ok_ = _buf["detailwindow"].(string); !_ok_ { err = errors.New("detailwindow error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["frontstoryid"].(float64); !_ok_ { err = errors.New("frontstoryid error"); return }; _v.Frontstoryid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["afterstoryid"].(float64); !_ok_ { err = errors.New("afterstoryid error"); return }; _v.Afterstoryid = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["mainlineName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MainlineName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MainlineName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } diff --git a/sys/configure/structs/game.activeRewardData.go b/sys/configure/structs/game.activeRewardData.go index 1b741d60e..aa46b9d5f 100644 --- a/sys/configure/structs/game.activeRewardData.go +++ b/sys/configure/structs/game.activeRewardData.go @@ -15,6 +15,8 @@ type GameActiveRewardData struct { IdTag int32 Active int32 Reword []*Gameatn + Action string + Stage int32 } const TypeId_GameActiveRewardData = 942906779 @@ -41,6 +43,8 @@ func (_v *GameActiveRewardData)Deserialize(_buf map[string]interface{}) (err err } } + { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 2d85ebe1d..76dc46387 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -214,6 +214,14 @@ type GameGlobalData struct { BusinessRenovatething int32 FavorabilityLikes int32 FavorabilityDislikes int32 + BuzkashiTime int32 + BuzkashiSchedule int32 + BuzkashiStime int32 + BuzkashiVreward []*Gameatn + BuzkashiFreward []*Gameatn + BuzkashiVintegral []*Gameatn + BuzkashiFintegral []*Gameatn + BuzkashiResurrection int32 FavorabilityAttenuation []*Gamekv } @@ -843,6 +851,66 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_time"].(float64); !_ok_ { err = errors.New("buzkashi_time error"); return }; _v.BuzkashiTime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_schedule"].(float64); !_ok_ { err = errors.New("buzkashi_schedule error"); return }; _v.BuzkashiSchedule = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_stime"].(float64); !_ok_ { err = errors.New("buzkashi_stime error"); return }; _v.BuzkashiStime = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["buzkashi_vreward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vreward error"); return } + + _v.BuzkashiVreward = 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.BuzkashiVreward = append(_v.BuzkashiVreward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["buzkashi_freward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_freward error"); return } + + _v.BuzkashiFreward = 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.BuzkashiFreward = append(_v.BuzkashiFreward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["buzkashi_vintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vintegral error"); return } + + _v.BuzkashiVintegral = 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.BuzkashiVintegral = append(_v.BuzkashiVintegral, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["buzkashi_fintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_fintegral error"); return } + + _v.BuzkashiFintegral = 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.BuzkashiFintegral = append(_v.BuzkashiFintegral, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.taskActiveRewardData.go b/sys/configure/structs/game.taskActiveRewardData.go index b6cff4ed7..fde65e4da 100644 --- a/sys/configure/structs/game.taskActiveRewardData.go +++ b/sys/configure/structs/game.taskActiveRewardData.go @@ -15,6 +15,8 @@ type GameTaskActiveRewardData struct { IdTag int32 Active int32 Reword []*Gameatn + Action string + Stage int32 } const TypeId_GameTaskActiveRewardData = 1583402816 @@ -41,6 +43,8 @@ func (_v *GameTaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err } } + { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) } return } From 2e4511feef7a6bf046ba85afa96f19cff399a15e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 21 Apr 2023 19:11:36 +0800 Subject: [PATCH 8/9] =?UTF-8?q?pb=20=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/battle_struct.pb.go | 97 +++++++-- pb/errorcode.pb.go | 470 +++++++++++++++++++++-------------------- 2 files changed, 320 insertions(+), 247 deletions(-) diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index 5fc1cd239..7984e5bcd 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -1545,6 +1545,54 @@ func (x *ComEffectTips) GetTo() int32 { return 0 } +//链接特效 +type ComChainEffect struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Roles []int32 `protobuf:"varint,1,rep,packed,name=roles,proto3" json:"roles"` +} + +func (x *ComChainEffect) Reset() { + *x = ComChainEffect{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComChainEffect) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComChainEffect) ProtoMessage() {} + +func (x *ComChainEffect) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[22] + 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 ComChainEffect.ProtoReflect.Descriptor instead. +func (*ComChainEffect) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{22} +} + +func (x *ComChainEffect) GetRoles() []int32 { + if x != nil { + return x.Roles + } + return nil +} + var File_battle_battle_struct_proto protoreflect.FileDescriptor var file_battle_battle_struct_proto_rawDesc = []byte{ @@ -1689,16 +1737,18 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x2a, 0x7b, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, - 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, - 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, - 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, - 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, - 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, - 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x10, 0x06, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, + 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x2a, + 0x7b, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, + 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, + 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, + 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, + 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1714,7 +1764,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte { } var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_battle_battle_struct_proto_goTypes = []interface{}{ (EffectTipsType)(0), // 0: EffectTipsType (*ComModifyOperate)(nil), // 1: ComModifyOperate @@ -1739,16 +1789,17 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{ (*ComPlayEffect)(nil), // 20: ComPlayEffect (*ComEmitCountdown)(nil), // 21: ComEmitCountdown (*ComEffectTips)(nil), // 22: ComEffectTips - (*BattleRole)(nil), // 23: BattleRole - (*BattleCmd)(nil), // 24: BattleCmd + (*ComChainEffect)(nil), // 23: ComChainEffect + (*BattleRole)(nil), // 24: BattleRole + (*BattleCmd)(nil), // 25: BattleCmd } var file_battle_battle_struct_proto_depIdxs = []int32{ - 23, // 0: ComInitFight.roles:type_name -> BattleRole + 24, // 0: ComInitFight.roles:type_name -> BattleRole 6, // 1: ComStartAction.skillInfo:type_name -> ComSkillInfo 6, // 2: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo 12, // 3: ComSkillAtk.comList:type_name -> ComSkillAfterAtk - 24, // 4: ComSkillAfterAtk.comList:type_name -> BattleCmd - 23, // 5: ComCreateRoles.roles:type_name -> BattleRole + 25, // 4: ComSkillAfterAtk.comList:type_name -> BattleCmd + 24, // 5: ComCreateRoles.roles:type_name -> BattleRole 0, // 6: ComEffectTips.type:type_name -> EffectTipsType 7, // [7:7] is the sub-list for method output_type 7, // [7:7] is the sub-list for method input_type @@ -2029,6 +2080,18 @@ func file_battle_battle_struct_proto_init() { return nil } } + file_battle_battle_struct_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComChainEffect); 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{ @@ -2036,7 +2099,7 @@ func file_battle_battle_struct_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_struct_proto_rawDesc, NumEnums: 1, - NumMessages: 22, + NumMessages: 23, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index dcce3f80c..b479866d4 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -375,7 +375,8 @@ const ( ErrorCode_ParkourInviteNoPermissions ErrorCode = 4403 //无权邀请 ErrorCode_ParkourTargetTeamed ErrorCode = 4404 //目标已组队 //reputation - ErrorCode_ReputationTalentFull ErrorCode = 4501 //天赋满级 + ErrorCode_ReputationTalentFull ErrorCode = 4501 //天赋满级 + ErrorCode_ReputationNoPreNodeLv ErrorCode = 4502 //前置节点等级不满足 ) // Enum value maps for ErrorCode. @@ -698,6 +699,7 @@ var ( 4403: "ParkourInviteNoPermissions", 4404: "ParkourTargetTeamed", 4501: "ReputationTalentFull", + 4502: "ReputationNoPreNodeLv", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1017,6 +1019,7 @@ var ( "ParkourInviteNoPermissions": 4403, "ParkourTargetTeamed": 4404, "ReputationTalentFull": 4501, + "ReputationNoPreNodeLv": 4502, } ) @@ -1051,7 +1054,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xa8, 0x38, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x9c, 0x3a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1283,234 +1286,241 @@ var file_errorcode_proto_rawDesc = []byte{ 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, - 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, - 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, - 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, - 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, - 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, - 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, - 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, - 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, - 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, - 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, - 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, - 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, - 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, - 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, - 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, - 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, - 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, - 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, - 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, - 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, - 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, - 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, - 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, - 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, - 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, - 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, - 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, - 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, - 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, - 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, - 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, - 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, - 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, - 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, - 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, - 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, - 0x10, 0xd6, 0x16, 0x12, 0x17, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16, 0x0a, 0x11, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x10, 0xd8, 0x16, 0x12, 0x12, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x4f, 0x66, 0x66, 0x10, 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x43, 0x61, 0x70, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x46, - 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xda, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x4e, 0x6f, 0x4b, 0x65, 0x65, 0x70, 0x10, 0xdb, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, - 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, - 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, - 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, - 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, - 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, - 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x15, - 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x10, 0xc2, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xc3, 0x17, 0x12, - 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xc4, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc5, 0x17, 0x12, 0x14, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, - 0xc6, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, - 0x6e, 0x10, 0xc7, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, - 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc8, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc9, 0x17, 0x12, 0x14, 0x0a, - 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, - 0x10, 0xca, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, - 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xcb, 0x17, 0x12, 0x1c, 0x0a, 0x17, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xcc, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x64, 0x10, 0xcd, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, - 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x10, 0xcf, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xd1, 0x17, 0x12, 0x13, 0x0a, - 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, - 0xd2, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, - 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd3, 0x17, 0x12, 0x1a, - 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, - 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd4, 0x17, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd5, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x10, 0xd6, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xd7, 0x17, 0x12, 0x15, 0x0a, 0x10, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, - 0x10, 0xd8, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, - 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd9, 0x17, 0x12, 0x14, - 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, - 0x72, 0x10, 0xda, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, - 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xdb, 0x17, 0x12, 0x1b, 0x0a, - 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, - 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdc, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, - 0x74, 0x10, 0xdd, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xde, 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x10, 0xdf, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, - 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xe0, 0x17, 0x12, 0x1a, 0x0a, 0x15, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe1, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, - 0xe2, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, - 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, - 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, - 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, - 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, - 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, - 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, - 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, - 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, - 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, - 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, - 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, - 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, - 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, - 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, - 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, - 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, - 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, - 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, - 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, - 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, - 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, - 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, - 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, - 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, - 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, - 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, - 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, - 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, - 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, - 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, - 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, - 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, - 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, - 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, - 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1e, 0x0a, 0x19, - 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, - 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, - 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, - 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, - 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, - 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, - 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, - 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, - 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, - 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, - 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, - 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, - 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, - 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, - 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, - 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, - 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, - 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, - 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, - 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, - 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, - 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, - 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, - 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, - 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, - 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, - 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, - 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, - 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, - 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, - 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x51, 0x69, 0x65, - 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, - 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, - 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, - 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, + 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, + 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, + 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, + 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, + 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, + 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, + 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, + 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, + 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, + 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, + 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, + 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, + 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, + 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, + 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, + 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, + 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, + 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, + 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, + 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, + 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, + 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x18, 0x0a, 0x13, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x10, 0xf8, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, + 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, + 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x17, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16, + 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x16, 0x12, 0x12, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x55, 0x73, 0x65, 0x72, 0x4f, 0x66, 0x66, 0x10, 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x43, 0x61, 0x70, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xda, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x4b, 0x65, 0x65, 0x70, 0x10, 0xdb, 0x16, 0x12, 0x13, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, + 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, + 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, + 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, + 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x10, 0xc2, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xc3, + 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xc4, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc5, 0x17, 0x12, 0x14, + 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, + 0x65, 0x10, 0xc6, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x69, 0x67, 0x6e, 0x10, 0xc7, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc8, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc9, 0x17, 0x12, + 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, + 0x61, 0x78, 0x10, 0xca, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xcb, 0x17, 0x12, 0x1c, + 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xcc, 0x17, 0x12, 0x1a, 0x0a, 0x15, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xcd, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x10, 0xce, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xcf, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xd1, 0x17, 0x12, + 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, + 0x64, 0x10, 0xd2, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, + 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd3, 0x17, + 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd4, 0x17, 0x12, 0x1c, 0x0a, 0x17, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, + 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd5, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x10, 0xd6, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xd7, 0x17, 0x12, 0x15, + 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, + 0x73, 0x74, 0x10, 0xd8, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd9, 0x17, + 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, + 0x74, 0x65, 0x72, 0x10, 0xda, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xdb, 0x17, 0x12, + 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, + 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdc, 0x17, 0x12, 0x18, 0x0a, 0x13, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, + 0x6e, 0x69, 0x74, 0x10, 0xdd, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xde, 0x17, 0x12, 0x16, 0x0a, + 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, + 0x63, 0x6b, 0x10, 0xdf, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xe0, 0x17, 0x12, 0x1a, + 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe1, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x64, 0x10, 0xe2, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, + 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, + 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, + 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, + 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, + 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, + 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, + 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, + 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, + 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, + 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, + 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, + 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, + 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, + 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, + 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, + 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, + 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, + 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, + 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, + 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, + 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, + 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, + 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, + 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, + 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, + 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, + 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, + 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x65, 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1e, + 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, + 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, + 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, + 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, + 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, + 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, + 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, + 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, + 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, + 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, + 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, + 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, + 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, + 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, + 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, + 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, + 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, + 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, + 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, + 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, + 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, + 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, + 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, + 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, + 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, + 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, + 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, + 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, + 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, + 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, + 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, + 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59, 0x6f, + 0x75, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c, 0x0a, + 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x51, + 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11, 0x50, + 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c, 0x6c, + 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, + 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x12, 0x1f, + 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4e, + 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0xb3, 0x22, 0x12, + 0x18, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x54, 0x65, 0x61, 0x6d, 0x65, 0x64, 0x10, 0xb4, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x52, 0x65, 0x70, + 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, + 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x76, 0x10, 0x96, 0x23, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From 3daf164bcbd4a95233fec248f6682233496727d1 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 21 Apr 2023 19:13:44 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 4 ---- bin/json/game_skillbuff.json | 2 +- sys/configure/structs/game.globalData.go | 6 ------ 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 9df88bd2f..edd6f3ae3 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -716,7 +716,6 @@ "n": 1000 } ], -<<<<<<< HEAD "buzkashi_resurrection": 10, "favorability_attenuation": [ { @@ -732,8 +731,5 @@ "v": 500 } ] -======= - "buzkashi_resurrection": 10 ->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31 } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 91c368613..2d3963ce6 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -476,7 +476,7 @@ "SameID": false, "golbalbufficon": "", "buffIcon": "ty_zd_buff_j008", - "buffeffect": "effect_jiaoxia_jiaobing", + "buffeffect": "effect_buff_bingdong", "buffpos": "脚底" }, { diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 87c169344..76dc46387 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -222,10 +222,7 @@ type GameGlobalData struct { BuzkashiVintegral []*Gameatn BuzkashiFintegral []*Gameatn BuzkashiResurrection int32 -<<<<<<< HEAD FavorabilityAttenuation []*Gamekv -======= ->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31 } const TypeId_GameGlobalData = 477542761 @@ -914,7 +911,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) } -<<<<<<< HEAD { var _arr_ []interface{} var _ok_ bool @@ -929,8 +925,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } } -======= ->>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31 return }