From 207163ddd5ae38abd61a98f5275fa719e05b9fcc Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期五, 18 九月 2026 17:16:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
index 0741e86..0a369c3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
@@ -5,4 +5,6 @@
 4	[]	[]	30	2026-6-19	2026-6-25	0	3	39	ActTaskScoreJRHD	30	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
 5	[]	[]	30	2026-7-23	2026-7-29	0	4	40	ActTaskScoreJRHD	31	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
 6	[]	[]	30	2026-8-19	2026-8-25	0	5	41	ActTaskScoreJRHD	32	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
-7	[]	[]	30	2026-9-23	2026-9-29	0	6	42	ActTaskScoreJRHD	33	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
+7	[]	[]	30	2026-9-21	2026-9-27	0	6	42	ActTaskScoreJRHD	33	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
+8	["xssg"]	[]	30	2026-10-1	2026-10-7	0	7	43	ActTaskScoreJRHD	34	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}
+9	["sghy"]	[]	30	2026-10-12	2026-10-18	0	7	43	ActTaskScoreJRHD	34	{"3000":[0,8,100],"6000":[1,3,300],"9000":[2,5,20],"15000":[3,20,20],"21000":[4,1005,1]}

--
Gitblit v1.8.0