10019 【砍树】回合战斗（灵宠通用；技能通用；玩家镜像支持） 1. 灵宠修改为通用模式，玩家及NPC均可召唤灵宠，NPC对应召唤的灵宠NPC与玩家...

hxp

2024-01-09 d1aa37504456311fe9d7ddc2f23f537c2408b90c

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

@@ -34,6 +34,7 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActGarbageSorting

import PlayerActBossTrial

import PlayerUniversalGameRec

import GameWorldAverageLv

import PlayerFamilyBoss

@@ -776,6 +777,11 @@
                GameWorld.Log("    dbActID变更: dbActID=%s,curActID=%s" % (dbActID, curActID))

                PlayerDBGSEvent.SetDBGSTrig_ByKey(dbOperationActIDKey, curActID)

                

                # 结束旧的

                if dbActID:

                    if actName == ShareDefine.OperationActionName_BossTrial:

                        PlayerActBossTrial.OnActEnd(actNum, ipyData, dayIndex)

                        
                if curActID:

                    if actName in ShareDefine.NeedWorldLVOperationActNameList:

                        #记录开启时世界等级

@@ -803,6 +809,8 @@
                        PlayerStore.ResetFlashSaleBuyCnt(ipyData)

                    elif actName == ShareDefine.OperationActionName_GarbageSorting:

                        PlayerActGarbageSorting.OnActStart(actNum)

                    elif actName == ShareDefine.OperationActionName_BossTrial:

                        PlayerActBossTrial.OnActStart(actNum)

                else:

                    if actName == ShareDefine.OperationActionName_GarbageSorting:

                        PlayerActGarbageSorting.OnActEnd(actNum)

@@ -1072,7 +1080,6 @@
    

    if GameWorld.IsCrossServer():

        CrossActionControl.Dispose_CrossDailyActionState()

        return

    

    todayDailyActionInfo = __GetTodayDailyActionInfo()

    if not todayDailyActionInfo:

@@ -1139,16 +1146,15 @@
def SendMapServerDailyActionState():

    # 地图启动成功时通知本日进行中的日常活动状态

    

    gameWorld = GameWorld.GetGameWorld()

    if GameWorld.IsCrossServer():

        CrossActionControl.SendMapServerCrossDailyActionState()

        return

    
    gameWorld = GameWorld.GetGameWorld()

    for dailyActionID in ShareDefine.CrossDailyActionIDList:

        dictName = ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % dailyActionID 
        state = gameWorld.GetDictByKey(dictName)

        if state:

            GameWorld.SendMapServerMsgEx(dictName, state)

    else:

        for dailyActionID in ShareDefine.CrossDailyActionIDList:

            dictName = ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % dailyActionID 
            state = gameWorld.GetDictByKey(dictName)

            if state:

                GameWorld.SendMapServerMsgEx(dictName, state)

            

    todayDailyActionInfo = __GetTodayDailyActionInfo()

    if not todayDailyActionInfo: