From cfecffaf7dea58d74867de14812cbcf45d310837 Mon Sep 17 00:00:00 2001
From: tlk <werasdrsd@qq,com>
Date: 星期四, 16 十月 2025 16:31:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

---
 Config/NPCLineup.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Config/NPCLineup.txt b/Config/NPCLineup.txt
index 69a4912..05f30b9 100644
--- a/Config/NPCLineup.txt
+++ b/Config/NPCLineup.txt
@@ -3,8 +3,8 @@
 闃靛ID	1鍙蜂綅NPCID	2鍙蜂綅NPCID	3鍙蜂綅NPCID	4鍙蜂綅NPCID	5鍙蜂綅NPCID	6鍙蜂綅NPCID	7鍙蜂綅NPCID	鏈樀瀹圭殑BossID	boss闄勫姞鎶�鑳藉簱	闅忔満闄勫姞鎶�鑳芥暟
 1010101		10101011						0	1001	0
 1010102		10101021			10101022			0	1002	0
-1010103		10101031		10101031	10101032			0	1003	0
-1010104	10101042		10101042	10101043		10101043		0	1004	0
+1010103		10101031		10101032	10101032			0	1003	0
+1010104	10101042		10101042	10101043		10101041		0	1004	0
 1010105	10101051		10101052		10101053			0	1005	0
 1010106	10101061	10101062	10101063					0	1006	0
 1010107	10101071	10101072	10101073					0	1007	0
@@ -13,7 +13,7 @@
 1010201	10102011	10102011	10102012	10102012	10102012			0	1010	0
 1010202		10102021		10102022		10102023		0	1011	0
 1010203		10102033		10102031		10102032		0	1012	0
-1010204		10102041	10102042		10102043	10102044		0	1013	0
+1010204	10102041		10102042	10102043		10102044		0	1013	0
 1010205	10102051		10102052		10102053			0	1014	0
 1010206	10102061	10102062	10102063		10102064			0	1015	0
 1010207		10102071		10102072	10102074	10102073		0	1016	0

--
Gitblit v1.8.0