6211 【后端】【1.6】合服任务单（删除旧合服相关内容）

hxp

2019-02-13 2120cc2ad13c74ed1c5b4f9432c83c9d37182a12

6211 【后端】【1.6】合服任务单（删除旧合服相关内容）

 PySysDB/PySysDBG.h

@@ -39,26 +39,6 @@
    dict        LimitInfo;    //限制条件

};



//运营活动表



struct tagActionControl

{

    WORD        _ID;    //活动ID

    char        Mark[20];    //活动类型标记

    char        Data[50];    //活动数据

    WORD        LVLimit;    //限制等级

    char        OpenDate[10];    //开启日期

    char        CloseDate[10];    //结束日期

    char        ValidOpenServerDay[10];    //有效开服天, 与合服天、星期互斥

    char        ValidMixServerDay[10];    //有效合服天, 与开服天、星期互斥

    char        VaildWeek[10];    //有效星期, 与开服天、合服天互斥

    char        OpenTime[5];    //开启时间

    char        CloseTime[5];    //结束时间

    BYTE        TimeValidType;    //时间有效性

    char        SpecTimeState[50];    //特殊活动状态时间控制信息

    char        NotifyInfo[100];    //全服广播信息配置

};



//日常活动表



struct tagDailyAction


 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.py

@@ -33,22 +33,16 @@
def OnExec(curPlayer, cmdList):

    

    if len(cmdList) <= 0:

        GameWorld.DebugAnswer(curPlayer, 'SetMixServer 合服状态(0-非合服,1-合服) 合服时的开服天(选填默认15)')

        GameWorld.DebugAnswer(curPlayer, 'SetMixServer 是否合服')

        return

    

    isMix = cmdList[0]

    curDay = cmdList[1] if len(cmdList) > 1 else 15

    
    if isMix:

        #设置合服(默认设置开服天为15天)

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer, 1)

    PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer, 1 if isMix else 0)

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay, 0)

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServerInitOK, 0)

    else:

        #重置开服天，设置非合服

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer, 0)

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay, 0)

    PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay, curDay)

    openDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)

    if openDay <= 14:

        PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay, 15)  


    openDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)

    isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer)


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

@@ -20,15 +20,9 @@
import ChConfig

import datetime

import GameWorld

import ReadChConfig

import PlayerControl

import ShareDefine

#import PlayerExam

import PlayerDBGSEvent

#import PlayerManorWar

#import GameWorldShopItem

#import GameWorldActionTeHui

import GameWorldAverageLv

import CrossRealmPK

import GameWorldFamilyWar

import PlayerFamilyParty

@@ -1151,21 +1145,6 @@
# @return 返回值无意义

# @remarks 

def __DoLogic_GameServer_ActionState(dictName, isOpen):

    #===============================================================================================

    # #领地争夺战

    # if dictName == ShareDefine.Def_Notify_WorldKey_ManorWar:

    #    PlayerManorWar.ManorWar_ChangeState(isOpen)

    # #答题活动

    # elif dictName == ShareDefine.Def_Notify_WorldKey_Game_EXAM:

    #    PlayerExam.Exam_ChangeState(isOpen)

    # #特惠活动

    # elif dictName in ShareDefine.TeHuiTypeKeyDict.values():

    #    GameWorldActionTeHui.OnTeHuiActionChange(dictName, isOpen)

    # #商店状态变更

    # elif dictName.startswith(ShareDefine.Def_Notify_WorldKey_ShopState[:-2]):

    #    GameWorldShopItem.OnShopStateChange(dictName, isOpen)

    #===============================================================================================

        
    #仙盟宴会 

    if dictName == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty:

        PlayerFamilyParty.FamilyPartyStateChange(isOpen)


 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py

