From 9b6868f9992c779d03f5d714b042bf7ec7bfd660 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期六, 10 十一月 2018 15:37:41 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 db/PyMongoDataServer/PySysDB/tagCTG.txt                                          |    2 +-
 db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt                             |    1 +
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                      |   42 +++++++++++++++++++++---------------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc      |    0 
 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt                                   |    2 +-
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                        |    2 +-
 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt                             |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc     |    0 
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 255176a..ac7ee8e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -98,4 +98,4 @@
 146	300	0	0
 147	60	0	0
 148	205	0	0
-149	600	0	0
+149	280	0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 87b7e0c..3b769a4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
new file mode 100644
index 0000000..03c6e1f
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 8945001..5194f44 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
index 4f07614..5654094 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 9df8e72..1f1196f 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -9,7 +9,7 @@
 108	0	6480	1088	6480	[]
 109	0	30000	5888	30000	[]
 110	0	10	1	0	[]
-2	0	60	0	0	[]
+2	0	60	6	60	[]
 201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
 202	0	60	6	60	[]
 203	0	300	30	300	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 1da8062..e0c69cc 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -98,4 +98,4 @@
 146	300	0	0	0	4
 147	60	0	0	0	0
 148	205	0	0	0	0
-149	600	0	0	0	0
+149	280	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index 3d57e10..1a89502 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -14,6 +14,7 @@
 145	
 93	{"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
 138	{"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
+149	{"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
 103	
 140	
 141	
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index ecd8ddd..9f0503e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -493,7 +493,7 @@
 30203004	2	0	麒麟之魂	260	0	35112	35112	0	0	0	0	10000	45043	0	0	0	0	0	0	0	0	2000	942622	59	0	300	2	3	0	0	0	0	0	0	0	0	0	40	2	5299791	0	0	0	0	3	0	0	1	1	1
 30203005	2	0	麒麟之魂	310	0	79698	79698	0	0	0	0	10000	91865	0	0	0	0	0	0	0	0	2000	1390474	95	0	300	2	3	0	0	0	0	0	0	0	0	0	40	2	30086907	0	0	0	0	3	0	0	1	1	1
 30301001	2	0	精英护卫	200	0	1503	1503	0	6	0	0	10000	25	0	0	780	0	0	0	0	1	3000	634880	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	34243	0	0	0	0	1	48352	7	1	1	1
-30301002	2	0	精英护卫	230	0	1839	1839	0	8	0	0	10000	55	0	0	780	0	0	0	0	1	3000	738321	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	51163	0	0	0	0	1	72243	13	1	1	1
+30301002	2	0	精英护卫	230	0	1839	1839	0	8	0	0	10000	55	0	0	780	0	0	0	0	1	3000	738321	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	51163	0	0	0	0	1	83079	13	1	1	1
 30303001	2	0	天枢	160	0	2524	2524	0	4	0	0	10000	3100	0	1	0	0	0	0	0	3	3000	444132	22	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	5799139	0	10000	0	0	5	0	0	186	1	1
 30303002	2	0	天璇	180	0	3754	3754	0	5	0	0	10000	4847	0	1	0	0	0	0	0	3	3000	501072	25	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	8527731	0	10000	0	0	5	0	0	186	1	1
 30303003	2	0	天玑	210	0	6200	6200	0	6	0	0	10000	7908	0	1	0	0	0	0	0	3	3000	597186	31	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	23982232	0	10000	0	0	5	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c77463c..948afee 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1894,16 +1894,16 @@
 30817	幻羽	30800	8	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	513	2700	7	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	0	0	0	20025	0	0	0	2	1529	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30818	幻羽	30800	9	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	513	2850	7	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	0	0	0	20025	0	0	0	2	1784	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30819	幻羽	30800	10	10	2	4	0	20	0	0	0	0	0	2	0	0	0	0	0	0	0	513	3000	7	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	21200	0	0	0	20025	0	0	0	2	2039	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30850	旁敲侧击	30850	1	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	1000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2294	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30851	旁敲侧击	30850	2	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	2000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2549	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30852	旁敲侧击	30850	3	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	3000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2804	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30853	旁敲侧击	30850	4	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	4000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3059	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30854	旁敲侧击	30850	5	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	5000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3313	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30855	旁敲侧击	30850	6	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	6000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3568	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30856	旁敲侧击	30850	7	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	7000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4340	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30857	旁敲侧击	30850	8	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	8000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4546	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30858	旁敲侧击	30850	9	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	9000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4753	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-30859	旁敲侧击	30850	10	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	10000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4960	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30850	旁敲侧击	30850	1	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	100	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2294	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30851	旁敲侧击	30850	2	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	200	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2549	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30852	旁敲侧击	30850	3	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	300	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	2804	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30853	旁敲侧击	30850	4	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	400	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3059	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30854	旁敲侧击	30850	5	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	500	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3313	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30855	旁敲侧击	30850	6	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	600	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	3568	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30856	旁敲侧击	30850	7	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	700	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4340	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30857	旁敲侧击	30850	8	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	800	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4546	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30858	旁敲侧击	30850	9	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	900	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4753	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+30859	旁敲侧击	30850	10	10	2	4	0	18	3	0	0	0	41	10	0	0	0	0	0	0	0	4004	1000	0	0	4012	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	0	0	0	0	20600	0	0	0	0	0	0	0	2	4960	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30900	不灭法身	30900	1	15	2	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4028	0	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	30850	6	0	20015	0	0	0	2	5167	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30901	不灭法身	30900	2	15	2	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4028	0	2500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	30850	6	0	20015	0	0	0	2	227	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30902	不灭法身	30900	3	15	2	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4028	0	3000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	20900	30850	6	0	20015	0	0	0	2	454	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -3213,16 +3213,16 @@
 35357	刺骨	35350	8	10	4	4	0	7	0	0	1	0	41	5	0	0	0	0	0	0	0	4003	1920	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	35300	9	0	10015	0	0	0	2	1019	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
 35358	刺骨	35350	9	10	4	4	0	7	0	0	1	0	41	5	0	0	0	0	0	0	0	4003	2160	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	35300	9	0	10015	0	0	0	2	1274	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
 35359	刺骨	35350	10	10	4	4	0	7	0	0	1	0	41	5	0	0	0	0	0	0	0	4003	2400	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	50900	35300	9	0	10015	0	0	0	2	1529	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
-35400	重冰	35400	1	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	100	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	1784	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35401	重冰	35400	2	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	200	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2039	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35402	重冰	35400	3	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	300	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2294	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35403	重冰	35400	4	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	400	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2549	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35404	重冰	35400	5	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2804	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35405	重冰	35400	6	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	600	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3059	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35406	重冰	35400	7	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	700	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3313	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35407	重冰	35400	8	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	800	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3568	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35408	重冰	35400	9	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	900	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	4340	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
-35409	重冰	35400	10	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	4546	0	0	0	3	511	511	3	4	0	55801	0	0	0	0
+35400	重冰	35400	1	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	100	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	1784	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35401	重冰	35400	2	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	200	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2039	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35402	重冰	35400	3	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	300	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2294	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35403	重冰	35400	4	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	400	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2549	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35404	重冰	35400	5	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	2804	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35405	重冰	35400	6	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	600	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3059	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35406	重冰	35400	7	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	700	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3313	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35407	重冰	35400	8	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	800	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	3568	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35408	重冰	35400	9	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	900	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	4340	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
+35409	重冰	35400	10	10	4	4	0	18	3	0	6	8	40	8	0	0	0	0	0	0	0	4053	3	0	0	4012	7	0	0	1200	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	51500	35350	6	0	10025	0	0	0	2	4546	0	0	0	3	511	511	3	4	0	35300	0	0	0	0
 35450	漫天冰晶	35450	1	10	4	4	0	7	0	0	0	0	41	10	0	0	0	0	0	0	0	4003	500	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35400	6	0	10035	0	0	0	2	4753	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
 35451	漫天冰晶	35450	2	10	4	4	0	7	0	0	0	0	41	10	0	0	0	0	0	0	0	4003	1000	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35400	6	0	10035	0	0	0	2	4960	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
 35452	漫天冰晶	35450	3	10	4	4	0	7	0	0	0	0	41	10	0	0	0	0	0	0	0	4003	1500	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35400	6	0	10035	0	0	0	2	5167	0	0	0	0	0	0	0	0	0	55801	0	0	0	0
@@ -3335,7 +3335,7 @@
 35957	雪上加霜	35950	8	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	8000	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35900	9	0	20040	0	0	0	2	3865	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 35958	雪上加霜	35950	9	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	9000	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35900	9	0	20040	0	0	0	2	4092	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 35959	雪上加霜	35950	10	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	4057	10000	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	51500	35900	9	0	20040	0	0	0	2	4319	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-36000	不灭冰心	36000	1	1	4	4	0	16	0	0	0	0	10	2	0	120000	0	0	0	0	0	4028	10000	0	0	4519	0	0	0	56	10000	1	0	9	8000	4	0	10	8000	4	0	0	0	0	0	10000	0	0	0	0	0	51700	35950	6	0	20050	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+36000	不灭冰心	36000	1	1	4	4	0	16	0	0	0	0	10	2	0	120000	0	0	0	0	0	4028	10000	0	0	4519	0	0	0	56	10000	1	0	9	8000	4	0	10	8000	4	0	0	0	0	0	10000	5000	0	0	0	0	51700	35950	6	0	20050	0	0	0	2	4547	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36050	闪避本能	36050	1	10	4	4	0	7	0	0	0	0	10	2	0	0	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1274	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36051	闪避本能	36050	2	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1529	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 36052	闪避本能	36050	3	10	4	4	0	7	0	0	1	0	0	2	0	0	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1784	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0