From b8205147a83828c471db21fc889b33d3221dbbb4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 19 四月 2019 11:50:46 +0800
Subject: [PATCH] 6457 【后端】【2.0】缥缈仙域开发单(任务接口修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
index b53635b..a4473cb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
@@ -29,6 +29,7 @@
 import EventReport
 import PlayerGoldGift
 import PlayerMagicWeapon
+import ChPlayer
 
 #---副本配置对应key值---
 (
@@ -328,7 +329,10 @@
     playerManager = GameWorld.GetMapCopyPlayerManager()
     if playerManager.GetPlayerCount() > 0:
         curPlayer = playerManager.GetPlayerByIndex(0)
-        curPlayer.SetHP(curPlayer.GetMaxHP())
+        if curPlayer.GetHP() <=0:
+            ChPlayer.PlayerRebornByType(curPlayer, ChConfig.rebornType_System, tick)
+        else:
+            curPlayer.SetHP(curPlayer.GetMaxHP())
         DoFBHelp(curPlayer, tick)
     
     FBCommon.SetFBStep(FB_Step_Fighting, tick)
@@ -442,15 +446,18 @@
         fbMissionID = gameFB.GetGameFBDictByKey(FBPlayerDict_MissionID)
         if fbMissionID:
             EventShell.EventRespons_FBEvent(curPlayer, "cleardevil_pass_%s" % fbMissionID)
-        # 成就
+        #触发激活法宝
         level = gameFB.GetGameFBDictByKey(FBPlayerDict_Level)
-        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_PassWagicWeapon, 1, [lineID + 1, level])
-        # 更新关卡
-        if level:
-            ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':level})
-            if ipyData:
-                mwID = ipyData.GetMWID()
-                PlayerMagicWeapon.UptateMWFBPasslv(curPlayer, mwID, level)
+        PlayerMagicWeapon.ActiveMagicWeaponByFB(curPlayer, ChConfig.Def_FBMapID_MagicWeapon, lineID, level)
+#        # 成就
+#        level = gameFB.GetGameFBDictByKey(FBPlayerDict_Level)
+#        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_PassWagicWeapon, 1, [lineID + 1, level])
+#        # 更新关卡
+#        if level:
+#            ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':level})
+#            if ipyData:
+#                mwID = ipyData.GetMWID()
+#                PlayerMagicWeapon.UptateMWFBPasslv(curPlayer, mwID, level)
                 
     
     DoFBHelp(curPlayer, tick)
@@ -582,14 +589,14 @@
     if isPass:
         EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_MagicWeapon, 0, ChConfig.CME_Log_End, 0, 1)
     
-    if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):
-        if not isPass:
-            #副本指定线路失败了,进入首充试用引导
-            if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):
-                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)
-                PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)
-        else:
-            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)
+#    if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):
+#        if not isPass:
+#            #副本指定线路失败了,进入首充试用引导
+#            if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):
+#                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)
+#                PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)
+#        else:
+#            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)
     return
 
 

--
Gitblit v1.8.0