From 985bdf70fd0022733f75bf2106e69c6de77c26b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 17:29:51 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(卑弥呼所有技能;技能表增加字段Buff保留-BuffRetain,支持死亡保留、复活保留;增加触发方式42-大回合开始时(死亡后有效);增加属性ID 73复活生命加成、74复活怒气加成;优化效果6014-支持失败次数额外概率;优化死亡、复活时的buff处理;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 18a3e8b..c297ea6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -94,11 +94,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
@@ -125,7 +125,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):

--
Gitblit v1.8.0