374 【活动内容】开服庆典-服务端（优化庆典成就任务更新进度不受功能开启限制；）

hxp

9 天以前 6ca833b5d01d8e5096be6efde1235b341665ae04

374 【活动内容】开服庆典-服务端（优化庆典成就任务更新进度不受功能开启限制；）

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

@@ -113,10 +113,11 @@
def GetOSACelebrationState(curPlayer):

    ## 玩家是否在开服庆典活动中

    # @return: 0-未开启；1-活动中；2-结束显示期；3-结束关闭期

    funcID = ShareDefine.GameFuncID_OSA_Celebration

    if not GameFuncComm.GetFuncCanUse(curPlayer, funcID):

        #GameWorld.DebugLog("开服庆典功能未开启! funcID=%s" % (funcID))

        return 0

    #开服庆典，后端不限制功能是否开启

    #funcID = ShareDefine.GameFuncID_OSA_Celebration

    #if not GameFuncComm.GetFuncCanUse(curPlayer, funcID):

    #    #GameWorld.DebugLog("开服庆典功能未开启! funcID=%s" % (funcID))

    #    return 0

    endDay = IpyGameDataPY.GetFuncCfg("OSACelebration", 1)

    serverDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1

    if serverDay <= endDay:


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

@@ -100,7 +100,7 @@
    ## 根据多种条件更新进度，如装备多品质的

    # @param conditionCountDict: 条件对应件数，条件需用元组为key {(c, ...):cnt, ..}

    if successType in ShareDefine.OSASuccTypeList:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) != 1:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) > 1:

            return

    ipyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("Success", successType)

    if not ipyDataList:

@@ -160,7 +160,7 @@


def UptateSuccessProgress(curPlayer, successType, newCnt, condition=[]):

    if successType in ShareDefine.OSASuccTypeList:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) != 1:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) > 1:

            return

    ipyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("Success", successType)

    if not ipyDataList:

@@ -276,7 +276,7 @@
    if successType not in ShareDefine.SuccessTypeList:

        return

    if successType in ShareDefine.OSASuccTypeList:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) != 1:

        if OpenServerActivity.GetOSACelebrationState(curPlayer) > 1:

            return

    ipyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("Success", successType)

    if not ipyDataList: