From 0957c665f046bee67819b7f4e223dd19baad9da4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 18:16:28 +0800
Subject: [PATCH] 16 卡牌服务端(数据备档、入库时间调整;每日3点6分入库,每30分钟备档;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

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 5feda41..ca053c1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
@@ -19,11 +19,13 @@
 import IpyGameDataPY
 import PlayerControl
 import NetPackCommon
+import PlayerGoldRush
 import ChPyNetSendPack
 import ItemControler
 import IPY_GameWorld
 import GameFuncComm
 import ShareDefine
+import PlayerHero
 import ChConfig
 import FBCommon
 
@@ -152,11 +154,38 @@
         lineID = conds[0]
         taskValue = 1 if FBCommon.IsFBPass(curPlayer, mapID, lineID) else 0
         
+    # 挑战主线关
+    elif taskType == ChConfig.TaskType_MainLevelChallenge:
+        if not conds:
+            return 0
+        mapID = ChConfig.Def_FBMapID_Main
+        lvID = conds[0]
+        taskValue = 1 if PlayerControl.IsMainLevelPass(curPlayer, lvID) else 0
+        if not taskValue:
+            challengeLVID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChallengeLVID)
+            taskValue = 1 if challengeLVID >= lvID else 0
+            
+    elif taskType == ChConfig.TaskType_FBZhanchui:
+        if not conds:
+            return 0
+        mapID = ChConfig.Def_FBMapID_Zhanchui
+        lineID = conds[0]
+        taskValue = 1 if FBCommon.IsFBPass(curPlayer, mapID, lineID) else 0
+        
+    elif taskType == ChConfig.TaskType_GoldRushWorkers:
+        taskValue = PlayerGoldRush.GetWorkerTotal(curPlayer)
+        
+    elif taskType == ChConfig.TaskType_ReqOrJoinFamily:
+        taskValue = 1 if curPlayer.GetFamilyID() else 0
+        
     elif taskType == ChConfig.TaskType_TreeLV:
         taskValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV)
         
     elif taskType == ChConfig.TaskType_RealmLV:
         taskValue = curPlayer.GetOfficialRank()
+        
+    elif taskType == ChConfig.TaskType_HeroBook:
+        taskValue = PlayerHero.GetHeroBookActCnt(curPlayer)
         
     elif taskType == ChConfig.TaskType_EquipColor:
         if not conds:
@@ -230,16 +259,6 @@
             return
         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
 

--
Gitblit v1.8.0