From 6ad924ae5602f3ebc89267ed6c824a2523c0f36e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 13 四月 2019 16:15:21 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 b3c73e9..5697e1b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -36,6 +36,7 @@
import GameFuncComm
import PlayerTJG
import IpyGameDataPY
+import cPickle
import time
import random
@@ -107,6 +108,8 @@
EventShell.EventResponse_OnFamilyLVUp(curPlayer)
if curPlayer.GetFamilyMemberLV() != refreshPack.GetFamilyMemberLV():
+ # 因为仙盟职位没有存DBPlayer，而跨服后又没有Family信息，所以这里做个存储，用于跨服用
+ curPlayer.SetReceivedSalary(refreshPack.GetFamilyMemberLV())
curPlayer.SetFamilyMemberLV(refreshPack.GetFamilyMemberLV())
#通知周围玩家家族职位刷新
#curPlayer.Notify_FamilyMemberLVRefresh()
@@ -186,7 +189,7 @@
def __OnFamilyLVBuffChange(curPlayer, tick):
return
# 跨服服务器不处理，防止登录跨服服务器后无战盟导致战力下降
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
familyLVBuffSkillTypeID = ReadChConfig.GetEvalChConfig("FamilyLVBuff")
@@ -588,7 +591,7 @@
return
#请求记录申请进入家族信息
- sendMsg = str([familyID, curPlayer.GetFightPower()])
+ sendMsg = cPickle.dumps([familyID, curPlayer.GetFightPower()], 2)
curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_AddFamilyAction,
ShareDefine.Def_ActionType_FamilyAdd, '', sendMsg, len(sendMsg))
@@ -632,6 +635,15 @@
PlayerFamilyTech.Sync_PlayerFamilyTechLV(curPlayer)
SyncFamilyActivityInfo(curPlayer)
Sync_FamilyDayRewardState(curPlayer)
+ return
+
+def FamilyPlayerOnLoginCross(curPlayer):
+ ## 登录跨服服务器
+ crossFamilyMemberLV = curPlayer.GetReceivedSalary()
+ if crossFamilyMemberLV:
+ curPlayer.SetFamilyMemberLV(crossFamilyMemberLV)
+ GameWorld.DebugLog("跨服登录设置仙盟职位等级: %s" % crossFamilyMemberLV, curPlayer.GetPlayerID())
+
return
@@ -734,7 +746,7 @@
## 添加家族事件记录
def AddFamilyEventNote(curPlayer, eventType, valueList):
##同步记录到GameServer, eventType默认为value1
- sendMsg = str([eventType] + valueList)
+ sendMsg = cPickle.dumps([eventType] + valueList, 2)
curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_AddFamilyAction, ShareDefine.Def_ActionType_FamilyEvent, '', sendMsg, len(sendMsg))
GameWorld.DebugLog("AddFamilyEventNote sendMsg=%s" % sendMsg)
return
@@ -848,7 +860,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