From 97cbea04b641f367c24096e69dfe058baf80b150 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 05 十二月 2018 15:42:59 +0800
Subject: [PATCH] 5242 【后端】【1.3.100】仙盟宴会答题修改为只能在宴会地图内才能答题

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 173b225..29cfc9f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -110,6 +110,7 @@
 import PlayerFairyCeremony
 import ChNetSendPack
 import FamilyRobBoss
+import FBHelpBattle
 import PyGameData
 import PlayerCoin
 import PlayerGeTui
@@ -556,6 +557,8 @@
     SyncLittleHelper(curPlayer)
     # 聊天气泡框
     SyncChatBubbleBoxState(curPlayer)
+    # 副本助战
+    FBHelpBattle.DoPlayerLogin(curPlayer)
     
     curPlayer.SetState(0)   # 脱机挂恢复为正常上线
     curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线,做一次恢复,1为保存 0为正常下线
@@ -2504,7 +2507,7 @@
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_RoomID, 0)
     
     #下线召回宠物
-    #PetControl.ReCallFightPet(curPlayer)
+    PetControl.ReCallFightPet(curPlayer)
     
     PlayerTJG.CalcPlayerTJG(curPlayer, tick)
     
@@ -3928,7 +3931,9 @@
     
     #设置血量
     curPlayer.SetHP(curPlayer.GetMaxHP() * resetHpPercent / ChConfig.Def_MaxRateValue)
-    curPlayer.SetMP(curPlayer.GetMaxMP() * resetMpPercent / ChConfig.Def_MaxRateValue)
+    #curPlayer.SetMP(curPlayer.GetMaxMP() * resetMpPercent / ChConfig.Def_MaxRateValue)
+    #护盾
+    PlayerControl.SetProDef(curPlayer, PlayerControl.GetMaxProDef(curPlayer))
     
     #玩家复活后副本处理
     FBLogic.OnPlayerRebornOver(curPlayer, playerRebornType)
@@ -5647,7 +5652,7 @@
     sendPack.Speed = curPlayer.GetSpeed()
     sendPack.MoveType = moveType
     # NotifyAll 做过滤或者数量处理
-    PlayerControl.PyNotifyAll(curPlayer, sendPack, False, -1)
+    PlayerControl.PyNotifyAll(curPlayer, sendPack, False, 0)
     return
 
 def GetDownloadAward(curPlayer, dataEx):

--
Gitblit v1.8.0