From acb03a0a858d43b74127736d8ab85204b5728a8e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 六月 2019 15:26:33 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 触发技能字段改成 指定技能ID, 不通过等级获得

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py
index a75a629..366cb50 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py
@@ -21,7 +21,6 @@
 # @change: "2012-10-16 17:30" jiang 增加一枚举Def_ResetPlayerBillboard
 # @change: "2012-11-01 15:30" wdb 新增跨服赛淘汰赛(跨服服务器)调用
 # @change: "2012-11-08 14:30" whx 新增跨服调用
-# @change: "2012-11-09 21:00" jiang jiang 增加一枚举Def_ServerLastOpenActionDay
 # @change: "2012-11-21 11:00" wdb 跨服赛报名(上传数据)调整
 # @change: "2012-11-29 11:30" jiang OnDay通知国王服务器开启天数
 # @change: "2012-11-29 13:00" hyx 新增跨服赛事件枚举
@@ -81,8 +80,8 @@
 #上次合服时的开服天数
 Def_LastMixServerDay = 'LastMixServerDay'
 
-#上次开服天数开启的活动时的时间(Def_ServerDay的值)
-Def_ServerLastOpenActionDay = "ServerLastOpenActionDay"
+#上次合服时的世界等级
+Def_LastMixServerWorldLV = 'LastMixServerWorldLV'
 
 #首次开服时间,注意不要用该日期做开服天相关的功能逻辑,如果要用开服天,请用 Def_ServerDay
 ''' 原因: 
@@ -97,6 +96,8 @@
 Def_FamilyWar_Round = 'FamilyWar_Round'
 #仙盟联赛是否已经处理过总结算
 Def_FamilyWar_AllOver = 'FamilyWar_AllOver'
+#仙盟联赛首轮开始时的世界等级
+Def_FamilyWar_StartWorldLV = 'FamilyWar_StartWorldLV'
 
 #服务器开服自动逻辑处理 年
 Def_Server_Year = 'Def_Server_Year'
@@ -115,22 +116,11 @@
 #服务器开服自动逻辑处理 小时
 Def_Server_Hour = 'Def_Server_Hour'
 
-# 跨服赛开启天数
-Def_MergeServerOpenActionDay = "MergeServerOpenActionDay"
-# 按天数开启活动,国王战标志
-Def_MergeWarStart = "MergeWarStart"
-
-# 上次领地战活动时的开服天数
-Def_LastManorWarServerDay = "LastManorWarServerDay"
-
 # 交易所开关
 Def_BourseState = "BourseState"
 
 # 本服红包产出数
 Def_RedPacketOutput = "RedPacketOutput"
-
-Def_TeHuiRepeatOrderKey = "DA_DayRepeatOrder" # 特惠循环顺序key
-Def_TeHuiRepeatNumKey = "DA_DayRepeatNum" # 今日特惠循环编号
 
 Def_BossRefreshTime = 'BossRefreshTime_%s'  # boss刷新时间, 参数为NPCID
 
@@ -146,6 +136,9 @@
 # 假仙盟随机编号
 Def_FakeFamilyIndex = 'FakeFamilyIndex_%s'  # 参数为第几个假仙盟
 
+# 服务器建盟次数
+Def_ServerCreatFamilyTimes = "CreatFamilyTimes"
+
 #设置运营活动ID的标记
 Def_OperationActID = 'OperationActID_%s' #参数为运营活动名
 #运营活动开启时世界等级,参数为运营活动名
@@ -156,6 +149,12 @@
 Def_BRServerPlayerCnt = "BRServerPlayerCnt"
 #boss复活活动已复活次数
 Def_BossRebornCnt = "BossRebornCnt"
+#多仙盟Boss击杀时间
+Def_AllFamilyBossTime = "AllFamilyBossTime"
+#骑宠Boss击杀时间
+Def_HorsePetBossTime = "HorsePetBossTime%s"
+#跨服服务器是否维护中
+Def_CrossServerClose = "CrossServerClose"
 
 def SetInitOpenServerTime(initTime):
     openDatetime = GameWorld.ChangeTimeNumToDatetime(initTime)

--
Gitblit v1.8.0