From ab57c59ab33f5e4bf7e3bfd5514b04cb3d38dc2b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 二月 2026 18:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index b2a6ba0..7100543 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -2451,6 +2451,7 @@
 TYPE_Time_Format = "%Y-%m-%d %H:%M:%S"
 TYPE_Time_Format_Day = "%Y-%m-%d"
 TYPE_Time_Format_YmdHMS = "%Y%m%d%H%M%S"
+TYPE_Time_Format_YmdH = "%Y%m%d%H"
 #---------------------------------------------------------------------
 
 #请求类型(需要和GameServer中的一致)
@@ -3175,6 +3176,7 @@
 Def_PDict_OnDayEx = "OnDayEx" # 特殊时间点凌晨X点过天
 Def_PDict_OnWeekEx = "OnWeekEx" # 特殊时间点凌晨X点过周
 Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
+Def_PDict_OnCrossEvent = "OnCrossEvent" # 跨服过x事件值, yyyyMMddhh
 Def_Player_Dict_PlayerFromPID = "PlayerFromPID"    # pid
 Def_Player_Dict_Account_Type = "account_type"    # account_type
 Def_Player_Dict_FirstLogin = "FirstLogin"    # 首登标记 0-未首登; 1-首登过

--
Gitblit v1.8.0