From 7dafc3a10c56f44ea6ab7fbdbdadd29ba679e1be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 十二月 2025 15:30:09 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(步练师所有技能; 5023效果增加可指定消耗层级或不消耗怒气;增加效果6031;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py |   82 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
index bbeaa36..0cf3556 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
@@ -17,16 +17,21 @@
 
 import DBDataMgr
 import GameWorld
+import PyMongoMain
 import PlayerFamily
 import IpyGameDataPY
 import IPY_GameWorld
+import DataRecordPack
 import PlayerEventCounter
+import PlayerViewCache
 import PlayerControl
 import NetPackCommon
 import PlayerOnline
 import ShareDefine
 import PyGameData
+import ItemCommon
 import BattleObj
+import ChPlayer
 import ObjPool
 
 import datetime
@@ -68,7 +73,7 @@
 #调用该函数时,C++已经设置好区服,如果改变区服需重启
 def StartDB(tick):
     #初始化数据库, 恢复备档(按区服记录), 加载静态表
-    from PyMongoDB import PyMongoMain
+    #from PyMongoDB import PyMongoMain
     PyMongoMain.StartDB()
     InitGameWorld(tick)
     return
@@ -80,7 +85,9 @@
     serverID = GameWorld.GetGameWorld().GetServerID()
     GameWorld.Log("服务器启动初始化InitGameWorld: serverID=%s" % serverID)
     DBDataMgr.OnServerStart() # 优先加载公共数据
+    ItemCommon.InitPyItem()
     LoadDBPlayer()
+    PlayerViewCache.LoadRobot()
     PyGameData.g_initGameTime = int(time.time()) # 放到加载数据之后
     
     #初始话开服时间、星期几
@@ -105,7 +112,11 @@
         pass
     else:
         serverGroupID = GameWorld.GetServerGroupID()
-        GameWorld.Log("服务器启动成功: ServerGroupID=%s,serverID=%s" % (serverGroupID, serverID))
+        serverDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1
+        isMixServer = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_IsMixServer)
+        mixServerDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_MixServerDay) + 1
+        GameWorld.Log("服务器启动成功: ServerGroupID=%s,serverID=%s,serverDay=%s,isMixServer=%s,mixServerDay=%s" 
+                      % (serverGroupID, serverID, serverDay, isMixServer, mixServerDay))
     PyGameData.g_serverInitOK = True
     return
 
@@ -233,13 +244,29 @@
     ## 每秒分钟执行一次
     if not PyGameData.g_initGameTime:
         return
-    if tick - PyGameData.g_highProcessTick < 1000:
+    curTime = int(time.time())
+    if not PyGameData.g_highProcessTime:
+        PyGameData.g_highProcessTime = curTime
+        
+    if curTime < PyGameData.g_highProcessTime:
+        GameWorld.Log("时间回调了: lastProcessTime=%s" % (GameWorld.ChangeTimeNumToStr(PyGameData.g_highProcessTime)))
+        PyGameData.g_highProcessTime = curTime
+        OnFixServerTimeProcess()
+        
+    passSeconds = curTime - PyGameData.g_highProcessTime
+    if passSeconds < 1:
         return
-    PyGameData.g_highProcessTick = tick
+    if passSeconds > 10:
+        GameWorld.Log("时间误差过大: passSeconds=%s,lastProcessTime=%s" % (passSeconds, GameWorld.ChangeTimeNumToStr(PyGameData.g_highProcessTime)))
+        OnFixServerTimeProcess()
+        
+    PyGameData.g_highProcessTime = curTime
     
     if PyGameData.g_serverClosing:
         CheckCloseMapOK()
         return
+    
+    PyMongoMain.GetUserCtrlDB().onSecondProcess()
     
     OnMinute(tick)
     
@@ -249,6 +276,21 @@
     
     return
 
+def OnFixServerTimeProcess():
+    
+    # 补同步一次服务器时间给前端
+    playerManager = GameWorld.GetPlayerManager()
+    for i in xrange(playerManager.GetPlayerCount()):
+        curPlayer = playerManager.GetPlayerByIndex(i)
+        
+        if not GameWorld.IsNormalPlayer(curPlayer):
+            continue
+        
+        ChPlayer.Sync_PyServerDataTimeToClient(curPlayer)
+        ChPlayer.Sync_OpenServerDay(curPlayer)
+        
+    return
+        
 def OnMinute(tick):
     ## 每整分钟执行一次
     curTime = GameWorld.GetCurrentTime()
@@ -262,18 +304,40 @@
     DBDataMgr.OnMinute(curTime)
     DoLogic_GameWorldEvenByTime(tick)
     
+    #每5分钟
+    if curMinute % 5 == 0:
+        OnMinute_5(curTime, tick)
+        
     #其他功能逻辑
     #GameWorldActionControl.Dispose_OperationActionState()
     #GameWorldActionControl.Dispose_DailyActionState()
     #GameWorldActionControl.Dispose_FBStateTime()
+    PlayerControl.OnMinute(curTime)
     PlayerFamily.OnMinute()
     PlayerOnline.OnMinute()
     BattleObj.OnMinute()
-    ObjPool.OnMinute()
+    ObjPool.OnMinute(curTime)
     
     __CheckIpyDataRecycle(curTime)
     return
     
+def OnMinute_5(curTime, tick):
+    ## 每5分钟
+    DisposeGameActivePlayer(curTime, tick)
+    return
+
+def DisposeGameActivePlayer(curTime, tick):
+    curMinute = curTime.minute
+    gameWorld = GameWorld.GetGameWorld()
+    noteData = gameWorld.GetGameWorldDictByKey("OnlineCntM")
+    if noteData == curMinute:
+        # 同一分钟只处理1次
+        return
+    gameWorld.SetGameWorldDict("OnlineCntM", curMinute)
+    activePlayerCount = GameWorld.GetPlayerManager().OnlineCount()
+    DataRecordPack.DR_OnLinePlayerCount(activePlayerCount) # 总在线
+    return
+
 def DoLogic_GameWorldEvenByTime(tick):
     #-----------服务器当前时间
     curTime = datetime.datetime.today()
@@ -324,11 +388,13 @@
     GameWorld.Log("Server -> OnDay!")
     #设定服务器当前天事件
     eventMgr = DBDataMgr.GetEventTrigMgr()
-    eventMgr.SetValueIncrement(ShareDefine.Def_ServerDay)
+    serverDay = eventMgr.SetValueIncrement(ShareDefine.Def_ServerDay)
     isMixServer = eventMgr.GetValue(ShareDefine.Def_IsMixServer)
+    mixServerDay = 0
     if isMixServer:
-        eventMgr.SetValueIncrement(ShareDefine.Def_MixServerDay)
-        
+        mixServerDay = eventMgr.SetValueIncrement(ShareDefine.Def_MixServerDay)
+    GameWorld.Log("OnDay -> serverDay=%s,isMixServer=%s,mixServerDay=%s" % (serverDay + 1, isMixServer, mixServerDay + 1))
+    
     PlayerEventCounter.DoLogic_OnDay(tick)
     return
 

--
Gitblit v1.8.0