From 48b04bf3b900bb42d22e4b6784e90827c969fa05 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 九月 2018 11:54:54 +0800
Subject: [PATCH] 1902 bug 点拒绝加好友，变成加为好友
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py | 27 ++++++++++++++++++---------
1 files changed, 18 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 ec36323..dd67884 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
@@ -29,13 +29,24 @@
import ChConfig
+def GetGiftbagTypeList(cfgID, dayIndex):
+ if cfgID == None or dayIndex == None:
+ return []
+ ipyData = IpyGameDataPY.GetIpyGameData("ActFlashGiftbag", cfgID)
+ if not ipyData:
+ return []
+ giftbagTypeList = ipyData.GetGiftbagTypeList()
+ todayGiftbag = giftbagTypeList[-1] if dayIndex >= len(giftbagTypeList) else giftbagTypeList[dayIndex]
+ return todayGiftbag
+
def OnPlayerLogin(curPlayer):
isReset = __CheckPlayerFlashGiftbagAction(curPlayer)
if not isReset:
actInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_FlashGiftbag, {})
# 活动中同步活动信息
if actInfo.get(ShareDefine.ActKey_State):
- SyncFlashGiftbagBuyCount(curPlayer, giftbagTypeList=actInfo.get(ShareDefine.ActKey_GiftbagTypeList, []))
+ giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
+ SyncFlashGiftbagBuyCount(curPlayer, giftbagTypeList=giftbagTypeList)
Sync_FlashGiftbagActionInfo(curPlayer)
return
@@ -57,9 +68,6 @@
actInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_FlashGiftbag, {})
actID = actInfo.get(ShareDefine.ActKey_ID, 0)
state = actInfo.get(ShareDefine.ActKey_State, 0)
- giftbagTypeList = actInfo.get(ShareDefine.ActKey_GiftbagTypeList, [])
- #if not state or not giftbagTypeList:
- # return
playerActID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashGiftbagID) # 玩家身上的活动ID
@@ -68,6 +76,7 @@
GameWorld.DebugLog("限时礼包活动ID不变，不处理！", curPlayer.GetPlayerID())
return
+ giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagID, actID)
ResetGiftbagItemBuyCount(curPlayer, giftbagTypeList)
@@ -108,7 +117,7 @@
DataRecordPack.DR_CTGError(curPlayer, "FlashGiftbag state is 0!", addDRDict)
return
- giftbagTypeList = actInfo.get(ShareDefine.ActKey_GiftbagTypeList, [])
+ giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
if not giftbagTypeList:
DataRecordPack.DR_CTGError(curPlayer, "FlashGiftbag GiftbagTypeList is null!", addDRDict)
return
@@ -202,7 +211,7 @@
return
cfgID = actInfo.get(ShareDefine.ActKey_CfgID, 0)
- giftbagTypeList = actInfo.get(ShareDefine.ActKey_GiftbagTypeList, 0)
+ giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
if not cfgID or not giftbagTypeList:
return
@@ -279,11 +288,11 @@
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(), appID)] = ipyData
+ FlashGiftbagIDRMBDict[(ipyData.GetGiftbagID(), ipyData.GetAppID())] = ipyData
IpyGameDataPY.SetConfigEx(key, FlashGiftbagIDRMBDict)
return FlashGiftbagIDRMBDict.get((giftbagID, appID))
--
Gitblit v1.8.0