From a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 14 十二月 2025 14:24:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(贾诩所有技能;5022效果支持配置buff额外属性计算方式;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index 0a510b1..93bec80 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -20,13 +20,14 @@
 import ShareDefine
 import NetPackCommon
 import PlayerControl
+import PlayerSuccess
 import ChPyNetSendPack
 import IPY_GameWorld
 import IpyGameDataPY
 import GameFuncComm
 import PlayerOnline
+import PlayerTask
 import GameWorld
-import ObjPool
 
 import time
 
@@ -119,6 +120,9 @@
     # 有升级额外处理
     if updHorseLV > horseLV:
         RefreshHorseAttr(curPlayer)
+        
+    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_HorseLVUP, costItemCount)
+    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHorseLVUP, costItemCount)
     return
 
 #// B2 02 坐骑进阶 #tagCSHorseClassUP
@@ -245,7 +249,7 @@
     return
 
 def SyncHorseClassInfo(curPlayer):
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseClassInfo)
+    clientPack = ChPyNetSendPack.tagSCHorseClassInfo()
     clientPack.ClassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
     clientPack.HorseLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseLV)
     clientPack.Exp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseExp)
@@ -408,14 +412,16 @@
     if state:
         return True
     
-#    if not ipyData:
-#        ipyData = IpyGameDataPY.GetIpyGameData("HorseSkin", horseSkinID)
-#    if ipyData:
-#        unlockWay = ipyData.GetUnlockWay()
-#        if unlockWay == 1:
-#            classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
-#            if classLV >= ipyData.GetUnlockValue():
-#                return True
+    if not ipyData:
+        ipyData = IpyGameDataPY.GetIpyGameData("HorseSkin", horseSkinID)
+    if ipyData:
+        unlockWay = ipyData.GetUnlockWay()
+        if unlockWay == 1:
+            if not ipyData.GetUnlockValue():
+                return True
+            #classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
+            #if classLV >= ipyData.GetUnlockValue():
+            #    return True
             
     return False
 
@@ -486,7 +492,7 @@
         state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_HorseSkinState, horseSkinID)
         if not state and horseSkinIDList == None:
             continue
-        horseSkin = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkin)
+        horseSkin = ChPyNetSendPack.tagSCHorseSkin()
         horseSkin.HorseSkinID = horseSkinID
         horseSkin.State = state
         horseSkin.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseSkinEndTime % horseSkinID)
@@ -496,7 +502,7 @@
     if not horseSkinList:
         return
     
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkinInfo)
+    clientPack = ChPyNetSendPack.tagSCHorseSkinInfo()
     clientPack.HorseSkinList = horseSkinList
     clientPack.Count = len(clientPack.HorseSkinList)
     NetPackCommon.SendFakePack(curPlayer, clientPack)

--
Gitblit v1.8.0