From b100e60651bd69472519d964f2e225148cfe7774 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 20 一月 2026 18:27:05 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（命格青龙、白虎调整为光环技能；优化光环技能支持层级；增加出发方式60-冰冻目标时；优化触发方式受控时、敌方受控时触发时机，解决受控触发被动导致的技能标签嵌套顺序问题；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
index 15f5a30..26f5dff 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
@@ -25,7 +25,7 @@
import PlayerGubao
import PlayerCoin
import ChConfig
-import ObjPool
+
import time
# 战令类型
@@ -35,10 +35,12 @@
ZhanlingType_MainLevel, # 主线关卡 3
ZhanlingType_GubaoCnt, # 古宝数量 4
ZhanlingType_ArenaCnt, # 演武场次数 5
-) = range(1, 1 + 5)
+ZhanlingType_WeekActivity, # 周活跃 6
+ZhanlingType_MainLevelPlus, # 主线关卡 7
+) = range(1, 1 + 7)
# 用Value1记录进度的战令类型
-ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt]
+ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt, ZhanlingType_WeekActivity]
def OnPlayerLogin(curPlayer):
for zhanlingType in ZhanlingTypeList:
@@ -226,7 +228,7 @@
curValue = curPlayer.GetLV()
elif zhanlingType == ZhanlingType_TreeLV:
curValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV)
- elif zhanlingType == ZhanlingType_MainLevel:
+ elif zhanlingType in [ZhanlingType_MainLevel, ZhanlingType_MainLevelPlus]:
lvID = needValue
curValue = lvID if PlayerControl.IsMainLevelPass(curPlayer, lvID) else 0
elif zhanlingType == ZhanlingType_GubaoCnt:
@@ -331,7 +333,7 @@
rewardList = []
for ipyData in ipyDataList:
rewardIndex = ipyData.GetRewardIndex()
- reward = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCZhanling)
+ reward = ChPyNetSendPack.tagMCZhanling()
reward.Clear()
reward.NeedValue = ipyData.GetNeedValue()
reward.FreeRewardState = 1 if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ZhanlingRewardFree, rewardIndex, True, [zhanlingType]) else 0
@@ -339,7 +341,7 @@
reward.ZLRewardStateH = 1 if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ZhanlingRewardH, rewardIndex, True, [zhanlingType]) else 0
rewardList.append(reward)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCZhanlingInfo)
+ clientPack = ChPyNetSendPack.tagMCZhanlingInfo()
clientPack.Clear()
clientPack.ZhanlingType = zhanlingType
clientPack.IsActivite = 1 if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhanlingState)&pow(2, zhanlingType) else 0
--
Gitblit v1.8.0