diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index ed904db0..9655de3b 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -938,21 +938,21 @@ end function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap) local elementTypeCount = 0 - local assistingList = nil + -- local assistingList = nil ---- 援助 for element, count in pairs(elementTypeMap) do - if element == elementType then - elementTypeCount = count - else - if assistingList == nil then - assistingList = {} - end - local obj = { - count = count, - skillMatch = element, - } - table.insert(assistingList, obj) - end + -- if element == elementType then + elementTypeCount = elementTypeCount + count + -- else + -- if assistingList == nil then + -- assistingList = {} + -- end + -- local obj = { + -- count = count, + -- skillMatch = element, + -- } + -- table.insert(assistingList, obj) + -- end end ---- 技能 @@ -990,12 +990,12 @@ function BattleController:generateInstructions(skillEntity, elementType, lineCou end end - if assistingList then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.ASSISTING, - assistingList = assistingList, - }) - end + -- if assistingList then + -- table.insert(self.instructions, { + -- name = BattleConst.INSTRUCTION_NAME.ASSISTING, + -- assistingList = assistingList, + -- }) + -- end ---- 加buff if skillEntity then diff --git a/lua/app/server/data/server_base_data.lua b/lua/app/server/data/server_base_data.lua index 9420f2ce..ea146939 100644 --- a/lua/app/server/data/server_base_data.lua +++ b/lua/app/server/data/server_base_data.lua @@ -32,7 +32,7 @@ function ServerBaseData:loadLocalData() end function ServerBaseData:saveLocalData() - local str = json.encode(GFunc.getTable(self.data)) or "" + local str = json.encode(self.data) or "" LocalData:setString(self:_getLocalSaveKey(), str) if EDITOR_MODE then Logger.logHighlight("save data:%s=%s", self:_getLocalSaveKey(), str) diff --git a/lua/app/server/data/server_item_data.lua b/lua/app/server/data/server_item_data.lua index dd907a74..0e59aa6d 100644 --- a/lua/app/server/data/server_item_data.lua +++ b/lua/app/server/data/server_item_data.lua @@ -116,7 +116,6 @@ function ServerItemData:recoveryItem(data, maxCount) addCount = maxCount - currentCount end self:_addItem(data.cfg_id, addCount) - ServerDataManager:saveData() end function ServerItemData:resetVitRecoverTime() diff --git a/lua/app/server/server_game_data.lua b/lua/app/server/server_game_data.lua index a7fa99e0..f174bb1b 100644 --- a/lua/app/server/server_game_data.lua +++ b/lua/app/server/server_game_data.lua @@ -82,7 +82,6 @@ function ServerGameData:initData() end end self:setNotNewPlayer() - self:saveData() else for k, v in pairs(self.dataMap) do v:loadLocalData()