From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index ad65c9f..ec43b70 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -18,7 +18,6 @@
import GameMap
import ChConfig
import EventShell
-import SkillShell
import BuffSkill
import PlayerEventCounter
import PlayerTeam
@@ -57,10 +56,8 @@
import PlayerLoginDayAward
import PlayerGodWeapon
import PlayerWorldAverageLv
-import GameLogic_ManorWar
import PlayerGoldInvest
import PlayerActivity
-import PlayerTeHui
import FBCommon
import PlayerBindJadeWheel
import BossHurtMng
@@ -70,15 +67,12 @@
import PlayerDienstgrad
import PlayerMixLoginDayAward
import PlayerFreeGoods
-import ShopItemManage
import PlayerRecover
import GameLogic_IceLode
import PlayerEquipDecompose
-import PlayerCoat
import PlayerGreatMaster
-import PlayerCostVIP
-import PlayerMergeKing
-import PlayerMergePK
+import PlayerGatherSoul
+import PlayerCrossRealmPK
import GameFuncComm
import PlayerMagicWeapon
import GameLogic_TrialTower
@@ -101,7 +95,6 @@
import QuestCommon
import PlayerTJG
import GameLogic_XMZZ
-import GameLogic_SealDemon
import PlayerFlashSale
import PlayerFlashGiftbag
import PlayerCostRebate
@@ -249,7 +242,7 @@
# 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送
# ！！！必要发送的数据要注意位置
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
curPlayer.SetForbiddenSyncClientState(True)
SyncGuideState(curPlayer)
@@ -308,7 +301,10 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FuncChangeLineID, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_HighChangeLineID, 0)
#GameWorld.DebugLog("离线超过10秒重置切线临时保存的相关记录值!leaveServerSecond=%s" % leaveServerSecond, curPlayer.GetPlayerID())
-
+ # 离线过久恢复为非跨服状态
+ if PlayerControl.GetCrossRealmState(curPlayer):
+ PlayerControl.SetCrossRealmState(curPlayer, 0)
+
# 合服首登处理
__DoMixServerFirstLogin(curPlayer)
PlayerBillboard.BillboardOnLogin(curPlayer)
@@ -486,6 +482,8 @@
# # 跨服匹配
# PlayerMergePK.MergePKOnLogin(curPlayer)
# PlayerMergeKing.MergePKOnLogin(curPlayer)
+ # 跨服PK
+ PlayerCrossRealmPK.DoPlayerLogin(curPlayer)
# 自定义货币值同步
PlayerControl.NotifyPlayerAllCurrency(curPlayer)
@@ -564,7 +562,8 @@
SyncChatBubbleBoxState(curPlayer)
# 副本助战
FBHelpBattle.DoPlayerLogin(curPlayer)
-
+ # 聚魂
+ PlayerGatherSoul.PlayerLogin(curPlayer)
curPlayer.SetState(0) # 脱机挂恢复为正常上线
curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线，做一次恢复，1为保存 0为正常下线
tjgTime = PlayerTJG.GetTJGTime(curPlayer)
@@ -577,8 +576,9 @@
# 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送
# ！！！必要发送的数据要注意位置
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
curPlayer.SetForbiddenSyncClientState(False)
+ PlayerControl.SetCrossRealmState(curPlayer, 1) # 因为主服上传数据之前该值为1，所以登录跨服后在跨服服务器要设置为1
return
@@ -834,7 +834,7 @@
def UpdatePlayerServerGroupID(curPlayer):
# 更新自己的服务器组ID, 跨服服务器不处理
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
serverGroupID = GameWorld.GetServerGroupID()
if not serverGroupID:
@@ -3827,7 +3827,7 @@
#复活冷却时间（秒）
rebornTime = GetRebronTime(curPlayer, playerRebornType)
#冷却时间到了
- if not CanRebornByTimeOver(curPlayer, rebornTime):
+ if playerRebornType != ChConfig.rebornType_System and not CanRebornByTimeOver(curPlayer, rebornTime):
PlayerControl.NotifyCode(curPlayer, 'RebornCD')
return False
--
Gitblit v1.8.0