From f20e4c080bb0662a80e1dfac2250013c987acf06 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 08 一月 2026 14:40:37 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端（寻宝结果A350增加寻宝类型等通知；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 15 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 264e875..5829731 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -584,25 +584,26 @@
lineupInfo = lineupDict.get("%s" % ShareDefine.Lineup_Main, {})
return lineupInfo
-def GetPlayerLineupFightPower(curPlayer, lineupID):
+def GetPlayerLineupFightPower(curPlayer, lineupID=ShareDefine.Lineup_Main):
## 获取玩家阵容战力，一般用于直接获取阵容战力记录用
return GetPlayerLineup(curPlayer, lineupID).fightPower
-def GetPlayerLineup(curPlayer, lineupID):
+def GetPlayerLineup(curPlayer, lineupID=ShareDefine.Lineup_Main, exclusiveMapID=0):
## 获取玩家阵容
olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
- lineup = olPlayer.GetLineup(lineupID)
+ lineup = olPlayer.GetLineup(lineupID, exclusiveMapID=exclusiveMapID)
if lineup.IsEmpty():
GameWorld.DebugLogEx("玩家没有目标阵容默认取主阵容! lineupID=%s", lineupID, curPlayer.GetPlayerID())
lineup = olPlayer.GetLineup(ShareDefine.Lineup_Main)
return lineup
-def GetPlayerLineupInfo(curPlayer, lineupID):
+def GetPlayerLineupInfo(curPlayer, lineupID, exclusiveMapID=0):
## 获取玩家阵容信息，可用于战斗或查看缓存，因为可能取玩家的缓存进行对战，所以统一使用json格式，前端通用
# @param lineupID: 阵容ID
+ # @param exclusiveMapID: 专享阵容的地图ID，如定军阁
# @return: 阵容全部信息json字典，前端通用格式
playerID = curPlayer.GetPlayerID()
- lineup = GetPlayerLineup(curPlayer, lineupID)
+ lineup = GetPlayerLineup(curPlayer, lineupID, exclusiveMapID)
if lineup.IsEmpty():
return {}
@@ -645,11 +646,12 @@
lineupInfo = {"PlayerID":playerID, "FightPower":lineup.fightPower, "ShapeType":lineup.shapeType, "Hero":heroDict}
return lineupInfo
-def GetNPCLineupInfo(lineupID, strongerLV=0, difficulty=0, isLog=True):
+def GetNPCLineupInfo(lineupID, strongerLV=0, difficulty=0, isLog=True, viewNPCID=0):
## 获取NPC阵容信息
# @param lineupID: 阵容ID
# @param npcLV: 成长NPC等级
# @param difficulty: 成长NPC难度系数
+ # @param viewNPCID: 查看指定的NPCID，供前端查询NPC属性用
# @return: 阵容全部信息json字典，前端通用格式
lineupInfo = GetGMTestNPCLineupInfo(lineupID, strongerLV, difficulty)
if lineupInfo:
@@ -667,10 +669,14 @@
npcID = getattr(ipyData, "GetPosNPCID%s" % posNum)()
if not npcID:
continue
+ if viewNPCID and viewNPCID != npcID:
+ continue
battleDict = GetNPCBattleDict(ipyData, npcID, strongerLV, difficulty, isLog)
if not battleDict:
continue
heroDict[str(posNum)] = battleDict
+ if viewNPCID:
+ break
lineupInfo = {"NPCLineupID":lineupID, "Hero":heroDict, "BossID":bossID, "BossPosView":bossPosView}
return lineupInfo
@@ -849,8 +855,8 @@
"SkinID":skinID,
"LV":npcLV,
"Star":star,
- #"BreakLV":breakLV,
- #"AwakeLV":awakeLV,
+ "BreakLV":breakLV,
+ "AwakeLV":awakeLV,
"AttrDict":{str(k):v for k, v in batAttrDict.items() if v > 0},
"SkillIDList":skillIDList,
}
@@ -1100,11 +1106,6 @@
if FBCommon.CheckCanEnterFBComm(curPlayer, mapID, funcLineID, fbIpyData, fbLineIpyData) != ShareDefine.EntFBAskRet_OK:
return
- # 攻防方所使用的阵容ID
- atkLineupID, defLineupID = FBLogic.GetFBPlayerLineupID(curPlayer, mapID, funcLineID)
- if atkLineupID not in ShareDefine.LineupList or defLineupID not in ShareDefine.LineupList:
- return
-
if CheckFightCD(curPlayer, tick, "TurnFightReqTick"):
return
@@ -1112,9 +1113,10 @@
playerServerID = GameWorld.GetPlayerServerID(curPlayer)
guid = GameWorld.GetGUID()
- atkLineupInfo = GetPlayerLineupInfo(curPlayer, atkLineupID)
+ atkLineupID = ShareDefine.Lineup_Main # 进攻方默认使用主阵容
+ atkLineupInfo = GetPlayerLineupInfo(curPlayer, atkLineupID, mapID)
if not atkLineupInfo:
- GameWorld.DebugLogEx("玩家没有该阵容数据! atkLineupID=%s", atkLineupID, playerID)
+ GameWorld.DebugLogEx("玩家没有该阵容数据! atkLineupID=%s,mapID=%s", atkLineupID, mapID, playerID)
return
# 玩家
@@ -1127,6 +1129,7 @@
PlayerControl.NotifyCode(curPlayer, "TagNoViewCache")
return
+ defLineupID = ChConfig.MapLineIDDict.get(mapID, ShareDefine.Lineup_Main)
defLineupInfo = GetCacheLineupInfo(tagViewCache, defLineupID)
if not defLineupInfo:
GameWorld.DebugLogEx("目标玩家没有该阵容数据! tagPlayerID=%s,defLineupID=%s", tagPlayerID, defLineupID, playerID)
@@ -1813,6 +1816,16 @@
if not curSkill:
continue
skillID = curSkill.GetSkillID()
+
+ # 每大回合重置能量
+ if curSkill.GetEnergy():
+ for eIndex in range(curSkill.GetEffectCount()):
+ effect = curSkill.GetEffect(eIndex)
+ if effect.GetEffectID() == ChConfig.PassiveEff_EnergySkill and effect.GetEffectValue(2) == 1:
+ curSkill.SetEnergy(0)
+ GameWorld.DebugLogEx(" 每大回合重置技能能量! curID=%s,skillID=%s", curID, skillID)
+ break
+
preTurnUseCnt = batObj.GetSkillTurnUseCnt(skillID)
remainTime = curSkill.GetRemainTime()
if remainTime <= 0:
@@ -2177,6 +2190,82 @@
PlayerControl.NotifyCode(curPlayer, "FightReportExpired")
return
+#// B4 16 查看NPC属性 #tagCSViewNPCAttr
+#
+#struct tagCSViewNPCAttr
+#{
+# tagHead Head;
+# DWORD MapID; // 自定义地图ID，可用于绑定战斗地图场景功能（如主线boss、爬塔、竞技场等）
+# DWORD FuncLineID; // MapID对应的扩展值，如具体某个关卡等
+# DWORD ViewNPCID; // 指定查看某个NPCID，发0则查看该关卡阵容所有NPC
+#};
+def OnViewNPCAttr(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ mapID = clientData.MapID
+ funcLineID = clientData.FuncLineID
+ viewNPCID = clientData.ViewNPCID
+ SyncLineupNPCAttr(curPlayer, mapID, funcLineID, viewNPCID)
+ return
+
+def SyncLineupNPCAttr(curPlayer, mapID, funcLineID, viewNPCID=0):
+ lineupIDList = []
+ strongerLV, difficulty = 0, 0
+
+ if mapID == ChConfig.Def_FBMapID_MainBoss:
+ chapterID = funcLineID / 100
+ levelNum = funcLineID % 100
+ levelIpyData = IpyGameDataPY.GetIpyGameData("MainLevel", chapterID, levelNum)
+ if not levelIpyData:
+ return
+ lineupIDList = levelIpyData.GetBossLineupIDList() # Boss波阵容ID列表，小队1阵容ID|小队2阵容ID|...
+ strongerLV = levelIpyData.GetNPCLV()
+ difficulty = levelIpyData.GetDifficulty()
+
+ else:
+ fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, funcLineID)
+ if fbLineIpyData:
+ lineupIDList = fbLineIpyData.GetLineupIDList()
+ strongerLV = fbLineIpyData.GetNPCLV()
+ difficulty = fbLineIpyData.GetDifficulty()
+ else:
+ ret = FBLogic.GetFBNPCLineupInfo(curPlayer, mapID, funcLineID)
+ if not ret:
+ return
+ lineupIDList, strongerLV, difficulty = ret
+
+ if not lineupIDList:
+ return
+
+ npcAttrList = []
+ for lineupID in lineupIDList:
+ lineupInfo = GetNPCLineupInfo(lineupID, strongerLV, difficulty, False, viewNPCID=viewNPCID)
+ if not lineupInfo:
+ continue
+ heroDict = lineupInfo["Hero"]
+ for posNum, attrInfo in heroDict.items():
+ posNum = int(posNum)
+ npcAttr = ChPyNetSendPack.tagSCViewNPCAttr()
+ npcAttr.PosNum = posNum
+ npcAttr.NPCID = attrInfo["NPCID"]
+ npcAttr.HeroID = attrInfo["HeroID"]
+ npcAttr.LV = attrInfo["LV"]
+ npcAttr.Star = attrInfo["Star"]
+ npcAttr.BreakLV = attrInfo["BreakLV"]
+ npcAttr.AwakeLV = attrInfo["AwakeLV"]
+ npcAttr.AttrMsg = json.dumps(attrInfo["AttrDict"], ensure_ascii=False).replace(" ", "")
+ npcAttr.AttrLen = len(npcAttr.AttrMsg)
+ npcAttrList.append(npcAttr)
+ if not npcAttrList:
+ return
+ clientPack = ChPyNetSendPack.tagSCViewNPCAttrRet()
+ clientPack.MapID = mapID
+ clientPack.FuncLineID = funcLineID
+ clientPack.ViewNPCID = viewNPCID
+ clientPack.NPCAttrList = npcAttrList
+ clientPack.NPCCnt = len(clientPack.NPCAttrList)
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
+ return
+
def SyncTurnFightReport(curPlayer, guid, reprot):
## 通知完整战报
clientPack = ChPyNetSendPack.tagSCTurnFightReport()
--
Gitblit v1.8.0