From eadf3027ca46ca6e8b4d6bab509ea33377ae2d7c Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 11 Jul 2023 18:44:15 +0800 Subject: [PATCH] =?UTF-8?q?#27556=20=E3=80=90=E5=B7=A8=E6=80=AA=E5=95=86?= =?UTF-8?q?=E9=98=9F=E3=80=91-=E8=83=8C=E5=8C=85=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=B4=9F=E9=87=8D=E7=9A=84=E6=A6=82=E5=BF=B5=EF=BC=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=85=8D=E7=BD=AE=E8=B4=9F=E9=87=8D=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 60 +++++++ bin/json/game_buriedcondi.json | 74 ++++---- bin/json/game_chatsystem.json | 10 +- bin/json/game_circulate.json | 160 ++++++++++++++++++ bin/json/game_heromethodcomment.json | 6 +- bin/json/game_item.json | 26 +-- bin/json/game_pandamasjx.json | 4 +- bin/json/game_skillafteratk.json | 4 +- bin/json/game_worldtask.json | 2 +- modules/caravan/api_buyorsell.go | 28 +-- modules/caravan/model_caravan.go | 1 - modules/caravan/module.go | 34 ++-- pb/caravan_db.pb.go | 141 ++++++++------- sys/configure/structs/Game.BattleReadyData.go | 30 ++++ sys/configure/structs/Game.CirculateData.go | 2 + 15 files changed, 407 insertions(+), 175 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index eea8ffc8a..78f003087 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -8,6 +8,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -25,6 +27,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -42,6 +46,8 @@ "scenesfight_05_01" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -59,6 +65,8 @@ "scenesfight_06" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -76,6 +84,8 @@ "bossfight_spinymandrilla_02" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -93,6 +103,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -110,6 +122,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -127,6 +141,8 @@ "bossfight_spinymandrilla_02" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -144,6 +160,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -161,6 +179,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -178,6 +198,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -195,6 +217,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -212,6 +236,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -229,6 +255,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -246,6 +274,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -263,6 +293,8 @@ "scenesfight_06" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -280,6 +312,8 @@ "scenesfight_07" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -297,6 +331,8 @@ "scenesfight_06" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -314,6 +350,8 @@ "scenesfight_05_01" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -331,6 +369,8 @@ "scenesfight_03_02" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -348,6 +388,8 @@ "bossfight_spinymandrilla_02" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -365,6 +407,8 @@ "bossfight_naturetitan_01" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -382,6 +426,8 @@ "bossfight_spinymandrilla_02" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -399,6 +445,8 @@ "bossfight_chef_01" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -416,6 +464,8 @@ "bossfight_spinymandrilla_03" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -433,6 +483,8 @@ "bossfight_chef_02" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -450,6 +502,8 @@ "scenesfight_08" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -467,6 +521,8 @@ "scenesfight_08" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [ "44004" @@ -486,6 +542,8 @@ "bossfight_dragon_01" ], "disableAiCamera": 1, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], @@ -503,6 +561,8 @@ "scenesfight_06" ], "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], "DefaultHero": 0, "ChoseHero": [], "DisableHero": [], diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index c18a9719f..aca24d02b 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -22,7 +22,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -51,7 +51,7 @@ 24004 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -109,7 +109,7 @@ 14007 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -138,7 +138,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -167,7 +167,7 @@ 25004 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -605,7 +605,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -692,7 +692,7 @@ 6 ], "filter2": [ - "英雄ID", + "守护者ID", "星级", "0", "0" @@ -723,7 +723,7 @@ ], "filter2": [ "等级", - "英雄ID", + "守护者ID", "0", "0" ] @@ -781,7 +781,7 @@ 20 ], "filter2": [ - "满足条件的英雄品质", + "满足条件的守护者品质", "需要升到的等级", "0", "0" @@ -839,7 +839,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -871,7 +871,7 @@ 1 ], "filter2": [ - "英雄品质", + "守护者品质", "指定职业", "指定阵营", "觉醒阶段" @@ -900,7 +900,7 @@ 3 ], "filter2": [ - "英雄品质", + "守护者品质", "0", "0", "0" @@ -1275,7 +1275,7 @@ 14007 ], "filter2": [ - "指定英雄", + "指定守护者", "0", "0", "0" @@ -1638,7 +1638,7 @@ 44006 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -9338,7 +9338,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -11447,7 +11447,7 @@ 25001 ], "filter2": [ - "指定英雄", + "指定守护者", "0", "0", "0" @@ -11476,7 +11476,7 @@ 25001 ], "filter2": [ - "指定英雄", + "指定守护者", "0", "0", "0" @@ -11780,7 +11780,7 @@ 25001 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -16265,7 +16265,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -16323,7 +16323,7 @@ 14007 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -16352,7 +16352,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -16381,7 +16381,7 @@ 25004 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -16823,7 +16823,7 @@ 6 ], "filter2": [ - "英雄ID", + "守护者ID", "星级", "0", "0" @@ -16963,7 +16963,7 @@ 20 ], "filter2": [ - "满足条件的英雄品质", + "满足条件的守护者品质", "需要升到的等级", "0", "0" @@ -16993,7 +16993,7 @@ 23 ], "filter2": [ - "满足条件的英雄品质", + "满足条件的守护者品质", "需要升到的等级", "0", "0" @@ -17051,7 +17051,7 @@ 25001 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -17083,7 +17083,7 @@ 1 ], "filter2": [ - "英雄品质", + "守护者品质", "指定职业", "指定阵营", "觉醒阶段" @@ -17112,7 +17112,7 @@ 3 ], "filter2": [ - "英雄品质", + "守护者品质", "0", "0", "0" @@ -17426,7 +17426,7 @@ 14007 ], "filter2": [ - "指定英雄", + "指定守护者", "0", "0", "0" @@ -18814,7 +18814,7 @@ 24004 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -18901,7 +18901,7 @@ 25001 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -18960,7 +18960,7 @@ 25001 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -19133,7 +19133,7 @@ 24004 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -19359,7 +19359,7 @@ 25001 ], "filter2": [ - "英雄id", + "守护者id", "0", "0", "0" @@ -19498,7 +19498,7 @@ 25004 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" @@ -20740,7 +20740,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_731", - "text": "使用木桩上阵英雄" + "text": "使用木桩上阵守护者" }, "type": 149, "valid": 0, @@ -20840,7 +20840,7 @@ 44004 ], "filter2": [ - "英雄ID", + "守护者ID", "0", "0", "0" diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json index 49e13bf6b..faf0ec808 100644 --- a/bin/json/game_chatsystem.json +++ b/bin/json/game_chatsystem.json @@ -176,7 +176,7 @@ "datatype": 3, "text": { "key": "chat_system_text_11", - "text": "【传闻】{0}已经{1}培养至60级！" + "text": "【传闻】{0}已经将{1}培养至60级！" }, "data": 60, "data2": 0, @@ -191,7 +191,7 @@ "datatype": 3, "text": { "key": "chat_system_text_12", - "text": "【传闻】{0}已经{1}培养至6星！" + "text": "【传闻】{0}已经将{1}培养至6星！" }, "data": 5, "data2": 0, @@ -206,7 +206,7 @@ "datatype": 3, "text": { "key": "chat_system_text_13", - "text": "【传闻】{0}已经{1}技能培养至满级！" + "text": "【传闻】{0}已经将{1}技能培养至满级！" }, "data": 5, "data2": 0, @@ -221,7 +221,7 @@ "datatype": 3, "text": { "key": "chat_system_text_14", - "text": "【传闻】{0}已经{1}回响至满级！" + "text": "【传闻】{0}已经将{1}回响至满级！" }, "data": 5, "data2": 0, @@ -236,7 +236,7 @@ "datatype": 3, "text": { "key": "chat_system_text_15", - "text": "【传闻】{0}已经{1}觉醒至满级！" + "text": "【传闻】{0}已经将{1}觉醒至满级！" }, "data": 5, "data2": 0, diff --git a/bin/json/game_circulate.json b/bin/json/game_circulate.json index a2acbfae8..92548819b 100644 --- a/bin/json/game_circulate.json +++ b/bin/json/game_circulate.json @@ -9,6 +9,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 1, "fightevents": [], @@ -54,6 +55,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 2, "fightevents": [], @@ -104,6 +106,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 3, "fightevents": [], @@ -149,6 +152,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 4, "fightevents": [], @@ -199,6 +203,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 5, "fightevents": [], @@ -244,6 +249,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 6, "fightevents": [], @@ -294,6 +300,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 7, "fightevents": [], @@ -339,6 +346,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 8, "fightevents": [], @@ -389,6 +397,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 9, "fightevents": [], @@ -434,6 +443,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 10, "fightevents": [], @@ -484,6 +494,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 11, "fightevents": [], @@ -529,6 +540,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 12, "fightevents": [], @@ -579,6 +591,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 13, "fightevents": [], @@ -624,6 +637,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 14, "fightevents": [], @@ -674,6 +688,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 15, "fightevents": [], @@ -719,6 +734,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 16, "fightevents": [], @@ -769,6 +785,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 17, "fightevents": [], @@ -814,6 +831,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 18, "fightevents": [], @@ -864,6 +882,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 19, "fightevents": [], @@ -909,6 +928,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 20, "fightevents": [], @@ -959,6 +979,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 1, "fightevents": [], @@ -1004,6 +1025,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 2, "fightevents": [], @@ -1054,6 +1076,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 3, "fightevents": [], @@ -1099,6 +1122,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 4, "fightevents": [], @@ -1149,6 +1173,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 5, "fightevents": [], @@ -1194,6 +1219,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 6, "fightevents": [], @@ -1244,6 +1270,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 7, "fightevents": [], @@ -1289,6 +1316,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 8, "fightevents": [], @@ -1339,6 +1367,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 9, "fightevents": [], @@ -1384,6 +1413,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 10, "fightevents": [], @@ -1434,6 +1464,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 11, "fightevents": [], @@ -1479,6 +1510,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 12, "fightevents": [], @@ -1529,6 +1561,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 13, "fightevents": [], @@ -1574,6 +1607,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 14, "fightevents": [], @@ -1624,6 +1658,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 15, "fightevents": [], @@ -1669,6 +1704,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 16, "fightevents": [], @@ -1719,6 +1755,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 17, "fightevents": [], @@ -1764,6 +1801,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 18, "fightevents": [], @@ -1814,6 +1852,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 19, "fightevents": [], @@ -1859,6 +1898,7 @@ 5, 7 ], + "time": 0, "unlock": 1100102, "floors": 20, "fightevents": [], @@ -1909,6 +1949,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 1, "fightevents": [], @@ -1954,6 +1995,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 2, "fightevents": [], @@ -2004,6 +2046,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 3, "fightevents": [], @@ -2049,6 +2092,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 4, "fightevents": [], @@ -2099,6 +2143,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 5, "fightevents": [], @@ -2144,6 +2189,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 6, "fightevents": [], @@ -2194,6 +2240,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 7, "fightevents": [], @@ -2239,6 +2286,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 8, "fightevents": [], @@ -2289,6 +2337,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 9, "fightevents": [], @@ -2334,6 +2383,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 10, "fightevents": [], @@ -2384,6 +2434,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 11, "fightevents": [], @@ -2429,6 +2480,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 12, "fightevents": [], @@ -2479,6 +2531,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 13, "fightevents": [], @@ -2524,6 +2577,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 14, "fightevents": [], @@ -2574,6 +2628,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 15, "fightevents": [], @@ -2619,6 +2674,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 16, "fightevents": [], @@ -2669,6 +2725,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 17, "fightevents": [], @@ -2714,6 +2771,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 18, "fightevents": [], @@ -2764,6 +2822,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 19, "fightevents": [], @@ -2809,6 +2868,7 @@ 6, 7 ], + "time": 0, "unlock": 1100102, "floors": 20, "fightevents": [], @@ -2855,6 +2915,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 1, "fightevents": [], @@ -2896,6 +2957,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 2, "fightevents": [], @@ -2942,6 +3004,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 3, "fightevents": [], @@ -2983,6 +3046,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 4, "fightevents": [], @@ -3029,6 +3093,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 5, "fightevents": [], @@ -3070,6 +3135,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 6, "fightevents": [], @@ -3116,6 +3182,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 7, "fightevents": [], @@ -3157,6 +3224,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 8, "fightevents": [], @@ -3203,6 +3271,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 9, "fightevents": [], @@ -3244,6 +3313,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 10, "fightevents": [], @@ -3290,6 +3360,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 11, "fightevents": [], @@ -3331,6 +3402,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 12, "fightevents": [], @@ -3377,6 +3449,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 13, "fightevents": [], @@ -3418,6 +3491,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 14, "fightevents": [], @@ -3464,6 +3538,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 15, "fightevents": [], @@ -3505,6 +3580,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 16, "fightevents": [], @@ -3551,6 +3627,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 17, "fightevents": [], @@ -3592,6 +3669,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 18, "fightevents": [], @@ -3638,6 +3716,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 19, "fightevents": [], @@ -3679,6 +3758,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 20, "fightevents": [], @@ -3725,6 +3805,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 21, "fightevents": [], @@ -3766,6 +3847,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 22, "fightevents": [], @@ -3812,6 +3894,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 23, "fightevents": [], @@ -3853,6 +3936,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 24, "fightevents": [], @@ -3899,6 +3983,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 25, "fightevents": [], @@ -3940,6 +4025,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 26, "fightevents": [], @@ -3986,6 +4072,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 27, "fightevents": [], @@ -4027,6 +4114,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 28, "fightevents": [], @@ -4073,6 +4161,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 29, "fightevents": [], @@ -4114,6 +4203,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 30, "fightevents": [], @@ -4160,6 +4250,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 31, "fightevents": [], @@ -4201,6 +4292,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 32, "fightevents": [], @@ -4247,6 +4339,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 33, "fightevents": [], @@ -4288,6 +4381,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 34, "fightevents": [], @@ -4334,6 +4428,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 35, "fightevents": [], @@ -4375,6 +4470,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 36, "fightevents": [], @@ -4421,6 +4517,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 37, "fightevents": [], @@ -4462,6 +4559,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 38, "fightevents": [], @@ -4508,6 +4606,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 39, "fightevents": [], @@ -4549,6 +4648,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 40, "fightevents": [], @@ -4595,6 +4695,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 41, "fightevents": [], @@ -4636,6 +4737,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 42, "fightevents": [], @@ -4682,6 +4784,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 43, "fightevents": [], @@ -4723,6 +4826,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 44, "fightevents": [], @@ -4769,6 +4873,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 45, "fightevents": [], @@ -4810,6 +4915,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 46, "fightevents": [], @@ -4856,6 +4962,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 47, "fightevents": [], @@ -4897,6 +5004,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 48, "fightevents": [], @@ -4943,6 +5051,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 49, "fightevents": [], @@ -4984,6 +5093,7 @@ "restriction": 10, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 50, "fightevents": [], @@ -5030,6 +5140,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 1, "fightevents": [], @@ -5071,6 +5182,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 2, "fightevents": [], @@ -5117,6 +5229,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 3, "fightevents": [], @@ -5158,6 +5271,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 4, "fightevents": [], @@ -5204,6 +5318,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 5, "fightevents": [], @@ -5245,6 +5360,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 6, "fightevents": [], @@ -5291,6 +5407,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 7, "fightevents": [], @@ -5332,6 +5449,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 8, "fightevents": [], @@ -5378,6 +5496,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 9, "fightevents": [], @@ -5419,6 +5538,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 10, "fightevents": [], @@ -5465,6 +5585,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 11, "fightevents": [], @@ -5506,6 +5627,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 12, "fightevents": [], @@ -5552,6 +5674,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 13, "fightevents": [], @@ -5593,6 +5716,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 14, "fightevents": [], @@ -5639,6 +5763,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 15, "fightevents": [], @@ -5680,6 +5805,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 16, "fightevents": [], @@ -5726,6 +5852,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 17, "fightevents": [], @@ -5767,6 +5894,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 18, "fightevents": [], @@ -5813,6 +5941,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 19, "fightevents": [], @@ -5854,6 +5983,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 20, "fightevents": [], @@ -5900,6 +6030,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 21, "fightevents": [], @@ -5941,6 +6072,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 22, "fightevents": [], @@ -5987,6 +6119,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 23, "fightevents": [], @@ -6028,6 +6161,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 24, "fightevents": [], @@ -6074,6 +6208,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 25, "fightevents": [], @@ -6115,6 +6250,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 26, "fightevents": [], @@ -6161,6 +6297,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 27, "fightevents": [], @@ -6202,6 +6339,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 28, "fightevents": [], @@ -6248,6 +6386,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 29, "fightevents": [], @@ -6289,6 +6428,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 30, "fightevents": [], @@ -6335,6 +6475,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 31, "fightevents": [], @@ -6376,6 +6517,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 32, "fightevents": [], @@ -6422,6 +6564,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 33, "fightevents": [], @@ -6463,6 +6606,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 34, "fightevents": [], @@ -6509,6 +6653,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 35, "fightevents": [], @@ -6550,6 +6695,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 36, "fightevents": [], @@ -6596,6 +6742,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 37, "fightevents": [], @@ -6637,6 +6784,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 38, "fightevents": [], @@ -6683,6 +6831,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 39, "fightevents": [], @@ -6724,6 +6873,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 40, "fightevents": [], @@ -6770,6 +6920,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 41, "fightevents": [], @@ -6811,6 +6962,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 42, "fightevents": [], @@ -6857,6 +7009,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 43, "fightevents": [], @@ -6898,6 +7051,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 44, "fightevents": [], @@ -6944,6 +7098,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 45, "fightevents": [], @@ -6985,6 +7140,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 46, "fightevents": [], @@ -7031,6 +7187,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 47, "fightevents": [], @@ -7072,6 +7229,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 48, "fightevents": [], @@ -7118,6 +7276,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 49, "fightevents": [], @@ -7159,6 +7318,7 @@ "restriction": 11, "battlereadyID": 129, "openingtime": [], + "time": 30, "unlock": 1, "floors": 50, "fightevents": [], diff --git a/bin/json/game_heromethodcomment.json b/bin/json/game_heromethodcomment.json index 7cb84c787..e10c2dfcd 100644 --- a/bin/json/game_heromethodcomment.json +++ b/bin/json/game_heromethodcomment.json @@ -3,7 +3,7 @@ "id": 101, "comment": { "key": "hero_method_hero_method_comment_comment_1", - "text": "这英雄速度有什么要求吗？" + "text": "这守护者速度有什么要求吗？" } }, { @@ -17,7 +17,7 @@ "id": 103, "comment": { "key": "hero_method_hero_method_comment_comment_3", - "text": "这英雄一波流打不了BOSS，竞技场好用~" + "text": "这守护者一波流打不了BOSS，竞技场好用~" } }, { @@ -38,7 +38,7 @@ "id": 106, "comment": { "key": "hero_method_hero_method_comment_comment_6", - "text": "平民英雄，好养。" + "text": "平民守护者，好养。" } }, { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 56f37be54..2faa9d010 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -276,7 +276,7 @@ "id": "10000008", "name": { "key": "item_item_name_8", - "text": "英雄初级护身符" + "text": "守护者初级护身符" }, "usetype": 2, "color": 2, @@ -315,7 +315,7 @@ "id": "10000009", "name": { "key": "item_item_name_9", - "text": "英雄中级护身符" + "text": "守护者中级护身符" }, "usetype": 2, "color": 3, @@ -354,7 +354,7 @@ "id": "10000010", "name": { "key": "item_item_name_10", - "text": "英雄高级护身符" + "text": "守护者高级护身符" }, "usetype": 2, "color": 4, @@ -9868,7 +9868,7 @@ "decompose_get": [ { "a": "item", - "t": "15000101", + "t": "15000201", "n": 2 } ], @@ -9931,7 +9931,7 @@ "decompose_get": [ { "a": "item", - "t": "15000102", + "t": "15000202", "n": 2 } ], @@ -9994,7 +9994,7 @@ "decompose_get": [ { "a": "item", - "t": "15000103", + "t": "15000203", "n": 2 } ], @@ -10057,7 +10057,7 @@ "decompose_get": [ { "a": "item", - "t": "15000104", + "t": "15000204", "n": 2 } ], @@ -10108,7 +10108,7 @@ "decompose_get": [ { "a": "item", - "t": "15000201", + "t": "15000301", "n": 2 } ], @@ -10159,7 +10159,7 @@ "decompose_get": [ { "a": "item", - "t": "15000202", + "t": "15000302", "n": 2 } ], @@ -10210,7 +10210,7 @@ "decompose_get": [ { "a": "item", - "t": "15000203", + "t": "15000303", "n": 2 } ], @@ -10261,7 +10261,7 @@ "decompose_get": [ { "a": "item", - "t": "15000204", + "t": "15000304", "n": 2 } ], @@ -11964,7 +11964,7 @@ "id": "17050001", "name": { "key": "item_item_name_298", - "text": "5星全英雄自选宝箱" + "text": "5星全守护者自选宝箱" }, "usetype": 4, "color": 5, @@ -11987,7 +11987,7 @@ "img": "item_17050001", "intr": { "key": "item_item_intr_306", - "text": "5星全英雄自选宝箱。" + "text": "5星全守护者自选宝箱。" }, "sale": [ { diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 448f87f3c..300aed76b 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -322,7 +322,7 @@ "img": "sbkp_js_45004", "intr": { "key": "item_pandamas_jx_intr_9", - "text": "训练结束可以额外获得英雄中级护身符*1" + "text": "训练结束可以额外获得守护者中级护身符*1" }, "standard_text": 25001, "special_text": 25002, @@ -332,7 +332,7 @@ ], "description": { "key": "item_pandamas_jx_description_9", - "text": "训练结束可以额外获得英雄中级护身符*1" + "text": "训练结束可以额外获得守护者中级护身符*1" }, "duration": 0, "exp": 0, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 1c7aa22e6..0b7aab7f7 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -27302,12 +27302,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, 4, - 3000 + 1000 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index c5c63b534..286b76abc 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -158,7 +158,7 @@ }, { "key": 20030, - "opencond": "", + "opencond": "heroic_teaching", "lock": 1, "lockend": 999, "ontxe": 20020, diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 3940da215..d019019a3 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -19,12 +19,10 @@ func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.CaravanBu func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (errdata *pb.ErrorData) { var ( - update map[string]interface{} - addScore int32 // 收益 - cityInfo *pb.CityInfo - ok bool - upperLimit int32 // 单个物品堆叠上限 - + update map[string]interface{} + addScore int32 // 收益 + cityInfo *pb.CityInfo + ok bool ) update = make(map[string]interface{}) if errdata = this.BuyOrSellCheck(session, req); errdata != nil { @@ -40,9 +38,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe return } c, err := this.module.configure.GetCaravanLv(caravan.Lv) - if err == nil { - upperLimit = c.Bagtagnum // 获取单个格子堆叠数 - } else { + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), @@ -50,7 +46,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } return } - + caravan.Baglimit = c.Bagtop // special 城市卖给玩家的商品 // exspecial 城市想要玩家卖给他的商品库 if !req.IsBuy { // 卖给npc @@ -101,13 +97,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } addScore += price * v // 卖出收益 } - if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_TrollMaxItemCount, // 道具数量不足 - Title: pb.ErrorCode_TrollMaxItemCount.ToString(), - } - return - } + this.module.ArrayBag(caravan) // 统计 收益 var lvReward []*cfg.Gameatn caravan.Profit += int64(addScore) @@ -145,7 +135,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe return } } - } else { // 买入 for k, v := range req.Items { if _, ok := caravan.Items[k]; !ok { @@ -198,7 +187,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe return } } - if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 + if this.module.CheckOverweight(caravan) { // 背包满了 errdata = &pb.ErrorData{ Code: pb.ErrorCode_TrollMaxItemCount, Title: pb.ErrorCode_TrollMaxItemCount.ToString(), @@ -215,7 +204,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } update["items"] = caravan.Items update["baglimit"] = caravan.Baglimit - update["useCount"] = caravan.UseCount // 更新背包使用数量 this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "buyorsell", &pb.CaravanBuyOrSellResp{ Data: caravan, diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go index 7f53356d3..b31038659 100644 --- a/modules/caravan/model_caravan.go +++ b/modules/caravan/model_caravan.go @@ -36,7 +36,6 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err result = &pb.DBCaravan{ Id: "", Uid: uid, - UseCount: 0, Items: map[string]*pb.BagInfo{}, Goods: map[string]*pb.Goods{}, City: map[int32]*pb.CityInfo{}, diff --git a/modules/caravan/module.go b/modules/caravan/module.go index c3bb6b46a..8ba4f0b87 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -341,28 +341,30 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) { } // 整理背包 (true 表示背包装不下) -func (this *Caravan) ArrayBag(data *pb.DBCaravan, limit int32) (bFull bool) { - var count int32 +func (this *Caravan) ArrayBag(data *pb.DBCaravan) { for k, v := range data.Items { if v.Count == 0 { delete(data.Items, k) - } else { - tmp := v.Count - for { - count++ - if tmp > limit { - tmp -= limit - } else { - break - } + } + } + + return +} + +// 校验货物是否超重 +func (this *Caravan) CheckOverweight(data *pb.DBCaravan) (b bool) { + var weight int32 + + for k, v := range data.Items { + if d, err := this.configure.GetCaravanGoods(k); err != nil { + weight += d.Weight * v.Count + if weight > data.Baglimit { + return true } } } - if count > data.Baglimit { - return true - } - data.UseCount = count - return false + + return true } // 获得利润判断是否能提升商队等级 diff --git a/pb/caravan_db.pb.go b/pb/caravan_db.pb.go index d15b2c1e2..d980a434b 100644 --- a/pb/caravan_db.pb.go +++ b/pb/caravan_db.pb.go @@ -198,9 +198,9 @@ type DBCaravan struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount" bson:"useCount"` //当前背包使用的数量 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + //int32 useCount = 3; //@go_tags(`bson:"useCount"`) 当前背包使用的数量 Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据 Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 @@ -263,13 +263,6 @@ func (x *DBCaravan) GetUid() string { return "" } -func (x *DBCaravan) GetUseCount() int32 { - if x != nil { - return x.UseCount - } - return 0 -} - func (x *DBCaravan) GetItems() map[string]*BagInfo { if x != nil { return x.Items @@ -485,74 +478,72 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, - 0x69, 0x63, 0x65, 0x22, 0xdd, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, + 0x69, 0x63, 0x65, 0x22, 0xc1, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, - 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x05, - 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, - 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x69, 0x74, - 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, - 0x76, 0x61, 0x6e, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, - 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x02, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, - 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, - 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, - 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x63, - 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, - 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, - 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, - 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1c, 0x0a, - 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x6f, - 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, - 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x12, 0x28, 0x0a, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4e, 0x65, 0x78, 0x74, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x1a, 0x42, 0x0a, 0x0a, 0x49, - 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x67, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x49, + 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x12, 0x2b, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x15, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x47, 0x6f, 0x6f, 0x64, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x28, 0x0a, + 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, + 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x12, + 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, + 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, + 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x61, 0x73, + 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0f, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, + 0x34, 0x0a, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, + 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, + 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x18, 0x11, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, + 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x1a, + 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, - 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x09, 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x52, - 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, - 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, - 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, - 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, - 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, - 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, - 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, + 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, + 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x09, 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, + 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, + 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, + 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, + 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, + 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index cea2546c8..eed85cef1 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -17,6 +17,8 @@ type GameBattleReadyData struct { ReadyScene string BattleScenes []string DisableAiCamera int32 + ChoseCamp []int32 + DisableCamp []int32 DefaultHero int32 ChoseHero []string DisableHero []string @@ -52,6 +54,34 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ChoseCamp"].([]interface{}); !_ok_ { err = errors.New("ChoseCamp error"); return } + + _v.ChoseCamp = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.ChoseCamp = append(_v.ChoseCamp, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["DisableCamp"].([]interface{}); !_ok_ { err = errors.New("DisableCamp error"); return } + + _v.DisableCamp = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.DisableCamp = append(_v.DisableCamp, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.CirculateData.go b/sys/configure/structs/Game.CirculateData.go index 46763d552..7c1be9ba5 100644 --- a/sys/configure/structs/Game.CirculateData.go +++ b/sys/configure/structs/Game.CirculateData.go @@ -16,6 +16,7 @@ type GameCirculateData struct { Restriction int32 BattlereadyID int32 Openingtime []int32 + Time int32 Unlock int32 Floors int32 Fightevents []int32 @@ -54,6 +55,7 @@ func (_v *GameCirculateData)Deserialize(_buf map[string]interface{}) (err error) } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floors"].(float64); !_ok_ { err = errors.New("floors error"); return }; _v.Floors = int32(_tempNum_) } {