From fcc7a25e81089b087cdbb8038c45e1d08379f3d9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 24 十一月 2020 17:13:08 +0800
Subject: [PATCH] 4872 【BT】直购礼包(含超级现金卡)购买后背包不足物品少给(补充限时礼包、每日礼包修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py |    9 +--------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py |    9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
index 48c7724..1a81ade 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
@@ -127,14 +127,7 @@
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyGiftbagBuyCount % giftbagID, buyCount + 1)
     
     if giftItemList:
-        needSpace = len(giftItemList)
-        emptySpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
-        if emptySpace < needSpace:
-            PlayerControl.SendMailByKey("", [curPlayer.GetPlayerID()], giftItemList)
-        else:
-            for itemID, itemCount, isBind in giftItemList:
-                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
-                                             event=[ChConfig.ItemGive_CTG, True, addDRDict])
+        ItemControler.GivePlayerItemOrMail(curPlayer, giftItemList, "", event=[ChConfig.ItemGive_CTG, True, addDRDict])
                 
     SyncDailyGiftbagBuyCount(curPlayer, giftbagType)
     return True
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 45d0497..d86ac36 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
@@ -156,14 +156,7 @@
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagBuyCount % giftbagID, buyCount + 1)
     
     if giftItemList:
-        needSpace = len(giftItemList)
-        emptySpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
-        if emptySpace < needSpace:
-            PlayerControl.SendMailByKey("", [curPlayer.GetPlayerID()], giftItemList)
-        else:
-            for itemID, itemCount, isBind in giftItemList:
-                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
-                                             event=[ChConfig.ItemGive_CTG, True, addDRDict])
+        ItemControler.GivePlayerItemOrMail(curPlayer, giftItemList, "", event=[ChConfig.ItemGive_CTG, True, addDRDict])
     
     # 取玩家APPID,混服使用
     appID = GameWorld.GetPlayerPlatform(curPlayer)

--
Gitblit v1.8.0