hxp
2025-11-25 3372c42f7017bbe6f8e111197ef64476014e21e6
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py
@@ -19,6 +19,7 @@
import IpyGameDataPY
import PlayerControl
import NetPackCommon
import PlayerGoldRush
import ChPyNetSendPack
import ItemControler
import IPY_GameWorld
@@ -152,6 +153,30 @@
        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)
        
@@ -230,16 +255,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