From ca2843c0c9c5ef564d5cfb28221969dc440abb02 Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期二, 14 七月 2026 11:55:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
index 26d7354..bc4ad6c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
@@ -360,14 +360,14 @@
 1071006	1021001	1022002	1021001	1034011	1026004	1014008	0				1
 1071013	1044006	1046011	1044005	1046012	1047014	1046015	1047014		1023|1024	0	2
 1072013	1026015	1023002	1025011	1024013	1027016	1026012	1027016		1022|1007	0	2
-1073013	1025015	1026014	42	1023002	1027017	1026012	1027017		1011|1017	0	2
-1074013	1035015	1034014	1031001	1036012	1037016	1036013	1037016		1024|1009	0	2
-1075013	1036015	1031001	42	1036012	1037017	1035013	1037017		1015|1010	0	2
-1076013	1042002	1044010	1046015	1045013	1047016	1046012	1047016		1018|1017	0	2
-1077013	1046014	1042002	1046015	42	1047017	1045012	1047017		1022|1009	0	2
-1078013	1012002	1016014	1014011	1015013	1017016	1016012	1017016		1011|1013	0	2
-1079013	1016015	1014014	1012002	1016013	1017017	1015012	1017017		1015|1001	0	2
-1080013	1016002	42	1016005	1011001	1017011	1011001	1017011		1005|1007	0	2
+1073013	1025015	1024014	1026010	1023002	1027017	1026012	1027017		1011|1017	0	2
+1074013	1035015	1034014	1033001	1036012	1037016	1036013	1037016		1024|1009	0	2
+1075013	1036015	1033001	1034009	1036012	1037017	1035013	1037017		1015|1010	0	2
+1076013	1043002	1044010	1046015	1045013	1047016	1046012	1047016		1018|1017	0	2
+1077013	1046014	1043002	1044015	1046009	1047017	1045012	1047017		1022|1009	0	2
+1078013	1013002	1016014	1014011	1015013	1017016	1016012	1017016		1011|1013	0	2
+1079013	1016015	1014014	1013002	1016013	1017017	1015012	1017017		1015|1001	0	2
+1080013	1016002	1015007	1016005	1011001	1017011	1011001	1017011		1005|1007	0	2
 1081013	1026008	1021001	1025007	1021001	1027010	1026011	1027010		1009|1007	0	2
 1082013	1012002	1016015	1012002	1015011	1017009	1016004	1017009		1007|1019	0	2
 1083013	1042002	1047011	1042002	1046009	1046004	1045008	1047011		1010|1022	0	2

--
Gitblit v1.8.0