From f198885f31c9c7eb19eb28adce562e39e64d581c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 七月 2025 16:23:11 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(属性计算、战斗力计算;新角色初始给默认装备、默认阵容武将;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 0311541..e1e95ad 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -517,14 +517,6 @@
         self.turnFight.clearFight()
         return
     
-    def playerLogin(self, curPlayer):
-        self.turnFight.curPlayer = curPlayer
-        return
-    
-    def playerOffline(self, curPlayer):
-        self.turnFight.curPlayer = None
-        return
-    
 def GetMainFightMgr(curPlayer):
     ## 获取主线战斗管理
     olPlayer = PlayerOnline.GetOnlineMgr().GetOnlinePlayer(curPlayer)
@@ -1412,7 +1404,7 @@
                 continue
             skillTypeID = useSkill.GetSkillTypeID()
             # 常规攻击优先xp
-            if SkillCommon.isXPSkill(useSkill) and turnBattleType == ChConfig.TurnBattleType_Normal:
+            if SkillCommon.isAngerSkill(useSkill) and turnBattleType == ChConfig.TurnBattleType_Normal:
                 if curXP < xpMax:
                     continue
                 useCnt = -1 # xp技能优先释放
@@ -1704,11 +1696,11 @@
         return
     
     skillID = curSkill.GetSkillID() if curSkill else 0
-    isXP = SkillCommon.isXPSkill(curSkill)
+    isXP = SkillCommon.isAngerSkill(curSkill)
     if isXP:
         GameObj.SetXP(curObj, 0)
     elif curSkill:
-        if SkillCommon.isTurnNormalAtkSkill(curSkill):
+        if SkillCommon.isTurnNormalSkill(curSkill):
             addXP = IpyGameDataPY.GetFuncCfg("AngerXP", 3)
             AddTurnFightXP(curObj, addXP, "skillID:%s" % skillID)
             

--
Gitblit v1.8.0