From a02d7379e60b7b3fe0ae8d1ada4cf86fc4d0a1be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 11 九月 2020 14:27:11 +0800
Subject: [PATCH] 1111 媒体卡固定码支持按appid配置；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 126ee33..624c85e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -53,7 +53,7 @@
import copy
import ConfigParser
import PyGameData
-
+import urllib
import md5
#---------------------------------------------------------------------
#设置允许的最大迭代数目, 默认1000
@@ -595,6 +595,15 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
+ if not dateInfo:
+ curDateTime = datetime.datetime.today()
+ return "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)
+ if dateInfo.startswith("W"):
+ curDateTime = datetime.datetime.today()
+ curWeekday = curDateTime.weekday() + 1
+ actionWeekday = int(dateInfo[1:])
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionWeekday-curWeekday))
+ return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
if dateInfo.startswith("Mix"):
diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay) + 1
actionServerDay = int(dateInfo[3:])
@@ -750,6 +759,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索引
@@ -1981,7 +2001,7 @@
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, msgInfo)
+ 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