@@ -61,23 +61,6 @@
                        ("dict", "LimitInfo", 0),

                        ),



                "ActionControl":(

                        ("WORD", "ID", 1),

                        ("char", "Mark", 0),

                        ("char", "Data", 0),

                        ("WORD", "LVLimit", 0),

                        ("char", "OpenDate", 0),

                        ("char", "CloseDate", 0),

                        ("char", "ValidOpenServerDay", 0),

                        ("char", "ValidMixServerDay", 0),

                        ("char", "VaildWeek", 0),

                        ("char", "OpenTime", 0),

                        ("char", "CloseTime", 0),

                        ("BYTE", "TimeValidType", 0),

                        ("char", "SpecTimeState", 0),

                        ("char", "NotifyInfo", 0),

                        ),



                "DailyAction":(

                        ("DWORD", "DailyID", 1),

                        ("dict", "OpenTimeDict", 0),

@@ -568,41 +551,6 @@
        
    def GetQueryType(self): return self.QueryType # 查询类型

    def GetLimitInfo(self): return self.LimitInfo # 限制条件

# 运营活动表
class IPY_ActionControl():
    
    def __init__(self):
        self.ID = 0

        self.Mark = ""

        self.Data = ""

        self.LVLimit = 0

        self.OpenDate = ""

        self.CloseDate = ""

        self.ValidOpenServerDay = ""

        self.ValidMixServerDay = ""

        self.VaildWeek = ""

        self.OpenTime = ""

        self.CloseTime = ""

        self.TimeValidType = 0

        self.SpecTimeState = ""

        self.NotifyInfo = ""
        return
        
    def GetID(self): return self.ID # 活动ID

    def GetMark(self): return self.Mark # 活动类型标记

    def GetData(self): return self.Data # 活动数据

    def GetLVLimit(self): return self.LVLimit # 限制等级

    def GetOpenDate(self): return self.OpenDate # 开启日期

    def GetCloseDate(self): return self.CloseDate # 结束日期

    def GetValidOpenServerDay(self): return self.ValidOpenServerDay # 有效开服天, 与合服天、星期互斥

    def GetValidMixServerDay(self): return self.ValidMixServerDay # 有效合服天, 与开服天、星期互斥

    def GetVaildWeek(self): return self.VaildWeek # 有效星期, 与开服天、合服天互斥

    def GetOpenTime(self): return self.OpenTime # 开启时间

    def GetCloseTime(self): return self.CloseTime # 结束时间

    def GetTimeValidType(self): return self.TimeValidType # 时间有效性

    def GetSpecTimeState(self): return self.SpecTimeState # 特殊活动状态时间控制信息

    def GetNotifyInfo(self): return self.NotifyInfo # 全服广播信息配置

# 日常活动表
class IPY_DailyAction():
@@ -1529,8 +1477,6 @@
        self.ipyFamilyLen = len(self.ipyFamilyCache)

        self.ipyMarketQueryCache = self.__LoadFileData("MarketQuery", IPY_MarketQuery)

        self.ipyMarketQueryLen = len(self.ipyMarketQueryCache)

        self.ipyActionControlCache = self.__LoadFileData("ActionControl", IPY_ActionControl)

        self.ipyActionControlLen = len(self.ipyActionControlCache)

        self.ipyDailyActionCache = self.__LoadFileData("DailyAction", IPY_DailyAction)

        self.ipyDailyActionLen = len(self.ipyDailyActionCache)

        self.ipyDailyActionCustomCache = self.__LoadFileData("DailyActionCustom", IPY_DailyActionCustom)

@@ -1783,8 +1729,6 @@
    def GetFamilyByIndex(self, index): return self.ipyFamilyCache[index]

    def GetMarketQueryCount(self): return self.ipyMarketQueryLen

    def GetMarketQueryByIndex(self, index): return self.ipyMarketQueryCache[index]

    def GetActionControlCount(self): return self.ipyActionControlLen

    def GetActionControlByIndex(self, index): return self.ipyActionControlCache[index]

    def GetDailyActionCount(self): return self.ipyDailyActionLen

    def GetDailyActionByIndex(self, index): return self.ipyDailyActionCache[index]

    def GetDailyActionCustomCount(self): return self.ipyDailyActionCustomLen