From 2120cc2ad13c74ed1c5b4f9432c83c9d37182a12 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 15:13:45 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单(删除旧合服相关内容)

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py |   56 --------------------------------------------------------
 1 files changed, 0 insertions(+), 56 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 4caf9cb..52e00c7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/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

--
Gitblit v1.8.0