From ac918c80a363585ae19c7dccf42cf070dcb154ad Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 26 十一月 2018 21:15:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagDailyAction.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt | 1 +
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 3 ++-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
index 713db92..1ac07e4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
@@ -18,3 +18,4 @@
17 {"1":[[20,30]],"3":[[20,30]],"5":[[20,30]],"7":[[20,30]]} 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
18 {} 0 {}
19 {} 0 {}
+20 {} 0 {}
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
index c306cef..354272b 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
@@ -18,3 +18,4 @@
17 1 2 0 0
18 2500 2 0 0
19 5 2 0 0
+20 1 2 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 685488e..2dc259e 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -20,9 +20,10 @@
19 1 11 80 1 15 0
21 1 13 80 1 10 0
22 1 14 0 1 20 0
-23 1 15 151 1 10 10
+
24 1 16 23 1 20 40
25 2 31240 22 1 30 0
26 2 31150 92 1 30 0
27 1 17 139 1 30 30
28 1 18 108 50 1 50
+29 1 20 151 1 10 10
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5c2f6c4..42a127e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -19,7 +19,7 @@
IceLodeSpecial [31403002] [23043,23044]
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
AI197Point {"31040":[[16,34],[18,99]]}
-AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]]}
+AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114007":[[16,14]]}
AIRefreshPointNPCRun {101:[[7,15]],102:[[13,22]],103:[[21,25]]}
RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 9 0
RuneDoubleInlayCnt 101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9
--
Gitblit v1.8.0