From 11fe4059a5f65e1f27d78aa9a8d2a110e8122476 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 11 四月 2019 19:16:13 +0800
Subject: [PATCH] 6457 【后端】【2.0】缥缈仙域开发单(新增表)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
index 3894633..441c4dd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
@@ -40,6 +40,7 @@
import PlayerFamilySWRH
import PlayerViewCache
import GameWorldBoss
+import AuctionHouse
import PlayerTalk
import PlayerTeam
@@ -368,7 +369,8 @@
PlayerFamilyBoss.NotifyFamilyBossFBInfo(jionPlayer)
#通知家族仓库
PyDataManager.GetFamilyStoreItemManager().SyncFamilyStoreItem(jionPlayer, curFamily.GetID())
-
+ #仙盟拍品
+ AuctionHouse.Sync_FamilyAuctionItemInfo(jionPlayer, curFamily.GetID())
SetMemberFightPower(familyMember, jionPlayer.GetFightPower())
AddFamilyIDToFightPowerChangeList(curFamily.GetID())
@@ -385,7 +387,6 @@
GameWorld.DebugLog(' 玩家战盟名变更处理, newFamilyName=%s' % familyName, playerID)
#不处理排行榜
needChangeFamilyBillboardList = [
- #ShareDefine.Def_BT_RechargeTeHui, # 充值特惠活动排行榜-当前期记录
]
billboardMgr = GameWorld.GetBillboard()
for billboardIndex in needChangeFamilyBillboardList:
@@ -1421,7 +1422,12 @@
if GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):
PlayerControl.NotifyCode(curPlayer, "FairyGrabBossExitError")
return
-
+ if PlayerFamilyBoss.IsInAllFamilyBoss():
+ PlayerControl.NotifyCode(curPlayer, "LeagueBOSSExitError1")
+ return
+ if AuctionHouse.IsFamilyMemberBiddingAuctionItem(curFamily.GetID(), tagMemberID):
+ PlayerControl.NotifyCode(curPlayer, "Paimai7")
+ return
tagPlayerName = curTagMember.GetName() # 被踢玩家名
tagPlayerID = curTagMember.GetPlayerID() # 被踢玩家ID
tagFamilyLV = curTagMember.GetFamilyLV() # 被踢玩家职位
@@ -1500,6 +1506,12 @@
if GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):
PlayerControl.NotifyCode(curPlayer, "FairyGrabBossExitError")
return
+ if PlayerFamilyBoss.IsInAllFamilyBoss():
+ PlayerControl.NotifyCode(curPlayer, "LeagueBOSSExitError1")
+ return
+ if AuctionHouse.IsFamilyMemberBiddingAuctionItem(curFamily.GetID(), curMember.GetPlayerID()):
+ PlayerControl.NotifyCode(curPlayer, "Paimai8")
+ return
#判断退出时间间隔
curTime = int(time.time())
lastLeaveFamilyTime = PlayerControl.GetLeaveFamilyTime(curPlayer)
--
Gitblit v1.8.0