From a11695de55b2959fb0e2e3761a87ff6aafa1e9be Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期六, 13 十月 2018 14:28:01 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt | 6 +- CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt | 122 ++++++++++++++++++++-------------------- db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt | 35 ++++++----- db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 2 6 files changed, 84 insertions(+), 85 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt index bec16d9..9312d1a 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt @@ -81,9 +81,9 @@ 80 4 11 7 [[12,0]] 60 81 5 1 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} 82 5 2 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} -83 5 3 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} -84 5 5 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} -85 5 7 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} +83 5 4 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} +84 5 6 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} +85 5 8 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} 86 5 10 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]} 87 5 1 7 [[12,0]] 60 88 5 2 7 [[12,0]] 60 diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt index a0d984a..1bb07da 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt @@ -3,22 +3,23 @@ 2 31170 1 21 15 21 30 0 1 {} 3 31170 4 21 0 21 15 1 1 {} 4 31170 4 21 15 21 30 0 1 {} -5 31180 6 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -6 31230 1 20 0 20 15 1 1 {} -7 31230 2 20 0 20 15 1 1 {} -8 31230 3 20 0 20 15 1 1 {} -9 31230 4 20 0 20 15 1 1 {} -10 31230 5 20 0 20 15 1 1 {} -11 31230 6 20 0 20 15 1 1 {} -12 31230 7 20 0 20 15 1 1 {} -13 31160 2 20 30 21 0 1 1 {} -14 31160 4 20 30 21 0 1 1 {} -15 31160 6 20 30 21 0 1 1 -16 31220 5 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} -17 31220 5 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -18 31220 5 21 21 21 25 0 13 {} -19 31220 5 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} -20 31220 5 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -21 31220 5 21 51 23 59 0 23 {} +5 31180 2 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +6 31180 6 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +7 31230 1 20 0 20 15 1 1 {} +8 31230 2 20 0 20 15 1 1 {} +9 31230 3 20 0 20 15 1 1 {} +10 31230 4 20 0 20 15 1 1 {} +11 31230 5 20 0 20 15 1 1 {} +12 31230 6 20 0 20 15 1 1 {} +13 31230 7 20 0 20 15 1 1 {} +14 31160 2 20 30 21 0 1 1 {} +15 31160 4 20 30 21 0 1 1 {} +16 31160 6 20 30 21 0 1 1 +17 31220 5 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} +18 31220 5 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +19 31220 5 21 21 21 25 0 13 {} +20 31220 5 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} +21 31220 5 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +22 31220 5 21 51 23 59 0 23 {} 23 31010 3 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} 24 31010 7 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt index de5d4d4..09efa99 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt @@ -208,65 +208,63 @@ 207 5 10 31230 20 0 20 15 1 1 {} 208 6 4 31170 21 0 21 15 1 1 {} 209 6 4 31170 21 15 21 30 0 1 {} -210 6 7 31170 21 0 21 15 1 1 {} -211 6 7 31170 21 15 21 30 0 1 {} -212 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -213 6 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -214 6 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -215 6 3 31160 20 30 21 0 1 1 {} -216 6 5 31160 20 30 21 0 1 1 {} -217 6 8 31160 20 30 21 0 1 1 {} -218 6 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} -219 6 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -220 6 3 31220 21 21 21 25 0 13 {} -221 6 3 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} -222 6 3 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -223 6 3 31220 21 51 23 59 0 23 {} -224 6 7 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} -225 6 7 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -226 6 7 31220 21 21 21 25 0 13 {} -227 6 7 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} -228 6 7 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -229 6 7 31220 21 51 23 59 0 23 {} -230 6 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} -231 6 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} -232 6 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} -233 6 1 31230 20 0 20 15 1 1 {} -234 6 2 31230 20 0 20 15 1 1 {} -235 6 3 31230 20 0 20 15 1 1 {} -236 6 4 31230 20 0 20 15 1 1 {} -237 6 5 31230 20 0 20 15 1 1 {} -238 6 6 31230 20 0 20 15 1 1 {} -239 6 7 31230 20 0 20 15 1 1 {} -240 6 8 31230 20 0 20 15 1 1 {} -241 6 9 31230 20 0 20 15 1 1 {} -242 7 4 31170 21 0 21 15 1 1 {} -243 7 4 31170 21 15 21 30 0 1 {} -244 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -245 7 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -246 7 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} -247 7 3 31160 20 30 21 0 1 1 {} -248 7 5 31160 20 30 21 0 1 1 {} -249 7 7 31160 20 30 21 0 1 1 {} -250 7 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} -251 7 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -252 7 3 31220 21 21 21 25 0 13 {} -253 7 3 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} -254 7 3 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -255 7 3 31220 21 51 23 59 0 23 {} -256 7 6 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} -257 7 6 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -258 7 6 31220 21 21 21 25 0 13 {} -259 7 6 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} -260 7 6 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} -261 7 6 31220 21 51 23 59 0 23 {} -262 7 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} -263 7 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} -264 7 1 31230 20 0 20 15 1 1 {} -265 7 2 31230 20 0 20 15 1 1 {} -266 7 3 31230 20 0 20 15 1 1 {} -267 7 4 31230 20 0 20 15 1 1 {} -268 7 5 31230 20 0 20 15 1 1 {} -269 7 6 31230 20 0 20 15 1 1 {} -270 7 7 31230 20 0 20 15 1 1 {} -271 7 8 31230 20 0 20 15 1 1 {} +210 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +211 6 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +212 6 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +213 6 3 31160 20 30 21 0 1 1 {} +214 6 5 31160 20 30 21 0 1 1 {} +215 6 8 31160 20 30 21 0 1 1 {} +216 6 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} +217 6 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +218 6 3 31220 21 21 21 25 0 13 {} +219 6 3 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} +220 6 3 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +221 6 3 31220 21 51 23 59 0 23 {} +222 6 7 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} +223 6 7 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +224 6 7 31220 21 21 21 25 0 13 {} +225 6 7 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} +226 6 7 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +227 6 7 31220 21 51 23 59 0 23 {} +228 6 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} +229 6 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} +230 6 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} +231 6 1 31230 20 0 20 15 1 1 {} +232 6 2 31230 20 0 20 15 1 1 {} +233 6 3 31230 20 0 20 15 1 1 {} +234 6 4 31230 20 0 20 15 1 1 {} +235 6 5 31230 20 0 20 15 1 1 {} +236 6 6 31230 20 0 20 15 1 1 {} +237 6 7 31230 20 0 20 15 1 1 {} +238 6 8 31230 20 0 20 15 1 1 {} +239 6 9 31230 20 0 20 15 1 1 {} +240 7 4 31170 21 0 21 15 1 1 {} +241 7 4 31170 21 15 21 30 0 1 {} +242 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +243 7 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +244 7 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]} +245 7 3 31160 20 30 21 0 1 1 {} +246 7 5 31160 20 30 21 0 1 1 {} +247 7 7 31160 20 30 21 0 1 1 {} +248 7 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} +249 7 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +250 7 3 31220 21 21 21 25 0 13 {} +251 7 3 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} +252 7 3 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +253 7 3 31220 21 51 23 59 0 23 {} +254 7 6 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]} +255 7 6 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +256 7 6 31220 21 21 21 25 0 13 {} +257 7 6 31220 21 25 21 30 0 21 {0:["FamilyMatchTime", []]} +258 7 6 31220 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]} +259 7 6 31220 21 51 23 59 0 23 {} +260 7 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} +261 7 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]} +262 7 1 31230 20 0 20 15 1 1 {} +263 7 2 31230 20 0 20 15 1 1 {} +264 7 3 31230 20 0 20 15 1 1 {} +265 7 4 31230 20 0 20 15 1 1 {} +266 7 5 31230 20 0 20 15 1 1 {} +267 7 6 31230 20 0 20 15 1 1 {} +268 7 7 31230 20 0 20 15 1 1 {} +269 7 8 31230 20 0 20 15 1 1 {} diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt index a0a89b8..fe0f3ea 100644 --- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt +++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt @@ -11,7 +11,7 @@ 10 2 31160 101 1 30 30 11 2 51010 103 1 20 40 12 1 7 114 1 2 20 -13 2 31220 111 1 100 100 +13 2 31220 111 1 100 200 14 2 31010 74 1 10 30 15 1 8 61 1 5 0 16 1 9 21 1 30 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt index 0bf6de2..d26a1dd 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt @@ -12,7 +12,7 @@ 31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 80 31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0 31210 0 0 0 0 0 0 0 0 0 0 0 -31220 1 2 0 0 0 0 0 0 0 0 0 +31220 2 2 0 0 0 0 0 0 0 0 0 31230 1 2 0 0 0 0 0 0 0 0 0 31240 0 2 0 0 0 0 15 0 1 0 0 51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 120 diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt index 451476e..750a8f9 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt @@ -295,5 +295,5 @@ FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60 FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]] SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018 -BindJadeWheelCfg 88 {"1":110,"2":130,"3":150,"4":150,"5":200,"6":200,"7":300,"8":300,"9":588} [(3879,1),(7379,2),(8379,3),(9379,4),(9679,5),(9979,6),(9989,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,5)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]] +BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]] BindJadeWheelNotice 150 -- Gitblit v1.8.0