From 18df4f587c3e6782da7c83ee27db78482b674c34 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 十二月 2025 10:13:54 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(生效卡牌逻辑修改: 主阵容中的优先生效;生效中的卡牌无法遣散;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
index c640cc3..ad97def 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
@@ -20,6 +20,7 @@
 import TurnAttack
 import ShareDefine
 import IpyGameDataPY
+import PlayerSuccess
 import PlayerControl
 import PlayerActivity
 import ChPyNetSendPack
@@ -159,6 +160,7 @@
                 curMoney = PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_ArenaTicket)
                 storeMax = PlayerArena.GetArenaTicketStoreMax(curPlayer)
                 if curMoney >= storeMax:
+                    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntBooty % itemID, 0)
                     GameWorld.DebugLog("挑战券已达存储上限! itemID=%s,curMoney=%s >= %s" % (itemID, curMoney, storeMax), playerID)
                     continue
                 
@@ -432,6 +434,7 @@
     ChEquip.RefreshRoleEquipAttr(curPlayer)
     
     PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_EquipColor)
+    PlayerSuccess.UpdateEquipSuccess(curPlayer)
     return
 
 def __doDecomposeMainEquip(curPlayer, itemIndexList):
@@ -485,6 +488,7 @@
     PlayerLLMJ.AddExpDecompose(curPlayer, mjExTotal)
     PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_EquipDecompose, decomposeCnt)
     PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_EquipDecompose, decomposeCnt)
+    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAEquipDecompose, decomposeCnt)
     return
 
 def __doPickupMainItem(curPlayer, itemIndexList):
@@ -534,9 +538,10 @@
     NetPackCommon.SendFakePack(curPlayer, clientPack)
     return
 
-def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
+def OnTurnFightOver(turnFight, mapID, funcLineID, overMsg):
     ## 回合战斗结束
     
+    curPlayer = turnFight.curPlayer
     if not curPlayer:
         return
     

--
Gitblit v1.8.0