From bd3ae908be312a85f4bcb0e1cfb80a637dfb8986 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 十一月 2025 18:02:45 +0800
Subject: [PATCH] 92 【主界面】主线任务-服务端（增加任务类型10-挑战主线关卡xxx； 主线任务奖励支持给定制属性装备；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py | 5 ++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py | 26 +++++++++++++++++++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 3 ++-
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 63faebc..2b8f9ab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -5124,7 +5124,8 @@
TaskType_KillNPC, # 击败X只怪物 7
TaskType_GetMoney, # 累计获得xx货币 8
TaskType_EquipColor, # 穿戴x件x品质及以上装备 9
-) = range(1, 1 + 9)
+TaskType_MainLevelChallenge, # 主线挑战xxx 10
+) = range(1, 1 + 10)
# 任务分组
TaskGroupList = (
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
index 91b8967..3d11e6e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
@@ -19,8 +19,9 @@
import IpyGameDataPY
import PlayerControl
import ItemControler
-
+import PlayerTask
import FBCommon
+import ChConfig
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList):
## 回合战斗请求
@@ -59,6 +60,8 @@
GameWorld.DebugLog("最后一波未通过，无法挑战本关boss! passWave=%s < %s" % (wave, waveMax))
return
+ PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_MainLevelChallenge, 1, [levelID])
+
return True, levelID
def GetFBNPCLineupInfo(curPlayer, mapID, funcLineID):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
index 1ff3d57..5feda41 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
@@ -231,6 +231,16 @@
if conds[0] != taskConds[0]:
return
+ # 挑战主线关
+ elif taskType == ChConfig.TaskType_MainLevelChallenge:
+ taskConds = ipyData.GetTaskConds()
+ if not conds or len(conds) != len(taskConds):
+ return
+ if conds[0] < taskConds[0]:
+ #GameWorld.DebugLog("挑战小于的不算完成: %s < TaskCond:%s" % (conds[0], taskConds[0]))
+ return
+ #GameWorld.DebugLog("挑战大于等于都算完整: %s >= TaskCond:%s" % (conds[0], taskConds[0]))
+
return True
def SetTaskValue(curPlayer, taskIpyData, value=0, isNotify=True):
@@ -298,15 +308,25 @@
if curState != ChConfig.TaskState_CanGet:
GameWorld.DebugLog("任务未完成无法领奖: taskID=%s,curValue=%s/%s,curState=%s" % (taskID, curValue, needValue, curState), playerID)
return
- #if not ItemControler.CheckPackSpaceEnough(curPlayer, awardItemList):
- # return
+ if not ItemControler.CheckPackSpaceEnough(curPlayer, awardItemList):
+ return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskIDLast % taskGroup, taskID)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskID % taskGroup, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskValue % taskGroup, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskState % taskGroup, 0)
- ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["Task", False, {}])
+ # 支持定制属性物品
+ isAuctionItem = 0
+ notifyAwardList = []
+ appointInfo = {}
+ for itemID, itemCount, appointID in awardItemList:
+ setAttrDict = {ShareDefine.Def_CItemKey_AppointID:appointID} if appointID else {}
+ if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isAuctionItem, event=["Task", False, {}], setAttrDict=setAttrDict):
+ continue
+ notifyAwardList.append([itemID, itemCount, isAuctionItem])
+ appointInfo[itemID] = appointID
+ ItemControler.NotifyGiveAwardInfo(curPlayer, notifyAwardList, "Task", dataEx={"appointInfo":appointInfo})
if not __giveNewTask(curPlayer, taskGroup):
SyncTaskInfo(curPlayer, [taskGroup])
--
Gitblit v1.8.0