From ac0cdeb67cbd2829aeea991a89ec4442bba3f865 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 09 五月 2019 20:25:43 +0800
Subject: [PATCH] 6711 【后端】【2.0】洗练从0级开始洗练 6717【后端】【2.0】洗练数值非0 6628【2.0】【后端】查看玩家装备和查看玩家战力功能
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 108 insertions(+), 41 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 3498980..ade467b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -45,16 +45,15 @@
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 urllib
import md5
#---------------------------------------------------------------------
#设置允许的最大迭代数目, 默认1000
@@ -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)
##获得服务器系统时间
@@ -746,6 +750,17 @@
return curNPC
return
+def FindNPCByNPCIDEx(copyMapID, npcID):
+ #查询某条分线的npc
+ gameNPCManager = GetNPCManager()
+ for index in xrange(gameNPCManager.GetNPCCountByGWIndex(copyMapID)):
+ curNPC = gameNPCManager.GetNPCByIndexByGWIndex(copyMapID, index)
+ curID = curNPC.GetID()
+ if curID == 0:
+ continue
+ if npcID == curNPC.GetNPCID():
+ return curNPC
+ return
#---------------------------------------------------------------------
##根据NPC的类型选择返回对象
# @param npcIndex NPC索引
@@ -1016,18 +1031,8 @@
return GetGameWorld().GetServerVersion()
def GetServerGroupID():
- # 服务器组ID： 代表一台服务器中包含的合服、混服的各平台区服组成的一个独立游戏区服服务器环境, 用某个ID来代表此服务器
- # 在跨服环境中，此ID就是代表来自同一台服务器子服的玩家
- # 服务器组ID生成规则: DB平台标识对应编号 * 1000000 + DB配置的ServerID
- # ServerID支持范围: 1~999999
- # 平台编号支持范围：1~2000
- platform = GetPlatform()
- serverNum = GetPlatformServerNum(platform)
- if not serverNum:
- return 0
- serverNum = max(1, min(2000, serverNum))
- serverID = max(1, min(999999, GetServerID()))
- return serverNum * 1000000 + serverID
+ ## 服务器组ID，必须唯一，代表这台物理服务器
+ return ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "GroupID"), 0)
def GetPlatformServerNum(platform):
# 获取服务器的平台编号
@@ -1045,15 +1050,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):
# 获取创角第几天
@@ -1084,12 +1093,28 @@
mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
if mainServerID != None:
return mainServerID
- return GetServerID()
+ return 0
+
+
+#===============================================================================
+# 平台ID = appid
+# 运营ID = spid
+# 服务器账号更改
+# 原先账号组合为
+# 运营提供的玩家账号ID + 平台ID + 区服组成
+#
+# 因为IOS和安卓在支持混服的情况下，还要能支持同一个角色号，故引入一个新的运营ID（客户端打包配置），以保证玩家账号为同一个
+# 账号组合变更
+# 运营提供的玩家账号ID + 运营ID + 区服组成
+#
+# 原游戏中获取平台ID接口变更
+# 1. db 从数据库中的账号表获取AppID
+# 2. GameServer和MapServer 接口改为GetOperator 参考 GetPlayerPlatform
+#===============================================================================
##获取玩家所属平台
-def GetPlayerPlatform(gameAccID):
- infoList = gameAccID.split(Def_AccID_Split_Sign)
- return "" if len(infoList) < 3 else infoList[-2]
+def GetPlayerPlatform(curPlayer):
+ return curPlayer.GetAccountData().GetOperator()
##获取平台账号
def GetPlatformAccID(gameAccID):
@@ -1566,14 +1591,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
@@ -1602,9 +1628,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
@@ -1621,6 +1647,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))
@@ -1631,6 +1658,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，不同一天！")
@@ -1790,7 +1830,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
@@ -1825,6 +1866,20 @@
msgList = str(msgList)
GetPlayerManager().GameServer_QueryPlayerResult(srcPlayerID, queryType, queryID,
'SendMergerChildMsg', msgList, len(msgList))
+ return
+
+def SendMsgToCrossServer(msgType, dataMsg, srcPlayerID=0, queryType=0, queryID=0):
+ ## 发送信息到跨服服务器
+ 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
## 根据排行获取名次对应值
@@ -1930,3 +1985,15 @@
return
+# 向运维发送邮件，用于需要紧急处理的信息
+# 此处不包含服务器报错的汇报
+def SendGameStateMail(msgInfo):
+ # 使用方式 向OpenStateUrl 发送Type为GameWarning，那么就会收到一封游戏内容警告邮件，信息为MsgInfo
+ getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl")
+ groupID = ReadChConfig.GetPyMongoConfig("platform", "GroupID")
+ userDBName = ReadChConfig.GetPyMongoConfig("connect", "USER_DB_NAME")
+ getUrl = getUrl + "?Type=GameWarning&groupID=%s&userDBName=%s&MsgInfo=%s"%(groupID, userDBName, urllib.quote_plus(msgInfo))
+
+ GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
+
+
--
Gitblit v1.8.0