From c06d47322d2892a440dc11b94f06950da762e5bd Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 六月 2019 19:41:43 +0800
Subject: [PATCH] 7413 宗门试炼评级通知

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
index 9961324..fe4c9a0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
@@ -27,6 +27,7 @@
 import ItemCommon
 import FormulaControl
 import NPCCustomRefresh
+import PlayerWeekParty
 import PlayerSuccess
 import PyGameData
 import EventReport
@@ -137,7 +138,7 @@
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_XMZZLastStartTime, curtime)
         #FBCommon.SetFBStep(FB_Step_Prepare, tick)
         #PrepareXMZZPK(curPlayer, tick)
-        
+        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_XMZZ, 1)
         msgInfo = str([1]) # 是否刚开始
         GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'XMZZStartFight', msgInfo, len(msgInfo))
         curPlayer.SetHP(curPlayer.GetMaxHP())
@@ -366,8 +367,8 @@
 # @return 返回值无意义
 # @remarks 玩家主动离开副本.
 def DoPlayerDead(curPlayer):
-    if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
-        return
+#    if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
+#        return
     
     HPPer = __GetHPPer(curPlayer)
     __SendPKResult(curPlayer, 0, 1, HPPer)
@@ -449,8 +450,7 @@
     prizeItemList = winCntAwardDict[str(prizeEx)]
     # 给物品 [奖励物品id,个数,是否绑定]
     for itemID, itemCnt, isBind in prizeItemList:
-        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,
-                                        [IPY_GameWorld.rptItem], True, showSysInfo=True):
+        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
     
             playerID = curPlayer.GetPlayerID()
             GameWorld.ErrLog("OnGetXMZZPrizeResult(), give item itemid:%s,count:%s" % (itemID, itemCnt), playerID)
@@ -533,9 +533,9 @@
         lastStartTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_XMZZLastStartTime)
         curTime = int(time.time())
         costTime = (curTime-lastStartTime)*1000
-        overDict = {FBCommon.Over_score:addScore, FBCommon.Over_extrScore:updExtraScore,
+        overDict = {FBCommon.Over_score:updScore, FBCommon.Over_extrScore:updExtraScore,
                     FBCommon.Over_extraExp:updExtraExp, FBCommon.Over_extraExpPoint:updExtraExpPoint,
-                    FBCommon.Over_exp:exp, FBCommon.Over_expPoint:expPoint, FBCommon.Over_costTime:costTime,
+                    FBCommon.Over_exp:updExp, FBCommon.Over_expPoint:updExpPoint, FBCommon.Over_costTime:costTime,
                     'conWinCnt':conWinCnt}
         FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_XMZZ, 0, isWin, overDict)
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_XMZZLastStartTime, 0)

--
Gitblit v1.8.0