From 6ba185abeea9dfa0601b08f7658039d701b4e240 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 14 一月 2026 10:20:43 +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/NPC.txt | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
index e9fa731..bfccc01 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
@@ -23,7 +23,7 @@
10101084 黄巾刀兵 610001 1 0 189 0 84 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10101091 魏国刀兵 610013 1 0 237 5 105 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10101092 魏国刀兵 610013 1 0 237 5 105 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
-10101093 庞德 510003 1 2 360 33 470 0 0 0 0 0 0 0 0 0 0 1500 0 0 0 {}
+10101093 庞德 510003 1 2 300 0 400 0 0 0 0 0 0 0 0 0 0 1000 0 0 0 {}
10102011 黄巾刀兵 610001 2 0 208 4 93 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10102012 黄巾刀兵 610001 2 0 208 4 93 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10102021 黄巾枪兵 610002 2 0 174 4 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
@@ -55,7 +55,7 @@
10102091 黄巾刀兵 610001 2 0 234 5 104 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10102092 黄巾枪兵 610002 2 0 194 5 130 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
10102093 黄巾枪兵 610002 2 0 194 5 130 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
-10102094 祝融 540007 2 2 558 28 1425 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10102094 祝融 540007 2 2 400 0 1200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10103011 黄巾枪兵 610002 3 0 192 5 128 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
10103012 黄巾刀兵 610001 3 0 230 5 102 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10103013 黄巾刀兵 610001 3 0 230 5 102 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
@@ -96,7 +96,7 @@
10103092 蜀国刀兵 610018 5 0 828 35 225 0 0 0 0 1050 0 0 0 0 0 0 0 0 0 {}
10103093 蜀国弩手 610021 5 0 828 35 225 0 0 0 0 0 0 0 0 1050 0 0 0 0 0 {}
10103094 蜀国弩手 610021 5 0 828 35 225 0 0 0 0 0 0 0 0 1050 0 0 0 0 0 {}
-10103095 张星彩 520007 4 2 558 53 1900 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10103095 李典 510007 4 2 558 53 1900 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
10104011 黄巾刀兵 610001 5 0 682 15 303 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10104012 黄巾刀兵 610001 5 0 682 15 303 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10104013 黄巾枪兵 610002 5 0 568 15 379 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
@@ -134,7 +134,7 @@
10104091 黄巾弩手 610004 5 0 900 27 546 0 0 0 0 0 0 0 0 750 0 0 0 0 0 {}
10104092 黄巾刀兵 610001 5 0 900 27 546 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10104093 黄巾刀兵 610001 5 0 900 27 546 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
-10104094 李傕 540003 5 2 900 81 4051 0 0 1462 0 0 0 0 0 0 0 0 0 0 0 {}
+10104094 李傕 540003 5 2 900 0 3500 0 0 1462 0 0 0 0 0 0 0 0 0 0 0 {}
10105011 黄巾刀兵 610001 6 0 1083 24 481 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10105012 黄巾枪兵 610002 6 0 901 24 602 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
10105013 黄巾刀兵 610001 6 0 1083 24 481 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
@@ -171,11 +171,11 @@
10105083 庞德 510003 7 0 1087 123 3955 0 0 0 0 0 0 0 0 0 0 1500 0 0 0 {}
10105084 乐进 510002 7 0 1630 99 2636 0 0 0 0 0 0 0 0 0 0 0 0 1500 0 {}
10105085 王异 510010 7 0 1630 99 2636 0 0 0 0 1500 0 0 0 0 0 0 0 0 0 {}
-10105091 黄巾弩手 610004 7 0 1440 36 1300 0 0 0 0 0 0 0 0 750 0 0 0 0 0 {}
-10105092 黄巾刀兵 610001 7 0 1440 36 1300 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
-10105093 黄巾枪兵 610002 7 0 1440 40 1500 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
-10105094 黄巾枪兵 610002 7 0 1440 40 1500 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
-10105095 张角 540015 7 2 1800 156 11000 0 0 0 0 0 0 1950 0 0 0 0 0 0 0 {}
+10105091 黄巾弩手 610004 7 0 1200 36 1000 0 0 0 0 0 0 0 0 750 0 0 0 0 0 {}
+10105092 黄巾刀兵 610001 7 0 1200 36 1000 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
+10105093 黄巾枪兵 610002 7 0 1200 40 1000 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
+10105094 黄巾枪兵 610002 7 0 1200 40 1000 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
+10105095 张角 540015 7 2 1500 0 6000 0 0 0 0 0 0 1950 0 0 0 0 0 0 0 {}
10201011 黄巾盾兵 610003 8 0 986 41 1316 0 0 0 0 0 0 0 0 0 0 750 0 0 0 {}
10201012 黄巾弩手 610004 8 0 1479 32 877 0 0 0 0 0 0 0 0 750 0 0 0 0 0 {}
10201013 黄巾刀兵 610001 8 0 1479 32 877 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
@@ -261,7 +261,7 @@
10202093 黄巾枪兵 610002 10 0 2054 54 3325 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
10202094 黄巾枪兵 610002 10 0 2163 54 3325 0 0 562 0 0 0 0 0 0 0 0 0 0 0 {}
10202095 庞德 510003 10 0 1806 205 8225 0 0 0 0 0 0 0 0 0 0 1500 0 0 0 {}
-10202096 孟获 540006 10 2 2394 228 22847 0 0 750 0 0 0 0 0 0 0 0 0 0 0 {}
+10202096 孟获 540006 10 2 2394 0 20000 0 0 500 0 0 0 0 0 0 0 0 0 0 0 {}
10203011 吴国刀兵 610023 11 0 2203 48 1632 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10203012 吴国刀兵 610023 11 0 2203 48 1632 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10203013 吴国刀兵 610023 11 0 2203 48 1632 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
@@ -307,7 +307,7 @@
10203092 李典 510007 12 1 2561 295 13053 0 0 0 0 0 0 1650 0 0 0 0 0 0 0 {}
10203093 魏国弩手 610016 12 0 3493 107 4315 0 0 0 0 0 0 0 0 1050 0 0 0 0 0 {}
10203094 魏国弩手 610016 12 0 3493 107 4315 0 0 0 0 0 0 0 0 1050 0 0 0 0 0 {}
-10203095 卞夫人 510004 12 2 5122 236 19778 0 0 1462 0 0 0 0 0 0 0 0 0 0 0 {}
+10203095 卞夫人 510004 12 2 5122 236 19778 0 0 500 0 0 0 0 0 0 0 0 0 0 0 {}
10204011 黄巾盾兵 610003 13 0 1636 68 2729 0 0 0 0 0 0 0 0 0 0 750 0 0 0 {}
10204012 黄巾弩手 610004 13 0 2455 54 1819 0 0 0 0 0 0 0 0 750 0 0 0 0 0 {}
10204013 王异 510010 13 0 2700 163 5458 0 0 0 0 1500 0 0 0 0 0 0 0 0 0 {}
@@ -346,7 +346,7 @@
10204091 吴国盾兵 610025 14 0 2709 156 7531 0 0 0 0 0 0 0 0 0 0 1050 0 0 0 {}
10204092 吴国太 530002 14 0 3670 249 10461 0 0 1012 0 0 0 0 0 0 0 0 0 0 0 {}
10204093 糜竺 520001 14 0 3105 224 9415 0 0 1125 0 0 0 0 0 0 0 0 0 0 0 {}
-10204094 凌统 530003 14 2 6732 301 26400 0 0 0 0 0 0 0 0 0 0 0 0 1950 0 {}
+10204094 凌统 530003 14 2 6000 301 25000 0 0 0 0 0 0 0 0 0 0 0 0 1950 0 {}
10205011 魏国刀兵 610013 15 0 3699 82 3289 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10205012 魏国刀兵 610013 15 0 3699 82 3289 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
10205013 魏国刀兵 610013 15 0 3699 82 3289 0 0 0 0 750 0 0 0 0 0 0 0 0 0 {}
@@ -1607,7 +1607,7 @@
1044003 李傕 540003 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1044004 张宝 540004 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1044005 韩遂 540005 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
-1044006 孟获 540006 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":2500}
+1044006 孟获 540006 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1044007 祝融 540007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"23":2500}
1044008 何太后 540008 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
1044009 董白 540009 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
@@ -1622,7 +1622,7 @@
1045003 李傕 540003 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1045004 张宝 540004 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1045005 韩遂 540005 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
-1045006 孟获 540006 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":2500}
+1045006 孟获 540006 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1045007 祝融 540007 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"23":2500}
1045008 何太后 540008 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
1045009 董白 540009 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
@@ -1637,7 +1637,7 @@
1046003 李傕 540003 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1046004 张宝 540004 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1046005 韩遂 540005 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
-1046006 孟获 540006 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":2500}
+1046006 孟获 540006 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1046007 祝融 540007 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"23":2500}
1046008 何太后 540008 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
1046009 董白 540009 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
@@ -1652,7 +1652,7 @@
1047003 李傕 540003 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1047004 张宝 540004 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1047005 韩遂 540005 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
-1047006 孟获 540006 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":2500}
+1047006 孟获 540006 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":2500}
1047007 祝融 540007 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"23":2500}
1047008 何太后 540008 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
1047009 董白 540009 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":2500}
--
Gitblit v1.8.0