From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
index bb5f56f..99d9348 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
@@ -108,7 +108,7 @@
GameWorld.ErrLog(' 邮件发放充值大礼奖励 CeremonyRecharge 未配置奖励 worldLvNum=%s' % worldLvNum)
else:
awardList = awardInfoDict[str(worldLvNum)]
- PlayerControl.SendMailByKey('CeremonyPayPack', [playerID], awardList, [playerName])
+ PlayerControl.SendMailByKey('NewCeremonyPayPack', [playerID], awardList, [playerName])
#全民来嗨
worldLvNum = __GetFCWorldLVIndex(curPlayer, Def_FC_Party)
curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_NewFCPartyCurPoint)
@@ -134,7 +134,7 @@
awardList = awardInfoDict[str(job)]
partyAwardList += awardList
if partyAwardList:
- PlayerControl.SendMailByKey('CeremonyHaiPoint', [playerID], partyAwardList, [playerName])
+ PlayerControl.SendMailByKey('NewCeremonyHaiPoint', [playerID], partyAwardList, [playerName])
return
def __IsAtFCAction():
@@ -189,11 +189,11 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_NewFCRechargeState, 2)
for itemID, itemCnt, isBind in awardList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncFCRechargeInfo(curPlayer)
- PlayerControl.WorldNotify(0, 'CeremonyRecharge', [curPlayer.GetName()])
+ PlayerControl.WorldNotify(0, 'NewCeremonyRecharge', [curPlayer.GetName()])
return
@@ -257,7 +257,7 @@
awardRecord |= awardMark
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_NewFCPartyAwardRecord, awardRecord)
for itemID, itemCnt, isBind in awardList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
#通知
SyncFCPartyInfo(curPlayer, isGetAward=True)
return
--
Gitblit v1.8.0