From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +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_QueenRelics.py | 10 ++++++++--
1 files changed, 8 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 212a26d..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,7 @@
#成就
if grade >= maxGrade:
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelics, 1, [lineID+1])
+
EventShell.EventRespons_PassQueenRelecs(curPlayer, lineID, grade)
#任务
EventShell.EventRespons_FBEvent(curPlayer, "queenrelics_pass")
@@ -510,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)
@@ -518,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)
@@ -639,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