From 26958aff1b844a743a805b4f9075bee800b72a46 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 04 十一月 2025 14:35:37 +0800
Subject: [PATCH] 332 【主界面】座骑系统-服务端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   69 +++++++++++++++-------------------
 1 files changed, 30 insertions(+), 39 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..7e2e8f4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -28,12 +28,9 @@
 import ItemCommon
 import OperControlManager
 import PetControl
-import ReadChConfig
 import DataRecordPack
 #import ChItem
 import ShareDefine
-import PlayerGreatMaster
-import PlayerHorse
 import GameObj
 import random
 import NetPackCommon
@@ -41,12 +38,10 @@
 import GameMap
 import collections
 import PassiveBuffEffMng
-import ChEquip
 import SkillShell
 import FBCommon
 import IpyGameDataPY
 import PyGameData
-import TurnAttack
 #---------------------------------------------------------------------
 GameWorld.ImportAll("Script\\Skill\\" , "GameSkills")
 GameWorld.ImportAll("Script\\Skill\\" , "GameBuffs")
@@ -709,29 +704,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,18 +1348,14 @@
     if GameObj.GetHP(curPlayer) <= 0:
         return
     
-    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
-        #GameWorld.DebugLog("自定义场景中,不检查!")
-        return True
-    
     #===========================================================================
     # if curPlayer.IsMoving():
     #    GameWorld.DebugLog("移动中不可使用技能")
     #    return False
     #===========================================================================
-    if curPlayer.GetPlayerVehicle() == IPY_GameWorld.pvHorse:
-        #GameWorld.DebugLog("骑马中不允许释放技能", curPlayerID)
-        PlayerHorse.PlayerRideHorseDown(curPlayer)
+    #if curPlayer.GetPlayerVehicle() == IPY_GameWorld.pvHorse:
+    #    #GameWorld.DebugLog("骑马中不允许释放技能", curPlayerID)
+    #    PlayerHorse.PlayerRideHorseDown(curPlayer)
     
     if not PlayerControl.PlayerCanStateTransfer(curPlayer):
         #GameWorld.DebugLog('CheckUseSkill, PlayerStateErr = %s '%( curPlayer.GetPlayerAction() ), curPlayerID )
@@ -1838,7 +1829,7 @@
     #===========================================================================
         
     if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill and SkillCommon.isPassiveAttr(curSkill):
-        PlayerHorse.RefreshHorseAttr(curPlayer)
+        pass#PlayerHorse.RefreshHorseAttr(curPlayer)
     else:
         if SkillCommon.isPassiveAttr(curSkill):
             curControl = PlayerControl.PlayerControl(curPlayer)
@@ -1891,9 +1882,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 +1949,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