diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index ee8bfbb5..0d004f8b 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -339,7 +339,7 @@ end function SDKManager:getServerList(callback) local postData = { - project_id = "b5", + project_id = "b6", bundle_id = Platform:getIdentifier(), version = Platform:getClientVersion(), device_id = DeviceHelper:getDeviceId(), diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index d03937fa..697b76a8 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1231,7 +1231,9 @@ function BattleController:generateInstructions(skillEntity, elementType, lineCou end function BattleController:exeInstructions(callback) - Logger.logHighlight("--------exeInstructions----------") + if EDITOR_MODE then + Logger.logHighlight("--------exeInstructions----------") + end if not self.instructions or #self.instructions <= 0 then callback() return diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index b0f94843..41253e69 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -195,17 +195,14 @@ function BattleTeam:handleShield(reduceShield, unit) end local needReedRefreshBuff = false - local shieldNum = 0 local currShieldBuff = self.shieldBuffList[1] while currShieldBuff do reduceShield = reduceShield + currShieldBuff.result if reduceShield > 0 then - shieldNum = shieldNum + reduceShield - currShieldBuff.result currShieldBuff.result = reduceShield reduceShield = 0 break else - shieldNum = shieldNum - currShieldBuff.result currShieldBuff.result = 0 for k, v in ipairs(self.buffList) do if v == currShieldBuff then