From 3f85865d16ea593bab12c7decf6108571e983893 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 19 四月 2019 10:51:49 +0800
Subject: [PATCH] 6457 【后端】【2.0】缥缈仙域开发单（宝藏报错修复）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
index b0386b1..39ea12e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.py
@@ -25,9 +25,9 @@
import PlayerFamily
import PlayerDBGSEvent
import GameWorldActionControl
+import PlayerFBHelpBattle
import ChPyNetSendPack
import NetPackCommon
-import PlayerManorWar
import PlayerDuJie
#---------------------------------------------------------------------
@@ -54,17 +54,9 @@
if isMixServer:
PlayerDBGSEvent.SetDBGSTrig_ServerTime(PlayerDBGSEvent.Def_MixServerDay)
- #设定上次开启活动时间距离现在天数事件
- GameWorldActionControl.DoLogic_ServerLastOpenActionDay()
-
- #领地争夺战OnDay
- #PlayerManorWar.OnDay()
-
#家族更新
PlayerFamily.FamilyOnDay(tick)
- #合服活动
- #GameWorldMixServerCampaign.MixServerOnDay()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -81,7 +73,8 @@
def DoLogic_GameServer_OnDayEx(tick):
#渡劫OnDay
PlayerDuJie.OnDayEx()
-
+ #副本助战
+ PlayerFBHelpBattle.HelpBattleOnDay()
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
@@ -180,14 +173,11 @@
# @remarks 函数详细说明.
def PlayerOnDay(curPlayer):
+ if GameWorld.IsCrossServer():
+ return
+
#通知开服天数
Sync_OpenServerDay(curPlayer)
-
- #通知上次根据开服天数开启的活动到现在的天数
- #Sync_ServerLastOpenActionDay(curPlayer)
-
- #通知跨服服务器开启的活动到现在的天数
- #Sync_MergeServerOpenActionDay(curPlayer)
GameWorld.Log("PlayerOnDay!", curPlayer.GetPlayerID())
return
@@ -297,7 +287,7 @@
packData.Day = openDay
packData.IsMixServer = isMixServer
packData.MixDay = mixServerDay
- packData.OpenWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime)
+ packData.OpenWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday)
packData.NowYear = serverTime.year
packData.NowMonth = serverTime.month
packData.NowDay = serverTime.day
@@ -306,18 +296,6 @@
packData.NowSecond = serverTime.second
packData.NowMicSecond = serverTime.microsecond
NetPackCommon.SendFakePack(curPlayer, packData)
- return
-
-
-## 通知上次根据开服天数开启的活动到现在的天数
-# @param curPlayer: 玩家实例
-# @return: None
-def Sync_ServerLastOpenActionDay(curPlayer):
-# lastOpenActionDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerLastOpenActionDay)
-# packData = ChPyNetSendPack.tagServerLastOpenActionDay()
-# packData.Clear()
-# packData.Day = lastOpenActionDay
-# NetPackCommon.SendFakePack(curPlayer, packData)
return
--
Gitblit v1.8.0