ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
@@ -26,7 +26,6 @@
import ItemControler
import IpyGameDataPY
import PyGameData
import ObjPool
#成就奖励是否已领取
def GetSuccHasGot(curPlayer, succID):
@@ -100,7 +99,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 +159,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 +275,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:
@@ -353,13 +352,12 @@
            syncTypeCondList.append(tcList)
            
    successInfoList = []
    objPoolMgr = ObjPool.GetPoolMgr()
    for succType, conds in syncTypeCondList:
        curValue = GetSuccValue(curPlayer, succType, conds)
        # 不发送为0的数据
        if not isSendZero and curValue <= 0:
            continue
        succInfo = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessInfo)
        succInfo = ChPyNetSendPack.tagSCSuccessInfo()
        succInfo.SuccType = succType
        succInfo.Conds = conds
        succInfo.CLen = len(succInfo.Conds)
@@ -369,7 +367,7 @@
    if not successInfoList:
        return
    
    clientPack = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessInfoList)
    clientPack = ChPyNetSendPack.tagSCSuccessInfoList()
    clientPack.SuccessInfoList = successInfoList
    clientPack.Count = len(clientPack.SuccessInfoList)
    NetPackCommon.SendFakePack(curPlayer, clientPack)
@@ -391,13 +389,12 @@
        maxSuccID = ipyDataMgr.GetSuccessByIndex(succCnt - 1).GetSuccID()
        recordIndexList = xrange(maxSuccID / 31 + 1)
        
    objPoolMgr = ObjPool.GetPoolMgr()
    recordList = []
    for i in recordIndexList:
        awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuccessAward % i)
        if not isSyncZero and not awardRecord:
            continue
        recordInfo = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessAwardRecord)
        recordInfo = ChPyNetSendPack.tagSCSuccessAwardRecord()
        recordInfo.RecordIndex = i
        recordInfo.Record = awardRecord
        recordList.append(recordInfo)
@@ -405,7 +402,7 @@
    if not recordList:
        return
    
    clientPack = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessAwardRecordList)
    clientPack = ChPyNetSendPack.tagSCSuccessAwardRecordList()
    clientPack.RecordList = recordList
    clientPack.RecordCnt = len(clientPack.RecordList)
    NetPackCommon.SendFakePack(curPlayer, clientPack)