From ea99ae4d08b7475560dceb9b8fd9a370daab0cbb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 九月 2019 18:54:22 +0800
Subject: [PATCH] 8255 【后端】【主干】拍品可使用及上下架优化(拍品可下架)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 72f5e00..624c85e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -45,17 +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
@@ -597,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:])
@@ -752,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索引
@@ -1976,3 +1994,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