From 62f26436a4a204a3919ba7fa98319ee72d66a411 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 22 十月 2018 21:11:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..29e13f3 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
@@ -411,13 +411,15 @@
if star == 5:
joinType = FBCommon.GetFBJoinType(curPlayer, isHelpFight)
- EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s" % (lineID+1))
+
EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, joinType, 1)
+ EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s_%s" % (lineID, star))
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [playerCount, star, lineID+1])
-
+ EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")
#增加助战积分
if isHelpFight:
FBCommon.AddFBHelpPoint(curPlayer, mapID, 1)
+ overDict.pop(FBCommon.Over_itemInfo, 0)
else:
# 如果在副本中过天，则只给物品奖励，不变更过关信息
if not isInFBOnDay:
@@ -450,6 +452,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 +694,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 +728,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