From 912176de9ed5b45e5fe0edbb15b8796f54c56ba2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 八月 2025 19:26:52 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(武将表、NPC表 增加性别)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 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..9560250 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
@@ -1891,9 +1890,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 +1957,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 +2033,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 +2170,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 +3493,7 @@
 
         #调用攻击惩罚逻辑
         BaseAttack.DoLogic_AttackResult(attacker, defender, None, tick)
-        TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
+        #TurnAttack.OnTurnfightAttackResult(attacker, defender, curSkill)
         
     return
 #---------------------------------------------------------------------

--
Gitblit v1.8.0