From 545986a8fdde345b28cf3004be84c6cfe79a3dc1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 四月 2019 11:29:12 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单（跨服分区逻辑优化，支持跨服妖王分区状态同步）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py | 125 +++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 26 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
index ef186a9..7380b23 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
@@ -39,11 +39,15 @@
import GameFuncComm
import FBHelpBattle
import ItemControler
+import SkillShell
import PyGameData
import time
import math
#---------------------------------------------------------------------
+def OnLogin(curPlayer):
+ NotifyBuyFBBuffInfo(curPlayer)
+ return
## 玩家副本行为封包 A5 08
# @param playerIndex 玩家索引
@@ -464,25 +468,12 @@
mapID = clientData.MapID
funcLineID = clientData.FuncLineID
prizeItemList = FBLogic.OnRefreshCustomFBPrize(curPlayer, mapID, funcLineID)
- if not prizeItemList:
- return
- PyGameData.g_customFBPrizeInfo[playerID] = [mapID, funcLineID, prizeItemList]
+ PyGameData.g_customFBPrizeInfo[playerID] = prizeItemList
prizePack = ChPyNetSendPack.tagMCCuntomFBPrizeInfo()
prizePack.MapID = mapID
prizePack.FuncLineID = funcLineID
- prizePack.PrizeItemList = []
- for prizeItemInfo in prizeItemList:
- itemID, itemCount, isAuctionItem, userData = ItemControler.GetItemInfo(prizeItemInfo)
- if not itemID:
- continue
- prizeItem = ChPyNetSendPack.tagMCCuntomFBPrizeItem()
- prizeItem.ItemID = itemID
- prizeItem.Count = itemCount
- prizeItem.IsAuctionItem = isAuctionItem
- prizeItem.UserData = userData
- prizeItem.UserDataLen = len(prizeItem.UserData)
- prizePack.PrizeItemList.append(prizeItem)
- prizePack.PrizeItemCount = len(prizePack.PrizeItemList)
+ prizePack.PrizeItemIDList = [prizeItemInfo[0] for prizeItemInfo in prizeItemList]
+ prizePack.PrizeItemCount = len(prizePack.PrizeItemIDList)
NetPackCommon.SendFakePack(curPlayer, prizePack)
return
@@ -498,16 +489,98 @@
def OnGiveCustomFBPrize(playerIndex, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(playerIndex)
playerID = curPlayer.GetPlayerID()
- packMapID = clientData.MapID
- packFuncLineID = clientData.FuncLineID
- prizeInfo = PyGameData.g_customFBPrizeInfo.pop(playerID, None)
- if not prizeInfo:
- return
- mapID, funcLineID, prizeItemList = prizeInfo
- if mapID != packMapID or funcLineID != packFuncLineID:
- return
- FBLogic.OnGiveCustomFBPrizeOK(curPlayer, mapID, funcLineID)
- ItemControler.GivePlayerItemOrMail(curPlayer, prizeItemList)
+ mapID = clientData.MapID
+ lineID = clientData.FuncLineID
+ prizeItemList = PyGameData.g_customFBPrizeInfo.pop(playerID, [])
+
+ mailItemList = []
+ jsonItemList = []
+ playerItemControl = ItemControler.PlayerItemControler(curPlayer)
+ for itemID, itemCount, isAuctionItem in prizeItemList:
+ curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem, curPlayer=curPlayer)
+ if not curItem:
+ continue
+ jsonItem = ItemCommon.GetJsonItem(curItem)
+ jsonItemList.append(jsonItem)
+ #放入玩家背包
+ if not playerItemControl.PutInItem(IPY_GameWorld.rptItem, curItem):
+ mailItemList.append(jsonItem)
+
+ if mailItemList:
+ PlayerControl.SendMailByKey("ItemNoPickUp", [playerID], mailItemList, [mapID])
+
+ overDict = FBLogic.OnGiveCustomFBPrizeOK(curPlayer, mapID, lineID)
+ isPass = 1
+ overDict.update({FBCommon.Over_itemInfo:jsonItemList})
+ FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)
return
+#// B1 0A 副本购买buff #tagCMFBBuyBuff
+#struct tagCMFBBuyBuff
+#{
+# tagHead Head;
+# DWORD MapID;
+# WORD MoneyCnt;
+#};
+def OnFBBuyBuff(playerIndex, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(playerIndex)
+ playerID = curPlayer.GetPlayerID()
+ mapID = clientData.MapID
+ moneyCnt = clientData.MoneyCnt
+ ipyData = IpyGameDataPY.GetIpyGameData('FBBuyBuff', mapID, moneyCnt)
+ if not ipyData:
+ return
+ addBuffID = ipyData.GetBuffID()
+ curSkill = GameWorld.GetGameData().GetSkillBySkillID(addBuffID)
+ if not curSkill:
+ return
+ crossMapID = PlayerControl.GetCrossMapID(curPlayer)
+ if crossMapID and mapID !=crossMapID:
+ return
+ if not crossMapID and mapID != GameWorld.GetMap().GetMapID():
+ return
+
+ curTime = int(time.time())
+ #判断CD
+ timeKey = (mapID, moneyCnt)
+ lastTime = PyGameData.g_fbBuyBuffTimeDict.get(playerID, {}).get(timeKey, 0)
+ if lastTime and curTime - lastTime < ipyData.GetBuffCD():
+ GameWorld.DebugLog('副本购买buff CD未到 ')
+ return
+
+ #扣钱
+ infoDict = {"MapID":mapID, "addBuffID":addBuffID}
+ if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, moneyCnt, ChConfig.Def_Cost_FBBuyBuff, infoDict):
+ return
+ if playerID not in PyGameData.g_fbBuyBuffTimeDict:
+ PyGameData.g_fbBuyBuffTimeDict[playerID] = {}
+ PyGameData.g_fbBuyBuffTimeDict[playerID][timeKey] = curTime
+ NotifyBuyFBBuffInfo(curPlayer)
+ if crossMapID:
+ msgDict = {"PlayerID":curPlayer.GetPlayerID(), "buffID":addBuffID}
+ GameWorld.SendMsgToCrossServer(ShareDefine.ClientServerMsg_AddBuff, msgDict)
+ GameWorld.DebugLog("跨服中请求复活, crossMapID=%s,msgDict=%s" % (crossMapID, msgDict), playerID)
+ return
+
+ SkillShell.__DoLogic_AddBuff(curPlayer, curPlayer, curSkill, False, tick, 0, 0)
+ #SkillCommon.AddBuffBySkillType(curPlayer, addBuffID, tick)
+ return
+
+def NotifyBuyFBBuffInfo(curPlayer):
+ playerID = curPlayer.GetPlayerID()
+ buffTimeDict = PyGameData.g_fbBuyBuffTimeDict.get(playerID, {})
+ if not buffTimeDict:
+ return
+ packData = ChPyNetSendPack.tagMCFBBuyBuffInfo()
+ packData.InfoList = []
+ for timeKey, buyTime in buffTimeDict.items():
+ mapID, moneyCnt = timeKey
+ timeInfo = ChPyNetSendPack.tagMCFBBuyBuffTime()
+ timeInfo.MapID = mapID
+ timeInfo.MoneyCnt = moneyCnt
+ timeInfo.BuyTime = buyTime
+ packData.InfoList.append(timeInfo)
+ packData.Cnt = len(packData.InfoList)
+ NetPackCommon.SendFakePack(curPlayer, packData)
+ return
--
Gitblit v1.8.0