From 1d877dc6c7523fbc38bafa29d27d9c0c73f72eff Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 13 三月 2019 10:24:15 +0800
Subject: [PATCH] 3049 【主干】【1.6】合服许愿池第一天奖励不能领取

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py
index 3decb61..6019b4e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py
@@ -30,6 +30,7 @@
 import ItemControler
 import ItemCommon
 
+import datetime
 import time
 
 g_randomWellDict = {}
@@ -117,7 +118,10 @@
                        % (WishingWellID, playerWishingWellID, state, worldLV), playerID)
     
     # 未领取的奖励邮件发放
-    __SendWishingWellMail(curPlayer, WishingWellID or int(time.time()), state)
+    curDataTime = GameWorld.GetCurrentTime()
+    curDayTime = datetime.datetime(curDataTime.year, curDataTime.month, curDataTime.day, 0, 0, 0)
+    curDayTimeNum = GameWorld.ChangeTimeStrToNum(str(curDayTime))
+    __SendWishingWellMail(curPlayer, WishingWellID or curDayTimeNum, state)
         
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WishingWellID, WishingWellID)
     #每天开始随机一次免费盘
@@ -137,9 +141,10 @@
     if not lastAwardTime:
         if state != -1:
             PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WishingWellAwardTime, curTime)
+            GameWorld.DebugLog('__SendWishingWellMail curTime =%s'%curTime)
         return
     GameWorld.DebugLog('许愿池未领取的奖励邮件发放检查 lastAwardTime=%s,state=%s,pass=%s'%(lastAwardTime, state, curTime - lastAwardTime))
-    passDay = (curTime - lastAwardTime)/86400
+    passDay = (curTime - lastAwardTime)/86000
     if passDay <= 0:
         return
     isOver = True
@@ -172,7 +177,7 @@
         PlayerControl.SendMailByKey('WishPool', [curPlayer.GetID()], mailItemList)
         if state == -1:
             SyncWishingWellPlayerInfo(curPlayer)
-    GameWorld.DebugLog('许愿池距离时间 passDay=%s,mailItemList=%s,saveItemList=%s,isOver=%s'%(passDay, mailItemList, saveItemList, isOver), curPlayer.GetID())
+    GameWorld.DebugLog('许愿池距离时间 passDay=%s,mailItemList=%s,saveItemList=%s,isOver=%s,curTime=%s'%(passDay, mailItemList, saveItemList, isOver, curTime), curPlayer.GetID())
     return
 
 

--
Gitblit v1.8.0