From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
index 7a7355b..9691003 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
@@ -62,7 +62,7 @@
import ChItem
import IpyGameDataPY
import PlayerRune
-import PlayerSuccess
+import GameFuncComm
import PlayerFairyCeremony
import PyGameData
@@ -201,6 +201,7 @@
if onEventType == ShareDefine.Def_OnEventType:
UpdataSuperGiftTime(curPlayer, True)
SyncSuperGiftInfo(curPlayer)
+ OSSaleOpenMail(curPlayer)
refreshType = [3]
elif onEventType == ShareDefine.Def_OnEventTypeEx:
refreshType = [4]
@@ -562,6 +563,16 @@
# 默认不限制
return False
+def OSSaleOpenMail(curPlayer):
+ #开服特惠开启邮件
+ if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_OSSail):
+ return
+ openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1
+ if openServerDay not in IpyGameDataPY.GetFuncEvalCfg('OSSaleOpenMail'):
+ return
+ addItemList = IpyGameDataPY.GetFuncEvalCfg('OSSaleOpenMail', 2)
+ PlayerControl.SendMailByKey('SellMail1', [curPlayer.GetID()], addItemList)
+ return
#超值礼包购买时间
def UpdataSuperGiftTime(curPlayer, isOnday=False):
@@ -607,10 +618,11 @@
return
giftID, day = superGiftTimeList[giftIndex-1]
openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1
+ remainDay = max(0, day - openServerDay+startDay)-1
packData = ChPyNetSendPack.tagMCSuperGiftInfo()
packData.GiftID = giftID
- packData.RemainDay = max(0, day - openServerDay+startDay)
+ packData.EndtDate = str(GameWorld.GetDatetimeByDiffDays(remainDay))[:10]
NetPackCommon.SendFakePack(curPlayer, packData)
return
def CheckSuperGiftBuy(curPlayer, giftID):
--
Gitblit v1.8.0