From 21633503720673ff5d9074a3126e9ed652178594 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 十月 2025 15:17:47 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化战斗结算时机，修复某个阵营全部被击杀后在某些情况下不会马上结算的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index fd10975..84f9426 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -32,7 +32,6 @@
import DataRecordPack
#import ChItem
import ShareDefine
-import PlayerGreatMaster
import PlayerHorse
import GameObj
import random
@@ -709,29 +708,29 @@
continue
npcObj.StopMove()
npcObj.ChangePos(npcPos.PosX, npcPos.PosY)
- BeatBackMove(curPlayer, npcObj)
+ #BeatBackMove(curPlayer, npcObj)
return
-# 针对NPC被推出远距离一直卡墙角问题，法宝挑战副本特殊处理为超过4米 NPC自动回退一些
-def BeatBackMove(curPlayer, npcObj):
- if GameWorld.GetMap().GetMapID() != ChConfig.Def_FBMapID_MagicWeapon:
- return
- if npcObj.GetCurAction() == IPY_GameWorld.laNPCSkillWarning:
- return
-
- posMap = npcObj.GetRefreshPosAt(npcObj.GetCurRefreshPointIndex())
- if not posMap:
- return
- #范围校验
- posMapX = posMap.GetPosX()
- posMapY = posMap.GetPosY()
- if GameWorld.GetDist(npcObj.GetPosX(), npcObj.GetPosY(), posMapX, posMapY) < 8:
- # 单次位移不超过5米
- return
- npcControl = NPCCommon.NPCControl(npcObj)
- moveDestX, moveDestY = npcControl.GetMoveNearPosEx(posMapX, posMapY, 5)
- npcObj.Move(moveDestX, moveDestY)
- return
+## 针对NPC被推出远距离一直卡墙角问题，法宝挑战副本特殊处理为超过4米 NPC自动回退一些
+#def BeatBackMove(curPlayer, npcObj):
+# if GameWorld.GetMap().GetMapID() != ChConfig.Def_FBMapID_MagicWeapon:
+# return
+# if npcObj.GetCurAction() == IPY_GameWorld.laNPCSkillWarning:
+# return
+#
+# posMap = npcObj.GetRefreshPosAt(npcObj.GetCurRefreshPointIndex())
+# if not posMap:
+# return
+# #范围校验
+# posMapX = posMap.GetPosX()
+# posMapY = posMap.GetPosY()
+# if GameWorld.GetDist(npcObj.GetPosX(), npcObj.GetPosY(), posMapX, posMapY) < 8:
+# # 单次位移不超过5米
+# return
+# npcControl = NPCCommon.NPCControl(npcObj)
+# moveDestX, moveDestY = npcControl.GetMoveNearPosEx(posMapX, posMapY, 5)
+# npcObj.Move(moveDestX, moveDestY)
+# return
#===============================================================================
# //B4 03 吸引NPC仇恨 #tagNPCAttention
@@ -1353,10 +1352,6 @@
if GameObj.GetHP(curPlayer) <= 0:
return
- if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
- #GameWorld.DebugLog("自定义场景中，不检查!")
- return True
-
#===========================================================================
# if curPlayer.IsMoving():
# GameWorld.DebugLog("移动中不可使用技能")
@@ -1891,9 +1886,9 @@
# if not PlayerHorse.CheckLearnHorseSkill(curPlayer, curSkillTypeID):
# return False
#天赋技学习点数判断
- if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
- if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):
- return False
+ #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
+ # if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):
+ # return False
#经验检测
skillLvUpNeedExp = upSkill.GetLVUpCostExp()
@@ -1958,8 +1953,8 @@
#GeRen_jin_474794 <n color="255,255,0" BKCOLOR="0,0,0">您消耗了经验值:</n><n color="0,190,255" BKCOLOR="0,0,0">{%S1%}</n>
PlayerControl.NotifyCode(curPlayer, "GeRen_jin_474794", [skillLvUpNeedExp])
- if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
- PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, -1)
+ #if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
+ # PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, -1)
return True
#---------------------------------------------------------------------
##检测学习技能需求条件
--
Gitblit v1.8.0