From d7f44d8d871a90c818bdb3ffe9a60af875b7100a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 30 九月 2025 10:12:23 +0800
Subject: [PATCH] 135 【挑战】战锤秘境-服务端(白骨盈野;副本基础;副本扫荡;广告奖励支持;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   79 ++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 42 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 ec02178..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
 #---------------------------------------------------------------------
 ##检测学习技能需求条件
@@ -2034,11 +2029,11 @@
     needBaseAttrID, needBaseAttrValue = GetSkillUpNeedAttr(stateSkillLV)
     if needBaseAttrID and needBaseAttrValue:
         baseAttrDict = {
-                            ShareDefine.Def_Effect_Metal:PlayerControl.GetMetal(curPlayer),
-                            ShareDefine.Def_Effect_Wood:PlayerControl.GetWood(curPlayer),
-                            ShareDefine.Def_Effect_Water:PlayerControl.GetWater(curPlayer),
-                            ShareDefine.Def_Effect_Fire:PlayerControl.GetFire(curPlayer),
-                            ShareDefine.Def_Effect_Earth:PlayerControl.GetEarth(curPlayer),
+                            #ShareDefine.Def_Effect_Metal:PlayerControl.GetMetal(curPlayer),
+                            #ShareDefine.Def_Effect_Wood:PlayerControl.GetWood(curPlayer),
+                            #ShareDefine.Def_Effect_Water:PlayerControl.GetWater(curPlayer),
+                            #ShareDefine.Def_Effect_Fire:PlayerControl.GetFire(curPlayer),
+                            #ShareDefine.Def_Effect_Earth:PlayerControl.GetEarth(curPlayer),
                          }
         if needBaseAttrID not in baseAttrDict:
             GameWorld.ErrLog('    技能升级属性点条件配置错误,curSkillTypeID=%s,needBaseAttrID=%s'%(curSkillTypeID, needBaseAttrID))
@@ -2171,11 +2166,11 @@
     if skillTypeID not in PyGameData.g_elemntSkillDict:
         return isNotify, hasChangeLV
     baseAttrDict = {
-                            ShareDefine.Def_Effect_Metal:PlayerControl.GetMetal(curPlayer),
-                            ShareDefine.Def_Effect_Wood:PlayerControl.GetWood(curPlayer),
-                            ShareDefine.Def_Effect_Water:PlayerControl.GetWater(curPlayer),
-                            ShareDefine.Def_Effect_Fire:PlayerControl.GetFire(curPlayer),
-                            ShareDefine.Def_Effect_Earth:PlayerControl.GetEarth(curPlayer),
+                            #ShareDefine.Def_Effect_Metal:PlayerControl.GetMetal(curPlayer),
+                            #ShareDefine.Def_Effect_Wood:PlayerControl.GetWood(curPlayer),
+                            #ShareDefine.Def_Effect_Water:PlayerControl.GetWater(curPlayer),
+                            #ShareDefine.Def_Effect_Fire:PlayerControl.GetFire(curPlayer),
+                            #ShareDefine.Def_Effect_Earth:PlayerControl.GetEarth(curPlayer),
                          }
     activeSkillLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementLV % skillTypeID)
     limitInfoList = PyGameData.g_elemntSkillDict[skillTypeID]
@@ -3494,7 +3489,7 @@
 
         #调用攻击惩罚逻辑
         BaseAttack.DoLogic_AttackResult(attacker, defender, None, tick)
-        TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+        #TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
         
     return
 #---------------------------------------------------------------------

--
Gitblit v1.8.0