From 6366979426fccd97c0cb0bd384ada3a8b9843a24 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 25 十月 2018 14:37:22 +0800
Subject: [PATCH] 2198 【主干】仙盟盟主5天没上线，盟主没有主动传位
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
index cace376..27d3874 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py
@@ -30,6 +30,7 @@
import ShareDefine
import EventShell
import EventReport
+import ChPlayer
#阶段时间
@@ -501,6 +502,8 @@
#成就
if grade >= maxGrade:
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelics, 1, [lineID+1])
+
+ EventShell.EventRespons_PassQueenRelecs(curPlayer, lineID, grade)
#任务
EventShell.EventRespons_FBEvent(curPlayer, "queenrelics_pass")
FBCommon.NotifyFBOver(curPlayer, dataMapID, lineID, isPass, overDict)
@@ -509,7 +512,7 @@
updRewardLine = lineID + 1
gameFB.SetPlayerGameFBDict(playerID, FBPKey_RewardLine, updRewardLine)
- if not rewardLine and not isHelpFight:
+ if isPass and not rewardLine and not isHelpFight:
isInFBOnDay = gameFB.GetPlayerGameFBDictByKey(playerID, FBPKey_IsInFBOnDay)
if not isInFBOnDay:
GameWorld.DebugLog("首次结算奖励，增加挑战次数！", playerID)
@@ -517,7 +520,7 @@
FBCommon.AddEnterFBCount(curPlayer, dataMapID)
else:
GameWorld.DebugLog("副本中过天，不增加挑战次数！", playerID)
-
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelicsEx, 1)
# 不可再挑战下一关了
if not nextLineID:
curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, fbLineTime[Def_LeaveTime] * 1000, True)
@@ -638,6 +641,10 @@
GameWorld.ErrLog("没有目标功能线路！toLineID=%s" % toLineID)
return
+ if curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
+ GameWorld.Log("进入下一层时玩家是死亡状态，先复活!", curPlayer.GetPlayerID())
+ ChPlayer.PlayerRebornByType(curPlayer, ChConfig.rebornType_System, tick)
+
toPosX, toPosY = __GetQueenRelicsLinePos(mapID, toLineID, toLineIpyData)
PlayerControl.PlayerResetWorldPosFBLineID(curPlayer, mapID, toPosX, toPosY, toLineID)
--
Gitblit v1.8.0