From 9a2c65117fcbddefa4f8e25c82c9bbdb4a92f8b9 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期六, 09 五月 2026 18:01:14 +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/ActBillboardAward.txt |   40 ++++++++++----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActBillboardAward.txt |   40 ++++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActBillboardAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActBillboardAward.txt
index c3813b0..dd51ae1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActBillboardAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActBillboardAward.txt
@@ -89,23 +89,23 @@
 200	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
 200	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
 200	201	2000	0	[[1002,1],[8,40],[1,100],[5,2]]
-1001	1	1	0	[[11016,50],[1001,3],[8,800],[1,2000],[5,40]]
-1001	2	2	0	[[11016,40],[1001,3],[8,600],[1,1800],[5,30]]
-1001	3	3	0	[[11016,35],[1001,2],[8,400],[1,1500],[5,20]]
-1001	4	5	0	[[11016,30],[1001,2],[8,300],[1,1000],[5,15]]
-1001	6	10	0	[[11016,25],[1001,2],[8,200],[1,800],[5,10]]
-1001	11	20	0	[[11016,20],[1001,1],[8,160],[1,500],[5,8]]
-1001	21	50	0	[[1003,1],[8,120],[1,400],[5,6]]
-1001	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
-1001	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
-1001	201	9999	0	[[1002,1],[8,40],[1,100],[5,2]]
-1002	1	1	0	[[14016,50],[1001,3],[8,800],[1,2000],[5,40]]
-1002	2	2	0	[[14016,40],[1001,3],[8,600],[1,1800],[5,30]]
-1002	3	3	0	[[14016,35],[1001,2],[8,400],[1,1500],[5,20]]
-1002	4	5	0	[[14016,30],[1001,2],[8,300],[1,1000],[5,15]]
-1002	6	10	0	[[14016,25],[1001,2],[8,200],[1,800],[5,10]]
-1002	11	20	0	[[14016,20],[1001,1],[8,160],[1,500],[5,8]]
-1002	21	50	0	[[1003,1],[8,120],[1,400],[5,6]]
-1002	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
-1002	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
-1002	201	9999	0	[[1002,1],[8,40],[1,100],[5,2]]
+1001	1	1	0	[[10000,100,0],[13,50,0],[3,200,0]]
+1001	2	2	0	[[10000,90,0],[13,40,0],[3,175,0]]
+1001	3	3	0	[[10000,80,0],[13,30,0],[3,150,0]]
+1001	4	5	0	[[10000,60,0],[13,25,0],[3,125,0]]
+1001	6	10	0	[[10000,50,0],[13,20,0],[3,100,0]]
+1001	11	20	0	[[10000,40,0],[13,20,0],[3,75,0]]
+1001	21	50	0	[[10000,30,0],[13,15,0],[3,60,0]]
+1001	51	100	0	[[10000,20,0],[13,13,0],[3,45,0]]
+1001	101	200	0	[[10000,10,0],[13,10,0],[3,30,0]]
+1001	201	9999	0	[[10000,5,0],[13,5,0],[3,20,0]]
+1002	1	1	0	[[10000,200,0],[13,50,0],[3,400,0]]
+1002	2	2	0	[[10000,180,0],[13,40,0],[3,350,0]]
+1002	3	3	0	[[10000,160,0],[13,30,0],[3,300,0]]
+1002	4	5	0	[[10000,120,0],[13,25,0],[3,250,0]]
+1002	6	10	0	[[10000,100,0],[13,20,0],[3,200,0]]
+1002	11	20	0	[[10000,80,0],[13,20,0],[3,150,0]]
+1002	21	50	0	[[10000,60,0],[13,15,0],[3,120,0]]
+1002	51	100	0	[[10000,40,0],[13,13,0],[3,90,0]]
+1002	101	200	0	[[10000,20,0],[13,10,0],[3,60,0]]
+1002	201	9999	0	[[10000,10,0],[13,5,0],[3,40,0]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActBillboardAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActBillboardAward.txt
index c3813b0..dd51ae1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActBillboardAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActBillboardAward.txt
@@ -89,23 +89,23 @@
 200	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
 200	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
 200	201	2000	0	[[1002,1],[8,40],[1,100],[5,2]]
-1001	1	1	0	[[11016,50],[1001,3],[8,800],[1,2000],[5,40]]
-1001	2	2	0	[[11016,40],[1001,3],[8,600],[1,1800],[5,30]]
-1001	3	3	0	[[11016,35],[1001,2],[8,400],[1,1500],[5,20]]
-1001	4	5	0	[[11016,30],[1001,2],[8,300],[1,1000],[5,15]]
-1001	6	10	0	[[11016,25],[1001,2],[8,200],[1,800],[5,10]]
-1001	11	20	0	[[11016,20],[1001,1],[8,160],[1,500],[5,8]]
-1001	21	50	0	[[1003,1],[8,120],[1,400],[5,6]]
-1001	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
-1001	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
-1001	201	9999	0	[[1002,1],[8,40],[1,100],[5,2]]
-1002	1	1	0	[[14016,50],[1001,3],[8,800],[1,2000],[5,40]]
-1002	2	2	0	[[14016,40],[1001,3],[8,600],[1,1800],[5,30]]
-1002	3	3	0	[[14016,35],[1001,2],[8,400],[1,1500],[5,20]]
-1002	4	5	0	[[14016,30],[1001,2],[8,300],[1,1000],[5,15]]
-1002	6	10	0	[[14016,25],[1001,2],[8,200],[1,800],[5,10]]
-1002	11	20	0	[[14016,20],[1001,1],[8,160],[1,500],[5,8]]
-1002	21	50	0	[[1003,1],[8,120],[1,400],[5,6]]
-1002	51	100	0	[[1003,1],[8,80],[1,200],[5,4]]
-1002	101	200	0	[[1002,1],[8,60],[1,150],[5,4]]
-1002	201	9999	0	[[1002,1],[8,40],[1,100],[5,2]]
+1001	1	1	0	[[10000,100,0],[13,50,0],[3,200,0]]
+1001	2	2	0	[[10000,90,0],[13,40,0],[3,175,0]]
+1001	3	3	0	[[10000,80,0],[13,30,0],[3,150,0]]
+1001	4	5	0	[[10000,60,0],[13,25,0],[3,125,0]]
+1001	6	10	0	[[10000,50,0],[13,20,0],[3,100,0]]
+1001	11	20	0	[[10000,40,0],[13,20,0],[3,75,0]]
+1001	21	50	0	[[10000,30,0],[13,15,0],[3,60,0]]
+1001	51	100	0	[[10000,20,0],[13,13,0],[3,45,0]]
+1001	101	200	0	[[10000,10,0],[13,10,0],[3,30,0]]
+1001	201	9999	0	[[10000,5,0],[13,5,0],[3,20,0]]
+1002	1	1	0	[[10000,200,0],[13,50,0],[3,400,0]]
+1002	2	2	0	[[10000,180,0],[13,40,0],[3,350,0]]
+1002	3	3	0	[[10000,160,0],[13,30,0],[3,300,0]]
+1002	4	5	0	[[10000,120,0],[13,25,0],[3,250,0]]
+1002	6	10	0	[[10000,100,0],[13,20,0],[3,200,0]]
+1002	11	20	0	[[10000,80,0],[13,20,0],[3,150,0]]
+1002	21	50	0	[[10000,60,0],[13,15,0],[3,120,0]]
+1002	51	100	0	[[10000,40,0],[13,13,0],[3,90,0]]
+1002	101	200	0	[[10000,20,0],[13,10,0],[3,60,0]]
+1002	201	9999	0	[[10000,10,0],[13,5,0],[3,40,0]]

--
Gitblit v1.8.0