From 829c5029f64d719c11dae62defd9f6c44ef6d423 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 04 一月 2019 19:49:21 +0800
Subject: [PATCH] 2824 【BUG】【1.4.100】跨服pk，跨服出来会触发仙盟商店红点
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 9f113ac..1f31053 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
@@ -175,7 +175,9 @@
fbStep = GameWorld.GetGameFB().GetFBStep()
# # 副本准备
-# if fbStep == FB_Step_Prepare:
+ if fbStep == FB_Step_Prepare:
+ ResetPos(tick)
+
# PrepareXMZZPK(tick)
# # 副本进行中
if fbStep == FB_Step_Fighting:
@@ -185,6 +187,15 @@
# __DoLogic_FB_Over(tick)
+ return
+
+def ResetPos(tick):
+ if tick - GameWorld.GetGameFB().GetFBStepTick() < 1 * 1000:
+ return
+ FBCommon.SetFBStep(FB_Step_Fighting, tick)
+ curPlayer = FBCommon.GetCurSingleFBPlayer()
+ if curPlayer:
+ __ResetPos(curPlayer)
return
def __ChcekFBOver(tick):
@@ -240,10 +251,10 @@
#===============================================================================================
FBCommon.SetFBStep(FB_Step_Prepare, tick)
#重置坐标
- __ResetPos(curPlayer)
+ #__ResetPos(curPlayer)
FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttWaitStart, __GetFightTime()[Def_PrepareTime] * 1000)
- FBCommon.SetFBStep(FB_Step_Fighting, tick)
+ #FBCommon.SetFBStep(FB_Step_Fighting, tick)
if not vsPlayerInfo:
return
@@ -355,8 +366,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)
--
Gitblit v1.8.0