From 330c5a30027fd33e2f77643f4c3c2f77b4d91a0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 五月 2024 16:42:13 +0800
Subject: [PATCH] 10019 【砍树】回合战斗（回合战斗NPC相关属性统一调整到NPC扩展表；去除副本回合制表，新增冒险关卡表；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py
index 33397f8..8de5fbc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py
@@ -21,12 +21,16 @@
import PlayerControl
import GameWorld
-def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList):
+def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList):
## 回合战斗请求 - 地图验证
+
+ if tagType != ChConfig.TurnBattle_TagType_Player:
+ GameWorld.DebugLog("请求回合战斗目标异常! mapID=%s,tagType=%s,tagID=%s" % (mapID, tagType, tagID), curPlayer.GetPlayerID())
+ return
# 摇人帮助
if funcLineID == 0:
- if not tagPlayerID:
+ if not tagID:
return
awardCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MineHelpAwardCount)
awardCountMax = IpyGameDataPY.GetFuncCfg("MineAreaHelp", 1)
@@ -42,27 +46,29 @@
return True
-def OnTurnFightOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet):
+def OnTurnFightOver(curPlayer, mapID, funcLineID, tagType, tagID, valueList, fightRet):
## 回合战斗结束
- # @return: 是否需要同步GameServer, 奖励列表, 发放方式(0-不发放, 1-TurnAttack模块统一发放, 2-功能自己决定发放逻辑)
+ # @return: 是否需要同步GameServer, 奖励列表
+ needSendGameServer = True
+ awardItemList = []
# 摇人帮助
if funcLineID == 0:
# 无论胜负都要同步GameServer汇报结果
isWin = fightRet[0]
if not isWin:
- return True, [], 0
+ return needSendGameServer, awardItemList
awardItemList = IpyGameDataPY.GetFuncEvalCfg("MineAreaHelp", 2)
- return True, awardItemList, 2
+ return needSendGameServer, awardItemList
# 自己驱赶
elif funcLineID == 1:
- return True, [], 0
+ return needSendGameServer, awardItemList
return
-def OnTurnFightOver_GameServerRet(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList, ret):
+def OnTurnFightOver_GameServerRet(curPlayer, mapID, funcLineID, tagType, tagID, valueList, fightRet, awardItemList, ret):
## 回合战斗结束 - GameServer处理完毕返回
# 摇人帮助
--
Gitblit v1.8.0