From 93367a2607db214ec6dda86bd796c1291bc06a49 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 三月 2019 15:29:05 +0800
Subject: [PATCH] 3167 【BUG】【2.0】拍卖，消耗了仙玉没获得拍品
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py | 74 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 03a013c..38cff40 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -30,6 +30,7 @@
import EventReport
import PlayerFamily
import PlayerActivity
+import ItemControler
import PlayerSuccess
import GameFuncComm
import PyGameData
@@ -201,15 +202,6 @@
if isNotify:
PlayerControl.NotifyCode(curPlayer, "FbLV", [mapID])
return ShareDefine.EntFBAskRet_LVLimit
-
- #职业阶判断
- jobRankLimit = fbLineIpyData.GetJobRankLimit()
- if jobRankLimit and PlayerControl.GetJobRank(curPlayer) < jobRankLimit:
- GameWorld.Log("玩家职业阶级不足, 无法进入副本!mapID=%s,lineID=%s,jobRank=%s < jobRankLimit=%s"
- % (mapID, lineID, PlayerControl.GetJobRank(curPlayer), jobRankLimit), playerID)
- if isNotify:
- PlayerControl.NotifyCode(curPlayer, "SingleEnterJob", [mapID])
- return ShareDefine.EntFBAskRet_JobRankLimit
#门票判断
if not GetFBEnterTicket(curPlayer, mapID, lineID, fbLineIpyData, reqEnterCnt, isTeamAsk)[0]:
@@ -582,7 +574,7 @@
return
def GetJsonItemList(itemList):
- ## [[itemID,itemCount,isBind], curItem] -> [{"ItemID":101, "Count":10, "IsBind":1, "IsSuite":1, "UserData":"自定义属性字符串"}]
+ ## [[itemID,itemCount,isAuctionItem], curItem] -> [{"ItemID":101, "Count":10, "IsAuctionItem":1, "UserData":"自定义属性字符串"}]
jsonItemList = []
for itemInfo in itemList:
itemDict = {}
@@ -593,7 +585,7 @@
if infolen > 1:
itemDict['Count'] = itemInfo[1]
if infolen > 2:
- itemDict['IsBind'] = int(itemInfo[2])
+ itemDict['IsAuctionItem'] = int(itemInfo[2])
elif isinstance(itemInfo, int):
itemDict['ItemID'] = itemInfo
else: #物品实例
@@ -601,8 +593,8 @@
continue
itemDict['ItemID'] = itemInfo.GetItemTypeID()
itemDict['Count'] = itemInfo.GetCount()
- itemDict['IsBind'] = int(itemInfo.GetIsBind())
- itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
+ itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
+ #itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
itemDict['UserData'] = itemInfo.GetUserData()
jsonItemList.append(itemDict)
return jsonItemList
@@ -1915,7 +1907,7 @@
# @param tick 当前时间
# @param isMaxlv 是否直接满级
# @return None
-def FbEncourageBuff(curPlayer, key, encourageType, tick, isMaxlv=False):
+def FbEncourageBuff(curPlayer, key, encourageType, tick, ownerID=0):
#GameWorld.Log("FbEncourageBuff moneyType=%s" % (moneyType))
curMapID = curPlayer.GetMapID()
curMapID = GetRecordMapID(curMapID)
@@ -1924,10 +1916,10 @@
return
maxCnt = ipyData.GetInspireMaxLV()
gameFB = GameWorld.GetGameFB()
- curPlayerID = curPlayer.GetID()
- encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)
+ ownerID = ownerID or curPlayer.GetID()
+ encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)
encourageCntKey = 'FbEncourageCnt_%s' % encourageType
- encourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey)
+ encourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey)
maxLV = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 2, {}).get(curMapID, 0)
if encourageLV >= maxLV:
PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_93643")
@@ -1962,29 +1954,47 @@
return
buffType = SkillCommon.GetBuffType(skillBuff)
- BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
- gameFB.SetPlayerGameFBDict(curPlayerID, key, encourageLV+1)
- gameFB.SetPlayerGameFBDict(curPlayerID, encourageCntKey, encourageCnt+1)
+
+ gameFB.SetPlayerGameFBDict(ownerID, key, encourageLV+1)
+ gameFB.SetPlayerGameFBDict(ownerID, encourageCntKey, encourageCnt+1)
#GameWorld.Log("FbEncourageBuff encourage nextLV=%s success" % encourageLV)
addHurtNum = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 3, {}).get(curMapID, 0)
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
- SendFBEncourageInfo(curPlayer, encourageLV+1)
- #成就
- PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
- EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
- return
+ if curMapID == ChConfig.Def_FBMapID_AllFamilyBoss:
+ #给副本里所有盟成员提示
+ playerManager = GameWorld.GetMapCopyPlayerManager()
+ for index in xrange(playerManager.GetPlayerCount()):
+ player = playerManager.GetPlayerByIndex(index)
+ if not player:
+ continue
+ if player.GetFamilyID() != ownerID:
+ continue
+ BuffSkill.DoAddBuff(player, buffType, skillBuff, tick)
+ PlayerControl.NotifyCode(player, "AllianceBossText2", [curPlayer.GetName(), encourageLV+1])
+ SendFBEncourageInfo(player, encourageLV+1, ownerID)
+ if player.GetID() == curPlayer.GetID():
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
+ EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
+
+ else:
+ BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
+ PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
+ SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)
+ #成就
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
+ EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
+ return True
## 添加副本鼓舞buff，一般用于玩家掉线后，在规定时间内重新上线回到副本时重新上buff
# @param curPlayer 玩家
# @param key 副本玩家字典key
# @param tick 当前时间
# @return None
-def AddFbEncourageBuff(curPlayer, key, tick):
+def AddFbEncourageBuff(curPlayer, key, tick, ownerID=0):
curPlayerID = curPlayer.GetID()
GameWorld.Log("AddFbEncourageBuff() curPlayerID=%s" % curPlayerID)
gameFB = GameWorld.GetGameFB()
- encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)
+ encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)
if not encourageLV:
return
mapID = GameWorld.GetMap().GetMapID()
@@ -1999,7 +2009,7 @@
buffType = SkillCommon.GetBuffType(skillBuff)
BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
- SendFBEncourageInfo(curPlayer, encourageLV)
+ SendFBEncourageInfo(curPlayer, encourageLV, ownerID)
return
## 清除鼓舞buff
@@ -2019,7 +2029,7 @@
## 发送副本鼓舞信息
# @param curPlayer 玩家
# @return None
-def SendFBEncourageInfo(curPlayer, lv):
+def SendFBEncourageInfo(curPlayer, lv, ownerID=0):
#//A3 0A 副本鼓舞信息通知 #tagMCFBEncourageInfo
curMapID = curPlayer.GetMapID()
curMapID = GetRecordMapID(curMapID)
@@ -2031,12 +2041,12 @@
encourageInfo.InfoList = []
encourageCntKey = 'FbEncourageCnt_%s'
gameFB = GameWorld.GetGameFB()
- curPlayerID = curPlayer.GetID()
+ ownerID = ownerID or curPlayer.GetID()
for ipyData in ipyDataList:
inspireType = ipyData.GetInspireType()
packData = ChPyNetSendPack.tagMCFBEncourageCnt()
packData.MoneyType = inspireType
- packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey % inspireType)
+ packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey % inspireType)
encourageInfo.InfoList.append(packData)
encourageInfo.Cnt = len(encourageInfo.InfoList)
NetPackCommon.SendFakePack(curPlayer, encourageInfo)
--
Gitblit v1.8.0