From 5dfc9bf567fdf69a0ee8899c4966ce64b4cfe5ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 三月 2026 12:07:54 +0800
Subject: [PATCH] 547 【红颜系统】新增红颜-服务端（新增激活方式8-定军阁层；新增红颜特殊效果5-遣散/吞噬额外返还；统一A801、0320物品获得标记；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0e8f249..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)
@@ -125,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):
@@ -165,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)
@@ -185,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