2091 【主干】【1.0.18】神兽背包满情况下拾取错误导致内存泄露

hch

2018-10-08 af061eb963b3d4c97f3d71424f42f89f4ff3b498

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py

@@ -156,7 +156,8 @@
            # 按开服天开的

            if startDateStr.isdigit() and endDateStr.isdigit():

                startServerDay, endServerDay = int(startDateStr), int(endDateStr)

                if openServerDay > endServerDay:

                #结束日可能还需要处理广播之类，所以这里需要+1

                if openServerDay > endServerDay + 1:

                    GameWorld.Log("        当前开服天超过活动结束开服天，不处理! cfgID=%s,%s ~ %s < openServerDay(%s)" % (cfgID, startDateStr, endDateStr, openServerDay))

                    continue

                openServerDateTime = curDateTime + datetime.timedelta(days=(startServerDay-openServerDay))

@@ -178,7 +179,7 @@
                

            notifyInfoDictStart = ipyData.GetNotifyInfoStart() if hasattr(ipyData, "GetNotifyInfoStart") else {}

            notifyInfoDictEnd = ipyData.GetNotifyInfoEnd() if hasattr(ipyData, "GetNotifyInfoEnd") else {}

            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key]

            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key, [广播参数列表可选]]

            

            if len(startHMStrList) != len(endHMStrList):

                GameWorld.ErrLog("        活动配置开始及结束时间个数不匹配! actName=%s,cfgID=%s,startHMStrList=%s,endHMStrList=%s" 

@@ -205,6 +206,7 @@
            isActivity = False # 有需要处理开关时间的（开始、结束）

            isNotify = False

            isAdvanceNotice = False

            isEnd = False

            # 没配置时分的代表全天, 只要开始或结束时分没配都算

            if not startHMStrList or not endHMStrList:

                startDateTime = startDayDate

@@ -217,10 +219,12 @@
                    needStartList.append(startDateTime)

                    needEndList.append(endDateTime)

                    isActivity = True

                    isEnd = (curDateTime == endDayDate)

                    

            # 每天按时段开启的，支持多时段

            else:

                if startDayDate <= curDateTime <= endDayDate:

                    isEnd = (curDateTime == endDayDate)

                    for hmIndex, startHMStr in enumerate(startHMStrList):

                        endHMStr = endHMStrList[hmIndex]

                        # 每天开的, 实际开关时间只取今天的日期； 这里有个问题，全服广播的时间不是今天的, 暂不做支持，之后真有这种需求再说

@@ -263,9 +267,10 @@
                        isNotify = True

                        

                # 广播 - 循环广播

                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) == 2:

                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo

                    notifyInfo = [loopNotifyKey, []] # 循环广播的默认无参数，不做支持

                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) >= 2:

                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo[:2]

                    loopNotifyParamList = notifyInfoLoopInfo[2] if len(notifyInfoLoopInfo) > 2 else []

                    notifyInfo = [loopNotifyKey, loopNotifyParamList] # 循环广播的默认无参数

                    loopCount, loopMaxCount = 0, 100

                    while loopMinutes and loopNotifyKey and loopCount < loopMaxCount:

                        loopCount += 1

@@ -287,10 +292,10 @@
            if not isActivity and not isNotify and not isAdvanceNotice:

                continue

            

            GameWorld.Log("        需要处理的运营活动信息: cfgID=%s,isAdvanceNotice=%s,isActivity=%s,isNotify=%s" % (cfgID, isAdvanceNotice, isActivity, isNotify))

            # 当天有需要激活活动或者提前预告活动的取开始时间较早的为准

            GameWorld.Log("        需要处理的运营活动信息: cfgID=%s,isAdvanceNotice=%s,isActivity=%s,isEnd=%s,isNotify=%s" % (cfgID, isAdvanceNotice, isActivity, isEnd, isNotify))

            # 当天有需要激活活动或者提前预告活动的取非结束的为准，如果有多个非结束的一般就是策划在活动时间上配置交叉，这种是不允许的

            if isActivity or isAdvanceNotice:

                if not activityIpyData or activityIpyData.GetStartDate() < ipyData.GetStartDate():

                if not activityIpyData or (isActivity and not isEnd):

                    activityIpyData = ipyData

                    activityInfoDict = {ShareDefine.ActKey_CfgID:cfgID}

                    

@@ -476,10 +481,11 @@
        return

    if len(ipyData.GetStartTimeList()) != len(ipyData.GetEndTimeList()):

        return

    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1

    multiExpRateInfo = ChPyNetSendPack.tagGCMultiExpRateInfo()

    multiExpRateInfo.Clear()

    multiExpRateInfo.StartDate = ipyData.GetStartDate()

    multiExpRateInfo.EndtDate = ipyData.GetEndDate()

    multiExpRateInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    multiExpRateInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    multiExpRateInfo.ActivityTime = []

    for i, startTime in enumerate(ipyData.GetStartTimeList()):

        endTime = ipyData.GetEndTimeList()[i]

@@ -508,10 +514,11 @@
    ##多倍修行点活动信息通知

    if not ipyData:

        return

    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1

    multiRealmPointInfo = ChPyNetSendPack.tagGCMultiRealmPointInfo()

    multiRealmPointInfo.Clear()

    multiRealmPointInfo.StartDate = ipyData.GetStartDate()

    multiRealmPointInfo.EndtDate = ipyData.GetEndDate()

    multiRealmPointInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    multiRealmPointInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    multiRealmPointInfo.Multiple = ipyData.GetMultiple()

    multiRealmPointInfo.LimitLV = ipyData.GetLVLimit()

    if not curPlayer: