121 【武将】武将系统-服务端（优化广播支持按产出格子配置不同的广播；）

hxp

4 天以前 f05e181ee1f27a3a60c449477acfc6e83d83f5e9

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTask.py

@@ -19,11 +19,14 @@
import IpyGameDataPY

import PlayerControl

import NetPackCommon

import PlayerGoldRush

import ChPyNetSendPack

import DataRecordPack

import ItemControler

import IPY_GameWorld

import GameFuncComm

import ShareDefine

import PlayerHero

import ChConfig

import FBCommon



@@ -36,11 +39,11 @@
        ipyDataMgr = IpyGameDataPY.IPY_Data()

        for index in xrange(ipyDataMgr.GetTaskCount()):

            ipyData = ipyDataMgr.GetTaskByIndex(index)

            taskGroup = ipyData.GetTaskGroup()

            tGroup = ipyData.GetTaskGroup()

            taskID = ipyData.GetTaskID()

            if taskGroup not in taskIDListDict:

                taskIDListDict[taskGroup] = []

            taskIDList = taskIDListDict[taskGroup]

            if tGroup not in taskIDListDict:

                taskIDListDict[tGroup] = []

            taskIDList = taskIDListDict[tGroup]

            if taskID not in taskIDList:

                taskIDList.append(taskID)

        IpyGameDataPY.SetConfigEx(key, taskIDListDict)

@@ -98,8 +101,9 @@
        

    return



def __giveNewTask(curPlayer, taskGroup=ChConfig.TaskGroup_Main):

def __giveNewTask(curPlayer, taskGroup=ChConfig.TaskGroup_Main, preTaskID=0):

    ## 给新任务

    # @param preTaskID: 上一个任务ID

    taskIDList = GetTaskIDList(taskGroup)

    if not taskIDList:

        return

@@ -134,6 +138,12 @@
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskValue % taskGroup, 0)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TaskState % taskGroup, ChConfig.TaskState_Doing)

    GameWorld.DebugLog("接到新任务: taskGroup=%s,newTaskID=%s" % (taskGroup, newTaskID), playerID)

    
    # 额外记录接到任务

    if taskGroup == ChConfig.TaskGroup_Main:

        PlayerControl.SetMainTaskID(curPlayer, newTaskID)

    DataRecordPack.DR_Task(curPlayer, taskGroup, newTaskID, "new", {"preTaskID":preTaskID})

    
    return SetTaskValue(curPlayer, ipyData, taskValue)



def __GetTaskValue(curPlayer, ipyData):

@@ -152,11 +162,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 +267,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



@@ -328,7 +355,7 @@
        appointInfo[itemID] = appointID

    ItemControler.NotifyGiveAwardInfo(curPlayer, notifyAwardList, "Task", dataEx={"appointInfo":appointInfo})

    

    if not __giveNewTask(curPlayer, taskGroup):

    if not __giveNewTask(curPlayer, taskGroup, taskID):

        SyncTaskInfo(curPlayer, [taskGroup])

        

    GameFuncComm.DoFuncOpenLogic(curPlayer)