From ce185c6150887f187a7bbe3266cc2bd57286e380 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十二月 2018 15:59:08 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(增加段位匹配范围字段)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 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 38297f3..befd498 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -252,8 +252,8 @@
     #通知玩家物品信息
     __Sync_PackDetel(curPlayer)
     
-    #更新主服ID信息
-    #UpdatePlayerServerGroupID(curPlayer)
+    #更新服务器组ID
+    PlayerControl.UpdPlayerServerGroupID(curPlayer)
     
     #上线学习技能
     SkillCommon.PlayerLoginCheckLearnSkill(curPlayer)
@@ -826,20 +826,6 @@
 # #    curPlayer.Syn_OfflineTimeRefresh(int(curOfflineMinutes))
 #    curPlayer.Syn_OfflineTimeQueryResult()
 #===============================================================================
-    return
-
-def UpdatePlayerServerGroupID(curPlayer):
-    # 更新自己的服务器组ID, 跨服服务器不处理
-    if GameWorld.IsCrossServer():
-        return
-    serverGroupID = GameWorld.GetServerGroupID()
-    if not serverGroupID:
-        return
-    playerServerGroupID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ServerGroupID)
-    if playerServerGroupID != serverGroupID:
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ServerGroupID, serverGroupID)
-        GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID)
-        
     return
 
 #---------------------------------------------------------------------
@@ -3806,7 +3792,7 @@
 #@param mapBornPlace 复活位置,默认0为原地
 #@return 返回值无意义
 #@remarks 自定义函数, 玩家复活
-def PlayerRebornByType(curPlayer, playerRebornType, tick, mapBornPlace=0):
+def PlayerRebornByType(curPlayer, playerRebornType, tick, mapBornPlace=0, isAddSuperBuff=True):
     curPlayerID = curPlayer.GetID()
     curVipLv = curPlayer.GetVIPLv()
     
@@ -3915,7 +3901,8 @@
         FBLogic.OnResetFBRebornPlacePos(curPlayer, mapBornPlace, tick)
     
     #复活加无敌Buff
-    SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer , ChConfig.Def_SkillID_LimitSuperBuff, tick)
+    if isAddSuperBuff:
+        SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer , ChConfig.Def_SkillID_LimitSuperBuff, tick)
     #复活疲劳BUff
     if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_IsAddReviveTired):
         findBuff = SkillCommon.FindBuffByID(curPlayer, ChConfig.Def_SkillID_ReviveTired)[0]

--
Gitblit v1.8.0