From 18a10a74bd18363b8a325044d0cec5e4838531a3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 05 五月 2019 10:55:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.py
index 82917dc..e4a673e 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 新增跨服赛事件枚举
@@ -66,6 +65,9 @@
#服务器运行了几天
Def_ServerDay = 'ServerDay'
+#开服是周几, 1代表周一
+Def_OpenServerWeekday = 'OpenServerWeekday'
+
#服务器是否是合服服务器
Def_IsMixServer = 'IsMixServer'
@@ -78,12 +80,17 @@
#上次合服时的开服天数
Def_LastMixServerDay = 'LastMixServerDay'
-#上次开服天数开启的活动时的时间(Def_ServerDay的值)
-Def_ServerLastOpenActionDay = "ServerLastOpenActionDay"
+#上次合服时的世界等级
+Def_LastMixServerWorldLV = 'LastMixServerWorldLV'
-#首次开服时间
+#首次开服时间，注意不要用该日期做开服天相关的功能逻辑，如果要用开服天，请用 Def_ServerDay
+''' 原因：
+因为目前开服天的逻辑大部分是用 Def_ServerDay，当出现服务器宕机超过24小时时，就会导致 Def_ServerDay 与 Def_InitOpenServerTime 不对应
+所以为了功能逻辑和数据的统一性，开服天相关的功能逻辑必须用 Def_ServerDay
+Def_InitOpenServerTime 目前仅用于预先设置开服日期用
+'''
Def_InitOpenServerTime = 'InitOpenServerTime'
-Def_SetOpenServerTime = 'SetOpenServerTime' # 设置的开服时间
+Def_SetOpenServerTime = 'SetOpenServerTime' # GM工具预定的开服时间
#仙盟联赛当前战斗轮次
Def_FamilyWar_Round = 'FamilyWar_Round'
@@ -107,22 +114,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
@@ -148,6 +144,25 @@
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)
+ openServerWeekday = openDatetime.weekday() + 1
+ SetDBGSTrig_ByKey(Def_InitOpenServerTime, initTime)
+ SetDBGSTrig_ByKey(Def_OpenServerWeekday, openServerWeekday)
+ GameWorld.Log("设置开服时间: %s(%s), 周%s" % (openDatetime, initTime, openServerWeekday))
+ # 需要这个参数主要是GM工具会判断是否有设置过，所以该值一般只有GM命令或工具才能设置
+ setOpenServerTime = GetDBGSTrig_ByKey(Def_SetOpenServerTime)
+ if setOpenServerTime and setOpenServerTime != initTime:
+ SetDBGSTrig_ByKey(Def_SetOpenServerTime, initTime)
+ GameWorld.Log(" 同步更新 Def_SetOpenServerTime=%s" % initTime)
+ return
## 查找事件
# @param findID 查找的ID
--
Gitblit v1.8.0