From 4572cc7f11e770235181bdfdbbaa10303415212f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 2 Nov 2023 22:10:01 +0800 Subject: [PATCH 1/2] update --- bin/json/game_achievegroup.json | 28 ++- bin/json/game_achievetask.json | 219 ++++++++++++++++- bin/json/game_buriedcondi.json | 96 +++----- bin/json/game_combatmanster.json | 2 +- bin/json/game_item.json | 24 +- bin/json/game_loading.json | 2 +- bin/json/game_mainstage.json | 2 +- bin/json/game_stonebuff.json | 284 +++++++++++----------- modules/entertainment/api_boxreward.go | 6 +- modules/entertainment/api_operatorover.go | 20 ++ modules/entertainment/model.go | 5 + modules/entertainment/room.go | 21 +- modules/entertainment/xxlPlat.go | 22 +- modules/stonehenge/api_event.go | 26 ++ modules/stonehenge/api_shop.go | 4 + modules/stonehenge/core.go | 1 + modules/stonehenge/modelStonehenge.go | 9 + pb/entertain_msg.pb.go | 253 ++++++++++++++++--- pb/stonehenge_msg.pb.go | 249 ++++++++++--------- 19 files changed, 879 insertions(+), 394 deletions(-) create mode 100644 modules/entertainment/api_operatorover.go diff --git a/bin/json/game_achievegroup.json b/bin/json/game_achievegroup.json index 6990679f3..08b6a3181 100644 --- a/bin/json/game_achievegroup.json +++ b/bin/json/game_achievegroup.json @@ -11,7 +11,7 @@ "id": 2, "achieve_group_id": { "key": "achieve_achieve_all_achieve_group_id_02", - "text": "生财有道" + "text": "装备锻萃" }, "achieve_group_icon": "cj_icon_rk_ty" }, @@ -19,7 +19,31 @@ "id": 3, "achieve_group_id": { "key": "achieve_achieve_all_achieve_group_id_03", - "text": "测试类型名字3" + "text": "解放双手" + }, + "achieve_group_icon": "cj_icon_rk_ty" + }, + { + "id": 4, + "achieve_group_id": { + "key": "achieve_achieve_all_achieve_group_id_04", + "text": "竞技的快乐" + }, + "achieve_group_icon": "cj_icon_rk_ty" + }, + { + "id": 5, + "achieve_group_id": { + "key": "achieve_achieve_all_achieve_group_id_05", + "text": "钻石恒久远" + }, + "achieve_group_icon": "cj_icon_rk_ty" + }, + { + "id": 6, + "achieve_group_id": { + "key": "achieve_achieve_all_achieve_group_id_06", + "text": "英雄汇聚" }, "achieve_group_icon": "cj_icon_rk_ty" } diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json index 573ac733e..b900a5f8b 100644 --- a/bin/json/game_achievetask.json +++ b/bin/json/game_achievetask.json @@ -73,7 +73,7 @@ "task_group_from": 2, "task_name": { "key": "achieve_achieve_task_task_name_22", - "text": "强化成功5次" + "text": "强化装备成功5次" }, "task_desc": { "key": "", @@ -96,7 +96,7 @@ "task_group_from": 2, "task_name": { "key": "achieve_achieve_task_task_name_23", - "text": "强化成功10次" + "text": "强化装备成功10次" }, "task_desc": { "key": "", @@ -119,7 +119,7 @@ "task_group_from": 2, "task_name": { "key": "achieve_achieve_task_task_name_24", - "text": "强化成功20次" + "text": "强化装备成功20次" }, "task_desc": { "key": "", @@ -158,7 +158,7 @@ "n": 10000 } ], - "jump": 103 + "jump": 10020 }, { "key": 1026, @@ -181,7 +181,7 @@ "n": 20000 } ], - "jump": 103 + "jump": 10020 }, { "key": 1027, @@ -204,6 +204,213 @@ "n": 30000 } ], - "jump": 103 + "jump": 10020 + }, + { + "key": 1028, + "task_group_from": 4, + "task_name": { + "key": "achieve_achieve_task_task_name_28", + "text": "竞技场积分1000" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000010, + "task_icon": "cj_icon_lb_ty03", + "task_quality": 1, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "jump": 10015 + }, + { + "key": 1029, + "task_group_from": 4, + "task_name": { + "key": "achieve_achieve_task_task_name_29", + "text": "竞技场积分2000" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000011, + "task_icon": "cj_icon_lb_ty02", + "task_quality": 2, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "jump": 10015 + }, + { + "key": 1030, + "task_group_from": 4, + "task_name": { + "key": "achieve_achieve_task_task_name_30", + "text": "竞技场积分3000" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000012, + "task_icon": "cj_icon_lb_ty01", + "task_quality": 3, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "jump": 10015 + }, + { + "key": 1031, + "task_group_from": 5, + "task_name": { + "key": "achieve_achieve_task_task_name_31", + "text": "消费1000钻石" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000013, + "task_icon": "cj_icon_lb_ty03", + "task_quality": 1, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "jump": 0 + }, + { + "key": 1032, + "task_group_from": 5, + "task_name": { + "key": "achieve_achieve_task_task_name_32", + "text": "消费2000钻石" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000014, + "task_icon": "cj_icon_lb_ty02", + "task_quality": 2, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "jump": 0 + }, + { + "key": 1033, + "task_group_from": 5, + "task_name": { + "key": "achieve_achieve_task_task_name_33", + "text": "消费3000钻石" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000015, + "task_icon": "cj_icon_lb_ty01", + "task_quality": 3, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "jump": 0 + }, + { + "key": 1034, + "task_group_from": 6, + "task_name": { + "key": "achieve_achieve_task_task_name_34", + "text": "进行30次招募" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000016, + "task_icon": "cj_icon_lb_ty03", + "task_quality": 1, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "jump": 0 + }, + { + "key": 1035, + "task_group_from": 6, + "task_name": { + "key": "achieve_achieve_task_task_name_35", + "text": "进行40次招募" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000017, + "task_icon": "cj_icon_lb_ty02", + "task_quality": 2, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "jump": 0 + }, + { + "key": 1036, + "task_group_from": 6, + "task_name": { + "key": "achieve_achieve_task_task_name_36", + "text": "进行50次招募" + }, + "task_desc": { + "key": "", + "text": "" + }, + "task_buried": 16000018, + "task_icon": "cj_icon_lb_ty01", + "task_quality": 3, + "task_reward": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "jump": 0 } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 2d07ca236..03a43e4be 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -31867,7 +31867,7 @@ "key": "buried_buried_condi_tasktxt_1104", "text": "完成1次自动战斗" }, - "type": 4, + "type": 161, "valid": 0, "head": { "a": "attr", @@ -31892,7 +31892,7 @@ "key": "buried_buried_condi_tasktxt_1105", "text": "完成10次自动战斗" }, - "type": 4, + "type": 161, "valid": 0, "head": { "a": "attr", @@ -31917,7 +31917,7 @@ "key": "buried_buried_condi_tasktxt_1106", "text": "完成20次自动战斗" }, - "type": 4, + "type": 161, "valid": 0, "head": { "a": "attr", @@ -31940,9 +31940,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1107", - "text": "让邦尼兔升到11级" + "text": "竞技场积分1000" }, - "type": 4, + "type": 128, "valid": 0, "head": { "a": "attr", @@ -31951,10 +31951,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 11, - "filter": [ - 24004 - ], + "value": 1000, + "filter": [], "filter2": [] }, { @@ -31967,9 +31965,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1108", - "text": "让邦尼兔升到12级" + "text": "竞技场积分2000" }, - "type": 4, + "type": 128, "valid": 0, "head": { "a": "attr", @@ -31978,10 +31976,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 12, - "filter": [ - 24004 - ], + "value": 2000, + "filter": [], "filter2": [] }, { @@ -31994,9 +31990,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1109", - "text": "让邦尼兔升到13级" + "text": "竞技场积分3000" }, - "type": 4, + "type": 128, "valid": 0, "head": { "a": "attr", @@ -32005,10 +32001,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 13, - "filter": [ - 24004 - ], + "value": 3000, + "filter": [], "filter2": [] }, { @@ -32021,9 +32015,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1110", - "text": "让邦尼兔升到14级" + "text": "消费1000钻石" }, - "type": 4, + "type": 104, "valid": 0, "head": { "a": "attr", @@ -32032,10 +32026,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 14, - "filter": [ - 24004 - ], + "value": 1000, + "filter": [], "filter2": [] }, { @@ -32048,9 +32040,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1111", - "text": "让邦尼兔升到15级" + "text": "消费2000钻石" }, - "type": 4, + "type": 104, "valid": 0, "head": { "a": "attr", @@ -32059,10 +32051,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 15, - "filter": [ - 24004 - ], + "value": 2000, + "filter": [], "filter2": [] }, { @@ -32075,9 +32065,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1112", - "text": "让邦尼兔升到16级" + "text": "消费3000钻石" }, - "type": 4, + "type": 104, "valid": 0, "head": { "a": "attr", @@ -32086,10 +32076,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 16, - "filter": [ - 24004 - ], + "value": 3000, + "filter": [], "filter2": [] }, { @@ -32102,9 +32090,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1113", - "text": "让邦尼兔升到17级" + "text": "进行30次招募" }, - "type": 4, + "type": 89, "valid": 0, "head": { "a": "attr", @@ -32113,10 +32101,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 17, - "filter": [ - 24004 - ], + "value": 30, + "filter": [], "filter2": [] }, { @@ -32129,9 +32115,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1114", - "text": "让邦尼兔升到18级" + "text": "进行40次招募" }, - "type": 4, + "type": 89, "valid": 0, "head": { "a": "attr", @@ -32140,10 +32126,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 18, - "filter": [ - 24004 - ], + "value": 40, + "filter": [], "filter2": [] }, { @@ -32156,9 +32140,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1115", - "text": "让邦尼兔升到19级" + "text": "进行50次招募" }, - "type": 4, + "type": 89, "valid": 0, "head": { "a": "attr", @@ -32167,10 +32151,8 @@ }, "Npc_event_type": 1, "NPC": 103, - "value": 19, - "filter": [ - 24004 - ], + "value": 50, + "filter": [], "filter2": [] }, { diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index a46795308..825722e49 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -390,7 +390,7 @@ "clickstory": 0, "BattleReadyID": 10103001, "formatList": [ - 102031 + 101101 ], "award": [ { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 3e03f6c9a..3ee11ced3 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -19981,7 +19981,7 @@ "id": "24011001", "name": { "key": "item_item_name_402", - "text": "第一章货币" + "text": "龙币" }, "usetype": 1, "color": 2, @@ -20005,11 +20005,11 @@ "img": "item_24011001", "intr": { "key": "item_item_intr_404", - "text": "" + "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { "key": "item_item_describe_404", - "text": "" + "text": "苦寒地带维京人的标志，原名已不可考。因其货币多篆刻龙头纹样被称为龙币。据说这些龙多由维京人驯养。" }, "dialogue": { "key": "item_item_dialogue_402", @@ -20028,7 +20028,7 @@ "id": "24021001", "name": { "key": "item_item_name_403", - "text": "第二章货币" + "text": "扇贝" }, "usetype": 1, "color": 2, @@ -20052,11 +20052,11 @@ "img": "item_24021001", "intr": { "key": "item_item_intr_405", - "text": "" + "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { "key": "item_item_describe_405", - "text": "" + "text": "扇贝虽然比不上螺贝的美丽，但因更为更常见而价值亲民，交易中使用它也就更为频繁。当然，咕噜一家只对扇贝的肉感兴趣……" }, "dialogue": { "key": "item_item_dialogue_403", @@ -20075,7 +20075,7 @@ "id": "24031001", "name": { "key": "item_item_name_404", - "text": "第三章货币" + "text": "钞票" }, "usetype": 1, "color": 2, @@ -20099,11 +20099,11 @@ "img": "item_24031001", "intr": { "key": "item_item_intr_406", - "text": "" + "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { "key": "item_item_describe_406", - "text": "" + "text": "淡黄的纸面，绿色的图案和文字。轻飘飘的外表，与它强大的购买力形成了强烈的对比。据说某个臭名昭著的坏蛋团伙，在行动之前一定会去咖啡店小坐一会，还会给几张钞票当做小费。" }, "dialogue": { "key": "item_item_dialogue_404", @@ -20122,7 +20122,7 @@ "id": "24041001", "name": { "key": "item_item_name_405", - "text": "第四章货币" + "text": "先令" }, "usetype": 1, "color": 2, @@ -20146,11 +20146,11 @@ "img": "item_24041001", "intr": { "key": "item_item_intr_407", - "text": "" + "text": "剧情货币，剧情探索中获得并在章节内的商店使用。" }, "describe": { "key": "item_item_describe_407", - "text": "" + "text": "在浪漫的童话世界，先令几乎就是货币的代名词。婚丧嫁娶，人们从生到死都离不开它。抓捕一个怪物或通缉犯，换取的先令更是不可估量。" }, "dialogue": { "key": "item_item_dialogue_405", diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index f5500e724..6d66bd235 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -2,7 +2,7 @@ { "id": 1001, "scene": "GameMain", - "image": "ld_mh_bg01", + "image": "ld_mh_bg_zc", "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_1", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 689b53954..4ad3489fa 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -17680,7 +17680,7 @@ "buried": 0, "grouptype": [], "Episodetype": 5, - "stage_param": 10001, + "stage_param": 30001, "inherit": 0, "battle_fail": 0, "venturemodelspeed": 9, diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json index 812161ed0..630b9af87 100644 --- a/bin/json/game_stonebuff.json +++ b/bin/json/game_stonebuff.json @@ -4,7 +4,7 @@ "Type": 1, "SkillId": 770001111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770001111", "TargetType": 1, "CampType": 0, @@ -30,7 +30,7 @@ "Type": 1, "SkillId": 770001111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770001111", "TargetType": 1, "CampType": 0, @@ -56,7 +56,7 @@ "Type": 1, "SkillId": 770002111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770002111", "TargetType": 1, "CampType": 0, @@ -82,7 +82,7 @@ "Type": 1, "SkillId": 770002111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770002111", "TargetType": 1, "CampType": 0, @@ -108,7 +108,7 @@ "Type": 1, "SkillId": 770003111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770003111", "TargetType": 1, "CampType": 0, @@ -134,7 +134,7 @@ "Type": 1, "SkillId": 770003111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770003111", "TargetType": 1, "CampType": 0, @@ -160,7 +160,7 @@ "Type": 1, "SkillId": 770004111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770004111", "TargetType": 1, "CampType": 0, @@ -186,7 +186,7 @@ "Type": 1, "SkillId": 770004111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770004111", "TargetType": 1, "CampType": 0, @@ -212,7 +212,7 @@ "Type": 1, "SkillId": 770005111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770005111", "TargetType": 1, "CampType": 0, @@ -238,7 +238,7 @@ "Type": 1, "SkillId": 770005111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770005111", "TargetType": 1, "CampType": 0, @@ -264,7 +264,7 @@ "Type": 1, "SkillId": 770006111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770006111", "TargetType": 1, "CampType": 0, @@ -290,7 +290,7 @@ "Type": 1, "SkillId": 770006111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770006111", "TargetType": 1, "CampType": 0, @@ -316,7 +316,7 @@ "Type": 1, "SkillId": 770007111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770007111", "TargetType": 1, "CampType": 0, @@ -342,7 +342,7 @@ "Type": 1, "SkillId": 770007111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770007111", "TargetType": 1, "CampType": 0, @@ -368,7 +368,7 @@ "Type": 1, "SkillId": 770008111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770008111", "TargetType": 1, "CampType": 0, @@ -394,7 +394,7 @@ "Type": 1, "SkillId": 770008111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770008111", "TargetType": 1, "CampType": 0, @@ -420,7 +420,7 @@ "Type": 1, "SkillId": 770009111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770009111", "TargetType": 1, "CampType": 0, @@ -446,7 +446,7 @@ "Type": 1, "SkillId": 770009111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770009111", "TargetType": 1, "CampType": 0, @@ -524,7 +524,7 @@ "Type": 1, "SkillId": 770011111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770011111", "TargetType": 1, "CampType": 0, @@ -550,7 +550,7 @@ "Type": 1, "SkillId": 770011111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770011111", "TargetType": 1, "CampType": 0, @@ -628,7 +628,7 @@ "Type": 1, "SkillId": 770013111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770013111", "TargetType": 1, "CampType": 0, @@ -654,7 +654,7 @@ "Type": 1, "SkillId": 770013111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770013111", "TargetType": 1, "CampType": 0, @@ -680,7 +680,7 @@ "Type": 1, "SkillId": 770014111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770014111", "TargetType": 1, "CampType": 0, @@ -706,7 +706,7 @@ "Type": 1, "SkillId": 770014111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770014111", "TargetType": 1, "CampType": 0, @@ -940,7 +940,7 @@ "Type": 1, "SkillId": 770019111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770019111", "TargetType": 1, "CampType": 0, @@ -966,7 +966,7 @@ "Type": 1, "SkillId": 770019111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770019111", "TargetType": 1, "CampType": 0, @@ -992,7 +992,7 @@ "Type": 1, "SkillId": 770020111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770020111", "TargetType": 1, "CampType": 0, @@ -1018,7 +1018,7 @@ "Type": 1, "SkillId": 770020111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770020111", "TargetType": 1, "CampType": 0, @@ -1044,7 +1044,7 @@ "Type": 2, "SkillId": 770021111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770021111", "TargetType": 1, "CampType": 0, @@ -1070,7 +1070,7 @@ "Type": 2, "SkillId": 770021111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770021111", "TargetType": 1, "CampType": 0, @@ -1096,7 +1096,7 @@ "Type": 2, "SkillId": 770022111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770022111", "TargetType": 1, "CampType": 0, @@ -1122,7 +1122,7 @@ "Type": 2, "SkillId": 770022111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770022111", "TargetType": 1, "CampType": 0, @@ -1148,7 +1148,7 @@ "Type": 2, "SkillId": 770023111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770023111", "TargetType": 1, "CampType": 0, @@ -1174,7 +1174,7 @@ "Type": 2, "SkillId": 770023111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770023111", "TargetType": 1, "CampType": 0, @@ -1200,7 +1200,7 @@ "Type": 2, "SkillId": 770024111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770024111", "TargetType": 1, "CampType": 0, @@ -1226,7 +1226,7 @@ "Type": 2, "SkillId": 770024111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770024111", "TargetType": 1, "CampType": 0, @@ -1252,7 +1252,7 @@ "Type": 2, "SkillId": 770025111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770025111", "TargetType": 1, "CampType": 0, @@ -1278,7 +1278,7 @@ "Type": 2, "SkillId": 770025111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770025111", "TargetType": 1, "CampType": 0, @@ -1304,7 +1304,7 @@ "Type": 2, "SkillId": 770026111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770026111", "TargetType": 1, "CampType": 0, @@ -1330,7 +1330,7 @@ "Type": 2, "SkillId": 770026111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770026111", "TargetType": 1, "CampType": 0, @@ -1356,7 +1356,7 @@ "Type": 2, "SkillId": 770027111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770027111", "TargetType": 1, "CampType": 0, @@ -1382,7 +1382,7 @@ "Type": 2, "SkillId": 770027111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770027111", "TargetType": 1, "CampType": 0, @@ -1408,7 +1408,7 @@ "Type": 2, "SkillId": 770028111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770028111", "TargetType": 1, "CampType": 0, @@ -1434,7 +1434,7 @@ "Type": 2, "SkillId": 770028111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770028111", "TargetType": 1, "CampType": 0, @@ -1512,7 +1512,7 @@ "Type": 2, "SkillId": 770030111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770030111", "TargetType": 1, "CampType": 0, @@ -1538,7 +1538,7 @@ "Type": 2, "SkillId": 770030111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770030111", "TargetType": 1, "CampType": 0, @@ -1616,7 +1616,7 @@ "Type": 2, "SkillId": 770032111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770032111", "TargetType": 1, "CampType": 0, @@ -1642,7 +1642,7 @@ "Type": 2, "SkillId": 770032111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770032111", "TargetType": 1, "CampType": 0, @@ -1668,7 +1668,7 @@ "Type": 2, "SkillId": 770033111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770033111", "TargetType": 1, "CampType": 0, @@ -1694,7 +1694,7 @@ "Type": 2, "SkillId": 770033111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770033111", "TargetType": 1, "CampType": 0, @@ -1720,7 +1720,7 @@ "Type": 2, "SkillId": 770034111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770034111", "TargetType": 1, "CampType": 0, @@ -1746,7 +1746,7 @@ "Type": 2, "SkillId": 770034111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770034111", "TargetType": 1, "CampType": 0, @@ -1824,7 +1824,7 @@ "Type": 2, "SkillId": 770036111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770036111", "TargetType": 1, "CampType": 0, @@ -1850,7 +1850,7 @@ "Type": 2, "SkillId": 770036111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770036111", "TargetType": 1, "CampType": 0, @@ -1980,7 +1980,7 @@ "Type": 2, "SkillId": 770039111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770039111", "TargetType": 1, "CampType": 0, @@ -2006,7 +2006,7 @@ "Type": 2, "SkillId": 770039111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770039111", "TargetType": 1, "CampType": 0, @@ -2084,7 +2084,7 @@ "Type": 3, "SkillId": 770041111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770041111", "TargetType": 1, "CampType": 0, @@ -2110,7 +2110,7 @@ "Type": 3, "SkillId": 770041111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770041111", "TargetType": 1, "CampType": 0, @@ -2136,7 +2136,7 @@ "Type": 3, "SkillId": 770042111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770042111", "TargetType": 1, "CampType": 0, @@ -2162,7 +2162,7 @@ "Type": 3, "SkillId": 770042111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770042111", "TargetType": 1, "CampType": 0, @@ -2188,7 +2188,7 @@ "Type": 3, "SkillId": 770043111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770043111", "TargetType": 1, "CampType": 0, @@ -2214,7 +2214,7 @@ "Type": 3, "SkillId": 770043111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770043111", "TargetType": 1, "CampType": 0, @@ -2240,7 +2240,7 @@ "Type": 3, "SkillId": 770044111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770044111", "TargetType": 1, "CampType": 0, @@ -2266,7 +2266,7 @@ "Type": 3, "SkillId": 770044111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770044111", "TargetType": 1, "CampType": 0, @@ -2292,7 +2292,7 @@ "Type": 3, "SkillId": 770045111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770045111", "TargetType": 1, "CampType": 0, @@ -2318,7 +2318,7 @@ "Type": 3, "SkillId": 770045111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770045111", "TargetType": 1, "CampType": 0, @@ -2344,7 +2344,7 @@ "Type": 3, "SkillId": 770046111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770046111", "TargetType": 1, "CampType": 0, @@ -2370,7 +2370,7 @@ "Type": 3, "SkillId": 770046111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770046111", "TargetType": 1, "CampType": 0, @@ -2396,7 +2396,7 @@ "Type": 3, "SkillId": 770047111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770047111", "TargetType": 1, "CampType": 0, @@ -2422,7 +2422,7 @@ "Type": 3, "SkillId": 770047111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770047111", "TargetType": 1, "CampType": 0, @@ -2448,7 +2448,7 @@ "Type": 3, "SkillId": 770048111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770048111", "TargetType": 1, "CampType": 0, @@ -2474,7 +2474,7 @@ "Type": 3, "SkillId": 770048111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770048111", "TargetType": 1, "CampType": 0, @@ -2500,7 +2500,7 @@ "Type": 3, "SkillId": 770049111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770049111", "TargetType": 1, "CampType": 0, @@ -2526,7 +2526,7 @@ "Type": 3, "SkillId": 770049111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770049111", "TargetType": 1, "CampType": 0, @@ -2656,7 +2656,7 @@ "Type": 3, "SkillId": 770052111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770052111", "TargetType": 1, "CampType": 0, @@ -2682,7 +2682,7 @@ "Type": 3, "SkillId": 770052111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770052111", "TargetType": 1, "CampType": 0, @@ -2708,7 +2708,7 @@ "Type": 3, "SkillId": 770053111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770053111", "TargetType": 1, "CampType": 0, @@ -2734,7 +2734,7 @@ "Type": 3, "SkillId": 770053111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770053111", "TargetType": 1, "CampType": 0, @@ -2760,7 +2760,7 @@ "Type": 3, "SkillId": 770054111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770054111", "TargetType": 1, "CampType": 0, @@ -2786,7 +2786,7 @@ "Type": 3, "SkillId": 770054111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770054111", "TargetType": 1, "CampType": 0, @@ -2916,7 +2916,7 @@ "Type": 3, "SkillId": 770057111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770057111", "TargetType": 1, "CampType": 0, @@ -2942,7 +2942,7 @@ "Type": 3, "SkillId": 770057111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770057111", "TargetType": 1, "CampType": 0, @@ -3072,7 +3072,7 @@ "Type": 3, "SkillId": 770060111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770060111", "TargetType": 1, "CampType": 0, @@ -3098,7 +3098,7 @@ "Type": 3, "SkillId": 770060111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770060111", "TargetType": 1, "CampType": 0, @@ -3124,7 +3124,7 @@ "Type": 4, "SkillId": 770061111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770061111", "TargetType": 1, "CampType": 0, @@ -3150,7 +3150,7 @@ "Type": 4, "SkillId": 770061111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770061111", "TargetType": 1, "CampType": 0, @@ -3176,7 +3176,7 @@ "Type": 4, "SkillId": 770062111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770062111", "TargetType": 1, "CampType": 0, @@ -3202,7 +3202,7 @@ "Type": 4, "SkillId": 770062111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770062111", "TargetType": 1, "CampType": 0, @@ -3228,7 +3228,7 @@ "Type": 4, "SkillId": 770063111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770063111", "TargetType": 1, "CampType": 0, @@ -3254,7 +3254,7 @@ "Type": 4, "SkillId": 770063111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770063111", "TargetType": 1, "CampType": 0, @@ -3280,7 +3280,7 @@ "Type": 4, "SkillId": 770064111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770064111", "TargetType": 1, "CampType": 0, @@ -3306,7 +3306,7 @@ "Type": 4, "SkillId": 770064111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770064111", "TargetType": 1, "CampType": 0, @@ -3384,7 +3384,7 @@ "Type": 4, "SkillId": 770066111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770066111", "TargetType": 1, "CampType": 0, @@ -3410,7 +3410,7 @@ "Type": 4, "SkillId": 770066111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770066111", "TargetType": 1, "CampType": 0, @@ -3488,7 +3488,7 @@ "Type": 4, "SkillId": 770068111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770068111", "TargetType": 1, "CampType": 0, @@ -3514,7 +3514,7 @@ "Type": 4, "SkillId": 770068111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770068111", "TargetType": 1, "CampType": 0, @@ -3592,7 +3592,7 @@ "Type": 4, "SkillId": 770070111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770070111", "TargetType": 1, "CampType": 0, @@ -3618,7 +3618,7 @@ "Type": 4, "SkillId": 770070111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770070111", "TargetType": 1, "CampType": 0, @@ -3644,7 +3644,7 @@ "Type": 4, "SkillId": 770071111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770071111", "TargetType": 1, "CampType": 0, @@ -3670,7 +3670,7 @@ "Type": 4, "SkillId": 770071111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770071111", "TargetType": 1, "CampType": 0, @@ -3696,7 +3696,7 @@ "Type": 4, "SkillId": 770072111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770072111", "TargetType": 1, "CampType": 0, @@ -3722,7 +3722,7 @@ "Type": 4, "SkillId": 770072111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770072111", "TargetType": 1, "CampType": 0, @@ -3800,7 +3800,7 @@ "Type": 4, "SkillId": 770074111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770074111", "TargetType": 1, "CampType": 0, @@ -3826,7 +3826,7 @@ "Type": 4, "SkillId": 770074111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770074111", "TargetType": 1, "CampType": 0, @@ -3852,7 +3852,7 @@ "Type": 4, "SkillId": 770075111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770075111", "TargetType": 1, "CampType": 0, @@ -3878,7 +3878,7 @@ "Type": 4, "SkillId": 770075111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770075111", "TargetType": 1, "CampType": 0, @@ -3904,7 +3904,7 @@ "Type": 4, "SkillId": 770076111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770076111", "TargetType": 1, "CampType": 0, @@ -3930,7 +3930,7 @@ "Type": 4, "SkillId": 770076111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770076111", "TargetType": 1, "CampType": 0, @@ -3956,7 +3956,7 @@ "Type": 4, "SkillId": 770077111, "BuffLevel": 1, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770077111", "TargetType": 1, "CampType": 0, @@ -3982,7 +3982,7 @@ "Type": 4, "SkillId": 770077111, "BuffLevel": 2, - "Quality": 1, + "Quality": 3, "BuffIcon": "stonehengebuff_770077111", "TargetType": 1, "CampType": 0, @@ -4112,7 +4112,7 @@ "Type": 4, "SkillId": 770080111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770080111", "TargetType": 1, "CampType": 0, @@ -4138,7 +4138,7 @@ "Type": 4, "SkillId": 770080111, "BuffLevel": 2, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_770080111", "TargetType": 1, "CampType": 0, @@ -4164,7 +4164,7 @@ "Type": 5, "SkillId": 782000111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782000111", "TargetType": 1, "CampType": 0, @@ -4190,7 +4190,7 @@ "Type": 5, "SkillId": 782001111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782001111", "TargetType": 1, "CampType": 0, @@ -4216,7 +4216,7 @@ "Type": 5, "SkillId": 782002111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782002111", "TargetType": 1, "CampType": 0, @@ -4242,7 +4242,7 @@ "Type": 5, "SkillId": 782003111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782003111", "TargetType": 1, "CampType": 0, @@ -4268,7 +4268,7 @@ "Type": 5, "SkillId": 782004111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782004111", "TargetType": 1, "CampType": 0, @@ -4294,7 +4294,7 @@ "Type": 5, "SkillId": 782005111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782005111", "TargetType": 1, "CampType": 0, @@ -4320,7 +4320,7 @@ "Type": 5, "SkillId": 782006111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782006111", "TargetType": 1, "CampType": 0, @@ -4346,7 +4346,7 @@ "Type": 5, "SkillId": 782007111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782007111", "TargetType": 1, "CampType": 0, @@ -4372,7 +4372,7 @@ "Type": 5, "SkillId": 782008111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782008111", "TargetType": 1, "CampType": 0, @@ -4398,7 +4398,7 @@ "Type": 5, "SkillId": 782009111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_782009111", "TargetType": 1, "CampType": 0, @@ -4424,7 +4424,7 @@ "Type": 999, "SkillId": 791000111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791000111", "TargetType": 1, "CampType": 0, @@ -4450,7 +4450,7 @@ "Type": 999, "SkillId": 791001111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791001111", "TargetType": 1, "CampType": 0, @@ -4476,7 +4476,7 @@ "Type": 999, "SkillId": 791002111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791002111", "TargetType": 1, "CampType": 0, @@ -4502,7 +4502,7 @@ "Type": 999, "SkillId": 791003111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791003111", "TargetType": 1, "CampType": 0, @@ -4528,7 +4528,7 @@ "Type": 999, "SkillId": 791004111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791004111", "TargetType": 1, "CampType": 0, @@ -4554,7 +4554,7 @@ "Type": 999, "SkillId": 791005111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791005111", "TargetType": 1, "CampType": 0, @@ -4580,7 +4580,7 @@ "Type": 999, "SkillId": 791006111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791006111", "TargetType": 1, "CampType": 0, @@ -4606,7 +4606,7 @@ "Type": 999, "SkillId": 791007111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791007111", "TargetType": 1, "CampType": 0, @@ -4632,7 +4632,7 @@ "Type": 999, "SkillId": 791008111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791008111", "TargetType": 1, "CampType": 0, @@ -4658,7 +4658,7 @@ "Type": 999, "SkillId": 791009111, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791009111", "TargetType": 1, "CampType": 0, @@ -4684,7 +4684,7 @@ "Type": 999, "SkillId": 791000211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791000211", "TargetType": 1, "CampType": 0, @@ -4710,7 +4710,7 @@ "Type": 999, "SkillId": 791001211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791001211", "TargetType": 1, "CampType": 0, @@ -4736,7 +4736,7 @@ "Type": 999, "SkillId": 791002211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791002211", "TargetType": 1, "CampType": 0, @@ -4762,7 +4762,7 @@ "Type": 999, "SkillId": 791003211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791003211", "TargetType": 1, "CampType": 0, @@ -4788,7 +4788,7 @@ "Type": 999, "SkillId": 791004211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791004211", "TargetType": 1, "CampType": 0, @@ -4814,7 +4814,7 @@ "Type": 999, "SkillId": 791005211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791005211", "TargetType": 1, "CampType": 0, @@ -4840,7 +4840,7 @@ "Type": 999, "SkillId": 791006211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791006211", "TargetType": 1, "CampType": 0, @@ -4866,7 +4866,7 @@ "Type": 999, "SkillId": 791007211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791007211", "TargetType": 1, "CampType": 0, @@ -4892,7 +4892,7 @@ "Type": 999, "SkillId": 791008211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791008211", "TargetType": 1, "CampType": 0, @@ -4918,7 +4918,7 @@ "Type": 999, "SkillId": 791009211, "BuffLevel": 1, - "Quality": 2, + "Quality": 3, "BuffIcon": "stonehengebuff_791009211", "TargetType": 1, "CampType": 0, diff --git a/modules/entertainment/api_boxreward.go b/modules/entertainment/api_boxreward.go index ac3804ddb..8f6e8dbe8 100644 --- a/modules/entertainment/api_boxreward.go +++ b/modules/entertainment/api_boxreward.go @@ -67,8 +67,10 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe return } reward := this.module.ModuleTools.GetGroupDataByLottery(conf.Group, user.Vip, user.Lv) - if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil { - return + if len(reward) > 0 { + if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil { + return + } } } diff --git a/modules/entertainment/api_operatorover.go b/modules/entertainment/api_operatorover.go new file mode 100644 index 000000000..de490e661 --- /dev/null +++ b/modules/entertainment/api_operatorover.go @@ -0,0 +1,20 @@ +package entertainment + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +//参数校验 +func (this *apiComp) OperatorOverCheck(session comm.IUserSession, req *pb.EntertainOperatorOverReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) OperatorOver(session comm.IUserSession, req *pb.EntertainOperatorOverReq) (errdata *pb.ErrorData) { + if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "operatorover", req); errdata == nil { + return + } + session.SendMsg(string(this.module.GetType()), "operatorover", &pb.EntertainOperatorOverResp{}) + return +} diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go index 1e7315e4f..6202a74ae 100644 --- a/modules/entertainment/model.go +++ b/modules/entertainment/model.go @@ -63,6 +63,11 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err for _, v := range this.module.configure.GetInitGameConsumeHero() { result.Card[v] = 1 } + if dbModel == nil { + err = this.Add(uid, result) + } else { + err = dbModel.Add(uid, result) + } } err = nil return result, err diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 4968fb184..686b86f5b 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -40,9 +40,7 @@ type Room struct { func (this *Room) operateTimeOut(task *timewheel.Task, args ...interface{}) { fmt.Printf("超时+++++%d\n", time.Now().Unix()) - if this.operatetimer != nil { - //this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器 - } + if this.player1.Userinfo.Uid == this.curPower { // 给玩家2 this.NexPower = this.player2.Userinfo.Uid this.player2.Ps = MaxPs // 恢复体力 @@ -85,6 +83,10 @@ func (this *Room) operateTimeOut(task *timewheel.Task, args ...interface{}) { // 二号玩家是机器人 if len(this.szSession) == 1 { this.AiOperator() + } else { + // if this.operatetimer != nil { + // this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器 + // } } } @@ -483,7 +485,8 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr }, this.szSession...); err != nil { this.module.Errorln(err) } - //this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) + // 游戏开始开启一个定时器 + this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) } case "reconnect": // 重连 @@ -523,6 +526,16 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr }, this.szSession...); err != nil { this.module.Errorln(err) } + case "operatorover": // 操作完成 开启一个定时器 + if this.operatetimer != nil { + timewheel.Remove(this.operatetimer) + this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) + } + if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startimer", &pb.EntertainStarTimerPush{ + Time: this.MaxTime, + }, this.szSession...); err != nil { + this.module.Errorln(err) + } } return diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go index f275666a2..4c49882bc 100644 --- a/modules/entertainment/xxlPlat.go +++ b/modules/entertainment/xxlPlat.go @@ -65,7 +65,7 @@ func (this *MapData) InitMap(module *Entertainment) { this.Plat[i] = this.CreateGride(int32(i)) } this.SetIndelibilityPlat() - //this.SetMap() // 方便测试固定地图 + this.SetMap() // 方便测试固定地图 } // 交换2个元素(参数 oid ) @@ -246,14 +246,14 @@ func (this *MapData) Check4X() (bEliminate bool, xiaochu []int, s map[int]int) { func (this *MapData) Check3X() (bEliminate bool, xiaochu []int) { //var xiaochu []int // 即将消除的key for k, v := range this.Plat { - // b := false - // for _, e := range this.operElem { - // if e == int32(k) { - // b = true - // break - // } - // } - if v.Cid == 0 { + b := false + for _, e := range this.operElem { + if e == int32(k) { + b = true + break + } + } + if v.Cid == 0 && !b { continue } x := int32(k % Height) // x @@ -626,8 +626,8 @@ func (this *MapData) SetMap() { 3, 4, 3, 5, 6, 1, 6, 1, 4, 6, 4, 2, 3, 6, 1, 5, 6, 5, 6, 1, 4, - 5, 3, 4, 1, 4, 3, 3, - 3, 3, 5, 1, 1, 2, 5, + 6, 6, 4, 6, 4, 3, 3, + 3, 3, 6, 1, 1, 2, 5, // 1, 4, 2, 5, 4, 5, 2, // 3, 2, 3, 5, 2, 1, 4, // 2, 5, 5, 4, 5, 4, 1, diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index 6a7d264c0..16e5e33db 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -450,6 +450,32 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq } } update["userbuff"] = stone.Userbuff + case EventType22: // + lenSelect := len(stone.Rooms.Selectbuff) + if pos, err := strconv.Atoi(req.Param1); err == nil { + if lenSelect == 0 || lenSelect <= pos { + return + } + delbuff := stone.Rooms.Selectbuff[pos] + if _, ok := stone.Userbuff[delbuff]; ok { + delete(stone.Userbuff, delbuff) + update["userbuff"] = stone.Userbuff + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), + } + return + } + } else { // 参数错误 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), + } + return + } } stone.Rooms.Eventid[req.Eventid] = true // // 校验事件有后续事件 diff --git a/modules/stonehenge/api_shop.go b/modules/stonehenge/api_shop.go index 147220c99..42b1e52b4 100644 --- a/modules/stonehenge/api_shop.go +++ b/modules/stonehenge/api_shop.go @@ -45,6 +45,9 @@ func (this *apiComp) Store(session comm.IUserSession, req *pb.StonehengeStoreReq } return } + + newEvent := storeConf.EventId + this.module.modelStonehenge.AddNewEvent([]int32{newEvent}, stone) if stone.Rooms.Shop == nil { stone.Rooms.Shop = make(map[int32]int32) } @@ -72,6 +75,7 @@ func (this *apiComp) Store(session comm.IUserSession, req *pb.StonehengeStoreReq session.SendMsg(string(this.module.GetType()), "store", &pb.StonehengeStoreResp{ StoreId: req.StoreId, Shop: stone.Rooms.Shop, + Room: stone.Rooms, }) return } diff --git a/modules/stonehenge/core.go b/modules/stonehenge/core.go index aedd1ebe5..4a1f0e2a7 100644 --- a/modules/stonehenge/core.go +++ b/modules/stonehenge/core.go @@ -11,6 +11,7 @@ const ( EventType18 = 18 // 回血事件 非场景 EventType19 = 19 // 扣血事件 非场景 EventType20 = 20 // 克隆一名英雄 + EventType22 = 22 // 删除buff（商店用） EventType23 = 23 // 事件buff强化 EventType24 = 24 // 增加背包中指定道具数量 EventType25 = 25 // buff三选一 diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go index 60c4181f6..838d8a515 100644 --- a/modules/stonehenge/modelStonehenge.go +++ b/modules/stonehenge/modelStonehenge.go @@ -143,6 +143,15 @@ func (this *MStonehenge) AddNewEvent(event []int32, stone *pb.DBStonehenge) { if _, ok := stone.Rooms.Passive[newEventConf.EventId]; !ok { stone.Rooms.Box[newEventConf.EventId] = newEventConf.Value1 } + case EventType22: //随机三个buff + stone.Rooms.Selectbuff = make([]int32, 0) + for k := range stone.Userbuff { + stone.Rooms.Selectbuff = append(stone.Rooms.Selectbuff, k) + if len(stone.Rooms.Selectbuff) >= 3 { + break + } + } + } } } diff --git a/pb/entertain_msg.pb.go b/pb/entertain_msg.pb.go index cb05d8429..626f50c88 100644 --- a/pb/entertain_msg.pb.go +++ b/pb/entertain_msg.pb.go @@ -1990,6 +1990,140 @@ func (x *EntertainBoxRewardResp) GetReward() []*UserAtno { return nil } +// 玩家操作完成 +type EntertainOperatorOverReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间号 +} + +func (x *EntertainOperatorOverReq) Reset() { + *x = EntertainOperatorOverReq{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainOperatorOverReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainOperatorOverReq) ProtoMessage() {} + +func (x *EntertainOperatorOverReq) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[35] + 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 EntertainOperatorOverReq.ProtoReflect.Descriptor instead. +func (*EntertainOperatorOverReq) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{35} +} + +func (x *EntertainOperatorOverReq) GetRoomid() string { + if x != nil { + return x.Roomid + } + return "" +} + +type EntertainOperatorOverResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *EntertainOperatorOverResp) Reset() { + *x = EntertainOperatorOverResp{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainOperatorOverResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainOperatorOverResp) ProtoMessage() {} + +func (x *EntertainOperatorOverResp) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[36] + 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 EntertainOperatorOverResp.ProtoReflect.Descriptor instead. +func (*EntertainOperatorOverResp) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{36} +} + +// 开启一个定时器 +type EntertainStarTimerPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Time int32 `protobuf:"varint,1,opt,name=time,proto3" json:"time"` +} + +func (x *EntertainStarTimerPush) Reset() { + *x = EntertainStarTimerPush{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainStarTimerPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainStarTimerPush) ProtoMessage() {} + +func (x *EntertainStarTimerPush) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[37] + 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 EntertainStarTimerPush.ProtoReflect.Descriptor instead. +func (*EntertainStarTimerPush) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{37} +} + +func (x *EntertainStarTimerPush) GetTime() int32 { + if x != nil { + return x.Time + } + return 0 +} + var File_entertain_entertain_msg_proto protoreflect.FileDescriptor var file_entertain_entertain_msg_proto_rawDesc = []byte{ @@ -2184,8 +2318,16 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x77, 0x61, 0x72, 0x64, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, + 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e, 0x74, 0x65, + 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f, 0x76, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, + 0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, + 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, + 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2200,7 +2342,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte { return file_entertain_entertain_msg_proto_rawDescData } -var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36) +var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39) var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainMatchReq)(nil), // 0: EntertainMatchReq (*EntertainMatchResp)(nil), // 1: EntertainMatchResp @@ -2237,40 +2379,43 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainGameReadyPush)(nil), // 32: EntertainGameReadyPush (*EntertainBoxRewardReq)(nil), // 33: EntertainBoxRewardReq (*EntertainBoxRewardResp)(nil), // 34: EntertainBoxRewardResp - nil, // 35: EntertainChangePush.CardEntry - (*PlayerData)(nil), // 36: PlayerData - (*MapData)(nil), // 37: MapData - (*UserAtno)(nil), // 38: UserAtno - (*BoxData)(nil), // 39: BoxData - (*DBXXLData)(nil), // 40: DBXXLData + (*EntertainOperatorOverReq)(nil), // 35: EntertainOperatorOverReq + (*EntertainOperatorOverResp)(nil), // 36: EntertainOperatorOverResp + (*EntertainStarTimerPush)(nil), // 37: EntertainStarTimerPush + nil, // 38: EntertainChangePush.CardEntry + (*PlayerData)(nil), // 39: PlayerData + (*MapData)(nil), // 40: MapData + (*UserAtno)(nil), // 41: UserAtno + (*BoxData)(nil), // 42: BoxData + (*DBXXLData)(nil), // 43: DBXXLData } var file_entertain_entertain_msg_proto_depIdxs = []int32{ - 36, // 0: EntertainStartGamePush.user1:type_name -> PlayerData - 36, // 1: EntertainStartGamePush.user2:type_name -> PlayerData - 37, // 2: EntertainStartGamePush.mpadata:type_name -> MapData - 37, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData - 36, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData - 36, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData - 36, // 6: EntertainGameOverPush.user1:type_name -> PlayerData - 36, // 7: EntertainGameOverPush.user2:type_name -> PlayerData - 37, // 8: EntertainGameOverPush.mpadata:type_name -> MapData - 38, // 9: EntertainGameOverPush.reward:type_name -> UserAtno - 39, // 10: EntertainGameOverPush.box:type_name -> BoxData - 36, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData - 36, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData - 37, // 13: EntertainReconnectResp.mpadata:type_name -> MapData - 36, // 14: EntertainReconnectResp.user1:type_name -> PlayerData - 36, // 15: EntertainReconnectResp.user2:type_name -> PlayerData - 37, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData - 37, // 17: EntertainRefreshPush.mpadata:type_name -> MapData - 40, // 18: EntertainGetListResp.data:type_name -> DBXXLData - 40, // 19: EntertainRewardResp.data:type_name -> DBXXLData - 38, // 20: EntertainRewardResp.reward:type_name -> UserAtno - 35, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry - 36, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData - 36, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData - 39, // 24: EntertainBoxRewardResp.box:type_name -> BoxData - 38, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno + 39, // 0: EntertainStartGamePush.user1:type_name -> PlayerData + 39, // 1: EntertainStartGamePush.user2:type_name -> PlayerData + 40, // 2: EntertainStartGamePush.mpadata:type_name -> MapData + 40, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData + 39, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData + 39, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData + 39, // 6: EntertainGameOverPush.user1:type_name -> PlayerData + 39, // 7: EntertainGameOverPush.user2:type_name -> PlayerData + 40, // 8: EntertainGameOverPush.mpadata:type_name -> MapData + 41, // 9: EntertainGameOverPush.reward:type_name -> UserAtno + 42, // 10: EntertainGameOverPush.box:type_name -> BoxData + 39, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData + 39, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData + 40, // 13: EntertainReconnectResp.mpadata:type_name -> MapData + 39, // 14: EntertainReconnectResp.user1:type_name -> PlayerData + 39, // 15: EntertainReconnectResp.user2:type_name -> PlayerData + 40, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData + 40, // 17: EntertainRefreshPush.mpadata:type_name -> MapData + 43, // 18: EntertainGetListResp.data:type_name -> DBXXLData + 43, // 19: EntertainRewardResp.data:type_name -> DBXXLData + 41, // 20: EntertainRewardResp.reward:type_name -> UserAtno + 38, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry + 39, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData + 39, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData + 42, // 24: EntertainBoxRewardResp.box:type_name -> BoxData + 41, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno 26, // [26:26] is the sub-list for method output_type 26, // [26:26] is the sub-list for method input_type 26, // [26:26] is the sub-list for extension type_name @@ -2706,6 +2851,42 @@ func file_entertain_entertain_msg_proto_init() { return nil } } + file_entertain_entertain_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainOperatorOverReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_entertain_entertain_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainOperatorOverResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_entertain_entertain_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainStarTimerPush); 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{ @@ -2713,7 +2894,7 @@ func file_entertain_entertain_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_entertain_entertain_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 36, + NumMessages: 39, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index b6bf77da0..64dba05f0 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -992,6 +992,7 @@ type StonehengeStoreResp struct { StoreId int32 `protobuf:"varint,1,opt,name=storeId,proto3" json:"storeId"` //商店配置表id Shop map[int32]int32 `protobuf:"bytes,2,rep,name=shop,proto3" json:"shop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 商店 + Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"` } func (x *StonehengeStoreResp) Reset() { @@ -1040,6 +1041,13 @@ func (x *StonehengeStoreResp) GetShop() map[int32]int32 { return nil } +func (x *StonehengeStoreResp) GetRoom() *RoomData { + if x != nil { + return x.Room + } + return nil +} + //激活天赋树 type StonehengeActivateTalentReq struct { state protoimpl.MessageState @@ -1895,113 +1903,115 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2e, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, - 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, + 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0xbb, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x6f, - 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, - 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x1b, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, - 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03, 0x0a, 0x1c, 0x53, 0x74, 0x6f, - 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x41, 0x0a, - 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, - 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, - 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, - 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x09, 0x70, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, - 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, - 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 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, 0x08, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, - 0x6c, 0x65, 0x6e, 0x74, 0x70, 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, 0x17, 0x0a, - 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, - 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, - 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, - 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, - 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x68, 0x0a, - 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, - 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, - 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, - 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, - 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4e, 0x0a, - 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, - 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, - 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x21, 0x0a, - 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, - 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, - 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0xaf, 0x01, 0x0a, 0x16, 0x53, - 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, - 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x12, 0x35, 0x0a, 0x04, - 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x53, 0x74, 0x6f, - 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, - 0x61, 0x73, 0x6b, 0x1a, 0x37, 0x0a, 0x09, 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, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x18, - 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, - 0x22, 0xb1, 0x01, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, - 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x53, - 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x54, - 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x12, 0x1d, 0x0a, 0x04, + 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, + 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x1a, 0x37, 0x0a, 0x09, 0x53, + 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x18, - 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, - 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, - 0x75, 0x66, 0x66, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x1b, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, + 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03, 0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, + 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x41, 0x0a, 0x06, + 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x53, + 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, + 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, + 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, + 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 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, 0x08, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x70, 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, 0x17, 0x0a, 0x15, + 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, + 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, + 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x68, 0x0a, 0x17, + 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, + 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, + 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, + 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, + 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, + 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, + 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0c, + 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, + 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, + 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, + 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, + 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x22, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, + 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0xaf, 0x01, 0x0a, 0x16, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x12, 0x35, 0x0a, 0x04, 0x74, + 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x53, 0x74, 0x6f, 0x6e, + 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, + 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, + 0x73, 0x6b, 0x1a, 0x37, 0x0a, 0x09, 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, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x18, 0x53, + 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x22, + 0xb1, 0x01, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, + 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, + 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 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, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, + 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, + 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, + 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, + 0x66, 0x66, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -2090,24 +2100,25 @@ var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ 47, // 14: StonehengeBattleResp.info:type_name -> BattleInfo 43, // 15: StonehengeStoryResp.room:type_name -> RoomData 35, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry - 36, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry - 37, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry - 48, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege - 49, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook - 50, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets - 38, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry - 50, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets - 51, // 24: StonehengeTaskInfoResp.conlds:type_name -> ConIProgress - 39, // 25: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry - 40, // 26: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry - 50, // 27: StonehengeTaskReceiveResp.award:type_name -> UserAssets - 52, // 28: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole - 52, // 29: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole - 30, // [30:30] is the sub-list for method output_type - 30, // [30:30] is the sub-list for method input_type - 30, // [30:30] is the sub-list for extension type_name - 30, // [30:30] is the sub-list for extension extendee - 0, // [0:30] is the sub-list for field type_name + 43, // 17: StonehengeStoreResp.room:type_name -> RoomData + 36, // 18: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry + 37, // 19: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry + 48, // 20: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege + 49, // 21: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook + 50, // 22: StonehengeBookAwardResp.award:type_name -> UserAssets + 38, // 23: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry + 50, // 24: StonehengeWeekAwardResp.award:type_name -> UserAssets + 51, // 25: StonehengeTaskInfoResp.conlds:type_name -> ConIProgress + 39, // 26: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry + 40, // 27: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry + 50, // 28: StonehengeTaskReceiveResp.award:type_name -> UserAssets + 52, // 29: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole + 52, // 30: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole + 31, // [31:31] is the sub-list for method output_type + 31, // [31:31] is the sub-list for method input_type + 31, // [31:31] is the sub-list for extension type_name + 31, // [31:31] is the sub-list for extension extendee + 0, // [0:31] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_msg_proto_init() } From 866b768e96b07f67e4068e4040f9393049825b16 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 3 Nov 2023 09:45:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=87=8C=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/entertainment/room.go | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 686b86f5b..d2e94315d 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -40,7 +40,9 @@ type Room struct { func (this *Room) operateTimeOut(task *timewheel.Task, args ...interface{}) { fmt.Printf("超时+++++%d\n", time.Now().Unix()) - + if this.operatetimer != nil { + this.operatetimer = nil + } if this.player1.Userinfo.Uid == this.curPower { // 给玩家2 this.NexPower = this.player2.Userinfo.Uid this.player2.Ps = MaxPs // 恢复体力 @@ -83,10 +85,6 @@ func (this *Room) operateTimeOut(task *timewheel.Task, args ...interface{}) { // 二号玩家是机器人 if len(this.szSession) == 1 { this.AiOperator() - } else { - // if this.operatetimer != nil { - // this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器 - // } } } @@ -156,10 +154,6 @@ func (this *Room) AiOperator() { this.NexPower = this.player1.Userinfo.Uid this.player1.Ps = MaxPs this.round++ - if this.operatetimer != nil { // 开启新的定时器 - timewheel.Remove(this.operatetimer) - } - //this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) } // 校验下次是不是消除 if !this.chessboard.CheckAndRefreshPlat() { @@ -418,12 +412,12 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr } return } - if this.operatetimer != nil { - timewheel.Remove(this.operatetimer) - this.operatetimer = nil - } - if this.curPower != this.NexPower && len(this.szSession) > 1 { - //this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器 + + if this.curPower != this.NexPower { // 下一次操作不是自己 清除定时器 + if this.operatetimer != nil { + timewheel.Remove(this.operatetimer) + this.operatetimer = nil + } } // 变更权限 this.curPower = this.NexPower @@ -486,7 +480,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr this.module.Errorln(err) } // 游戏开始开启一个定时器 - this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) + //this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) } case "reconnect": // 重连 @@ -529,8 +523,10 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr case "operatorover": // 操作完成 开启一个定时器 if this.operatetimer != nil { timewheel.Remove(this.operatetimer) - this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) + this.operatetimer = nil } + this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) + if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startimer", &pb.EntertainStarTimerPush{ Time: this.MaxTime, }, this.szSession...); err != nil { @@ -554,6 +550,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) { ) if this.operatetimer != nil { timewheel.Remove(this.operatetimer) + this.operatetimer = nil } winner = this.player1 bReward = true