From e640ec307d9d64fd6094734c06058678a4caeb2f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 10 四月 2019 15:44:15 +0800
Subject: [PATCH] 3222 【2.0】仙盟BOSS血量世界广播有误
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 0de2912..abca8cc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -45,15 +45,14 @@
import datetime
import ChConfig
import os
-import MapConfig
import CommFunc
import ShareDefine
-import PyMapTable
#import psyco
from decimal import Decimal
import time
import copy
import ConfigParser
+import PyGameData
import md5
#---------------------------------------------------------------------
@@ -596,11 +595,16 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
- if not dateInfo.isdigit():
+ if dateInfo.startswith("Mix"):
+ diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay) + 1
+ actionServerDay = int(dateInfo[3:])
+ elif not dateInfo.isdigit():
return dateInfo
- actionServerDay = int(dateInfo)
+ else:
+ diffDay = openServerDay
+ actionServerDay = int(dateInfo)
curDateTime = datetime.datetime.today()
- actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-openServerDay))
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-diffDay))
return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
##获得服务器系统时间
@@ -1035,15 +1039,19 @@
def GetPlatform():
return ReadChConfig.GetPyMongoConfig("platform", "PlatformName")
-##获得当前服务器ID
-# @param 无
-# @return
-def GetServerID():
- return ToIntDef(GetServerSID()[1:], 0)
+#===============================================================================
+# ##获得当前服务器ID
+# # @param 无
+# # @return
+# def GetServerID():
+# return ToIntDef(GetServerSID()[1:], 0)
+#===============================================================================
-def GetServerSID():
- ##获得当前服务器ID, 带s的
- return ReadChConfig.GetPyMongoConfig("platform", "ServerID")
+#===============================================================================
+# def GetServerSID():
+# ##获得当前服务器ID, 带s的
+# return ReadChConfig.GetPyMongoConfig("platform", "ServerID")
+#===============================================================================
def GetCreateRoleDays(curPlayer):
# 获取创角第几天
@@ -1074,7 +1082,7 @@
mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
if mainServerID != None:
return mainServerID
- return GetServerID()
+ return 0
#===============================================================================
@@ -1572,17 +1580,15 @@
return inputText
-## 是否跨服服务器
-# @param None None
-# @return
-def IsMergeServer():
- config = MapConfig.GetConfig()
-
- return config.get('IsMergeWarServe', 0)
-
def IsCrossServer():
## 是否跨服服务器
return ToIntDef(ReadChConfig.GetPyMongoConfig("Merge", "IsMergeServer"), 0)
+
+def GetCrossZoneName():
+ ## 跨服服务器分区名，标记一起跨服分区的名字，配置在跨服服务器，子服不用配置，由跨服服务器同步
+ if IsCrossServer():
+ return ReadChConfig.GetPyMongoConfig("Merge", "CrossZoneName")
+ return PyGameData.g_crossZoneName
## 时间格式转换成数值时间，可参考datetime.datetime.fromtimestamp(102645645)
# @param timeNum
@@ -1611,9 +1617,9 @@
'''
checkDate = ChangeTimeNumToDatetime(checkTime)
curDate = GetCurrentTime()
- if checkDate > curDate:
- #DebugLog("检查时间比当前时间大")
- return False
+ #if checkDate > curDate:
+ # #DebugLog("检查时间比当前时间大")
+ # return False
Def_OnEventHour = ShareDefine.Def_OnEventHour
chkYear, chkMonth, chkDay, chkHour = checkDate.year, checkDate.month, checkDate.day, checkDate.hour
@@ -1630,6 +1636,7 @@
checkDateEx = datetime.datetime(chkYear, chkMonth, chkDay, 0, 0, 0)
curDateEx = datetime.datetime(curYear, curMonth, curDay, 0, 0, 0)
diffDays = (curDateEx - checkDateEx).days
+ ## 当前时间比检查的时间大1天
if diffDays == 1:
if chkHour < Def_OnEventHour:
#DebugLog("日期相差天数1, 不同天! chkHour(%s) < %s" % (chkHour, Def_OnEventHour))
@@ -1640,6 +1647,19 @@
return False
#DebugLog("日期相差天数1, 同天! curHour(%s) < %s <= chkHour(%s)" % (curHour, Def_OnEventHour, chkHour))
+ return True
+
+ ## 当前时间比检查的时间小1天
+ elif diffDays == -1:
+ if curHour < Def_OnEventHour:
+ #DebugLog("日期相差天数-1, 不同天! curHour(%s) < %s" % (curHour, Def_OnEventHour))
+ return False
+
+ if chkHour >= Def_OnEventHour:
+ #DebugLog("日期相差天数-1, 不同天! chkHour(%s) >= %s" % (chkHour, Def_OnEventHour))
+ return False
+
+ #DebugLog("日期相差天数-1, 同天! chkHour(%s) < %s <= curHour(%s)" % (chkHour, Def_OnEventHour, curHour))
return True
#DebugLog("日期相差天数大于1，不同一天！")
@@ -1799,7 +1819,8 @@
if updDictValue == 0:
curPlayer.NomalDictDelProperty(keyName, 0)
else:
- curPlayer.NomalDictAddProperty(keyName, updDictValue)
+ import PlayerControl
+ PlayerControl.NomalDictSetProperty(curPlayer, keyName, updDictValue)
#DebugLog("SetDictValueByBit keyFormat=%s,isBin=%s,bit=%s,keyNum=%s,keyName=%s,dictValue=%s,bitIndex=%s,updDictValue=%s"
# % (keyFormat, isBin, bit, keyNum, keyName, dictValue, bitIndex, updDictValue))
return dictValue, updDictValue
@@ -1840,12 +1861,14 @@
## 发送信息到跨服服务器
msgList = str([msgType, dataMsg])
GetPlayerManager().GameServer_QueryPlayerResult(srcPlayerID, queryType, queryID, "SendMsgToCrossServer", msgList, len(msgList))
+ DebugLog("发送跨服信息: %s, %s" % (msgType, dataMsg))
return
def SendMsgToClientServer(msgType, dataMsg, serverGroupIDList, srcPlayerID=0, queryType=0, queryID=0):
## 发送信息到子服
msgList = str([msgType, dataMsg, serverGroupIDList])
GetPlayerManager().GameServer_QueryPlayerResult(srcPlayerID, queryType, queryID, "SendMsgToClientServer", msgList, len(msgList))
+ DebugLog("发送子服信息: %s, %s, serverGroupIDList=%s" % (msgType, dataMsg, serverGroupIDList))
return
## 根据排行获取名次对应值
--
Gitblit v1.8.0