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/PlayerActivity.py | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index f9ea573..39bf514 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -25,7 +25,6 @@
import IpyGameDataPY
import GameWorld
import DBDataMgr
-import ObjPool
def OnDay(curPlayer):
CheckResetWeekActivity(curPlayer)
@@ -78,7 +77,8 @@
taskConds = ipyData.GetTaskConds()
if conds or taskConds:
# 可按任务类型扩展不同的条件验证方式
- if taskConds != conds:
+ if taskConds != tuple(conds):
+ #GameWorld.DebugLog("条件不同taskConds=%s,conds=%s" % (taskConds, conds))
continue
needValue = ipyData.GetNeedValue()
maxValue = max(maxValue, needValue)
@@ -93,11 +93,11 @@
def GetDailyTaskValue(curPlayer, taskType, conds=[]):
##获取完成度
- condition = "" if not conds else str(conds).replace(" ", "")[1:-1]
+ condition = "" if not conds else str(list(conds)).replace(" ", "")[1:-1]
return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DailyTaskValue % (taskType, condition))
def SetDailyTaskValue(curPlayer, taskType, conds, value):
##设置完成度
- condition = "" if not conds else str(conds).replace(" ", "")[1:-1]
+ condition = "" if not conds else str(list(conds)).replace(" ", "")[1:-1]
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyTaskValue % (taskType, condition), value)
GameWorld.DebugLog("更新每日任务进度值: taskType=%s,conds=%s,value=%s" % (taskType, condition, value), curPlayer.GetPlayerID())
return
@@ -124,7 +124,8 @@
updState = taskState|pow(2, taskID)
GameWorld.DebugLog("每日任务领奖! taskID=%s,updState=%s" % (taskID, updState), playerID)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyTaskState, updState)
- DoAddActivity(curPlayer, ipyData.GetAwardLiveness())
+ awardItemList = ipyData.GetAwardItemList()
+ ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["DailyTaskAward", False, {}])
return
def DoAddActivity(curPlayer, addValue):
@@ -164,7 +165,7 @@
return
def SyncDailyTaskInfo(curPlayer, taskType=0, conds=[], isAll=False):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDailyTaskInfo)
+ clientPack = ChPyNetSendPack.tagSCDailyTaskInfo()
clientPack.ActivityTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ActivityTotal)
clientPack.ActivityAward = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ActivityAward)
clientPack.DailyTaskState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DailyTaskState)
@@ -184,7 +185,7 @@
clientPack.TaskList = []
for taskType, conds in syncTaskCondList:
- task = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDailyTask)
+ task = ChPyNetSendPack.tagSCDailyTask()
task.TaskType = taskType
task.Conds = conds
task.CLen = len(task.Conds)
--
Gitblit v1.8.0