From b19236f4da0999ccbc22eb562a7faa34b428b684 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 28 八月 2018 20:42:03 +0800
Subject: [PATCH] 2996 子 【设计】新增一个可均摊的技能 / 【后端】新增一个伤害均摊的技能, 修复均摊保底数值为1%

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
index 2688388..de7255d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
@@ -418,6 +418,7 @@
         #增加助战积分
         if isHelpFight:
             FBCommon.AddFBHelpPoint(curPlayer, mapID, 1)
+            overDict.pop(FBCommon.Over_itemInfo, 0)
         else:
             # 如果在副本中过天,则只给物品奖励,不变更过关信息
             if not isInFBOnDay:
@@ -450,6 +451,7 @@
             
 #        if not canDropPlayerList:
 #            FBCommon.Notify_FB_Over(curPlayer, overDict)
+        GameWorld.DebugLog('    overDict=%s'%overDict, curPlayer.GetID())
         FBCommon.Notify_FB_Over(curPlayer, overDict)
     return
 
@@ -691,7 +693,16 @@
         return
     playerID = curPlayer.GetPlayerID()
     
-    exchangeItemID = ipyData.GetExchangeItemID()
+    exchangeItemIDList = ipyData.GetExchangeItemIDList()
+    if not exchangeItemIDList:
+        return
+    if len(exchangeItemIDList) > 1:
+        jobIndex = curPlayer.GetJob() - 1
+        if jobIndex < 0 or jobIndex >= len(exchangeItemIDList):
+            return
+        exchangeItemID = exchangeItemIDList[jobIndex]
+    else:
+        exchangeItemID = exchangeItemIDList[0]
     exchangeItemCount = ipyData.GetExchangeItemCount()
     exchangeItemIsBind = ipyData.GetExchangeItemIsBind()
     costItemID = ipyData.GetCostItemID()
@@ -716,6 +727,8 @@
     #给物品
     ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, exchangeItemIsBind, [IPY_GameWorld.rptItem], 
                                  event=[ChConfig.ItemGive_TrialExchange, False, {}])
+    #任务
+    EventShell.EventRespons_TrialExchange(curPlayer, costItemID)
     
     GameWorld.DebugLog("宗门兑换成功!exchangeID=%s,costItemID=%s,costItemCount=%s,delInfoDict=%s" 
                            % (exchangeID, costItemID, costItemCount, delInfoDict), playerID)

--
Gitblit v1.8.0