From 4522a07fe53f63a2ff97701ee6a166e80e329181 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 二月 2019 12:01:09 +0800
Subject: [PATCH] 6249 【后端】【2.0】拍卖行(拍卖物品表、拍卖记录表定义)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
index 1c74150..c390c49 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -107,9 +107,11 @@
             EventShell.EventResponse_OnFamilyLVUp(curPlayer)
         
     if curPlayer.GetFamilyMemberLV() != refreshPack.GetFamilyMemberLV():
+        # 因为仙盟职位没有存DBPlayer,而跨服后又没有Family信息,所以这里做个存储,用于跨服用
+        curPlayer.SetReceivedSalary(refreshPack.GetFamilyMemberLV())
         curPlayer.SetFamilyMemberLV(refreshPack.GetFamilyMemberLV())
         #通知周围玩家家族职位刷新
-        curPlayer.Notify_FamilyMemberLVRefresh()
+        #curPlayer.Notify_FamilyMemberLVRefresh()
         GameLogic_FamilyWar.DoCheckChampionFamilyTitle(curPlayer)
     
     if curPlayer.GetFamilyMoney() != refreshPack.GetFamilyMoney():
@@ -186,7 +188,7 @@
 def __OnFamilyLVBuffChange(curPlayer, tick):
     return
     # 跨服服务器不处理,防止登录跨服服务器后无战盟导致战力下降
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         return
     
     familyLVBuffSkillTypeID = ReadChConfig.GetEvalChConfig("FamilyLVBuff")
@@ -634,6 +636,15 @@
     Sync_FamilyDayRewardState(curPlayer)
     return
 
+def FamilyPlayerOnLoginCross(curPlayer):
+    ## 登录跨服服务器
+    crossFamilyMemberLV = curPlayer.GetReceivedSalary()
+    if crossFamilyMemberLV:
+        curPlayer.SetFamilyMemberLV(crossFamilyMemberLV)
+        GameWorld.DebugLog("跨服登录设置仙盟职位等级: %s" % crossFamilyMemberLV, curPlayer.GetPlayerID())
+        
+    return
+
 
 
 
@@ -755,6 +766,7 @@
 #  @param awardIndex
 #  @return None
 def GetFamilyActivityAward(curPlayer, awardIndex):
+    return
     familyActiveList = IpyGameDataPY.GetFuncEvalCfg('FamilyActive')
     familyActiveAwardList = IpyGameDataPY.GetFuncEvalCfg('FamilyActive', 2)
     if awardIndex < 0 or awardIndex >= len(familyActiveList):
@@ -790,6 +802,7 @@
     return
 
 def AddFamilyActivity(curPlayer, actionid, addCnt=1):
+    return
     ipyData = IpyGameDataPY.GetIpyGameData('FamilyActivity', actionid)
     if not ipyData:
         return
@@ -817,6 +830,7 @@
     return totalPoint
 
 def SyncFamilyActivityInfo(curPlayer, syncActionid=-1):
+    return
     #通知活跃领取情况
     syncActionIDList = ShareDefine.FamilyActiveIDList if syncActionid==-1 else [syncActionid]
     sendPack = ChPyNetSendPack.tagMCFamilyActivityInfo()
@@ -845,7 +859,7 @@
 def UpdateFamilyName(index, clientData, tick):
     
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         #itemuse_lzxkoy_0:不可在跨服环境下使用改名功能。
         PlayerControl.NotifyCode(curPlayer, "itemuse_lzxkoy_0")
         return

--
Gitblit v1.8.0