From 9d0b6e92a4cdb313f5b5c451715cc1dfcb227177 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 06 六月 2024 11:18:00 +0800
Subject: [PATCH] 10130 【后端】福地争夺资源功能（增加摇人功能、支持自己驱赶；优化刷福地物品相关GM命令；）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
index ffe290e..e19922f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
@@ -18,6 +18,7 @@
import GameWorld
import GameWorldMineArea
import ChConfig
+import PlayerViewCache
def MapServer_TurnFight(curPlayer, msgList):
mapID = curPlayer.GetRealMapID()
@@ -35,6 +36,9 @@
elif msgType == "TurnFightOver":
ret = __OnTurnFightOver(curPlayer, dataMsg)
+ elif msgType == "TurnFightTagPlayerInfo":
+ ret = __OnGetTagPlayerInfo(curPlayer, dataMsg)
+
if ret == None:
return
return msgList + (ret if isinstance(ret, list) else [ret])
@@ -43,20 +47,33 @@
## 回合战斗请求
# @return: None-不允许战斗；非None-允许战斗，具体返回内容功能自己决定
- mapID, funcLineID, tagPlayerID, valueList = dataMsg
+ mapID, funcLineID, tagType, tagID, valueList = dataMsg
if mapID == ChConfig.Def_TFMapID_MineArea:
- return GameWorldMineArea.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList)
+ return GameWorldMineArea.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagID, valueList)
return
def __OnTurnFightOver(curPlayer, dataMsg):
## 回合战斗结束
- mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList = dataMsg
+ mapID, funcLineID, tagType, tagID, valueList, fightRet, awardItemList = dataMsg
if mapID == ChConfig.Def_TFMapID_MineArea:
- return GameWorldMineArea.OnTurnFightOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList)
+ return GameWorldMineArea.OnTurnFightOver(curPlayer, mapID, funcLineID, tagID, valueList, fightRet, awardItemList)
return
-
+def __OnGetTagPlayerInfo(curPlayer, dataMsg):
+ _, _, tagPlayerID, _ = dataMsg
+ if tagPlayerID < 10000:
+ return
+ cacheDict = PlayerViewCache.GetCachePropDataDict(PlayerViewCache.FindViewCache(tagPlayerID))
+ tagPlayerInfo = {
+ "Name":cacheDict.get("Name", ""),
+ "Job":cacheDict.get("Job", 0),
+ "LV":cacheDict.get("LV", 0),
+ "RealmLV":cacheDict.get("RealmLV", 0),
+ "MaxHP":cacheDict.get("MaxHP", 0),
+ "FightPower":cacheDict.get("FightPower", 0),
+ }
+ return tagPlayerInfo
--
Gitblit v1.8.0