From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
index 3a704b3..e2bc580 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
@@ -149,10 +149,12 @@
for itemID, itemCount, isBind in giftItemList:
ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem],
event=[ChConfig.ItemGive_CTG, True, addDRDict])
-
+
+ # 取玩家APPID，混服使用
+ appID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
notifyKey = giftbagIpyData.GetNotifyKey()
if notifyKey:
- orderIpyData = GetFlashGiftbagIDOrderInfoIpyData(giftbagID)
+ orderIpyData = GetFlashGiftbagIDOrderInfoIpyData(giftbagID, appID)
rmb = 0 if not orderIpyData else int(orderIpyData.GetPayRMBNum())
PlayerControl.WorldNotify(0, notifyKey, [curPlayer.GetPlayerName(), rmb, giftbagIpyData.GetMainItemID()])
@@ -215,6 +217,9 @@
GameWorld.ErrLog("限时礼包开关时间时分配置错误!cfgID=%s" % cfgID)
return
+ # 取玩家APPID，混服使用
+ appID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
+
packInfo = ChPyNetSendPack.tagMCFlashGiftbagInfo()
packInfo.StartDate = flashGiftbagIpyData.GetStartDate()
packInfo.EndtDate = flashGiftbagIpyData.GetEndDate()
@@ -239,7 +244,7 @@
for giftIpyData in giftbagIpyDataList:
giftbagID = giftIpyData.GetGiftbagID()
- orderIpyData = GetFlashGiftbagIDOrderInfoIpyData(giftbagID)
+ orderIpyData = GetFlashGiftbagIDOrderInfoIpyData(giftbagID, appID)
giftBag = ChPyNetSendPack.tagMCFlashGiftbag()
giftBag.GiftID = giftbagID
giftBag.OrderInfo = "" if not orderIpyData else orderIpyData.GetOrderInfo()
@@ -265,21 +270,20 @@
NetPackCommon.SendFakePack(curPlayer, packInfo)
return
-def GetFlashGiftbagIDOrderInfoIpyData(giftbagID):
+def GetFlashGiftbagIDOrderInfoIpyData(giftbagID, appID):
## 获取礼包ID对应实际售价
key = "FlashGiftbagIDRMB"
FlashGiftbagIDRMBDict = IpyGameDataPY.GetConfigEx(key)
if not FlashGiftbagIDRMBDict:
FlashGiftbagIDRMBDict = {}
- appID = GameWorld.GetPlatform()
ipyDataMgr = IpyGameDataPY.IPY_Data()
for i in xrange(ipyDataMgr.GetOrderInfoCount()):
ipyData = ipyDataMgr.GetOrderInfoByIndex(i)
- if ipyData.GetAppID() != appID:
- continue
+ #if ipyData.GetAppID() != appID:
+ # continue
if not ipyData.GetGiftbagID():
continue
- FlashGiftbagIDRMBDict[ipyData.GetGiftbagID()] = ipyData
+ FlashGiftbagIDRMBDict[(ipyData.GetGiftbagID(), ipyData.GetAppID())] = ipyData
IpyGameDataPY.SetConfigEx(key, FlashGiftbagIDRMBDict)
- return FlashGiftbagIDRMBDict.get(giftbagID)
+ return FlashGiftbagIDRMBDict.get((giftbagID, appID))
--
Gitblit v1.8.0