From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py | 22 ++++++++++++++++------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 6 ++----
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index d17f023..93812f5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -501,9 +501,6 @@
#成就
PlayerSuccess.SuccOnDay(curPlayer)
- # 仙盟红包OnDay
- PlayerFamilyRedPacket.RedPacketOnDay(curPlayer)
-
# 新手卡
PlayerNewGuyCard.NewGuyCardOnday(curPlayer)
@@ -548,7 +545,8 @@
# 商店物品购买兑换OnDay
FunctionNPCCommon.ShopItemOnDay(curPlayer, onEventType)
-
+ # 仙盟红包OnDay
+ PlayerFamilyRedPacket.RedPacketOnDay(curPlayer, onEventType)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
index 5027d3c..a608139 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
@@ -46,10 +46,19 @@
## OnDay处理
# @param curPlayer
# @return None
-def RedPacketOnDay(curPlayer):
- #发钻石红包额度重置
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FamilyRedPacketGoldLimit, 0)
- __NotifyGoldLimt(curPlayer)
+def RedPacketOnDay(curPlayer, onEventType):
+ if onEventType == ShareDefine.Def_OnEventType:
+ #发钻石红包额度重置
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FamilyRedPacketGoldLimit, 0)
+ __NotifyGoldLimt(curPlayer)
+ elif onEventType == ShareDefine.Def_OnEventTypeEx:
+ oscDay = IpyGameDataPY.GetFuncCfg('OpenServerRedPacketCfg')
+ openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)
+ if openServerDay < oscDay:
+ grabCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSRedPacketCanGrabCnt, 0)
+ sendCnt = IpyGameDataPY.GetFuncCfg('OpenServerRedPacketCfg', 5)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSRedPacketCanGrabCnt, grabCnt+sendCnt)
+ NotifyOSRedPacket(curPlayer)
return
def CreatCacheRedPacktet(curPlayer):
@@ -231,8 +240,8 @@
if not isSelf: #抢自己的红包不扣次数
grabCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSRedPacketCanGrabCnt, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSRedPacketCanGrabCnt, max(0, grabCnt-1))
- if grabCnt == IpyGameDataPY.GetFuncCfg('OpenServerRedPacketCfg', 4):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSRedPacketStartTime, int(time.time()))
+# if grabCnt == IpyGameDataPY.GetFuncCfg('OpenServerRedPacketCfg', 4):
+# PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSRedPacketStartTime, int(time.time()))
#通知
@@ -240,6 +249,7 @@
return
def ProcessOSRedPacket(curPlayer, tick):
+ return
#开服红包恢复次数
if not GameWorld.SetPlayerTickTime(curPlayer, ChConfig.TYPE_Player_Tick_OSRedPacket, tick):
return
--
Gitblit v1.8.0