From a2274db7758cdba8c93ee9e5f4466c4cebaf33f2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 16 八月 2018 10:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
index de50965..d4e615e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
@@ -270,13 +270,11 @@
def Sync_FirstGoldTime(curPlayer):
##通知首充提示剩余时间
showSysTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldRemainTime)
- firstGoldTry = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry)
- if not showSysTime and not firstGoldTry:
+ if not showSysTime:
return
sendPack = ChPyNetSendPack.tagMCFirstGoldTime()
sendPack.Clear()
sendPack.FirstGoldRemainTime = showSysTime
- sendPack.FirstGoldTry = firstGoldTry
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
@@ -652,6 +650,7 @@
sendPack = ChPyNetSendPack.tagMCFirstGoldInfo()
sendPack.Clear()
sendPack.FirstGoldRewardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)
+ sendPack.FirstGoldTry = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry)
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
@@ -747,7 +746,7 @@
else:
curItem.clear()
GameWorld.Log(' 试用首充武器 试穿失败！！tryItemID=%s'%tryItemID, curPlayer.GetID())
- Sync_FirstGoldTime(curPlayer)
+ Sync_FirstGoldInfo(curPlayer)
return
def FirstGoldTryItemOutTime(curPlayer):
--
Gitblit v1.8.0