From e082d496795bd07657a81714bab4a5a63446e397 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 12 四月 2019 16:41:10 +0800
Subject: [PATCH] 6491 子 【2.0】【开发】打宝界面和境界压制调整 / 【2.0】【后端】打宝界面和境界压制调整
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 f15e88a..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 = {}
@@ -85,7 +86,7 @@
return
def RefreshWishingWellAction():
- #__InitWishRateList()
+ __InitWishRateList()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -117,12 +118,15 @@
% (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)
#每天开始随机一次免费盘
if state:
- g_randomWellDict = {}
+ #g_randomWellDict = {}
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WishingWellRefreshCnt, 0)
__DoActWishingRefresh(curPlayer, 1, True)
@@ -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
@@ -355,7 +360,7 @@
PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
return
for itemID, itemCnt, isBind in giveItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
for i in xrange(count):
__SetItemData(curPlayer, WellType_Get, i, 0, 0, 0, 0)
SyncWishingWellPlayerInfo(curPlayer)
--
Gitblit v1.8.0