From d989b8704d5f1bf85c9e8f52fee4eb50d5f5826d Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期二, 27 十一月 2018 21:02:47 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagStore.txt | 4 ++-- db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6 +++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagStore.txt | 2 +- CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 8 ++++---- ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt index 577a4b0..12c77fa 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt @@ -4,19 +4,19 @@ 31090 0 41110 0 31080 0 -31110 50 +31110 40 31130 0 31140 0 31150 0 31170 0 -31180 120 +31180 40 31190 0 31210 0 31220 0 31230 0 31240 0 -51010 30 -60010 25 +51010 40 +60010 40 31160 0 31250 0 52010 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index 889a3c1..0aee74c 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -71,7 +71,7 @@ 204 5 4 0 205 5 4 0 206 5 4 0 -207 5 4 0 +207 0 0 0 251 6 0 0 252 6 0 0 253 6 0 0 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index fa66bd8..fd71925 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc index cf75a2f..ddf907d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt index 5cf8991..28378ae 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt @@ -4,19 +4,19 @@ 31090 0 0 0 0 0 0 0 0 0 0 0 0 0 41110 0 0 0 0 0 0 0 0 0 0 0 0 0 31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 0 0 -31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 100 50 0 +31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 170 40 0 31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 0 0 31140 0 2 0 0 0 0 0 0 1 0 0 0 0 31150 1 2 0 0 0 0 19 0 1 180 0 0 0 31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0 0 0 -31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120 120 1 +31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 170 40 1 31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0 0 0 31210 0 0 0 0 0 0 0 0 0 0 0 0 0 31220 2 2 0 0 0 0 0 0 0 0 0 0 0 31230 1 2 0 0 0 0 0 0 0 0 0 0 0 31240 0 2 0 0 0 0 15 0 1 0 0 0 0 -51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 60 30 0 -60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 50 25 0 +51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 170 40 0 +60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 170 40 0 31160 1 2 0 0 0 0 0 0 1 0 0 0 0 31250 0 0 0 0 0 0 0 0 0 0 0 0 0 52010 5 2 0 0 0 25 0 0 1 180 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt index a431223..220cc46 100644 --- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt +++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt @@ -36,8 +36,8 @@ 4 35 110 1 [(4694,6,1),(913,1,1)] 913 LimitGift3 2 36 30 1 [(108,5,1),(109,1,1)] 109 LimitGift3 2 37 34 1 [(4007,3,1),(30,100,1)] 4007 LimitGift3 -4 38 1000 1 [(4680,1,1),(4681,1,1)] 4680 LimitGift3 +4 38 100 1 [(4680,1,1),(4681,1,1)] 4680 LimitGift3 2 39 30 1 [(191,2,1),(30,100,1)] 191 LimitGift3 -4 40 1100 1 [(4694,6,1),(913,1,1)] 4694 LimitGift3 +4 40 110 1 [(4694,6,1),(913,1,1)] 4694 LimitGift3 2 41 33 1 [(2213,10,1),(4610,1,1)] 2213 LimitGift3 -4 42 1100 1 [(4151,100,1),(1500,4,1)] 4151 LimitGift3 +4 42 110 1 [(4151,100,1),(1500,4,1)] 4151 LimitGift3 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 0d9a25d..c2c784c 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -71,7 +71,7 @@ 204 5 0 181 1 1 [] 0 4 0 0 6 0 17 100 0 0 205 5 0 911 1 1 [] 0 4 0 0 1 0 17 100 0 0 206 5 0 952 1 1 [] 0 4 0 0 1 0 17 200 0 0 -207 5 0 880 1 1 [] 0 4 0 0 1 0 17 500 0 0 +207 0 0 0 0 0 [] 0 0 0 0 0 0 0 0 0 0 251 6 0 901 100 1 [] 0 0 0 0 0 0 3 3000 0 0 252 6 0 902 100 1 [] 0 0 0 0 0 0 3 6000 0 0 253 6 0 903 100 1 [] 0 0 0 0 0 0 3 15000 0 0 @@ -182,7 +182,7 @@ 773 108 1 4606 1 1 [[2213,70,1]] 4606 0 0 0 1 0 1 288 8750 0 LimitGift7 774 108 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8 775 109 1 913 1 1 [[109,6,1]] 913 0 0 0 1 0 1 388 1400 0 LimitGift6 -776 110 1 4664 2 1 [[4673,2,1]] 4664 0 0 0 1 0 1 88 320 0 LimitGift6 +776 110 1 4664 2 1 [[4674,2,1]] 4664 0 0 0 1 0 1 88 320 0 LimitGift6 777 111 1 4606 1 1 [[2213,25,1]] 4606 0 0 0 1 0 1 388 1375 0 LimitGift7 778 112 1 181 10 1 [[4151,20,1]] 181 0 0 0 1 0 1 88 300 0 LimitGift6 779 113 1 983 30 1 [] 983 0 0 0 1 0 1 188 900 0 LimitGift6 -- Gitblit v1.8.0