From e5d9e13d80e43fb89e00cc9e0ffafcb25e36e435 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 三月 2019 16:55:12 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(页游领地争夺战)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 287d675..1f0e0dc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -188,13 +188,6 @@
 
 Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState"  #战盟相关活动今日开启状态, 按位存储代表今日是否开启过
 
-Def_Notify_WorldKey_ManorWar = 'ManorWar'               # 领地争夺活动状态
-Def_Notify_WorldKey_ManorWarWinFamilyID = 'ManorWarWinFamilyID_%s'  # 领地争夺获胜战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarFamilyLeaderID = 'ManorWarFamilyLeaderID_%s'  # 领地争夺占领的战盟盟主id,%s地图id
-Def_Notify_WorldKey_ManorWarTempFamilyID = 'ManorWarTempFamilyID_%s'  # 领地争夺活动中临时占领的战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarLastFamilyID = 'ManorWarLastFamilyID_%s'  # 领地争夺上次占领的战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarServerDay = 'ManorWarServerDay' # 领地战活动时的开服天数
-
 Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s'   # 登录领取奖励开始时间,参数为活动类型
 Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s'   # 登录领取奖励结束时间,参数为活动类型
 
@@ -899,12 +892,6 @@
     Def_Battle_Query     # 查询
 ) = range(1, 4)
 
-
-#区域类型定义, 从5开始, C++定义到 IPY_GameWorld.gatMax 4
-(
-gatManor, # 领地区域, 领地战期间可PK, 反之为普通区域
-) = range(5, 6)  
-
 # 游戏功能ID定义,需确保唯一,与PyGameFuncControl.txt中FuncId一致
 GameFuncID_Wing = 3             # 翅膀
 GameFuncID_Pet = 6              # 宠物,灵宠
@@ -1041,7 +1028,7 @@
                                 Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息
                                 Def_UniversalGameRecType_31,
                                 Def_UniversalGameRecType_32,              
-                                Def_UniversalGameRecType_ManorWarInfo,  # 领地争夺战占领结果33
+                                Def_UniversalGameRecType_33,
                                 Def_UniversalGameRecType_34,
                                 Def_UniversalGameRecType_35,
                                 Def_UniversalGameRecType_36,
@@ -1142,8 +1129,7 @@
 #家族相关活动类型定义
 Def_FamActivityList = (
 Def_FamActivity_War, # 战盟争霸
-Def_FamActivity_Manor, # 领地争夺
-) = range(2)
+) = range(1)
 
 #副本通关类型
 (

--
Gitblit v1.8.0