From 6a696b8fb81631d4914731f1ddc3bee70988e1a6 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 20 九月 2018 11:16:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt | 10 ++++
db/PyMongoDataServer/PySysDB/tagEquipWash.txt | 60 +++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagEquipWashSpec.txt | 18 ++++----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt | 14 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
6 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
index 27c1e0e..63fb913 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
@@ -65,7 +65,15 @@
1 : (0, 0, 0),
2 : (85, 0, 0),
3 : (70, 0, 0),
- },
+ },
+ 31103010: {0 : (0, 0, 0),
+ 1 : (0, 0, 0),
+ 2 : (85, 0, 0),
+ },
+ 31103011: {0 : (0, 0, 0),
+ 1 : (0, 0, 0),
+ 2 : (85, 0, 0),
+ },
31203001: {0 : (0, 0, 0),
1 : (85, 0, 0),
2 : (70, 0, 0),
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
index 90c4548..c7cc6e2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
@@ -2,12 +2,12 @@
#{职业:[等级]}
(
{
- 0:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 1:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 2:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 3:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 4:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 5:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
- 6:[70,80,95,100,105,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 0:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 1:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 2:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 3:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 4:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 5:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+ 6:[70,80,95,100,105,113,115,120,125,128,130,140,150,155,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
}
)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index e3c6d9f..781a320 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipWash.txt b/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
index 64d9410..823762a 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
@@ -1,31 +1,31 @@
type level attType1 attMax1 attRandomDic1 attCostMoneyMin1 attCostMoneyMax1 attType2 attMax2 attRandomDic2 attCostMoneyMin2 attCostMoneyMax2 attType3 attMax3 attRandomDic3 attCostMoneyMin3 attCostMoneyMax3 costItem costCount costMoneyList
-1 1 7 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 32 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 3 5|10|20
-1 2 7 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 32 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 5303 5 5|10|20
-1 3 7 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 32 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 5303 8 10|20|40
-1 4 7 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 32 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 5303 12 15|30|60
-1 5 7 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 32 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 5303 15 15|30|60
-1 6 7 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 32 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 5303 18 20|40|80
-1 7 7 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 32 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 26 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 5303 20 20|40|80
-1 8 7 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 32 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 26 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 5303 25 25|50|100
-1 9 7 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 32 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 26 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 5303 30 30|60|120
-1 10 7 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 32 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 26 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 5303 40 40|80|160
-2 1 6 600 {(0,120):[0,200],(121,240):[0,200],(241,360):[0,200],(361,480):[-20,200],(481,600):[-40,200]} 200 200 27 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 3 5|10|20
-2 2 6 1400 {(600,760):[0,200],(761,920):[-3,200],(921,1080):[-25,200],(1081,1240):[-48,200],(1241,1400):[-70,200]} 200 200 27 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 5303 5 5|10|20
-2 3 6 2400 {(1400,1600):[0,200],(1601,1800):[-16,200],(1801,2000):[-40,200],(2001,2200):[-64,200],(2201,2400):[-88,200]} 200 200 27 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 5303 8 10|20|40
-2 4 6 3600 {(2400,2640):[0,200],(2641,2880):[-25,200],(2881,3120):[-50,200],(3121,3360):[-75,200],(3361,3600):[-100,200]} 200 200 27 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 5303 12 15|30|60
-2 5 6 5000 {(3600,3880):[0,200],(3881,4160):[-19,200],(4161,4440):[-43,200],(4441,4720):[-68,200],(4721,5000):[-92,200]} 200 200 27 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 5303 15 15|30|60
-2 6 6 7000 {(5000,5400):[0,200],(5401,5800):[-25,200],(5801,6200):[-50,200],(6201,6600):[-75,200],(6601,7000):[-100,200]} 200 200 27 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 5303 18 20|40|80
-2 7 6 10000 {(7000,7600):[0,200],(7601,8200):[-22,200],(8201,8800):[-47,200],(8801,9400):[-72,200],(9401,10000):[-96,200]} 200 200 27 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 26 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 5303 20 20|40|80
-2 8 6 15000 {(10000,11000):[0,200],(11001,12000):[0,200],(12001,13000):[0,200],(13001,14000):[-20,200],(14001,15000):[-40,200]} 200 200 27 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 26 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 5303 25 25|50|100
-2 9 6 21000 {(15000,16200):[0,200],(16201,17400):[0,200],(17401,18600):[0,200],(18601,19800):[-20,200],(19801,21000):[-40,200]} 200 200 27 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 26 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 5303 30 30|60|120
-2 10 6 29000 {(21000,22600):[0,200],(22601,24200):[0,200],(24201,25800):[0,200],(25801,27400):[-20,200],(27401,29000):[-40,200]} 200 200 27 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 26 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 5303 40 40|80|160
-3 1 7 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 32 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 3 5|10|20
-3 2 7 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 32 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[-1,10],(47,54):[-2,10],(55,62):[-3,10],(63,70):[-4,10]} 10 10 5303 5 5|10|20
-3 3 7 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 32 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-4,10],(111,120):[-5,10]} 10 10 5303 8 10|20|40
-3 4 7 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 32 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-2,10],(145,156):[-3,10],(157,168):[-4,10],(169,180):[-5,10]} 10 10 5303 12 15|30|60
-3 5 7 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 32 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-4,10],(237,250):[-5,10]} 10 10 5303 15 15|30|60
-3 6 7 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 32 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-2,10],(291,310):[-3,10],(311,330):[-4,10],(331,350):[-5,10]} 10 10 5303 18 20|40|80
-3 7 7 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 32 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 26 500 {(350,380):[0,10],(381,410):[-2,10],(411,440):[-3,10],(441,470):[-4,10],(471,500):[-5,10]} 10 10 5303 20 20|40|80
-3 8 7 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 32 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 26 750 {(500,550):[0,10],(551,600):[0,10],(601,650):[0,10],(651,700):[-1,10],(701,750):[-2,10]} 10 10 5303 25 25|50|100
-3 9 7 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 32 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 26 1050 {(750,810):[0,10],(811,870):[0,10],(871,930):[0,10],(931,990):[-1,10],(991,1050):[-2,10]} 10 10 5303 30 30|60|120
-3 10 7 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 32 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 26 1450 {(1050,1130):[0,10],(1131,1210):[0,10],(1211,1290):[0,10],(1291,1370):[-1,10],(1371,1450):[-2,10]} 10 10 5303 40 40|80|160
+1 1 7 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 32 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 2 5|15|50
+1 2 7 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 32 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 5303 4 5|15|50
+1 3 7 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 32 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 5303 6 10|30|100
+1 4 7 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 32 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 5303 8 15|45|150
+1 5 7 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 32 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 5303 12 20|60|200
+1 6 7 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 32 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 5303 15 20|60|200
+1 7 7 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 32 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 26 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 5303 15 25|75|250
+1 8 7 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 32 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 26 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 5303 15 25|75|250
+1 9 7 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 32 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 26 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 5303 20 30|90|300
+1 10 7 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 32 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 26 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 5303 20 40|120|400
+2 1 6 600 {(0,120):[0,200],(121,240):[0,200],(241,360):[0,200],(361,480):[-20,200],(481,600):[-26,200]} 200 200 27 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 2 5|15|50
+2 2 6 1400 {(600,760):[0,200],(761,920):[-8,200],(921,1080):[-31,200],(1081,1240):[-37,200],(1241,1400):[-44,200]} 200 200 27 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 5303 4 5|15|50
+2 3 6 2400 {(1400,1600):[0,200],(1601,1800):[-15,200],(1801,2000):[-45,200],(2001,2200):[-60,200],(2201,2400):[-65,200]} 200 200 27 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 5303 6 10|30|100
+2 4 6 3600 {(2400,2640):[0,200],(2641,2880):[-17,200],(2881,3120):[-47,200],(3121,3360):[-69,200],(3361,3600):[-69,200]} 200 200 27 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 5303 8 15|45|150
+2 5 6 5000 {(3600,3880):[0,200],(3881,4160):[-19,200],(4161,4440):[-53,200],(4441,4720):[-82,200],(4721,5000):[-115,200]} 200 200 27 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 5303 12 20|60|200
+2 6 6 7000 {(5000,5400):[0,200],(5401,5800):[-19,200],(5801,6200):[-58,200],(6201,6600):[-90,200],(6601,7000):[-116,200]} 200 200 27 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 5303 15 20|60|200
+2 7 6 10500 {(7000,7700):[0,200],(7701,8400):[-21,200],(8401,9100):[-57,200],(9101,9800):[-92,200],(9801,10500):[-119,200]} 200 200 27 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 26 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 5303 15 25|75|250
+2 8 6 15500 {(10500,11500):[0,200],(11501,12500):[-21,200],(12501,13500):[-56,200],(13501,14500):[-104,200],(14501,15500):[-136,200]} 200 200 27 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 26 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 5303 15 25|75|250
+2 9 6 22000 {(15500,16800):[0,200],(16801,18100):[-24,200],(18101,19400):[-62,200],(19401,20700):[-108,200],(20701,22000):[-165,200]} 200 200 27 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 26 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 5303 20 30|90|300
+2 10 6 30000 {(22000,23600):[0,200],(23601,25200):[-29,200],(25201,26800):[-66,200],(26801,28400):[-111,200],(28401,30000):[-166,200]} 200 200 27 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 26 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 5303 20 40|120|400
+3 1 7 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 32 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 26 30 {(0,6):[0,10],(7,12):[0,10],(13,18):[0,10],(19,24):[-1,10],(25,30):[-2,10]} 10 10 5303 2 5|15|50
+3 2 7 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 32 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 26 70 {(30,38):[0,10],(39,46):[0,10],(47,54):[-2,10],(55,62):[-2,10],(63,70):[-3,10]} 10 10 5303 4 5|15|50
+3 3 7 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 32 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 26 120 {(70,80):[0,10],(81,90):[-1,10],(91,100):[-2,10],(101,110):[-3,10],(111,120):[-4,10]} 10 10 5303 6 10|30|100
+3 4 7 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 32 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 26 180 {(120,132):[0,10],(133,144):[-1,10],(145,156):[-2,10],(157,168):[-4,10],(169,180):[-4,10]} 10 10 5303 8 15|45|150
+3 5 7 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 32 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 26 250 {(180,194):[0,10],(195,208):[-1,10],(209,222):[-3,10],(223,236):[-5,10],(237,250):[-6,10]} 10 10 5303 12 20|60|200
+3 6 7 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 32 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 26 350 {(250,270):[0,10],(271,290):[-1,10],(291,310):[-3,10],(311,330):[-5,10],(331,350):[-6,10]} 10 10 5303 15 20|60|200
+3 7 7 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 32 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 26 525 {(350,385):[0,10],(386,420):[-1,10],(421,455):[-3,10],(456,490):[-5,10],(491,525):[-6,10]} 10 10 5303 15 25|75|250
+3 8 7 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 32 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 26 775 {(525,575):[0,10],(576,625):[-1,10],(626,675):[-3,10],(676,725):[-6,10],(726,775):[-7,10]} 10 10 5303 15 25|75|250
+3 9 7 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 32 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 26 1100 {(775,840):[0,10],(841,905):[-1,10],(906,970):[-3,10],(971,1035):[-6,10],(1036,1100):[-9,10]} 10 10 5303 20 30|90|300
+3 10 7 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 32 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 26 1500 {(1100,1180):[0,10],(1181,1260):[-1,10],(1261,1340):[-3,10],(1341,1420):[-6,10],(1421,1500):[-9,10]} 10 10 5303 20 40|120|400
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipWashSpec.txt b/db/PyMongoDataServer/PySysDB/tagEquipWashSpec.txt
index 3cb8d2c..e835b52 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipWashSpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipWashSpec.txt
@@ -2,12 +2,12 @@
1 2 30|65 500|1000
1 4 30|65 1000|2500
1 6 30|65 1500|4500
-1 8 30|65 2000|7500
-2 2 11|63 800|1000
-2 4 11|63 1600|2500
-2 6 11|63 2400|4500
-2 8 11|63 3200|7500
-3 2 33|64 300|1000
-3 4 33|64 600|2500
-3 6 33|64 900|4500
-3 8 33|64 1200|7500
+1 9 30|65 2000|7500
+2 2 11|63 800|1600
+2 4 11|63 1600|4000
+2 6 11|63 2400|7200
+2 9 11|63 3200|1200
+3 2 33|64 300|3000
+3 4 33|64 600|7500
+3 6 33|64 900|13500
+3 9 33|64 1200|22500
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1ef6135..1afd3ee 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -54,7 +54,7 @@
BoursePriceLimit 2 100000000
BourseCharge 1 0
SkillXPAddByFB 31090|31060|31250 0 0 0 0
-SPSkillType {"1":[1005,2005,3005,50005,50105,50205,50305,50405,50505,50605,50705,50805,55005,55105,55205,55305,55405,55505,55605,55705,55805,60005,60105,60205,60305,60405,60505,60605,60705,60805],"2":[1035,2035,3035,50035,50135,50235,50335,50435,50535,50635,50735,50835,55035,55135,55235,55335,55435,55535,55635,55735,55835,60035,60135,60235,60335,60435,60535,60635,60735,60835],"3":[1065,2065,3065,50065,50165,50265,50365,50465,50565,50665,50765,50865,55065,55165,55265,55365,55465,55565,55665,55765,55865,60065,60165,60265,60365,60465,60565,60665,60765,60865]} 6000 0 0 0
+SPSkillType {"1":[1005,2005,3005,50005,50105,50205,50305,50405,50505,50605,50705,50805,55005,55105,55205,55305,55405,55505,55605,55705,55805,60005,60105,60205,60305,60405,60505,60605,60705,60805,51005,51105,56005,56105],"2":[1035,2035,3035,50035,50135,50235,50335,50435,50535,50635,50735,50835,55035,55135,55235,55335,55435,55535,55635,55735,55835,60035,60135,60235,60335,60435,60535,60635,60735,60835,51035,51135,56035,56135],"3":[1065,2065,3065,50065,50165,50265,50365,50465,50565,50665,50765,50865,55065,55165,55265,55365,55465,55565,55665,55765,55865,60065,60165,60265,60365,60465,60565,60665,60765,60865,51065,51165,56065,56165]} 6000 0 0 0
PassSkillEquipLimit {"0":{"level":70},"1":{"level":70},"2":{"OpenSkillSlots":2},"3":{"OpenSkillSlots":3},"4":{"OpenSkillSlots":4},"5":{"OpenSkillSlots":5}} 6 3 2_20005|3_20006|4_20007|5_20008
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
--
Gitblit v1.8.0