From d29d62a715f0cb35396b8f3331f0942b1126cebc Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期五, 09 十一月 2018 17:16:10 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagStore.txt | 16 ++++++++-------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagStore.txt | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index c05bcb6..9cbeed6 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -189,28 +189,28 @@ 1002 200 0 5 1003 200 0 20 1004 200 0 50 -1005 200 0 0 -1006 200 0 0 +1005 200 0 999 +1006 200 0 999 1007 201 0 1 1008 201 0 2 1009 201 0 5 1010 201 0 10 1011 201 0 10 1012 201 0 20 -1013 201 0 0 -1014 201 0 0 +1013 201 0 999 +1014 201 0 999 1015 202 0 2 1016 202 0 3 1017 202 0 3 1018 202 0 5 1019 202 0 10 -1020 202 0 0 -1021 202 0 0 +1020 202 0 999 +1021 202 0 999 1022 203 0 1 1023 203 0 1 1024 203 0 1 1025 203 0 20 1026 203 0 5 1027 203 0 10 -1028 203 0 0 -1029 203 0 0 +1028 203 0 999 +1029 203 0 999 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc index 5641b84..261e15f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index f66217b..157f772 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -189,28 +189,28 @@ 1002 200 2 4606 1 1 [] 4606 0 0 0 1 5 1 300 1000 0 FlashRushToBuy2 FlashToSnapUp 1003 200 2 2213 50 1 [] 2213 0 0 0 1 20 1 150 625 0 FlashRushToBuy2 FlashToSnapUp 1004 200 2 1503 2 1 [] 1503 0 0 0 1 50 1 20 100 0 FlashRushToBuy2 FlashToSnapUp -1005 200 2 4007 3 1 [] 4007 0 0 0 1 0 1 60 240 0 FlashRushToBuy2 FlashToSnapUp -1006 200 2 4622 5 1 [] 4622 0 0 0 1 0 1 88 400 0 FlashRushToBuy2 FlashToSnapUp +1005 200 2 4007 3 1 [] 4007 0 0 0 1 999 1 60 240 0 FlashRushToBuy2 FlashToSnapUp +1006 200 2 4622 5 1 [] 4622 0 0 0 1 999 1 88 400 0 FlashRushToBuy2 FlashToSnapUp 1007 201 2 3516 2 1 [] 3516 0 0 0 1 1 1 999 4860 0 FlashRushToBuy2 FlashToSnapUp 1008 201 2 947 1 1 [] 947 0 0 0 1 2 1 300 1000 0 FlashRushToBuy2 FlashToSnapUp 1009 201 2 2050 6 1 [] 2050 0 0 0 1 5 1 50 300 0 FlashRushToBuy2 FlashToSnapUp 1010 201 2 953 2 1 [] 953 0 0 0 1 10 1 88 500 0 FlashRushToBuy2 FlashToSnapUp 1011 201 2 4681 1 1 [] 4681 0 0 0 1 10 1 50 250 0 FlashRushToBuy2 FlashToSnapUp 1012 201 2 4184 1 1 [] 4184 0 0 0 1 20 1 58 230 0 FlashRushToBuy2 FlashToSnapUp -1013 201 2 4010 4 1 [] 4010 0 0 0 1 0 1 100 320 0 FlashRushToBuy2 FlashToSnapUp -1014 201 2 4609 2 1 [] 4609 0 0 0 1 0 1 50 200 0 FlashRushToBuy2 FlashToSnapUp +1013 201 2 4010 4 1 [] 4010 0 0 0 1 999 1 100 320 0 FlashRushToBuy2 FlashToSnapUp +1014 201 2 4609 2 1 [] 4609 0 0 0 1 999 1 50 200 0 FlashRushToBuy2 FlashToSnapUp 1015 202 2 4607 2 1 [] 4607 0 0 0 1 2 1 999 4000 0 FlashRushToBuy2 FlashToSnapUp 1016 202 2 7002 1 0 [] 7002 0 0 0 1 3 1 680 1800 0 FlashRushToBuy2 FlashToSnapUp 1017 202 2 5206 1 1 [] 5206 0 0 0 1 3 1 100 250 0 FlashRushToBuy2 FlashToSnapUp 1018 202 2 196 1 1 [] 196 0 0 0 1 5 1 200 800 0 FlashRushToBuy2 FlashToSnapUp 1019 202 2 195 3 1 [] 195 0 0 0 1 10 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp -1020 202 2 4610 1 1 [] 4610 0 0 0 1 0 1 60 200 0 FlashRushToBuy2 FlashToSnapUp -1021 202 2 5410 3 1 [] 5410 0 0 0 1 0 1 88 150 0 FlashRushToBuy2 FlashToSnapUp +1020 202 2 4610 1 1 [] 4610 0 0 0 1 999 1 60 200 0 FlashRushToBuy2 FlashToSnapUp +1021 202 2 5410 3 1 [] 5410 0 0 0 1 999 1 88 150 0 FlashRushToBuy2 FlashToSnapUp 1022 203 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp 1023 203 2 5206 2 1 [] 5206 0 0 0 1 1 1 300 500 0 FlashRushToBuy2 FlashToSnapUp 1024 203 2 2390 5 1 [] 2390 0 0 0 1 1 1 1800 3000 0 FlashRushToBuy2 FlashToSnapUp 1025 203 2 4680 1 1 [] 4680 0 0 0 1 20 1 200 750 0 FlashRushToBuy2 FlashToSnapUp 1026 203 2 2390 1 1 [] 2390 0 0 0 1 5 1 300 600 0 FlashRushToBuy2 FlashToSnapUp 1027 203 2 2213 100 1 [] 2213 0 0 0 1 10 1 500 1250 0 FlashRushToBuy2 FlashToSnapUp -1028 203 2 4608 2 1 [] 4608 0 0 0 1 0 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp -1029 203 2 198 3 1 [] 198 0 0 0 1 0 1 88 900 0 FlashRushToBuy2 FlashToSnapUp +1028 203 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp +1029 203 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp -- Gitblit v1.8.0