From a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 14 十二月 2025 14:24:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（贾诩所有技能；5022效果支持配置buff额外属性计算方式；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 324 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 199 insertions(+), 125 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 20d85f8..8bcaf33 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -29,6 +29,9 @@
import GameWorld
import PlayerLLMJ
import PlayerPrestigeSys
+import CrossServerPackLogic
+import DataRecordPack
+import PlayerSuccess
import IpyGameDataPY
import PlayerOnline
import NPCCommon
@@ -41,13 +44,11 @@
import TurnBuff
import FBCommon
import CommFunc
-import ObjPool
import FBLogic
import random
import time
import json
-import shutil
import os
g_gmTestFightReq = []
@@ -74,6 +75,7 @@
self.faction = faction # 所属阵营
self.num = num # 该阵容所在阵营中的编号，不同阵营可重复，多V多
self.ownerID = 0 # 阵容所属玩家ID，可能为0，0代表非玩家阵容
+ self.lineupInfo = {} # 传入初始化的阵容信息
self.shapeType = 0 # 阵型
self.fightPower = 0 # 阵容总战力
self.posObjIDDict = {} # 站位对应战斗实体 {站位编号:batObjID, ...}, 站位编号小于0为非主战单位，如主公、红颜等
@@ -96,6 +98,7 @@
## 设置阵容
# @param lineupInfo: 阵容信息
self.clearLineup()
+ self.lineupInfo = lineupInfo
self.ownerID = lineupInfo.get("PlayerID", 0) # 阵容所属的玩家ID
self.shapeType = lineupInfo.get("ShapeType", 0)
self.fightPower = lineupInfo.get("FightPower", 0)
@@ -113,6 +116,7 @@
batObjMgr.delBatObj(objID)
for objID in self.beautyObjIDDict.values():
batObjMgr.delBatObj(objID)
+ self.lineupInfo = {}
self.posObjIDDict = {}
self.heroObjIDDict = {}
self.lingshouObjIDDict = {}
@@ -176,7 +180,7 @@
def __init__(self, guid, mapID=0, funcLineID=0, reqPlayerID=0, reqServerID=0):
self.guid = guid # 某场战斗的唯一guid，可用于存储记录如战报等
self._reqPlayerID = reqPlayerID # 可能为0，系统后台自动处理的战斗时为0，某个玩家发起则为发起玩家ID，同个玩家ID可能同时存在多场战斗，如主线+其他
- self._reqServerID = reqServerID
+ self._reqServerID = reqServerID # 可能是玩家的服务器ID，或者请求的ServerID
self.curPlayer = None
self.mapID = mapID
self.funcLineID = funcLineID
@@ -301,8 +305,8 @@
for _, _, _, faction, num in sortList:
self.actionSortList.append([faction, num])
- GameWorld.DebugLog("阵容战力排序[isPlayer, fp, sortV, f, n]: %s" % sortList)
- GameWorld.DebugLog("阵容行动顺序[f, n]: %s" % self.actionSortList)
+ GameWorld.DebugLogEx("阵容战力排序[isPlayer, fp, sortV, f, n]: %s", sortList)
+ GameWorld.DebugLogEx("阵容行动顺序[f, n]: %s", self.actionSortList)
return
def getBatFaction(self, faction=ChConfig.Def_FactionA):
@@ -340,7 +344,10 @@
break
if allKilled:
- self.winFaction = ChConfig.Def_FactionA if faction == ChConfig.Def_FactionB else ChConfig.Def_FactionB
+ if self.mapID in ChConfig.PlayerWinMapIDList:
+ self.winFaction = ChConfig.Def_FactionA
+ else:
+ self.winFaction = ChConfig.Def_FactionA if faction == ChConfig.Def_FactionB else ChConfig.Def_FactionB
DoTurnFightOver(self.guid)
return self.winFaction
@@ -457,17 +464,15 @@
if self._isNeedReport:
packBuff = clientPack.GetBuffer()
buffLen = len(packBuff)
- GameWorld.DebugLog("回合战斗过程封包: %s, len:%s" % (headStr, buffLen))
+ #GameWorld.DebugLogEx("回合战斗过程封包: %s, len:%s, %s", headStr, buffLen, CommFunc.B2Hex(packBuff))
+ GameWorld.DebugLogEx("回合战斗过程封包: %s, len:%s", headStr, buffLen)
self.batBuffer += CommFunc.WriteWORD("", buffLen)
self.batBuffer += packBuff
- ObjPool.GetPoolMgr().release(clientPack)
else:
- GameWorld.DebugLog("回合战斗过程封包: %s" % (headStr))
+ GameWorld.DebugLogEx("回合战斗过程封包: %s", headStr)
# 有玩家的统一每个包单独发送，同样也支持战报统计
if self.curPlayer:
NetPackCommon.SendFakePack(self.curPlayer, clientPack)
- else:
- ObjPool.GetPoolMgr().release(clientPack)
return
def ResetOneActionUseSkillCnt(self): self._oneActionUseSkillCntDict = {}
@@ -485,7 +490,7 @@
return
def addTurnFight(self, guid, mapID, funcLineID=0, reqPlayerID=0, reqServerID=0):
- tf = ObjPool.GetPoolMgr().acquire(TurnFight, guid, mapID, funcLineID, reqPlayerID, reqServerID)
+ tf = TurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID)
if not tf:
tf = TurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID) # 一般是不可能，为了点出代码
self.turnFightDict[tf.guid] = tf
@@ -497,7 +502,6 @@
return
turnFight.exitFight()
self.turnFightDict.pop(guid, None)
- ObjPool.GetPoolMgr().release(turnFight)
return
def getTurnFight(self, guid):
@@ -581,7 +585,7 @@
olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
lineup = olPlayer.GetLineup(lineupID)
if lineup.IsEmpty():
- GameWorld.DebugLog("玩家没有目标阵容默认取主阵容! lineupID=%s" % lineupID, curPlayer.GetPlayerID())
+ GameWorld.DebugLogEx("玩家没有目标阵容默认取主阵容! lineupID=%s", lineupID, curPlayer.GetPlayerID())
lineup = olPlayer.GetLineup(ShareDefine.Lineup_Main)
return lineup
@@ -601,13 +605,15 @@
hero = lineup.GetLineupHero(posNum)
heroID = hero.heroID
itemIndex = hero.itemIndex
- userData = ""
heroLV = 1
+ star = 0
if itemIndex >= 0 and itemIndex < curPack.GetCount():
heroItem = curPack.GetAt(itemIndex)
if heroItem and not heroItem.IsEmpty():
- userData = heroItem.GetUserData()
heroLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroLV)
+ star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)
+ #breakLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroBreakLV)
+ #awakeLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroAwakeLV)
skillIDlist = []
skillIDlist += hero.heroSkillIDList
@@ -615,7 +621,9 @@
"HeroID":heroID,
"SkinID":hero.skinID,
"LV":heroLV,
- "Data":userData,
+ "Star":star,
+ #"BreakLV":breakLV,
+ #"AwakeLV":awakeLV,
"FightPower":hero.fightPower,
"AttrDict":{str(k):v for k, v in hero.heroBatAttrDict.items() if v > 0},
"SkillIDList":skillIDlist,
@@ -656,6 +664,24 @@
lineupInfo = {"NPCLineupID":lineupID, "Hero":heroDict, "BossID":bossID, "BossPosView":bossPosView}
return lineupInfo
+
+def GMTestPVP(curPlayer, tagPlayerID=0):
+ ## GM测试PVP战斗
+ if not tagPlayerID:
+ tagPlayerID = curPlayer.GetPlayerID()
+
+ guid = GameWorld.GetGUID()
+ mapID, funcLineID = 0, 0
+
+ tagViewCache = PlayerViewCache.FindBattleViewCache(tagPlayerID)
+ if not tagViewCache:
+ PlayerControl.NotifyCode(curPlayer, "TagNoViewCache")
+ return
+ defLineupInfo = GetCacheLineupInfo(tagViewCache, ShareDefine.Lineup_Main)
+ lineupDictA = {1:GetPlayerLineupInfo(curPlayer, ShareDefine.Lineup_Main)}
+ lineupDictB = {1:defLineupInfo}
+ turnFight = DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB)
+ return turnFight.costTime if turnFight else None
def GMTestFight(curPlayer, heroIDList, isAllSkill):
## GM测试战斗，指定武将
@@ -753,6 +779,7 @@
return
heroID = npcData.GetRelatedHeroID()
npcLV = npcData.GetLV()
+ star, breakLV, awakeLV = 0, 0, 0
lvIpyData = None
heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None
@@ -763,11 +790,14 @@
npcLV = strongerLV
if not lvIpyData:
lvIpyData = IpyGameDataPY.GetIpyGameData("PlayerLV", npcLV)
-
- if heroIpyData and lvIpyData:
+ if lvIpyData:
+ star = lvIpyData.GetReHeroStar()
+ breakLV = lvIpyData.GetReHeroBreakLV()
+ awakeLV = lvIpyData.GetReHeroAwakeLV()
+ if heroIpyData:
skinIDList = heroIpyData.GetSkinIDList()
skinID = skinIDList[0] if skinIDList else 0
- skillIDList = GetNPCHeroSkillIDList(heroID, heroIpyData, lvIpyData.GetReHeroBreakLV(), lvIpyData.GetReHeroAwakeLV())
+ skillIDList = GetNPCHeroSkillIDList(heroID, heroIpyData, breakLV, awakeLV)
else:
heroID = 0
skinID = 0
@@ -784,7 +814,7 @@
random.shuffle(randSkillIDExList)
randSkillIDExList = randSkillIDExList[:skillExCnt]
skillIDList += randSkillIDExList
- GameWorld.DebugLog("阵容boss技能: %s, 随机附加技能: %s" % (skillIDList, randSkillIDExList))
+ GameWorld.DebugLogEx("阵容boss技能: %s, 随机附加技能: %s", skillIDList, randSkillIDExList)
# 成长怪属性
batAttrDict = GetNPCStrongerAttrDict(npcID, lvIpyData, npcStronger, difficulty)
@@ -807,11 +837,14 @@
"HeroID":heroID,
"SkinID":skinID,
"LV":npcLV,
+ "Star":star,
+ #"BreakLV":breakLV,
+ #"AwakeLV":awakeLV,
"AttrDict":{str(k):v for k, v in batAttrDict.items() if v > 0},
"SkillIDList":skillIDList,
}
- GameWorld.DebugLog("GetNPCBattleDict npcID=%s,strongerLV=%s,difficulty=%s,%s" % (npcID, strongerLV, difficulty, battleDict))
+ GameWorld.DebugLogEx("GetNPCBattleDict npcID=%s,strongerLV=%s,difficulty=%s,%s", npcID, strongerLV, difficulty, battleDict)
return battleDict
def GetNPCHeroSkillIDList(heroID, heroIpyData, breakLV, awakeLV):
@@ -860,9 +893,9 @@
ratio = getattr(npcStronger, "Get%sRatio" % attrName)() if hasattr(npcStronger, "Get%sRatio" % attrName) else 1 # 属性系数
attrValue = int(reValue * ratio * difficulty)
batAttrDict[attrID] = attrValue
- #GameWorld.DebugLog(" attrID=%s,attrValue=%s,reValue=%s,ratio=%s,difficulty=%s" % (attrID, attrValue, reValue, ratio, difficulty))
+ #GameWorld.DebugLogEx(" attrID=%s,attrValue=%s,reValue=%s,ratio=%s,difficulty=%s", attrID, attrValue, reValue, ratio, difficulty)
- GameWorld.DebugLog("NPC成长属性: npcID=%s,lv=%s,difficulty=%s,%s" % (npcID, lv, difficulty, batAttrDict))
+ GameWorld.DebugLogEx("NPC成长属性: npcID=%s,lv=%s,difficulty=%s,%s", npcID, lv, difficulty, batAttrDict)
return batAttrDict
def SummonLineupObjs(batLineup, faction, num, lineupInfo, reqPlayerID=0):
@@ -874,7 +907,7 @@
'''
lineupPlayerID = lineupInfo.get("PlayerID", 0) # 阵容所属玩家ID
npcLineupID = lineupInfo.get("NPCLineupID", 0)
- GameWorld.DebugLog("SummonLineupObjs faction:%s,num:%s,npcLineupID=%s,lineupPlayerID=%s" % (faction, num, npcLineupID, lineupPlayerID), reqPlayerID)
+ GameWorld.DebugLogEx("SummonLineupObjs faction:%s,num:%s,npcLineupID=%s,lineupPlayerID=%s", faction, num, npcLineupID, lineupPlayerID)
turnFight = batLineup.turnFight
tfGUID = turnFight.guid
@@ -894,6 +927,7 @@
heroID = heroInfo.get("HeroID", 0)
skinID = heroInfo.get("SkinID", 0)
lv = heroInfo.get("LV", 1)
+ star = heroInfo.get("Star", 0)
specialty, atkDistType, country, sex, job = 0, 1, 0, 1, 0
heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None
if heroIpyData:
@@ -930,6 +964,7 @@
batObj.SetLineupPos(posNum, num)
batObj.SetFightPower(fightPower)
batObj.SetLV(lv)
+ batObj.SetStar(star)
batObj.SetAtkDistType(atkDistType)
batObj.SetSpecialty(specialty)
batObj.SetCountry(country)
@@ -944,15 +979,16 @@
batLineup.posObjIDDict[posNum] = objID
batLineup.heroObjIDDict[heroID] = objID
- GameWorld.DebugLog("AddBatObj %s,skill=%s" % (GetObjName(batObj), skillManager.GetSkillIDList()))
+ GameWorld.DebugLogEx("AddBatObj %s,lv=%s,star=%s,skill=%s", GetObjName(batObj), lv, star, skillManager.GetSkillIDList())
ResetObjSkill(batObj)
if npcID:
#副本指定NPC属性
fbNPCInitAttrDict = FBLogic.GetFBNPCInitAttr(turnFight, batObj)
if fbNPCInitAttrDict:
- GameWorld.DebugLog("副本指定NPC初始化属性: npcID=%s, %s" % (npcID, fbNPCInitAttrDict))
+ GameWorld.DebugLogEx("副本指定NPC初始化属性: npcID=%s, %s", npcID, fbNPCInitAttrDict)
attrDict = {str(k):v for k, v in fbNPCInitAttrDict.items()} # 统一格式
+ #attrDict[str(ChConfig.AttrID_MaxHP)] = 10000000000
batObj.InitBatAttr({int(k):v for k, v in attrDict.items()}, initXP)
return
@@ -963,7 +999,7 @@
batFaction = turnFight.getBatFaction(ChConfig.Def_FactionA)
if not batFaction:
return
- GameWorld.DebugLog("切换小队重置玩家阵容武将...")
+ GameWorld.DebugLogEx("切换小队重置玩家阵容武将...")
batLineup = batFaction.getBatlineup(1) # 只处理玩家阵容
batObjMgr = BattleObj.GetBatObjMgr()
for objID in batLineup.posObjIDDict.values():
@@ -972,9 +1008,9 @@
continue
objName = GetObjName(batObj)
if not batObj.IsAlive():
- GameWorld.DebugLog(" 已被击杀不处理! %s" % (objName))
+ GameWorld.DebugLogEx(" 已被击杀不处理! %s", objName)
continue
- GameWorld.DebugLog("重置武将: %s, HP:%s/%s, XP:%s" % (objName, batObj.GetHP(), batObj.GetMaxHP(), batObj.GetXP()))
+ GameWorld.DebugLogEx("重置武将: %s, HP:%s/%s, XP:%s", objName, batObj.GetHP(), batObj.GetMaxHP(), batObj.GetXP())
# 清除buff
buffMgr = batObj.GetBuffManager()
@@ -997,7 +1033,7 @@
pubCD = IpyGameDataPY.GetFuncCfg("TurnFightCD", 1)
if pubCD:
if tfMgr.lastRequestTick and tick - tfMgr.lastRequestTick <= pubCD:
- GameWorld.DebugLog("回合制战斗请求服务器公共CD中!")
+ GameWorld.DebugLogEx("回合制战斗请求服务器公共CD中!")
PlayerControl.NotifyCode(curPlayer, "BattleCoolDown")
return True
@@ -1005,7 +1041,7 @@
selfCD = IpyGameDataPY.GetFuncCfg("TurnFightCD", 2)
lastTick = curPlayer.GetDictByKey(selfKey)
if selfCD and lastTick and tick - lastTick <= selfCD:
- GameWorld.DebugLog("回合制战斗请求CD中: %s" % selfKey)
+ GameWorld.DebugLogEx("回合制战斗请求CD中: %s", selfKey)
PlayerControl.NotifyCode(curPlayer, "BattleCoolDown")
return True
@@ -1036,8 +1072,7 @@
tagID = clientData.TagID
valueList = clientData.ValueList
- GameWorld.DebugLog("----- 回合制战斗请求: mapID=%s,funcLineID=%s,tagType=%s,tagID=%s,valueList=%s"
- % (mapID, funcLineID, tagType, tagID, valueList), playerID)
+ GameWorld.DebugLogEx("----- 回合制战斗请求: mapID=%s,funcLineID=%s,tagType=%s,tagID=%s,valueList=%s", mapID, funcLineID, tagType, tagID, valueList, playerID)
reqRet = FBLogic.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList)
if not reqRet:
@@ -1048,7 +1083,7 @@
fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, funcLineID, False)
if fbIpyData:
if not fbLineIpyData:
- GameWorld.DebugLog("不存在该副本功能线路! mapID=%s,funcLineID=%s" % (mapID, funcLineID))
+ GameWorld.DebugLogEx("不存在该副本功能线路! mapID=%s,funcLineID=%s", mapID, funcLineID)
return
if FBCommon.CheckCanEnterFBComm(curPlayer, mapID, funcLineID, fbIpyData, fbLineIpyData) != ShareDefine.EntFBAskRet_OK:
return
@@ -1062,11 +1097,12 @@
return
reqPlayerID = playerID
+ playerServerID = GameWorld.GetPlayerServerID(curPlayer)
guid = GameWorld.GetGUID()
atkLineupInfo = GetPlayerLineupInfo(curPlayer, atkLineupID)
if not atkLineupInfo:
- GameWorld.DebugLog("玩家没有该阵容数据! atkLineupID=%s" % atkLineupID, playerID)
+ GameWorld.DebugLogEx("玩家没有该阵容数据! atkLineupID=%s", atkLineupID, playerID)
return
# 玩家
@@ -1075,19 +1111,19 @@
tagViewCache = PlayerViewCache.FindBattleViewCache(tagPlayerID)
if not tagViewCache:
# 跨服玩家待扩展
- GameWorld.DebugLog("目标玩家没有缓存数据! tagPlayerID=%s" % tagPlayerID, playerID)
+ GameWorld.DebugLogEx("目标玩家没有缓存数据! tagPlayerID=%s", tagPlayerID, playerID)
PlayerControl.NotifyCode(curPlayer, "TagNoViewCache")
return
defLineupInfo = GetCacheLineupInfo(tagViewCache, defLineupID)
if not defLineupInfo:
- GameWorld.DebugLog("目标玩家没有该阵容数据! tagPlayerID=%s,defLineupID=%s" % (tagPlayerID, defLineupID), playerID)
+ GameWorld.DebugLogEx("目标玩家没有该阵容数据! tagPlayerID=%s,defLineupID=%s", tagPlayerID, defLineupID, playerID)
PlayerControl.NotifyCode(curPlayer, "TagNoLineup")
return
lineupDictA = {1:atkLineupInfo}
lineupDictB = {1:defLineupInfo}
- AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, reqData=[tagType, tagID, valueList])
+ AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, reqData=[tagType, tagID, valueList])
# NPC
else:
@@ -1115,11 +1151,11 @@
lineupDictA = {1:atkLineupInfo}
lineupDictB = None
- AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty)
+ AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty)
return True
-def AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, npcLineupIDList=[], strongerLV=0, difficulty=0, reqData=None):
+def AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, playerServerID=0, npcLineupIDList=[], strongerLV=0, difficulty=0, reqData=None):
'''添加进战斗请求队列，这里做战斗分发处理，由当前服务器根据当前服务器情况分配到本机子的其他战斗地图，或直接本地图处理
@param lineupDictA: 阵营A所有阵容{阵容编号:{阵容信息}, ...}
@param lineupDictB: 阵营B所有阵容{阵容编号:{阵容信息}, ...}，pvp时用
@@ -1137,21 +1173,32 @@
# pvp 或 pve 必须要满足其中一种
return
- # 先默认本地图处理，后续优化多战斗地图支持
-
- reqServerID = GameWorld.GetGameWorld().GetServerID()
- reqInfo = [reqServerID, guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty, reqData]
- OnMsg_BattleRequest(reqInfo)
+ fromServerID = GameWorld.GetGameWorld().GetServerID()
+ reqInfo = [guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData]
+ multiMapSet = IpyGameDataPY.GetFuncCfg("TurnFightProcess", 1)
+ #multiMapSet = 0
+ # 多地图战斗 0-本地图处理；1-多地图处理；2-debug模式默认本地图处理，非debug默认多地图处理
+ isMultiMap = False
+ if multiMapSet == 1:
+ isMultiMap = True
+ elif multiMapSet == 2:
+ if not GameWorld.GetGameWorld().GetDebugLevel():
+ isMultiMap = True
+
+ if isMultiMap:
+ CrossServerPackLogic.SendToBattleServer(ShareDefine.SSMsg_BattleRequest, reqInfo, reqPlayerID)
+ else:
+ SSMsg_BattleRequest(reqInfo, fromServerID)
return
-def OnMsg_BattleRequest(reqInfo):
+def SSMsg_BattleRequest(reqInfo, fromServerID):
## 请求执行战斗，由本地图或其他服务器地图分配过来的战斗请求
- reqServerID, guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo
+ guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo
if npcLineupIDList:
- turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, reqServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)
+ turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)
else:
- turnFight = DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, reqServerID)
+ turnFight = DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID)
winFaction = None
statMsg = {}
@@ -1164,16 +1211,15 @@
retInfo = [guid, mapID, funcLineID, reqPlayerID, winFaction, statMsg, dateStr, reqData]
# 本地图自己处理的
- if reqServerID == GameWorld.GetGameWorld().GetServerID():
- OnMsg_BattleResult(retInfo)
+ if fromServerID == GameWorld.GetGameWorld().GetServerID():
+ SSMsg_BattleResult(retInfo, fromServerID)
# 其他服务器地图请求的，发送战斗结果回去
else:
- pass
-
+ CrossServerPackLogic.SendToServer(ShareDefine.SSMsg_BattleResult, retInfo, [fromServerID], playerID=reqPlayerID)
return
-def OnMsg_BattleResult(retInfo):
+def SSMsg_BattleResult(retInfo, fromServerID):
## 收到战斗结果信息
guid, mapID, funcLineID, reqPlayerID, winFaction, statMsg, dateStr, reqData = retInfo
@@ -1200,14 +1246,14 @@
return
-def DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, reqServerID, playerLineupDict, npcLineupIDList, strongerLV, difficulty):
+def DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, playerLineupDict, npcLineupIDList, strongerLV, difficulty):
'''执行PVE战斗，支持多小队
'''
turnMax = GetTurnMax(mapID)
tfMgr = GetTurnFightMgr()
- turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID)
+ turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, playerServerID)
guid = turnFight.guid
turnFight.setTurnFight(mapID, funcLineID, turnMax, True)
@@ -1216,7 +1262,7 @@
for index, lineupID in enumerate(npcLineupIDList):
turnFight.lineupIndex = index
- GameWorld.DebugLog("对战NPC阵容: index=%s, lineupID=%s" % (index, lineupID))
+ GameWorld.DebugLogEx("对战NPC阵容: index=%s, lineupID=%s", index, lineupID)
if index > 0:
turnFight.nextTurnFight()
turnFight.setFactionLineup(ChConfig.Def_FactionB, {1:GetNPCLineupInfo(lineupID, strongerLV, difficulty)})
@@ -1232,7 +1278,8 @@
tfMgr.delTurnFight(guid)
return turnFight if saveOK else None
-def DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, reqServerID=0):
+#@CommFunc.DoCProfile
+def DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, playerServerID=0):
'''执行PVP战斗，只处理战斗，不关心功能及curPlayer相关
@param lineupDictA: 阵营A所有阵容{阵容编号:{阵容信息}, ...}
@param lineupDictB: 阵营B所有阵容{阵容编号:{阵容信息}, ...}
@@ -1242,7 +1289,7 @@
turnMax = GetTurnMax(mapID)
tfMgr = GetTurnFightMgr()
- turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID)
+ turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, playerServerID)
guid = turnFight.guid
turnFight.setTurnFight(mapID, funcLineID, turnMax, True)
@@ -1284,7 +1331,7 @@
__doSetFightPoint(curPlayer, reqValue)
return
- GameWorld.DebugLog("------------------- 主线战斗请求: reqType=%s" % reqType, curPlayer.GetPlayerID())
+ GameWorld.DebugLogEx("------------------- 主线战斗请求: reqType=%s", reqType, curPlayer.GetPlayerID())
mainFightMgr = GetMainFightMgr(curPlayer)
mainFightMgr.resetMainFightExDataRec() # 请求时补重置，防止异常时重复结算逻辑
@@ -1315,6 +1362,7 @@
PlayerLLMJ.AddUseZhanchui(curPlayer, useZhanchui)
PlayerPrestigeSys.AddRealmTaskValue(curPlayer, PlayerPrestigeSys.RealmTaskType_UseXiantao, useZhanchui)
PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_CutTree, useZhanchui)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSACutTree, useZhanchui)
PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_CutTree, useZhanchui)
# 历练秘境额外经验
@@ -1327,6 +1375,7 @@
if killNPCCnt > 0:
PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_KillNPC, killNPCCnt)
PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_KillNPC, killNPCCnt)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAKillNPC, killNPCCnt)
# 结算逻辑最后重置数据
mainFightMgr.resetMainFightExDataRec()
@@ -1342,14 +1391,14 @@
def __doSetFightPoint(curPlayer, fightPoint):
## 设置消耗倍值
- GameWorld.DebugLog("设置战锤消耗倍值: %s" % fightPoint)
+ GameWorld.DebugLogEx("设置战锤消耗倍值: %s", fightPoint)
needTreeLVList = IpyGameDataPY.GetFuncEvalCfg("AutoGuaji", 1)
if fightPoint < 1 or fightPoint > len(needTreeLVList):
return
needTreeLV = needTreeLVList[fightPoint - 1]
treeLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV)
if treeLV < needTreeLV:
- GameWorld.DebugLog("祝福树等级不足: treeLV=%s < %s" % (treeLV, needTreeLV))
+ GameWorld.DebugLogEx("祝福树等级不足: treeLV=%s < %s", treeLV, needTreeLV)
return
curPlayer.SetFightPoint(fightPoint)
return
@@ -1359,10 +1408,10 @@
# @param isRestStart: 是否从休息状态重新开始的
playerID = curPlayer.GetPlayerID()
chapterID, levelNum, wave = PlayerControl.GetMainLevelNowInfo(curPlayer)
- GameWorld.DebugLog("请求关卡波战斗: chapterID=%s,levelNum=%s,wave=%s,isRestStart=%s" % (chapterID, levelNum, wave, isRestStart), playerID)
+ GameWorld.DebugLogEx("请求关卡波战斗: chapterID=%s,levelNum=%s,wave=%s,isRestStart=%s", chapterID, levelNum, wave, isRestStart, playerID)
fightPoint = max(curPlayer.GetFightPoint(), 1)
if not PlayerControl.HaveMoney(curPlayer, ShareDefine.TYPE_Price_Xiantao, fightPoint):
- GameWorld.DebugLog("战锤不足，无法开始!")
+ GameWorld.DebugLogEx("战锤不足，无法开始!")
return
chapterIpyData = IpyGameDataPY.GetIpyGameData("MainChapter", chapterID)
if not chapterIpyData:
@@ -1394,7 +1443,7 @@
lineupMainInfo = GetPlayerLineupInfo(curPlayer, ShareDefine.Lineup_Main)
if not lineupMainInfo:
- GameWorld.DebugLog("没有设置主阵容!", playerID)
+ GameWorld.DebugLogEx("没有设置主阵容!", playerID)
return
strongerLV = levelIpyData.GetNPCLV()
@@ -1406,8 +1455,8 @@
mainFightMgr.wave = wave
mapID, funcLineID = ChConfig.Def_FBMapID_Main, PlayerControl.ComMainLevelValue(chapterID, levelNum, wave)
turnMax = GetTurnMax(mapID)
- GameWorld.DebugLog("设置起始关卡波: 关卡%s-%s,波=%s/%s,lineupIDList=%s,mapID=%s,funcLineID=%s,lineupID=%s,strongerLV=%s,difficulty=%s"
- % (chapterID, levelNum, wave, waveMax, lineupIDList, mapID, funcLineID, lineupID, strongerLV, difficulty), playerID)
+ GameWorld.DebugLogEx("设置起始关卡波: 关卡%s-%s,波=%s/%s,lineupIDList=%s,mapID=%s,funcLineID=%s,lineupID=%s,strongerLV=%s,difficulty=%s",
+ chapterID, levelNum, wave, waveMax, lineupIDList, mapID, funcLineID, lineupID, strongerLV, difficulty, playerID)
turnFight = mainFightMgr.turnFight
turnFight.setTurnFight(mapID, funcLineID, turnMax, False, curPlayer)
@@ -1446,7 +1495,7 @@
if winFaction:
nextLineupID = turnFight.nextLineupID()
if nextLineupID:
- GameWorld.DebugLog("---开始进入下一小队: lineupIndex=%s,nextLineupID=%s,%s" % (turnFight.lineupIndex, nextLineupID, turnFight.lineupIDList))
+ GameWorld.DebugLogEx("---开始进入下一小队: lineupIndex=%s,nextLineupID=%s,%s", turnFight.lineupIndex, nextLineupID, turnFight.lineupIDList)
turnFight.nextTurnFight()
# 切换小队时，玩家阵容不需要处理，保留状态
@@ -1462,7 +1511,7 @@
# 小怪战斗，每次消耗1个战锤
fightPoint = max(curPlayer.GetFightPoint(), 1) # 主线战斗消耗倍值，默认1
if not PlayerControl.HaveMoney(curPlayer, ShareDefine.TYPE_Price_Xiantao, fightPoint):
- GameWorld.DebugLog("回合开始时战锤不足!")
+ GameWorld.DebugLogEx("回合开始时战锤不足!")
return
# 以下均是处理关卡小怪分段实时战斗
@@ -1482,7 +1531,7 @@
# 回合开始
if turnNumStart < turnNum:
- GameWorld.DebugLog("【----- 回合制战斗轮次: %s -----】 " % (turnNum))
+ GameWorld.DebugLogEx("【----- 回合制战斗轮次: %s -----】 ", turnNum)
turnFight.turnNum = turnNum
turnFight.turnNumStart = turnNum
if curPlayer:
@@ -1504,10 +1553,10 @@
batFaction = turnFight.getBatFaction(faction)
batLineup = batFaction.getBatlineup(num)
for posNum in range(batLineup.actionNum, PosNumMax + 1):
- #GameWorld.DebugLog("武将位置: faction=%s,posNum=%s" % (faction, posNum))
+ #GameWorld.DebugLogEx("武将位置: faction=%s,posNum=%s", faction, posNum)
if posNum not in batLineup.posObjIDDict:
batLineup.actionNum = posNum + 1
- #GameWorld.DebugLog("没有武将: faction=%s,posNum=%s" % (faction, posNum))
+ #GameWorld.DebugLogEx("没有武将: faction=%s,posNum=%s", faction, posNum)
continue
objID = batLineup.posObjIDDict[posNum]
@@ -1516,7 +1565,7 @@
# 玩家自己阵营，预判可否行动
if checkBreakpoint and faction == ChConfig.Def_FactionA and batObj:
if batObj.CanAction():
- GameWorld.DebugLog("玩家阵容下一个可行动的武将，断点: nextPosNum=%s" % (posNum))
+ GameWorld.DebugLogEx("玩家阵容下一个可行动的武将，断点: nextPosNum=%s", posNum)
return
batLineup.actionNum = posNum + 1
@@ -1559,7 +1608,7 @@
if turnFight.winFaction:
break
turnFight.turnNum = turnNum
- GameWorld.DebugLog("【----- 回合制战斗轮次: %s -----】" % turnNum)
+ GameWorld.DebugLogEx("【----- 回合制战斗轮次: %s -----】", turnNum)
if curPlayer:
turnFight.syncState(FightState_Fighting)
@@ -1622,7 +1671,7 @@
## 执行进场逻辑
if turnFight.enterLogic:
return
- GameWorld.DebugLog("执行进场逻辑...")
+ GameWorld.DebugLogEx("执行进场逻辑...")
batObjMgr = BattleObj.GetBatObjMgr()
for faction, num in turnFight.actionSortList:
@@ -1643,7 +1692,7 @@
batObjMgr = BattleObj.GetBatObjMgr()
for faction, num in turnFight.actionSortList:
- GameWorld.DebugLog("大回合开始逻辑: turnNum=%s,faction=%s,num=%s" % (turnNum, faction, num))
+ GameWorld.DebugLogEx("大回合开始逻辑: turnNum=%s,faction=%s,num=%s", turnNum, faction, num)
batFaction = turnFight.getBatFaction(faction)
batLineup = batFaction.getBatlineup(num)
batLineup.actionNum = 1
@@ -1671,7 +1720,7 @@
batObjMgr = BattleObj.GetBatObjMgr()
for faction, num in turnFight.actionSortList:
- GameWorld.DebugLog("回合结束逻辑: turnNum=%s,faction=%s, num=%s" % (turnNum, faction, num))
+ GameWorld.DebugLogEx("回合结束逻辑: turnNum=%s,faction=%s, num=%s", turnNum, faction, num)
batFaction = turnFight.getBatFaction(faction)
batLineup = batFaction.getBatlineup(num)
for objID in batLineup.posObjIDDict.values():
@@ -1694,7 +1743,7 @@
if not batObj.IsAlive():
return
- GameWorld.DebugLog("---[武将回合开始] : curID=%s,curHP=%s/%s" % (batObj.GetID(), batObj.GetHP(), batObj.GetMaxHP()))
+ GameWorld.DebugLogEx("---[武将回合开始] : curID=%s,curHP=%s/%s", batObj.GetID(), batObj.GetHP(), batObj.GetMaxHP())
turnFight.ResetOneActionUseSkillCnt()
RefreshObjBuffTime(turnFight, batObj)
TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_HeroTurnStart)
@@ -1711,7 +1760,7 @@
if not batObj.IsAlive():
return
- GameWorld.DebugLog("---[武将回合结束] : curID=%s,curHP=%s/%s" % (batObj.GetID(), batObj.GetHP(), batObj.GetMaxHP()))
+ GameWorld.DebugLogEx("---[武将回合结束] : curID=%s,curHP=%s/%s", batObj.GetID(), batObj.GetHP(), batObj.GetMaxHP())
turnFight.ResetOneActionUseSkillCnt()
RefreshObjBuffTime(turnFight, batObj)
return
@@ -1729,7 +1778,7 @@
initCD = curSkill.GetCoolDownInit()
if initCD:
curSkill.SetRemainTime(initCD)
- GameWorld.DebugLog("技能初始CD: curID=%s,skillID=%s,initCD=%s" % (curID, skillID, initCD))
+ GameWorld.DebugLogEx("技能初始CD: curID=%s,skillID=%s,initCD=%s", curID, skillID, initCD)
elif curSkill.GetRemainTime():
curSkill.SetRemainTime(0)
curSkill.SetEnergy(0)
@@ -1751,11 +1800,11 @@
if remainTime <= 0:
continue
if preTurnUseCnt > 0:
- GameWorld.DebugLog(" 上回合有使用技能本回合不刷新CD: curID=%s,skillID=%s,remainTime=%s,preTurnUseCnt=%s" % (curID, skillID, remainTime, preTurnUseCnt))
+ GameWorld.DebugLogEx(" 上回合有使用技能本回合不刷新CD: curID=%s,skillID=%s,remainTime=%s,preTurnUseCnt=%s", curID, skillID, remainTime, preTurnUseCnt)
continue
remainTime -= 1
curSkill.SetRemainTime(remainTime)
- GameWorld.DebugLog(" 更新技能CD: curID=%s,skillID=%s,remainTime=%s" % (curID, skillID, remainTime))
+ GameWorld.DebugLogEx(" 更新技能CD: curID=%s,skillID=%s,remainTime=%s", curID, skillID, remainTime)
return
def RefreshObjByBigTurn(turnFight, batObj):
@@ -1770,16 +1819,16 @@
if skillData.GetLastTimeType() != ChConfig.BuffLastTimeType_BigTurn:
continue
if skillData.GetSkillType() in ChConfig.Def_LstBuff_List:
- #GameWorld.DebugLog(" 持续类buff由触发时机决定剩余时间! curID=%s,index=%s,skillID=%s,buffID=%s" % (curID, index, skillID, buffID))
+ #GameWorld.DebugLogEx(" 持续类buff由触发时机决定剩余时间! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
if skillData.GetSkillType() == ChConfig.Def_SkillType_Halo and buff.GetOwnerID() != curID:
- GameWorld.DebugLog(" 光环buff非光源不处理! curID=%s,index=%s,skillID=%s,buffID=%s" % (curID, index, skillID, buffID))
+ GameWorld.DebugLogEx(" 光环buff非光源不处理! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
remainTime = buff.GetRemainTime()
if remainTime <= 0:
continue
remainTime -= 1
- GameWorld.DebugLog(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s" % (curID, buffID, skillID, remainTime))
+ GameWorld.DebugLogEx(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s", curID, buffID, skillID, remainTime)
TurnBuff.SetBuffRemainTime(turnFight, batObj, buff, remainTime)
return
@@ -1798,26 +1847,26 @@
if skillData.GetLastTimeType() != ChConfig.BuffLastTimeType_Default:
continue
if skillData.GetSkillType() in ChConfig.Def_LstBuff_List:
- #GameWorld.DebugLog(" 持续类buff由触发时机决定剩余时间! curID=%s,index=%s,skillID=%s,buffID=%s" % (curID, index, skillID, buffID))
+ #GameWorld.DebugLogEx(" 持续类buff由触发时机决定剩余时间! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
if skillData.GetSkillType() == ChConfig.Def_SkillType_Halo and buff.GetOwnerID() != curID:
- GameWorld.DebugLog(" 光环buff非光源不处理! curID=%s,index=%s,skillID=%s,buffID=%s" % (curID, index, skillID, buffID))
+ GameWorld.DebugLogEx(" 光环buff非光源不处理! curID=%s,index=%s,skillID=%s,buffID=%s", curID, index, skillID, buffID)
continue
remainTime = buff.GetRemainTime()
if remainTime <= 0:
# 永久buff不处理
- #GameWorld.DebugLog(" 永久buff不处理! curID=%s,index=%s,skillID=%s" % (curID, index, skillID))
+ #GameWorld.DebugLogEx(" 永久buff不处理! curID=%s,index=%s,skillID=%s", curID, index, skillID)
continue
addTiming = buff.GetAddTiming()
if not buff.GetRefreshState():
- GameWorld.DebugLog(" 未刷新过的buff更新为刷新过! curID=%s,index=%s,skillID=%s,buffID=%s,addTiming=%s" % (curID, index, skillID, buffID, addTiming))
+ GameWorld.DebugLogEx(" 未刷新过的buff更新为刷新过! curID=%s,index=%s,skillID=%s,buffID=%s,addTiming=%s", curID, index, skillID, buffID, addTiming)
buff.SetRefreshState(1)
continue
if addTiming != curTiming:
- GameWorld.DebugLog(" buff添加时机不同不处理! curID=%s,index=%s,skillID=%s,buffID=%s,addTiming=%s" % (curID, index, skillID, buffID, addTiming))
+ GameWorld.DebugLogEx(" buff添加时机不同不处理! curID=%s,index=%s,skillID=%s,buffID=%s,addTiming=%s", curID, index, skillID, buffID, addTiming)
continue
remainTime -= 1
- GameWorld.DebugLog(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s,addTiming=%s" % (curID, buffID, skillID, remainTime, addTiming))
+ GameWorld.DebugLogEx(" 更新buff回合: curID=%s,buffID=%s,skillID=%s,remainTime=%s,addTiming=%s", curID, buffID, skillID, remainTime, addTiming)
TurnBuff.SetBuffRemainTime(turnFight, batObj, buff, remainTime)
return
@@ -1832,8 +1881,8 @@
curID = curObj.GetID()
srcID = srcObj.GetID()
updStatValue = srcObj.StatCureValue(cureHP)
- GameWorld.DebugLog(" 统计治疗: curID=%s,srcID=%s,skillID=%s,addValue=%s,cureHP=%s,updStatValue=%s"
- % (curID, srcID, skillID, addValue, cureHP, updStatValue))
+ GameWorld.DebugLogEx(" 统计治疗: curID=%s,srcID=%s,skillID=%s,addValue=%s,cureHP=%s,updStatValue=%s",
+ curID, srcID, skillID, addValue, cureHP, updStatValue)
return
@@ -1845,18 +1894,18 @@
tagID = tagBatObj.GetID()
if curID != tagID:
updStatValue = curBatObj.StatHurtValue(hurtValue)
- GameWorld.DebugLog(" 统计输出: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,updStatValue=%s,tagHP=%s,lostType=%s"
- % (curID, tagID, skillID, hurtValue, lostHP, updStatValue, tagBatObj.GetHP(), lostType))
+ GameWorld.DebugLogEx(" 统计输出: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,updStatValue=%s,tagHP=%s,lostType=%s",
+ curID, tagID, skillID, hurtValue, lostHP, updStatValue, tagBatObj.GetHP(), lostType)
if tagBatObj:
updStatValue = tagBatObj.StatDefValue(hurtValue)
- GameWorld.DebugLog(" 统计承伤: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,updStatValue=%s,curHP=%s,lostType=%s"
- % (tagID, curID, skillID, hurtValue, lostHP, updStatValue, tagBatObj.GetHP(), lostType))
+ GameWorld.DebugLogEx(" 统计承伤: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,updStatValue=%s,curHP=%s,lostType=%s",
+ tagID, curID, skillID, hurtValue, lostHP, updStatValue, tagBatObj.GetHP(), lostType)
else:
# 如换血类技能，自残的伤害不算输出
- GameWorld.DebugLog(" 自残: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,curHP=%s"
- % (curID, tagID, skillID, hurtValue, lostHP, curBatObj.GetHP()))
+ GameWorld.DebugLogEx(" 自残: curID=%s,tagID=%s,skillID=%s,hurtValue=%s,lostHP=%s,curHP=%s",
+ curID, tagID, skillID, hurtValue, lostHP, curBatObj.GetHP())
return
def OnObjAction(turnFight, curBatObj, isExtra=False):
@@ -1876,12 +1925,12 @@
# 是否可行动状态判断
canAction = curBatObj.CanAction()
if not canAction:
- GameWorld.DebugLog("★回合%s %s 当前状态不可行动! isExtra=%s" % (turnNum, objName, isExtra))
+ GameWorld.DebugLogEx("★回合%s %s 当前状态不可行动! isExtra=%s", turnNum, objName, isExtra)
return
atk = curBatObj.GetAtk()
curXP = curBatObj.GetXP()
- GameWorld.DebugLog("★回合%s %s %s行动 : atk=%s,curHP=%s/%s,curXP=%s" % (turnNum, objName, "额外" if isExtra else "", atk, curHP, curBatObj.GetMaxHP(), curXP))
+ GameWorld.DebugLogEx("★回合%s %s %s行动 : atk=%s,curHP=%s/%s,curXP=%s", turnNum, objName, "额外" if isExtra else "", atk, curHP, curBatObj.GetMaxHP(), curXP)
turnFight.ResetOneActionUseSkillCnt()
turnFight.syncObjAction(turnNum, objID)
@@ -1890,7 +1939,7 @@
xpMax = IpyGameDataPY.GetFuncCfg("AngerXP", 2)
skillManager = curBatObj.GetSkillManager()
useSkillList = []
- #GameWorld.DebugLog('skillCount=%s' % skillManager.GetSkillCount(), npcID)
+ #GameWorld.DebugLogEx('skillCount=%s', skillManager.GetSkillCount(), npcID)
for index in range(0, skillManager.GetSkillCount()):
useSkill = skillManager.GetSkillByIndex(index)
if not useSkill:
@@ -1910,18 +1959,18 @@
if curXP < xpMax and not useSkill.GetEffectByID(ChConfig.SkillEff_AngerSkillNoXP):
continue
if curBatObj.CheckInState(ChConfig.BatObjState_Sneer):
- GameWorld.DebugLog("嘲讽状态下，无法主动释放怒技! skillID=%s" % skillID) # 可被动释放怒技，如怒技追击
+ GameWorld.DebugLogEx("嘲讽状态下，无法主动释放怒技! skillID=%s", skillID) # 可被动释放怒技，如怒技追击
continue
useCnt = -1 # xp技能优先释放
else:
if useSkill.GetEffectByID(ChConfig.SkillEff_ActionUseInvalid): # 配置该效果时如果被嘲讽，相当于无法行动
- GameWorld.DebugLog("行动时无法释放该技能! skillID=%s" % skillID)
+ GameWorld.DebugLogEx("行动时无法释放该技能! skillID=%s", skillID)
continue
useCnt = curBatObj.GetSkillUseCnt(skillID)
useSkillList.append([useCnt, skillID, useSkill])
useSkillList.sort() # 按使用次数优先升序排，使用次数低的优先判断使用
- #GameWorld.DebugLog(' 技能使用顺序 = useSkillList%s' % str(useSkillList), npcID)
+ #GameWorld.DebugLogEx(' 技能使用顺序 = useSkillList%s', str(useSkillList), npcID)
for useInfo in useSkillList:
useSkill = useInfo[-1]
@@ -1943,11 +1992,11 @@
objID = gameObj.GetID()
killerObjID = killer.GetID() if killer else 0
skillID = useSkill.GetSkillID() if useSkill else 0
- GameWorld.DebugLog(" %s 回合战斗主体被击杀: curID=%s,killerObjID=%s,skillID=%s" % (GetObjName(gameObj), objID, killerObjID, skillID))
+ GameWorld.DebugLogEx(" %s 回合战斗主体被击杀: curID=%s,killerObjID=%s,skillID=%s", GetObjName(gameObj), objID, killerObjID, skillID)
gameObj.SetDead()
TurnBuff.DoBuffByDead(turnFight, gameObj)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCTurnFightObjDead)
+ clientPack = ChPyNetSendPack.tagMCTurnFightObjDead()
clientPack.ObjID = objID
clientPack.KillerObjID = killerObjID
clientPack.SkillID = skillID
@@ -1960,7 +2009,7 @@
def OnTurnAllOver(guid):
## 所有回合已经全部执行完毕
- GameWorld.DebugLog("所有回合结束")
+ GameWorld.DebugLogEx("所有回合结束")
turnFight = GetTurnFightMgr().getTurnFight(guid)
if not turnFight:
return
@@ -1970,7 +2019,10 @@
if turnFight.getReqPlayerID():
# 玩家发起的，未击杀对方，算玩家输
- turnFight.winFaction = ChConfig.Def_FactionB
+ if turnFight.mapID in ChConfig.PlayerWinMapIDList:
+ turnFight.winFaction = ChConfig.Def_FactionA
+ else:
+ turnFight.winFaction = ChConfig.Def_FactionB
else:
# 系统场次，按一定规则来，这里先随机
turnFight.winFaction = random.choice([ChConfig.Def_FactionA, ChConfig.Def_FactionB])
@@ -1990,17 +2042,23 @@
turnFight.isWin = (winFaction == ChConfig.Def_FactionA)
mapID = turnFight.mapID
funcLineID = turnFight.funcLineID
- GameWorld.DebugLog("--- 战斗结束处理 ---, winFaction=%s, costTime=%ss, %s" % (winFaction, turnFight.costTime, guid))
+ reqPlayerID = turnFight.getReqPlayerID()
+ GameWorld.DebugLogEx("--- 战斗结束处理 ---, winFaction=%s, costTime=%ss, %s", winFaction, turnFight.costTime, guid)
if mapID != ChConfig.Def_FBMapID_Main:
- GameWorld.Log("战斗耗时: %ss, mapID=%s,funcLineID=%s" % (turnFight.costTime, mapID, funcLineID))
+ GameWorld.Log("战斗耗时: %ss, mapID=%s,funcLineID=%s,turnNum=%s/%s" % (turnFight.costTime, mapID, funcLineID, turnFight.turnNum, turnFight.turnMax))
# 统计明细
+ heroCount = 0
batObjMgr = BattleObj.GetBatObjMgr()
statInfo = {}
+ drLineupInfo = {}
for faction in turnFight.factionDict.keys():
if str(faction) not in statInfo:
statInfo[str(faction)] = {}
facStatInfo = statInfo[str(faction)]
+ if str(faction) not in drLineupInfo:
+ drLineupInfo[str(faction)] = {}
+ facDRLineupInfo = drLineupInfo[str(faction)]
batFaction = turnFight.getBatFaction(faction)
batFaction.totalHurt = 0
for num in batFaction.lineupDict.keys():
@@ -2009,11 +2067,13 @@
lineupStatInfo = facStatInfo[str(num)]
batLineup = batFaction.getBatlineup(num)
batLineup.totalHurt = 0
- GameWorld.DebugLog("阵容明细: faction=%s,num=%s" % (faction, num))
+ facDRLineupInfo[str(num)] = batLineup.lineupInfo
+ GameWorld.DebugLogEx("阵容明细: faction=%s,num=%s", faction, num)
for posNum, objID in batLineup.posObjIDDict.items():
batObj = batObjMgr.getBatObj(objID)
if not batObj:
continue
+ heroCount += 1
objID = batObj.GetID()
npcID = batObj.GetNPCID()
heroID = batObj.GetHeroID()
@@ -2022,15 +2082,22 @@
cureHP = batObj.cureStat
batLineup.totalHurt += atkHurt
batFaction.totalHurt += atkHurt
- GameWorld.DebugLog(" Pos:%s ID=%s,npcID=%s,heroID=%s,HP=%s/%s, 输出=%s,承伤=%s,治疗=%s"
- % (posNum, objID, npcID, heroID, batObj.GetHP(), batObj.GetMaxHP(), atkHurt, defHurt, cureHP))
- lineupStatInfo[str(posNum)] = {"ObjID":objID, "HeroID":heroID, "NPCID":npcID, "AtkHurt":atkHurt, "DefHurt":defHurt, "CureHP":cureHP}
+ dead = 0 if batObj.IsAlive() else 1
+ GameWorld.DebugLogEx(" Pos:%s ID=%s,npcID=%s,heroID=%s,HP=%s/%s, 输出=%s,承伤=%s,治疗=%s",
+ posNum, objID, npcID, heroID, batObj.GetHP(), batObj.GetMaxHP(), atkHurt, defHurt, cureHP)
+ lineupStatInfo[str(posNum)] = {"ObjID":objID, "HeroID":heroID, "NPCID":npcID, "AtkHurt":atkHurt, "DefHurt":defHurt, "CureHP":cureHP,
+ "LV":batObj.GetLV(), "Star":batObj.GetStar(), "Skin":batObj.GetSkinID(), "Dead":dead}
statMsg = {"winFaction":winFaction, "statInfo":statInfo}
FBLogic.OnTurnFightOver(turnFight, mapID, funcLineID, statMsg)
turnFight.syncState(FightState_Award, statMsg)
+
+ # 流向记录
+ if mapID != ChConfig.Def_FBMapID_Main and reqPlayerID:
+ DataRecordPack.DR_FightStat(reqPlayerID, mapID, funcLineID, turnFight.isWin, turnFight.turnNum, turnFight.turnMax,
+ heroCount, turnFight.costTime, statInfo, drLineupInfo)
return
#// B4 14 查看战报 #tagCSTurnFightReportView
@@ -2075,21 +2142,28 @@
ReportRoot = "C:\TurnFightReport"
dateStr = GameWorld.ChangeTimeNumToStr(int(time.time()), "%Y%m%d")
- ReportDir = os.path.join(ReportRoot, "S%s" % reqServerID, dateStr, "%s" % reqPlayerID)
-
- GameWorld.DebugLog("ReportDir=%s" % ReportDir)
+ ReportDir = os.path.join(ReportRoot, "S%s" % reqServerID, dateStr, "%s" % reqPlayerID, "%s" % turnFight.mapID)
if not os.path.exists(ReportDir):
os.makedirs(ReportDir)
else:
- shutil.rmtree(ReportDir)
- os.makedirs(ReportDir)
-
+ items = os.listdir(ReportDir)
+ for item in items:
+ fullPath = os.path.join(ReportDir, item)
+ try:
+ os.remove(fullPath)
+ except:
+ pass
+
saveFilePath = os.path.join(ReportDir, "%s.tfr" % guid)
- GameWorld.DebugLog("saveFilePath=%s" % saveFilePath)
+ GameWorld.DebugLogEx("战报路径=%s", saveFilePath)
try:
- fp = open(saveFilePath, "w")
- fp.write(turnFight.batBuffer)
+ clientPack = ChPyNetSendPack.tagSCTurnFightReport()
+ clientPack.GUID = guid
+ clientPack.Report = turnFight.batBuffer
+ clientPack.Len = len(clientPack.Report)
+ fp = open(saveFilePath, "wb")
+ fp.write(clientPack.GetBuffer())
fp.close()
except:
return
--
Gitblit v1.8.0