From ba7e58246ec38107b91e972c523016990071095d Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 14 Sep 2023 10:06:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?redis=20=E8=AE=BE=E7=BD=AE=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_bubblegroup.json | 216 +++++++++ bin/json/game_dragonplay.json | 78 +-- bin/json/game_gm.json | 800 +++++++++++++++++++++++++++++++ bin/json/game_skillafteratk.json | 2 + bin/编译部署文档.md | 7 + 5 files changed, 1046 insertions(+), 57 deletions(-) diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index 140c08bb0..f92f765d3 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -1174,5 +1174,221 @@ "key": "bubblegroup_bubblegroup_Text_Bubble_98", "text": "阿卡迪亚战争的记忆永远不会被抹去。" } + }, + { + "KeyId": 99, + "GroupID": 2003000311, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_99", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 100, + "GroupID": 2003000321, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_100", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 101, + "GroupID": 2003000322, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_101", + "text": "就这点东西就给本大爷打发了是吧" + } + }, + { + "KeyId": 102, + "GroupID": 2003000323, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_102", + "text": "好好好,这么玩儿是吧" + } + }, + { + "KeyId": 103, + "GroupID": 2003000324, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_103", + "text": "轻点,当洗车呢" + } + }, + { + "KeyId": 104, + "GroupID": 2003000331, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_104", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 105, + "GroupID": 2003000332, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_105", + "text": "就这点东西就给本大爷打发了是吧" + } + }, + { + "KeyId": 106, + "GroupID": 2003000111, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_106", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 107, + "GroupID": 2003000121, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_107", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 108, + "GroupID": 2003000122, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_108", + "text": "就这点东西就给本大爷打发了是吧" + } + }, + { + "KeyId": 109, + "GroupID": 2003000123, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_109", + "text": "好好好,这么玩儿是吧" + } + }, + { + "KeyId": 110, + "GroupID": 2003000124, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_110", + "text": "轻点,当洗车呢" + } + }, + { + "KeyId": 111, + "GroupID": 2003000131, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_111", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 112, + "GroupID": 2003000132, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_112", + "text": "就这点东西就给本大爷打发了是吧" + } + }, + { + "KeyId": 113, + "GroupID": 2003000211, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_113", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 114, + "GroupID": 2003000222, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_114", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 115, + "GroupID": 2003000231, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_115", + "text": "你再摸一个试试" + } + }, + { + "KeyId": 116, + "GroupID": 2003000232, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_bubblegroup_Text_Bubble_116", + "text": "就这点东西就给本大爷打发了是吧" + } } ] \ No newline at end of file diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index 4ab9bb1fc..c6c178fb1 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -8,19 +8,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, - "group": 0 - }, - { - "key": 2, - "id": "20030003", - "type": 1, - "interact": 2, - "exp": 300, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 14005, + "bubble": 2003000311, "group": 0 }, { @@ -32,7 +20,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000321, "group": 0 }, { @@ -43,14 +31,8 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012001", - "n": 1 - } - ], - "bubble": 14005, + "deplete": [], + "bubble": 2003000322, "group": 0 }, { @@ -62,7 +44,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000323, "group": 0 }, { @@ -74,7 +56,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000324, "group": 0 }, { @@ -86,7 +68,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000331, "group": 0 }, { @@ -97,14 +79,8 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [ - { - "a": "item", - "t": "24012002", - "n": 1 - } - ], - "bubble": 14005, + "deplete": [], + "bubble": 2003000332, "group": 0 }, { @@ -116,19 +92,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, - "group": 0 - }, - { - "key": 10, - "id": "20030001", - "type": 1, - "interact": 2, - "exp": 300, - "time": 1, - "cd": 0, - "deplete": [], - "bubble": 14005, + "bubble": 2003000111, "group": 0 }, { @@ -140,7 +104,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000121, "group": 0 }, { @@ -152,7 +116,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000122, "group": 0 }, { @@ -164,7 +128,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000123, "group": 0 }, { @@ -176,7 +140,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000124, "group": 0 }, { @@ -188,7 +152,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000131, "group": 0 }, { @@ -200,7 +164,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000132, "group": 0 }, { @@ -212,19 +176,19 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000211, "group": 0 }, { "key": 18, "id": "20030002", "type": 2, - "interact": 2, + "interact": 1, "exp": 200, "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000221, "group": 0 }, { @@ -236,7 +200,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000231, "group": 0 }, { @@ -248,7 +212,7 @@ "time": 1, "cd": 0, "deplete": [], - "bubble": 14005, + "bubble": 2003000232, "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index e23ab8773..3045db456 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -438,5 +438,805 @@ }, "data": "137", "prefix": "" + }, + { + "id": 47, + "type": 4, + "text": { + "key": "GM_GM_text_47", + "text": "前往背包道具界面" + }, + "data": "101", + "prefix": "" + }, + { + "id": 48, + "type": 4, + "text": { + "key": "GM_GM_text_48", + "text": "前往守护者装备" + }, + "data": "102", + "prefix": "" + }, + { + "id": 49, + "type": 4, + "text": { + "key": "GM_GM_text_49", + "text": "前往守护者强化" + }, + "data": "103", + "prefix": "" + }, + { + "id": 50, + "type": 4, + "text": { + "key": "GM_GM_text_50", + "text": "前往守护者觉醒" + }, + "data": "104", + "prefix": "" + }, + { + "id": 51, + "type": 4, + "text": { + "key": "GM_GM_text_51", + "text": "查看周常任务" + }, + "data": "110", + "prefix": "" + }, + { + "id": 52, + "type": 4, + "text": { + "key": "GM_GM_text_52", + "text": "前往成就任务" + }, + "data": "111", + "prefix": "" + }, + { + "id": 53, + "type": 4, + "text": { + "key": "GM_GM_text_53", + "text": "前往好友列表" + }, + "data": "115", + "prefix": "" + }, + { + "id": 54, + "type": 4, + "text": { + "key": "GM_GM_text_54", + "text": "前往心魔之塔" + }, + "data": "120", + "prefix": "" + }, + { + "id": 55, + "type": 4, + "text": { + "key": "GM_GM_text_55", + "text": "打开商铺" + }, + "data": "122", + "prefix": "" + }, + { + "id": 56, + "type": 4, + "text": { + "key": "GM_GM_text_56", + "text": "前往守护者详情" + }, + "data": "127", + "prefix": "" + }, + { + "id": 57, + "type": 4, + "text": { + "key": "GM_GM_text_57", + "text": "前往武馆" + }, + "data": "137", + "prefix": "" + }, + { + "id": 58, + "type": 4, + "text": { + "key": "GM_GM_text_58", + "text": "前往铁匠铺" + }, + "data": "139", + "prefix": "" + }, + { + "id": 59, + "type": 4, + "text": { + "key": "GM_GM_text_59", + "text": "开始烹饪" + }, + "data": "140", + "prefix": "" + }, + { + "id": 60, + "type": 4, + "text": { + "key": "GM_GM_text_60", + "text": "前往好感度" + }, + "data": "146", + "prefix": "" + }, + { + "id": 61, + "type": 4, + "text": { + "key": "GM_GM_text_61", + "text": "前往中轴城" + }, + "data": "150", + "prefix": "" + }, + { + "id": 62, + "type": 4, + "text": { + "key": "GM_GM_text_62", + "text": "前往守护者回响" + }, + "data": "155", + "prefix": "" + }, + { + "id": 63, + "type": 4, + "text": { + "key": "GM_GM_text_63", + "text": "前往竞技场" + }, + "data": "156", + "prefix": "" + }, + { + "id": 64, + "type": 4, + "text": { + "key": "GM_GM_text_64", + "text": "热销" + }, + "data": "165", + "prefix": "" + }, + { + "id": 65, + "type": 4, + "text": { + "key": "GM_GM_text_65", + "text": "前往冒险之旅" + }, + "data": "166", + "prefix": "" + }, + { + "id": 66, + "type": 4, + "text": { + "key": "GM_GM_text_66", + "text": "前往维京远征" + }, + "data": "167", + "prefix": "" + }, + { + "id": 67, + "type": 4, + "text": { + "key": "GM_GM_text_67", + "text": "前往猎魂副本" + }, + "data": "168", + "prefix": "" + }, + { + "id": 68, + "type": 4, + "text": { + "key": "GM_GM_text_68", + "text": "前往旧时光" + }, + "data": "169", + "prefix": "" + }, + { + "id": 69, + "type": 4, + "text": { + "key": "GM_GM_text_69", + "text": "前往捕羊大赛" + }, + "data": "170", + "prefix": "" + }, + { + "id": 70, + "type": 4, + "text": { + "key": "GM_GM_text_70", + "text": "打开星座图" + }, + "data": "171", + "prefix": "" + }, + { + "id": 71, + "type": 4, + "text": { + "key": "GM_GM_text_71", + "text": "打开俱乐部boss" + }, + "data": "172", + "prefix": "" + }, + { + "id": 72, + "type": 4, + "text": { + "key": "GM_GM_text_72", + "text": "前往中轴城" + }, + "data": "901", + "prefix": "" + }, + { + "id": 73, + "type": 4, + "text": { + "key": "GM_GM_text_73", + "text": "开启邮箱" + }, + "data": "721", + "prefix": "" + }, + { + "id": 74, + "type": 4, + "text": { + "key": "GM_GM_text_74", + "text": "进行锻造" + }, + "data": "1001", + "prefix": "" + }, + { + "id": 75, + "type": 4, + "text": { + "key": "GM_GM_text_75", + "text": "打开冶炼炉" + }, + "data": "1002", + "prefix": "" + }, + { + "id": 76, + "type": 4, + "text": { + "key": "GM_GM_text_76", + "text": "打开装备手册" + }, + "data": "1003", + "prefix": "" + }, + { + "id": 77, + "type": 4, + "text": { + "key": "GM_GM_text_77", + "text": "打开图鉴" + }, + "data": "1004", + "prefix": "" + }, + { + "id": 78, + "type": 4, + "text": { + "key": "GM_GM_text_78", + "text": "寻找木人桩" + }, + "data": "10001", + "prefix": "" + }, + { + "id": 79, + "type": 4, + "text": { + "key": "GM_GM_text_79", + "text": "打开每日一练" + }, + "data": "10002", + "prefix": "" + }, + { + "id": 80, + "type": 4, + "text": { + "key": "GM_GM_text_80", + "text": "打开守护者教习" + }, + "data": "10003", + "prefix": "" + }, + { + "id": 81, + "type": 4, + "text": { + "key": "GM_GM_text_81", + "text": "进入炼金塔" + }, + "data": "10004", + "prefix": "" + }, + { + "id": 82, + "type": 4, + "text": { + "key": "GM_GM_text_82", + "text": "进入梦境回廊" + }, + "data": "10005", + "prefix": "" + }, + { + "id": 83, + "type": 4, + "text": { + "key": "GM_GM_text_83", + "text": "打开布告栏" + }, + "data": "10006", + "prefix": "" + }, + { + "id": 84, + "type": 4, + "text": { + "key": "GM_GM_text_84", + "text": "打开图鉴" + }, + "data": "10009", + "prefix": "" + }, + { + "id": 85, + "type": 4, + "text": { + "key": "GM_GM_text_85", + "text": "查看周常任务" + }, + "data": "904", + "prefix": "" + }, + { + "id": 86, + "type": 4, + "text": { + "key": "GM_GM_text_86", + "text": "前往指挥部" + }, + "data": "905", + "prefix": "" + }, + { + "id": 87, + "type": 4, + "text": { + "key": "GM_GM_text_87", + "text": "前往守护者" + }, + "data": "906", + "prefix": "" + }, + { + "id": 88, + "type": 4, + "text": { + "key": "GM_GM_text_88", + "text": "前往俱乐部" + }, + "data": "908", + "prefix": "" + }, + { + "id": 89, + "type": 4, + "text": { + "key": "GM_GM_text_89", + "text": "前往商队" + }, + "data": "11001", + "prefix": "" + }, + { + "id": 90, + "type": 4, + "text": { + "key": "GM_GM_text_90", + "text": "前往俱乐部内部场景" + }, + "data": "11005", + "prefix": "" + }, + { + "id": 91, + "type": 4, + "text": { + "key": "GM_GM_text_91", + "text": "打开商铺" + }, + "data": "11006", + "prefix": "" + }, + { + "id": 92, + "type": 4, + "text": { + "key": "GM_GM_text_92", + "text": "前往月光原石商铺" + }, + "data": "11007", + "prefix": "" + }, + { + "id": 93, + "type": 4, + "text": { + "key": "GM_GM_text_93", + "text": "前往友情商铺" + }, + "data": "11008", + "prefix": "" + }, + { + "id": 94, + "type": 4, + "text": { + "key": "GM_GM_text_94", + "text": "前往俱乐部商铺" + }, + "data": "11009", + "prefix": "" + }, + { + "id": 95, + "type": 4, + "text": { + "key": "GM_GM_text_95", + "text": "前往特殊商铺" + }, + "data": "11010", + "prefix": "" + }, + { + "id": 96, + "type": 4, + "text": { + "key": "GM_GM_text_96", + "text": "前往铁匠商铺" + }, + "data": "11011", + "prefix": "" + }, + { + "id": 97, + "type": 4, + "text": { + "key": "GM_GM_text_97", + "text": "前往维京远征" + }, + "data": "11012", + "prefix": "" + }, + { + "id": 98, + "type": 4, + "text": { + "key": "GM_GM_text_98", + "text": "进入梦境回廊" + }, + "data": "10013", + "prefix": "" + }, + { + "id": 99, + "type": 4, + "text": { + "key": "GM_GM_text_99", + "text": "竞技场" + }, + "data": "10015", + "prefix": "" + }, + { + "id": 100, + "type": 4, + "text": { + "key": "GM_GM_text_100", + "text": "前往无极塔" + }, + "data": "10017", + "prefix": "" + }, + { + "id": 101, + "type": 4, + "text": { + "key": "GM_GM_text_101", + "text": "前往六合塔" + }, + "data": "10018", + "prefix": "" + }, + { + "id": 102, + "type": 4, + "text": { + "key": "GM_GM_text_102", + "text": "打开月光护符" + }, + "data": "10019", + "prefix": "" + }, + { + "id": 103, + "type": 4, + "text": { + "key": "GM_GM_text_103", + "text": "前往维京远征" + }, + "data": "10020", + "prefix": "" + }, + { + "id": 104, + "type": 4, + "text": { + "key": "GM_GM_text_104", + "text": "前往维京远征" + }, + "data": "10021", + "prefix": "" + }, + { + "id": 105, + "type": 4, + "text": { + "key": "GM_GM_text_105", + "text": "前往维京远征" + }, + "data": "10022", + "prefix": "" + }, + { + "id": 106, + "type": 4, + "text": { + "key": "GM_GM_text_106", + "text": "前往猎魂副本" + }, + "data": "10023", + "prefix": "" + }, + { + "id": 107, + "type": 4, + "text": { + "key": "GM_GM_text_107", + "text": "前往猎魂副本" + }, + "data": "10024", + "prefix": "" + }, + { + "id": 108, + "type": 4, + "text": { + "key": "GM_GM_text_108", + "text": "前往猎魂副本" + }, + "data": "10025", + "prefix": "" + }, + { + "id": 109, + "type": 4, + "text": { + "key": "GM_GM_text_109", + "text": "前往石阵秘境" + }, + "data": "10026", + "prefix": "" + }, + { + "id": 110, + "type": 4, + "text": { + "key": "GM_GM_text_110", + "text": "" + }, + "data": "10027", + "prefix": "" + }, + { + "id": 111, + "type": 4, + "text": { + "key": "GM_GM_text_111", + "text": "月卡" + }, + "data": "10028", + "prefix": "" + }, + { + "id": 112, + "type": 4, + "text": { + "key": "GM_GM_text_112", + "text": "礼包" + }, + "data": "10029", + "prefix": "" + }, + { + "id": 113, + "type": 4, + "text": { + "key": "GM_GM_text_113", + "text": "通行证" + }, + "data": "10030", + "prefix": "" + }, + { + "id": 114, + "type": 4, + "text": { + "key": "GM_GM_text_114", + "text": "推送礼包" + }, + "data": "10031", + "prefix": "" + }, + { + "id": 115, + "type": 4, + "text": { + "key": "GM_GM_text_115", + "text": "月梦战令购买等级弹窗" + }, + "data": "10032", + "prefix": "" + }, + { + "id": 116, + "type": 4, + "text": { + "key": "GM_GM_text_116", + "text": "月梦战令" + }, + "data": "10033", + "prefix": "" + }, + { + "id": 117, + "type": 4, + "text": { + "key": "GM_GM_text_117", + "text": "补给战令" + }, + "data": "10034", + "prefix": "" + }, + { + "id": 118, + "type": 4, + "text": { + "key": "GM_GM_text_118", + "text": "剧情活动" + }, + "data": "10035", + "prefix": "" + }, + { + "id": 119, + "type": 4, + "text": { + "key": "GM_GM_text_119", + "text": "圣桃招募" + }, + "data": "10036", + "prefix": "" + }, + { + "id": 120, + "type": 4, + "text": { + "key": "GM_GM_text_120", + "text": "限定招募" + }, + "data": "10037", + "prefix": "" + }, + { + "id": 121, + "type": 4, + "text": { + "key": "GM_GM_text_121", + "text": "阵营招募" + }, + "data": "10038", + "prefix": "" + }, + { + "id": 122, + "type": 4, + "text": { + "key": "GM_GM_text_122", + "text": "许愿招募" + }, + "data": "10039", + "prefix": "" + }, + { + "id": 123, + "type": 4, + "text": { + "key": "GM_GM_text_123", + "text": "体力购买" + }, + "data": "10040", + "prefix": "" + }, + { + "id": 124, + "type": 4, + "text": { + "key": "GM_GM_text_124", + "text": "" + }, + "data": "10041", + "prefix": "" + }, + { + "id": 125, + "type": 4, + "text": { + "key": "GM_GM_text_125", + "text": "" + }, + "data": "10042", + "prefix": "" + }, + { + "id": 126, + "type": 4, + "text": { + "key": "GM_GM_text_126", + "text": "前往主线关卡界面" + }, + "data": "10043", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index e3399adc2..3481319d6 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -32337,6 +32337,8 @@ 1, -10, 2, + -10, + 3, -10 ], "FollowSK": [], diff --git a/bin/编译部署文档.md b/bin/编译部署文档.md index 405bf551e..3e7360c34 100644 --- a/bin/编译部署文档.md +++ b/bin/编译部署文档.md @@ -133,3 +133,10 @@ - 启动命令: - ./cmd start -g ./conf/gm01.json - ./cmd start -g ./conf/gm02.json + +PS: 解决redis 并发下断联重启问题 需要做以下设置 参考 https://www.cnblogs.com/to-be-rich/p/7818618.html + +1.redis设置的tcp连接数受限于系统默认限制128个,因此必须要先调整内核的连接数 + echo 511 > /proc/sys/net/core/somaxconn +overcommit_memory参数设置为0!在内存不足的情况下,后台程序save可能失败 + "vm.overcommit_memory=1" > /etc/sysctl.conf \ No newline at end of file From 83a5794a4d02119db39cb599b10bd522f3f1387f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 14 Sep 2023 10:36:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E5=A4=AB=E5=A1=94=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/robot/modulerobot_pagoda.go | 35 +++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/modules/robot/modulerobot_pagoda.go b/modules/robot/modulerobot_pagoda.go index 49b8ac7d8..765d9b78b 100644 --- a/modules/robot/modulerobot_pagoda.go +++ b/modules/robot/modulerobot_pagoda.go @@ -15,6 +15,7 @@ import ( type ModuleRobot_Pagoda struct { pagoda *pb.DBPagoda _mapPagoda map[int32]*cfg.GamePagodaData + //mainline *ModuleRobot_MainLine } func (this *ModuleRobot_Pagoda) Init() (err error) { @@ -31,6 +32,9 @@ func (this *ModuleRobot_Pagoda) Init() (err error) { return } } + + //this.mainline = robot.GetModule(comm.ModuleMainline).(*ModuleRobot_MainLine) + return } @@ -67,9 +71,20 @@ func (this *ModuleRobot_Pagoda) DoPipeline(robot IRobot) (err error) { ) heromodule := robot.GetModule(comm.ModuleHero).(*ModuleRobot_Hero) heros := heromodule.getbattlehero() - + this.pagoda.PagodaId += 1 + // 校验能不能打 + if c, e := this.getPagodaDataById(this.pagoda.PagodaId); e != nil { // 参数有误 + return + } else { + if c.Unlock != 0 { + this.pagoda.PagodaId -= 1 + } + } + if this.pagoda.PagodaId == 0 { + this.pagoda.PagodaId = 1 + } if resp, errdata = robot.SendMessage("pagoda", "challenge", &pb.PagodaChallengeReq{ - Cid: this.pagoda.PagodaId + 1, + Cid: +1, Battle: &pb.BattleFormation{ Format: heros, }}); errdata != nil { @@ -151,3 +166,19 @@ func (this *ModuleRobot_Pagoda) getPagodaData(tab int32, lv int32) (conf *cfg.Ga err = comm.NewNotFoundConfErr("robot", game_buriedcondi, fmt.Sprintf("tab:%d,lv:%d", tab, lv)) return } + +func (this *ModuleRobot_Pagoda) getPagodaDataById(id int32) (conf *cfg.GamePagodaData, err error) { + var ( + v interface{} + ) + if v, err = configure.GetConfigure(game_pagoda); err != nil { + return + } else { + conf = v.(*cfg.GamePagoda).Get(id) + if conf != nil { + return + } + } + err = comm.NewNotFoundConfErr("robot", game_buriedcondi, id) + return +}