9823 9265【主干】【小7】【骨折】跨服云购修改

hxp

2023-07-10 dcec4a9b39a53106bd80dfb41fad83e7319e728e

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

@@ -484,6 +484,7 @@
    curDateTime = datetime.datetime.strptime("%d-%d-%d %d:%d:00" % (curDateTime.year, curDateTime.month, curDateTime.day,

                                                                    curDateTime.hour, curDateTime.minute), ChConfig.TYPE_Time_Format)

    actChangeList = []

    actStateChangeList = []

    sysnCrossActInfoDict = {}

    for actName in ShareDefine.CrossActNameList:

        if actName not in actTimeInfoDict or actName not in crossActInfoDict or actName not in actCfgIDInfoDict:

@@ -498,6 +499,7 @@
                continue

            ipyData, startList, endList, notifyDict = timeInfoDict[cfgID]

            

            isEnd = True

            state = 0 # 默认关闭

            cfgID = ipyData.GetCfgID()

            groupName = ipyData.GetActGroupName()

@@ -514,6 +516,8 @@
                    if startDateTime <= curDateTime < endDateTime:

                        state = dIndex + 1 # 也是代表第几个时间段

                        break

                if endList:

                    isEnd = (curDateTime >= endList[-1])

                

            serverIDRangeList = actInfoDict.get(ShareDefine.ActKey_ServerIDRangeList)

            # 全服广播提示信息

@@ -542,8 +546,8 @@
            if not isReload and dbState == state and dbActID == actID and not forceReset:

                #已经是这个状态了

                continue

            GameWorld.Log("跨服运营活动状态: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s, dbActID=%s -> actID=%s,forceReset=%s" 
                          % (actName, cfgID, groupName, zoneID, dbState, state, dbActID, actID, forceReset))

            GameWorld.Log("跨服运营活动状态: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s,isEnd=%s, dbActID=%s -> actID=%s,forceReset=%s" 
                          % (actName, cfgID, groupName, zoneID, dbState, state, isEnd, dbActID, actID, forceReset))

            

            # 更新状态

            actInfoDict[ShareDefine.ActKey_State] = state

@@ -565,12 +569,22 @@
                else:

                    actChangeList.append([actName, ipyData, state, cfgID, groupName, zoneID, dbActID, actID, forceReset, dbTemplateID])

                    

                # 活动ID变更强制视为状态变更，防止维护前后状态一样，但其实活动ID已经不同的情况会导致无法触发状态变更

                actIDChange = True

                actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID])

                
            elif dbState != state:

                actIDChange = False

                GameWorld.Log("    活动状态变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s,actIDChange=%s,dbTemplateID=%s" 
                              % (actName, cfgID, groupName, zoneID, dbState, state, actIDChange, dbTemplateID))

                actStateChangeList.append([actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID])

                
            # 非活动中的处理完关闭后，最后删除

            if not state:

            if not state and isEnd:

                del crossActInfoDict[actName][cfgID]

                if not crossActInfoDict[actName]:

                    del crossActInfoDict[actName]

                #GameWorld.Log("    移除结束的活动: actName=%s,cfgID=%s,crossActInfoDict=%s" % (actName, cfgID, crossActInfoDict))

                GameWorld.Log("    移除结束的活动: actName=%s,cfgID=%s,crossActInfoDict=%s" % (actName, cfgID, crossActInfoDict))

                

    # 同步子服务器

    if sysnCrossActInfoDict:

@@ -583,13 +597,19 @@
        GameWorld.Log("    活动ID变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbActID=%s -> actID=%s,forceReset=%s,dbTemplateID=%s" 

                      % (actName, cfgID, groupName, zoneID, dbActID, actID, forceReset, dbTemplateID))

        

        if actName == ShareDefine.CrossActName_LuckyCloudBuy:

            import CrossLuckyCloudBuy

            CrossLuckyCloudBuy.OnLuckyCloudBuyReset(ipyData, state)

        elif actName == ShareDefine.CrossActName_AllRecharge:

        if actName == ShareDefine.CrossActName_AllRecharge:

            import CrossActAllRecharge

            CrossActAllRecharge.OnActIDChange(ipyData, state)

            

    for changeInfo in actStateChangeList:

        actName, ipyData, dbState, state, cfgID, groupName, zoneID, actIDChange, dbTemplateID = changeInfo

        GameWorld.Log("    活动状态变更: actName=%s,cfgID=%s,groupName=%s,zoneID=%s,dbState=%s -> state=%s,actIDChange=%s,dbTemplateID=%s" 
                      % (actName, cfgID, groupName, zoneID, dbState, state, actIDChange, dbTemplateID))

        
        if actName == ShareDefine.CrossActName_LuckyCloudBuy:

            import CrossLuckyCloudBuy

            CrossLuckyCloudBuy.OnLuckyCloudBuyStateChange(ipyData, actIDChange, state)

            
    return



def Sync_CrossActInfoToClientServer(serverGroupID=0):