From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 1108741..a6ac5ed 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -234,6 +234,8 @@
self.tagViewCache = tagViewCache
return
+ def getPVPPlayerID(self): return self.tagPlayerID # 获取PVP目标玩家ID，也可用于判断是否PVP
+
def isFBMap(self):
## 是否副本地图中，非主线的均视为副本
return self.mapID not in [ChConfig.Def_FBMapID_Main, ChConfig.Def_FBMapID_MainBoss]
@@ -574,7 +576,7 @@
olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
lineup = olPlayer.GetLineup(lineupID)
if lineup.IsEmpty():
- GameWorld.DebugLog("玩家没有目标阵容默认取主阵容! lineupID=%s" % lineupID)
+ GameWorld.DebugLog("玩家没有目标阵容默认取主阵容! lineupID=%s" % lineupID, curPlayer.GetPlayerID())
lineup = olPlayer.GetLineup(ShareDefine.Lineup_Main)
return lineup
@@ -1141,10 +1143,12 @@
tagViewCache = PlayerViewCache.FindViewCache(tagPlayerID)
if not tagViewCache:
GameWorld.DebugLog("目标玩家没有缓存数据! tagPlayerID=%s" % tagPlayerID, playerID)
- return {}
+ PlayerControl.NotifyCode(curPlayer, "TagNoViewCache")
+ return
defLineupInfo = GetCacheLineupInfo(tagViewCache, defLineupID)
if not defLineupInfo:
GameWorld.DebugLog("目标玩家没有该阵容数据! tagPlayerID=%s,defLineupID=%s" % (tagPlayerID, defLineupID), playerID)
+ PlayerControl.NotifyCode(curPlayer, "TagNoLineup")
return
turnMax = GetTurnMax(mapID)
@@ -1253,15 +1257,13 @@
def __doSetFightPoint(curPlayer, fightPoint):
## 设置消耗倍值
GameWorld.DebugLog("设置战锤消耗倍值: %s" % fightPoint)
- if fightPoint == 1:
- pass
- elif fightPoint == 2:
- # 条件验证
- pass
- elif fightPoint == 3:
- # 条件验证
- pass
- else:
+ 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))
return
curPlayer.SetFightPoint(fightPoint)
return
--
Gitblit v1.8.0