From ffb2b5d1c7246523bb51e75d067c14d7bb8bbdc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 一月 2019 16:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/1.5.200.develop'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py
index 8520ffa..628fdde 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py
@@ -23,6 +23,7 @@
import PlayerControl
import PlayerBossReborn
import PlayerFairyCeremony
+import PlayerWeekParty
import EventReport
import time
@@ -143,11 +144,11 @@
EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_GodArea, 0, ChConfig.CME_Log_Start)
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_GodArea, 1)
PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_GodArea, 1)
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_GodArea, 1)
elif __IsAngerFull(curPlayer):
#怒气已满，退出副本
GameWorld.DebugLog(" 副本里掉线重上 怒气已满，退出副本")
PlayerControl.PlayerLeaveFB(curPlayer)
- FBCommon.SetHadDelTicket(curPlayer, 0)
DoFBHelp(curPlayer, tick)
return
@@ -164,7 +165,6 @@
# @param tick 时间戳
# @return 返回值无意义
def DoPlayerLeaveFB(curPlayer, tick):
- FBCommon.SetHadDelTicket(curPlayer, 0)
return
##玩家切换地图
--
Gitblit v1.8.0