From 47813c8aef184ab6bc6f4556d2a18303a2a31d47 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 14 十月 2025 12:33:30 +0800
Subject: [PATCH] 15 卡牌服务端搭建 - 跨服支持PY自定义封包通信

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 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 9560250..84f9426 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -708,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
@@ -1351,10 +1351,6 @@
 def __CheckPlayerUseSkill_ClientPack(curPlayer, posX, posY, curSkill):
     if GameObj.GetHP(curPlayer) <= 0:
         return
-    
-    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
-        #GameWorld.DebugLog("自定义场景中,不检查!")
-        return True
     
     #===========================================================================
     # if curPlayer.IsMoving():

--
Gitblit v1.8.0