From e261fda74c51592a8e83175f3a7386f48ed13df4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 28 十一月 2018 16:46:56 +0800
Subject: [PATCH] 4762 【后端】修复开关服后助战次数信息加载失败bug;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   14 +++++++++++---
 1 files changed, 11 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 0108dab..853f5b2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -72,7 +72,7 @@
 import PlayerFreeGoods
 import ShopItemManage
 import PlayerRecover
-import Operate_EquipSuitCompose
+import GameLogic_IceLode
 import PlayerEquipDecompose
 import PlayerCoat
 import PlayerGreatMaster
@@ -110,6 +110,7 @@
 import PlayerFairyCeremony
 import ChNetSendPack
 import FamilyRobBoss
+import FBHelpBattle
 import PyGameData
 import PlayerCoin
 import PlayerGeTui
@@ -524,7 +525,6 @@
     #仙魔之争
     GameLogic_XMZZ.OnXMZZLogin(curPlayer)
     PlayerOnlinePrize.OnPlayerLogin(curPlayer)
-    GameLogic_SealDemon.NotifyFMTDouble(curPlayer)
     #装备分解
     PlayerEquipDecompose.PlayerLogin(curPlayer)
     #防沉迷
@@ -557,6 +557,8 @@
     SyncLittleHelper(curPlayer)
     # 聊天气泡框
     SyncChatBubbleBoxState(curPlayer)
+    # 副本助战
+    FBHelpBattle.DoPlayerLogin(curPlayer)
     
     curPlayer.SetState(0)   # 脱机挂恢复为正常上线
     curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线,做一次恢复,1为保存 0为正常下线
@@ -3929,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)
@@ -5127,6 +5131,10 @@
     # 功能开启奖励
     elif rewardType == ChConfig.Def_RewardType_OpenFunc:
         GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)
+    # 冰晶矿脉星级奖励
+    elif rewardType == ChConfig.Def_RewardType_IceLodeStar:
+        GameLogic_IceLode.GetIceLodeStarAward(curPlayer, dataEx)
+    
 #
 #    # 充值豪礼奖励
 #    elif rewardType == ShareDefine.Def_RewardType_GoldGift:

--
Gitblit v1.8.0