From a569a7bb683bb01edb14be508e123ba556305f9f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 26 十二月 2025 14:00:40 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(曹操所有技能;增加触发方式50-敌方受控时(硬控);)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
index 32612d3..df14000 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -470,8 +470,10 @@
         if inMain:
             updEffectiveCardDict[heroID] = [cardAddPer, index, inMain]
         else:
-            addPer = updEffectiveCardDict.get(heroID, [-1, -1, False])[0]
-            if cardAddPer > addPer:
+            effInfo = updEffectiveCardDict.get(heroID, [-1, -1, False])
+            if effInfo[2] == True:
+                pass #GameWorld.Log("    已经有在阵容中的生效卡了: index=%s" % effInfo[1])
+            elif cardAddPer > effInfo[0]:
                 updEffectiveCardDict[heroID] = [cardAddPer, index, inMain]
                 
     # 更新生效变更的卡牌

--
Gitblit v1.8.0