From 344501791f8ff016cbf8c99241f1fbb1954e46d6 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 13 Jun 2020 16:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=85=B7=E6=8E=89=E8=90=BD=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E5=92=8C=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/BattleMain.lua | 309 ------------------ .../SArenaRobotStaticConfig.java | 5 + .../ljsd/jieling/logic/item/ItemLogic.java | 5 +- .../jieling/thread/task/DataReportTask.java | 4 + 4 files changed, 12 insertions(+), 311 deletions(-) delete mode 100644 conf/BattleMain.lua diff --git a/conf/BattleMain.lua b/conf/BattleMain.lua deleted file mode 100644 index c48db5835..000000000 --- a/conf/BattleMain.lua +++ /dev/null @@ -1,309 +0,0 @@ --- linux -package.path = package.path ..';../luafight/?.lua'; - -require("Modules.Battle.Logic.Misc.BattleDefine") -require("Modules.Battle.Logic.Misc.BattleUtil") -require("Modules.Battle.Logic.Misc.BattleQueue") -require("Modules.Battle.Logic.Misc.BattleDictionary") -require("Modules.Battle.Logic.Misc.BattleList") -require("Modules.Battle.Logic.Misc.BattleObjectPool") - -require("Modules.Battle.Logic.Base.BattleEvent") -require("Modules.Battle.Logic.Base.Random") - -require("Modules.Battle.Logic.Base.RoleData") -require("Modules.Battle.Logic.Base.Buff") -require("Modules.Battle.Logic.Base.Skill") -require("Modules.Battle.Logic.Base.Passivity") - -require("Modules.Battle.Logic.BattleLogic") -require("Modules.Battle.Logic.RoleLogic") - -local BattleMain = {} -local BattleLogic = BattleLogic -local Random = Random -local BattleRecord - -local _BattleErrorCache = {} -local _BattleErrorIndex = 0 -local _seed -local _type -local _maxRound -local _fightData -local _optionData - -local function pairsByKeys(t) - local a = {} - for n in pairs(t) do - if n then - a[#a+1] = n - end - end - table.sort(a, function( op1, op2 ) - local type1, type2 = type(op1), type(op2) - local num1, num2 = tonumber(op1), tonumber(op2) - - if ( num1 ~= nil) and (num2 ~= nil) then - return num1 < num2 - elseif type1 ~= type2 then - return type1 < type2 - elseif type1 == "string" then - return op1 < op2 - elseif type1 == "boolean" then - return op1 - -- 以上处理: number, string, boolean - else -- 处理剩下的: function, table, thread, userdata - return tostring(op1) < tostring(op2) -- tostring后比较字符串 - end - end) - local i = 0 - return function() - i = i + 1 - return a[i], t[a[i]] - end -end - -local function PrintTable(tb) - local indent_str = "{" - local count = 0 - for k,v in pairs(tb) do - count = count + 1 - end - for k=1, #tb do - local v = tb[k] - if type(v) == "table" then - indent_str = indent_str .. PrintTable(v) - else - indent_str = indent_str .. tostring(v) - end - if k < count then - indent_str = indent_str.."," - end - end - - local index = 0 - for k,v in pairsByKeys(tb) do - index = index + 1 - if type(k) ~= "number" then - if type(v) == "table" then - indent_str = string.format("%s%s=%s", indent_str, tostring(k), PrintTable(v)) - else - indent_str = string.format("%s%s=%s", indent_str, tostring(k), tostring(v)) - end - if index < count then - indent_str = indent_str .. "," - end - end - end - indent_str = indent_str .. "}" - return indent_str -end - -local function generateRecordFile() - local time = string.format("%d-%d-%d-%d-%d-%d", - os.date("%Y"), - os.date("%m"), - os.date("%d"), - os.date("%H"), - os.date("%M"), - os.date("%S")) - local file = io.open("luafight/BattleRecord/"..time..".txt", "a") - local record = BattleLogic.GetRecord() - for i=1, #record do - file:write(record[i].."\n") - end - io.close(file) -end - - -local function addBattleData() - local str = "" - str = str.."seed:\n"..tostring(_seed).."\n" - str = str.."type:\n"..tostring(_type).."\n" - str = str.."fightData:\n"..PrintTable(_fightData).."\n" - str = str.."optionData:\n"..PrintTable(_optionData).."\n" - - _BattleErrorIndex = _BattleErrorIndex + 1 - if _BattleErrorIndex > 5 then - _BattleErrorIndex = 1 - end - _BattleErrorCache[_BattleErrorIndex] = str -end - -local function AddRecord(fightData) - BattleRecord = {} - BattleLogic.Event:AddEvent(BattleEventName.AddRole, function (role) - local record = {} - record.uid = role.uid - record.camp = role.camp - record.damage = 0 - role.Event:AddEvent(BattleEventName.RoleDamage, function (defRole, damage, bCrit, finalDmg) - record.damage = record.damage + finalDmg - end) - BattleRecord[role.uid] = record - end) - - for i=1, #fightData.playerData.teamSkill do - local teamCaster = BattleLogic.GetTeamSkillCaster(0) - local teamSkill = fightData.playerData.teamSkill[i] - local teamType = math.floor(teamSkill[1] / 100) - - local str = "order:1".."camp:"..teamCaster.camp.." team"..teamSkill[1] - - local record = {} - record.uid = str - record.camp = teamCaster.camp - record.damage = 0 - record.order = 1 - - local curSkill - teamCaster.Event:AddEvent(BattleEventName.SkillCast, function (skill) - if skill.owner.camp == record.camp then - curSkill = skill - end - end) - teamCaster.Event:AddEvent(BattleEventName.RoleDamage, function (defRole, damage, bCrit, finalDmg) - if curSkill and curSkill.teamSkillType == teamType then - record.damage = record.damage + finalDmg - end - end) - BattleRecord[str] = record - end - - for i=1, #fightData.enemyData do - for j=1, #fightData.enemyData[i].teamSkill do - local teamCaster = BattleLogic.GetTeamSkillCaster(1) - local teamSkill = fightData.enemyData[i].teamSkill[j] - local teamType = math.floor(teamSkill[1] / 100) - - local str = "order:"..i.."camp:"..teamCaster.camp.." team"..teamSkill[1] - - local record = {} - record.uid = str - record.camp = teamCaster.camp - record.damage = 0 - record.order = i - - local curSkill - teamCaster.Event:AddEvent(BattleEventName.SkillCast, function (skill) - if skill.owner.camp == record.camp then - curSkill = skill - end - end) - teamCaster.Event:AddEvent(BattleEventName.RoleDamage, function (defRole, damage, bCrit, finalDmg) - if curSkill and curSkill.teamSkillType == teamType and record.order == BattleLogic.CurOrder then - record.damage = record.damage + finalDmg - end - end) - BattleRecord[str] = record - end - end -end -function BattleMain.Execute(args, fightData, optionData) - _seed = args.seed - _type = args.type - _maxRound = args.maxRound - _fightData = fightData - _optionData = optionData or {} - - --该开关用于输出战斗过程中的日志，用于验证前后端是否出现战斗不同步 - BattleLogic.IsOpenBattleRecord = false - - local isError = false - local errorCache - if xpcall(function () - Random.SetSeed(args.seed) - BattleLogic.Init(fightData, optionData, _maxRound) - BattleLogic.Type = _type - if _type == 9 or _type == 10 or _type == 11 then - AddRecord(fightData) - end - BattleLogic.StartOrder() - - while not BattleLogic.IsEnd do - BattleLogic.Update() - end - end, function (err) - isError = true - errorCache = "error:\n"..debug.traceback(err).."\n" - end) then - local resultList = {} - if BattleLogic.Result == 1 then --胜利记录我方剩余血量 - local arr = RoleManager.Query(function (r) return r.camp == 0 end, true) - for i=1, #arr do - resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp) - end - elseif BattleLogic.Result == 0 then --失败记录敌方剩余血量 - local arr = RoleManager.Query(function (r) return r.camp == 1 end, true) - for i=1, #arr do - resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp) - end - end - - - if BattleLogic.IsOpenBattleRecord then - generateRecordFile() - end - - -- print ----------------------------------------- - --for i=1, #resultList do - -- print("hp:"..resultList[i]) - --end - --print("最终运行帧数："..BattleLogic.CurFrame()) - local curRound, maxRound = BattleLogic.GetCurRound() - if curRound > maxRound and _type == 9 then - local playerDamage=0 - local enemyDamage=0 - for k,v in pairs(BattleRecord)do - if v.camp == 0 then - playerDamage = playerDamage + v.damage - else - enemyDamage = enemyDamage + v.damage - end - end - resultList.result = playerDamage > enemyDamage and 1 or 0 - else - resultList.result = BattleLogic.Result - end - - if _type == 10 or _type == 11 then -- 公会boss和车迟斗法boss返回伤害值 - local playerDamage=0 - for k,v in pairs(BattleRecord)do - if v.camp == 0 then - playerDamage = playerDamage + v.damage - end - end - resultList.duration = playerDamage --TODO:公会boss的持续时间传递的是我方总伤害值 - else - resultList.duration = BattleLogic.CurFrame() / BattleLogic.GameFrameRate - end - - - addBattleData() - return resultList - end - if isError then --捕获异常，并输出错误日志 - local time = string.format("%d-%d-%d-%d-%d-%d", - os.date("%Y"), - os.date("%m"), - os.date("%d"), - os.date("%H"), - os.date("%M"), - os.date("%S")) - local file = io.open("luafight/LogError/"..time..".txt", "a") - file:write(errorCache) - file:write("seed:\n"..tostring(args.seed).."\n") - file:write("type:\n"..tostring(args.type).."\n") - file:write("fightData:\n"..PrintTable(_fightData).."\n") - file:write("optionData:\n"..PrintTable(_optionData).."\n") - file:write("\n\nlast com.ljsd.battle data:\n") - for i=1, #_BattleErrorCache do - file:write(string.format("\nindex:%d\n", i)) - file:write(_BattleErrorCache[i]) - end - io.close(file) - end - return { result = -1 } -end - -return BattleMain \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java index 6c62c7f24..7f135408d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.config.clazzStaticCfg; import com.ljsd.jieling.logic.hero.HeroLogic; import config.SArenaRobotConfig; +import config.SCHero; import config.SWorkShopTechnology; import manager.AbstractClassStaticConfig; import manager.STableManager; @@ -25,6 +26,10 @@ public class SArenaRobotStaticConfig extends AbstractClassStaticConfig { int heroLevel = sArenaRobotConfig.getRobotLevel(); Map starHeroMap = new HashMap<>(); for(Integer heroTid :heroList){ + SCHero scHero = SCHero.getsCHero().get(heroTid); + if(null ==scHero){ + throw new IllegalArgumentException("sArenaRobotConfig id "+sArenaRobotConfig.getId()+"机器人英雄模板id找不到 heroTid:"+heroTid); + } int heroBreakId = HeroLogic.getInstance().calRobotStarByLevel(heroTid, heroLevel,starHeroMap); sArenaRobotConfig.setBreakId(heroBreakId); sArenaRobotConfig.setStarOfHeroMap(starHeroMap); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 5857e861b..1415683bd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -221,7 +221,8 @@ public class ItemLogic { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - if(!itemMap.containsKey(itemId)&&!cardMap.containsKey(itemId)&&!equipMap.containsKey(itemId)&&!randomMap.containsKey(itemId)){ + Map mapRe = ItemUtil.getMapRe(itemId, itemMap, cardMap, equipMap, randomMap); + if(!mapRe.containsKey(itemId)){ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE); } @@ -229,7 +230,7 @@ public class ItemLogic { int[][] dropItems = new int[1][]; dropItems[0] = new int[2]; dropItems[0][0] = itemId; - dropItems[0][1] = num; + dropItems[0][1] = num*mapRe.get(itemId); CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.USER_ITEM); sendUseAndPriceItemMessage(iSession, msgId, drop); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java index 548e38643..b9285e6e4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/DataReportTask.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.thread.task; +import com.ljsd.GameApplication; import com.ljsd.jieling.config.reportData.DataMessageUtils; import org.springframework.stereotype.Component; @@ -13,6 +14,9 @@ public class DataReportTask extends Thread { } @Override public void run() { + if(GameApplication.serverProperties.isDebug()){ + return; + } while (true) { DataMessageUtils.manageData(); }