From 637e783b5caca75b201e1dffd54b89bd7b37bb0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 三月 2019 16:09:53 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（增加竞价时间通知）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
index 2831347..bbb2ea5 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
@@ -83,6 +84,9 @@
def GetCurWeekMissionMoney(curFamily): return curFamily.GetExtra2()
def SetCurWeekMissionMoney(curFamily, value): return curFamily.SetExtra2(min(value, ChConfig.Def_UpperLimit_DWord))
+# 仙盟上次处理的合服天
+def GetFamilyMixServerDay(curFamily): return curFamily.GetExtra1()
+def SetFamilyMixServerDay(curFamily, value): return curFamily.SetExtra1(value)
## ------------------ 成员 ----------------------
def GetMemberFightPower(curMember): return curMember.GetExattr3()
def SetMemberFightPower(curMember, fightPower): return curMember.SetExattr3(fightPower)
@@ -236,6 +240,9 @@
curFamily.SetAcceptJoin(ShareDefine.FamilyAcceptJoin_Agree) #设置收人方式为直接通过申请
PyDataManager.GetFamilyStoreItemManager().DelFamilyStoreItemAll(curFamily.GetID())
+ #新创建的仙盟默认设置已处理过合服
+ SetFamilyMixServerDay(curFamily, PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay))
+
#-设置家族成员属性
DoPlayerJionFamily(curFamily, curPlayer, IPY_GameServer.fmlLeader)
@@ -362,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())
@@ -379,8 +387,6 @@
GameWorld.DebugLog(' 玩家战盟名变更处理, newFamilyName=%s' % familyName, playerID)
#不处理排行榜
needChangeFamilyBillboardList = [
- #ShareDefine.Def_BT_MixCampaign_Recharge, # 累计充值(合服活动)
- #ShareDefine.Def_BT_RechargeTeHui, # 充值特惠活动排行榜-当前期记录
]
billboardMgr = GameWorld.GetBillboard()
for billboardIndex in needChangeFamilyBillboardList:
@@ -1416,6 +1422,9 @@
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
tagPlayerName = curTagMember.GetName() # 被踢玩家名
tagPlayerID = curTagMember.GetPlayerID() # 被踢玩家ID
@@ -1494,6 +1503,9 @@
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
#判断退出时间间隔
curTime = int(time.time())
@@ -1856,8 +1868,6 @@
# @return None
# @remarks 函数详细说明.
def PlayerLoginRefreshFamily(curPlayer, tick):
- if GameWorld.IsCrossServer():
- return
SyncFakeFamilyInfo(curPlayer)
familyID = curPlayer.GetFamilyID()
curFamily = None
@@ -1929,6 +1939,37 @@
PlayerRefresh(curPlayer, tick)
GameWorldFamilyWar.OnPlayerLogin(curFamily, curPlayer)
+
+ # 盟主上线处理
+ if curMember.GetFamilyLV() == IPY_GameServer.fmlLeader:
+ OnFamilyLeaderLogin(curPlayer, curFamily)
+ return
+
+def OnFamilyLeaderLogin(curPlayer, curFamily):
+ ## 盟主登录处理
+ __DoFamilyMixServerLogicOnLeaderLogin(curPlayer, curFamily)
+ return
+
+def __DoFamilyMixServerLogicOnLeaderLogin(curPlayer, curFamily):
+ ## 合服仙盟盟主登录处理
+
+ isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer)
+ if not isMixServer:
+ return
+ lastMixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay)
+ familyID = curFamily.GetID()
+ familyMixServerDay = GetFamilyMixServerDay(curFamily)
+ if familyMixServerDay == lastMixServerDay:
+ GameWorld.DebugLog("已经处理过仙盟盟主合服登录逻辑! lastMixServerDay=%s" % (lastMixServerDay), familyID)
+ return
+ SetFamilyMixServerDay(curFamily, lastMixServerDay)
+ GameWorld.Log("处理合服仙盟盟主登录! lastMixServerDay=%s" % (lastMixServerDay), familyID)
+
+ mailItemList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 4)
+ playerID = curPlayer.GetPlayerID()
+ detailDict = {}
+ GameWorld.Log(" 发送合服盟主专属补偿邮件! familyID=%s,mailItemList=%s" % (familyID, mailItemList), playerID)
+ PlayerCompensation.SendMailByKey("MixServer2", [playerID], mailItemList, detail=detailDict)
return
#---------------------------------------------------------------------
## 玩家下线家族刷新逻辑
@@ -2323,6 +2364,7 @@
#上面已经验证过了，家族肯定存在的
curFamily = curPlayer.GetFamily()
curFamilyID = curFamily.GetID()
+ curPlayerID = curPlayer.GetID()
# curFamilyTrig = PlayerDBGSEvent.FindDBGSTrig_ByEventID(curFamilyID , PlayerDBGSEvent.Def_Key_RenameFamily)
#
# if not curFamilyTrig:
@@ -2357,20 +2399,20 @@
curMemberID = curMember.GetPlayerID()
__OnFamilyNameChange(curMemberID, familyName)
memberIDList.append(curMemberID)
- curPlayer = playerManager.FindPlayerByID(curMemberID)
+ player = playerManager.FindPlayerByID(curMemberID)
#玩家不在线
- if not curPlayer:
+ if not player:
continue
- curPlayerMapID = GameWorld.GetQueryPlayerMapID(curPlayer)
+ curPlayerMapID = GameWorld.GetQueryPlayerMapID(player)
if not curPlayerMapID:
continue
- msgStr = str([curPlayer.GetPlayerID(), familyName])
+ msgStr = str([curPlayerID, familyName])
playerManager.MapServer_QueryPlayer(0, 0, curMemberID, curPlayerMapID, 'FamilyNameRefresh',
msgStr, len(msgStr),
- curPlayer.GetRouteServerIndex())
+ player.GetRouteServerIndex())
PlayerCompensation.SendMailByKey('FamilyNameChange', memberIDList, [], [oldName, familyName])
PlayerControl.WorldNotify(0, 'Family_ChangeName', [oldName, familyName])
--
Gitblit v1.8.0