From c438674f6bf389ecc9a4609b866a8508176f9fc4 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期二, 29 一月 2019 17:18:52 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagChests.txt | 2 db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 93 +++++++++++++++++++++-- db/PyMongoDataServer/SysDB/tagChinItem.txt | 7 + db/PyMongoDataServer/PySysDB/tagDienstgrad.txt | 3 CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 93 +++++++++++++++++++++-- db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt | 19 ++++ 7 files changed, 198 insertions(+), 21 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt index c96cf46..249b893 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt @@ -71,12 +71,87 @@ 123 33 50 2 4 0 124 33 50 2 4 0 125 33 100 2 6 0 -126 32 500 2 20 0 2019-2-4 12:00 30 -127 32 500 2 20 0 2019-2-4 12:30 30 -128 31 1000 2 20 0 2019-2-4 13:00 30 -129 32 1000 2 20 0 2019-2-5 18:00 30 -130 32 1000 2 20 0 2019-2-5 18:30 30 -131 31 2000 2 20 0 2019-2-5 19:00 30 -132 32 1500 2 20 0 2019-2-6 20:00 30 -133 32 1500 2 20 0 2019-2-6 20:30 30 -134 31 3000 2 20 0 2019-2-6 21:00 30 +126 32 400 2 20 0 2019-2-4 10:15 30 +127 32 400 2 20 0 2019-2-4 10:18 30 +128 31 2500 2 50 0 2019-2-4 10:21 30 +129 32 400 2 20 0 2019-2-4 14:15 30 +130 32 400 2 20 0 2019-2-4 14:18 30 +131 31 2500 2 50 0 2019-2-4 14:21 30 +132 32 400 2 20 0 2019-2-4 18:15 30 +133 32 400 2 20 0 2019-2-4 18:18 30 +134 31 2500 2 50 0 2019-2-4 18:21 30 +135 32 400 2 20 0 2019-2-4 22:15 30 +136 32 400 2 20 0 2019-2-4 22:18 30 +137 31 2500 2 50 0 2019-2-4 22:21 30 +138 32 400 2 20 0 2019-2-5 10:15 30 +139 32 400 2 20 0 2019-2-5 10:18 30 +140 31 2500 2 50 0 2019-2-5 10:21 30 +141 32 400 2 20 0 2019-2-5 14:15 30 +142 32 400 2 20 0 2019-2-5 14:18 30 +143 31 2500 2 50 0 2019-2-5 14:21 30 +144 32 400 2 20 0 2019-2-5 18:15 30 +145 32 400 2 20 0 2019-2-5 18:18 30 +146 31 2500 2 50 0 2019-2-5 18:21 30 +147 32 400 2 20 0 2019-2-5 22:15 30 +148 32 400 2 20 0 2019-2-5 22:18 30 +149 31 2500 2 50 0 2019-2-5 22:21 30 +150 32 400 2 20 0 2019-2-6 10:15 30 +151 32 400 2 20 0 2019-2-6 10:18 30 +152 31 2500 2 50 0 2019-2-6 10:21 30 +153 32 400 2 20 0 2019-2-6 14:15 30 +154 32 400 2 20 0 2019-2-6 14:18 30 +155 31 2500 2 50 0 2019-2-6 14:21 30 +156 32 400 2 20 0 2019-2-6 18:15 30 +157 32 400 2 20 0 2019-2-6 18:18 30 +158 31 2500 2 50 0 2019-2-6 18:21 30 +159 32 400 2 20 0 2019-2-6 22:15 30 +160 32 400 2 20 0 2019-2-6 22:18 30 +161 31 2500 2 50 0 2019-2-6 22:21 30 +162 32 400 2 20 0 2019-2-7 10:15 30 +163 32 400 2 20 0 2019-2-7 10:18 30 +164 31 2500 2 50 0 2019-2-7 10:21 30 +165 32 400 2 20 0 2019-2-7 14:15 30 +166 32 400 2 20 0 2019-2-7 14:18 30 +167 31 2500 2 50 0 2019-2-7 14:21 30 +168 32 400 2 20 0 2019-2-7 18:15 30 +169 32 400 2 20 0 2019-2-7 18:18 30 +170 31 2500 2 50 0 2019-2-7 18:21 30 +171 32 400 2 20 0 2019-2-7 22:15 30 +172 32 400 2 20 0 2019-2-7 22:18 30 +173 31 2500 2 50 0 2019-2-7 22:21 30 +174 32 400 2 20 0 2019-2-8 10:15 30 +175 32 400 2 20 0 2019-2-8 10:18 30 +176 31 2500 2 50 0 2019-2-8 10:21 30 +177 32 400 2 20 0 2019-2-8 14:15 30 +178 32 400 2 20 0 2019-2-8 14:18 30 +179 31 2500 2 50 0 2019-2-8 14:21 30 +180 32 400 2 20 0 2019-2-8 18:15 30 +181 32 400 2 20 0 2019-2-8 18:18 30 +182 31 2500 2 50 0 2019-2-8 18:21 30 +183 32 400 2 20 0 2019-2-8 22:15 30 +184 32 400 2 20 0 2019-2-8 22:18 30 +185 31 2500 2 50 0 2019-2-8 22:21 30 +186 32 400 2 20 0 2019-2-9 10:15 30 +187 32 400 2 20 0 2019-2-9 10:18 30 +188 31 2500 2 50 0 2019-2-9 10:21 30 +189 32 400 2 20 0 2019-2-9 14:15 30 +190 32 400 2 20 0 2019-2-9 14:18 30 +191 31 2500 2 50 0 2019-2-9 14:21 30 +192 32 400 2 20 0 2019-2-9 18:15 30 +193 32 400 2 20 0 2019-2-9 18:18 30 +194 31 2500 2 50 0 2019-2-9 18:21 30 +195 32 400 2 20 0 2019-2-9 22:15 30 +196 32 400 2 20 0 2019-2-9 22:18 30 +197 31 2500 2 50 0 2019-2-9 22:21 30 +198 32 400 2 20 0 2019-2-10 10:15 30 +199 32 400 2 20 0 2019-2-10 10:18 30 +200 31 2500 2 50 0 2019-2-10 10:21 30 +201 32 400 2 20 0 2019-2-10 14:15 30 +202 32 400 2 20 0 2019-2-10 14:18 30 +203 31 2500 2 50 0 2019-2-10 14:21 30 +204 32 400 2 20 0 2019-2-10 18:15 30 +205 32 400 2 20 0 2019-2-10 18:18 30 +206 31 2500 2 50 0 2019-2-10 18:21 30 +207 32 400 2 20 0 2019-2-10 22:15 30 +208 32 400 2 20 0 2019-2-10 22:18 30 +209 31 2500 2 50 0 2019-2-10 22:21 30 diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt index 37f6b2a..ba73d3b 100644 --- a/db/PyMongoDataServer/PySysDB/tagChests.txt +++ b/db/PyMongoDataServer/PySysDB/tagChests.txt @@ -262,3 +262,5 @@ 2471 0 0 600 0 1 2472 0 0 0 0 1 2473 0 0 600 0 1 +2474 0 0 0 0 1 +2475 0 0 0 0 1 diff --git a/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt b/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt index 68c43ff..6b7dfa1 100644 --- a/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt +++ b/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt @@ -25,3 +25,6 @@ 33 1 0 6|7|8 3000|150|30 34 1 0 6|7|89 20000|1000|200 35 1 0 6|7|89 20000|1000|300 +36 1 0 6|7|89 20000|1000|300 +37 1 0 6|7|89 20000|1000|100 +38 1 0 6|7 20000|1000 diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt index 3a87c9e..c4eceed 100644 --- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt +++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt @@ -71,12 +71,87 @@ 123 33 50 2 4 124 33 50 2 4 125 33 100 2 6 -126 32 500 2 20 -127 32 500 2 20 -128 31 1000 2 20 -129 32 1000 2 20 -130 32 1000 2 20 -131 31 2000 2 20 -132 32 1500 2 20 -133 32 1500 2 20 -134 31 3000 2 20 +126 32 400 2 20 +127 32 400 2 20 +128 31 2500 2 50 +129 32 400 2 20 +130 32 400 2 20 +131 31 2500 2 50 +132 32 400 2 20 +133 32 400 2 20 +134 31 2500 2 50 +135 32 400 2 20 +136 32 400 2 20 +137 31 2500 2 50 +138 32 400 2 20 +139 32 400 2 20 +140 31 2500 2 50 +141 32 400 2 20 +142 32 400 2 20 +143 31 2500 2 50 +144 32 400 2 20 +145 32 400 2 20 +146 31 2500 2 50 +147 32 400 2 20 +148 32 400 2 20 +149 31 2500 2 50 +150 32 400 2 20 +151 32 400 2 20 +152 31 2500 2 50 +153 32 400 2 20 +154 32 400 2 20 +155 31 2500 2 50 +156 32 400 2 20 +157 32 400 2 20 +158 31 2500 2 50 +159 32 400 2 20 +160 32 400 2 20 +161 31 2500 2 50 +162 32 400 2 20 +163 32 400 2 20 +164 31 2500 2 50 +165 32 400 2 20 +166 32 400 2 20 +167 31 2500 2 50 +168 32 400 2 20 +169 32 400 2 20 +170 31 2500 2 50 +171 32 400 2 20 +172 32 400 2 20 +173 31 2500 2 50 +174 32 400 2 20 +175 32 400 2 20 +176 31 2500 2 50 +177 32 400 2 20 +178 32 400 2 20 +179 31 2500 2 50 +180 32 400 2 20 +181 32 400 2 20 +182 31 2500 2 50 +183 32 400 2 20 +184 32 400 2 20 +185 31 2500 2 50 +186 32 400 2 20 +187 32 400 2 20 +188 31 2500 2 50 +189 32 400 2 20 +190 32 400 2 20 +191 31 2500 2 50 +192 32 400 2 20 +193 32 400 2 20 +194 31 2500 2 50 +195 32 400 2 20 +196 32 400 2 20 +197 31 2500 2 50 +198 32 400 2 20 +199 32 400 2 20 +200 31 2500 2 50 +201 32 400 2 20 +202 32 400 2 20 +203 31 2500 2 50 +204 32 400 2 20 +205 32 400 2 20 +206 31 2500 2 50 +207 32 400 2 20 +208 32 400 2 20 +209 31 2500 2 50 diff --git a/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt b/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt new file mode 100644 index 0000000..5164def --- /dev/null +++ b/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt @@ -0,0 +1,19 @@ +suiteType shareSoneLV attrIDList attrValueList +1 1 96|97|98 1000|1000|1000 +1 2 96|97|98 1500|1500|1500 +1 3 96|97|98 2000|2000|2000 +1 4 96|97|98 2500|2500|2500 +1 5 96|97|98 3000|3000|3000 +1 6 96|97|98 3500|3500|3500 +2 1 99|100|101 1500|1500|1500 +2 2 99|100|101 2250|2250|2250 +2 3 99|100|101 3000|3000|3000 +2 4 99|100|101 3750|3750|3750 +2 5 99|100|101 4500|4500|4500 +2 6 99|100|101 5250|5250|5250 +3 1 90|91|93|94 300|300|150|150 +3 2 90|91|93|94 600|600|300|300 +3 3 90|91|93|94 900|900|450|450 +3 4 90|91|93|94 1200|1200|600|600 +3 5 90|91|93|94 1500|1500|750|750 +3 6 90|91|93|94 1800|1800|900|900 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index aa261e4..50009c9 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -60,8 +60,11 @@ 60 1 0 万服飞将 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 1 0 独步猛士 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 31 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 1 0 天选之人 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 32 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -63 1 0 富甲一方 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 34 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -64 1 0 至尊财神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 35 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +63 1 0 富甲一方 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 34 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +64 1 0 至尊财神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 35 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +65 1 0 壕 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 36 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +66 1 0 腰缠万贯 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 37 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +67 1 0 新春快乐 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 38 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 1 0 初级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 2 0 10 0 1 0 0 206 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 2 0 中级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 12 0 20 0 1 0 0 206 120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 103 3 0 高级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 60 0 50 0 1 0 0 206 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt index 343032f..43b4298 100644 --- a/db/PyMongoDataServer/SysDB/tagChinMap.txt +++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt @@ -13,7 +13,7 @@ 21070 深海古墓 1 90 0 0 0 0 0 0 0 0 0 0 1 1 21070 75 12 1 1 0 5 35 21100 荒芜沙漠 1 240 0 0 0 0 0 0 0 0 0 0 1 1 21100 103 37 1 1 0 5 35 21110 异兽之地 1 260 0 0 0 0 0 0 0 0 0 0 1 1 21110 94 91 1 1 0 5 35 -21310 古舰战场 1 600 0 0 0 0 0 0 0 0 0 0 1 1 21310 94 91 1 1 0 5 35 +21310 古舰战场 1 380 0 0 0 0 0 0 0 0 0 0 1 1 21310 94 91 1 1 0 5 35 31010 仙魔之争 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 31010 26 6 0 1 0 1 2 31020 BOSS之家一层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31020 49 71 0 1 0 5 35 31030 BOSS之家二层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31030 55 14 0 1 0 5 35 -- Gitblit v1.8.0