From 135ef9b45c159383385848b3c734bfe475aaf1c7 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期六, 24 十一月 2018 17:31:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
index 7a2c240..749c422 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
@@ -1,37 +1,37 @@
RangListType RankA RankB Gift
-2 1 1 {"1":[[203,1,1],[6712,1,0],[181,50,1],[6,1,1]],"2":[[203,1,1],[6812,1,0],[181,50,1],[6,1,1]],"3":[[203,1,1],[6912,1,0],[181,50,1],[6,1,1]]}
-2 2 2 {"1":[[203,1,1],[6713,1,0],[181,40,1],[9,1,1]],"2":[[203,1,1],[6813,1,0],[181,40,1],[9,1,1]],"3":[[203,1,1],[6913,1,0],[181,40,1],[9,1,1]]}
-2 3 3 {"1":[[204,1,1],[6713,1,0],[181,30,1],[7,1,1]],"2":[[204,1,1],[6813,1,0],[181,30,1],[7,1,1]],"3":[[204,1,1],[6913,1,0],[181,30,1],[7,1,1]]}
-2 4 5 {"1":[[204,1,1],[6714,1,0],[181,25,1],[8,1,1]],"2":[[204,1,1],[6814,1,0],[181,25,1],[8,1,1]],"3":[[204,1,1],[6914,1,0],[181,25,1],[8,1,1]]}
-2 6 10 {"1":[[205,1,1],[6714,1,0],[181,15,1],[5,1,1]],"2":[[205,1,1],[6814,1,0],[181,15,1],[5,1,1]],"3":[[205,1,1],[6914,1,0],[181,15,1],[5,1,1]]}
-2 11 20 {"1":[[205,1,1],[181,15,1],[4,1,1]],"2":[[205,1,1],[181,15,1],[4,1,1]],"3":[[205,1,1],[181,15,1],[4,1,1]]}
-1 1 1 {"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
-1 2 2 {"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
-1 3 3 {"1":[[4703,1,1],[6707,1,0],[3503,4,1],[3513,4,1]],"2":[[4703,1,1],[6807,1,0],[3503,4,1],[3513,4,1]],"3":[[4703,1,1],[6907,1,0],[3503,4,1],[3513,4,1]]}
-1 4 5 {"1":[[4703,1,1],[6708,1,0],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[6808,1,0],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[6908,1,0],[3503,3,1],[3513,3,1]]}
-1 6 10 {"1":[[4704,1,1],[6708,1,0],[3503,2,1],[3513,2,1]],"2":[[4704,1,1],[6808,1,0],[3503,2,1],[3513,2,1]],"3":[[4704,1,1],[6908,1,0],[3503,2,1],[3513,2,1]]}
-1 11 20 {"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
-3 1 1 {"1":[[4699,1,1],[6709,1,0],[4151,50,1],[6,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,50,1],[6,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,50,1],[6,1,1]]}
-3 2 2 {"1":[[4699,1,1],[6710,1,0],[4151,40,1],[9,1,1]],"2":[[4699,1,1],[6810,1,0],[4151,40,1],[9,1,1]],"3":[[4699,1,1],[6910,1,0],[4151,40,1],[9,1,1]]}
-3 3 3 {"1":[[4700,1,1],[6710,1,0],[4151,30,1],[7,1,1]],"2":[[4700,1,1],[6810,1,0],[4151,30,1],[7,1,1]],"3":[[4700,1,1],[6910,1,0],[4151,30,1],[7,1,1]]}
-3 4 5 {"1":[[4700,1,1],[6711,1,0],[4151,25,1],[8,1,1]],"2":[[4700,1,1],[6811,1,0],[4151,25,1],[8,1,1]],"3":[[4700,1,1],[6911,1,0],[4151,25,1],[8,1,1]]}
-3 6 10 {"1":[[4701,1,1],[6711,1,0],[4151,15,1],[5,1,1]],"2":[[4701,1,1],[6811,1,0],[4151,15,1],[5,1,1]],"3":[[4701,1,1],[6911,1,0],[4151,15,1],[5,1,1]]}
+2 1 1 {"1":[[203,1,1],[6712,1,0],[181,60,1],[4304,20,1]],"2":[[203,1,1],[6812,1,0],[181,60,1],[4304,20,1]],"3":[[203,1,1],[6912,1,0],[181,60,1],[4304,20,1]]}
+2 2 2 {"1":[[203,1,1],[6713,1,0],[181,50,1],[4304,15,1]],"2":[[203,1,1],[6813,1,0],[181,50,1],[4304,15,1]],"3":[[203,1,1],[6913,1,0],[181,50,1],[4304,15,1]]}
+2 3 3 {"1":[[203,1,1],[6714,1,0],[181,40,1],[4304,10,1]],"2":[[203,1,1],[6814,1,0],[181,40,1],[4304,10,1]],"3":[[203,1,1],[6914,1,0],[181,40,1],[4304,10,1]]}
+2 4 5 {"1":[[204,1,1],[181,30,1],[4304,6,1]],"2":[[204,1,1],[181,30,1],[4304,6,1]],"3":[[204,1,1],[181,30,1],[4304,6,1]]}
+2 6 10 {"1":[[204,1,1],[181,20,1],[4303,6,1]],"2":[[204,1,1],[181,20,1],[4303,6,1]],"3":[[204,1,1],[181,20,1],[4303,6,1]]}
+2 11 20 {"1":[[205,1,1],[181,15,1],[4303,4,1]],"2":[[205,1,1],[181,15,1],[4303,4,1]],"3":[[205,1,1],[181,15,1],[4303,4,1]]}
+7 1 1 {"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
+7 2 2 {"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
+7 3 3 {"1":[[4702,1,1],[6708,1,0],[3503,4,1],[3513,4,1]],"2":[[4702,1,1],[6808,1,0],[3503,4,1],[3513,4,1]],"3":[[4702,1,1],[6908,1,0],[3503,4,1],[3513,4,1]]}
+7 4 5 {"1":[[4703,1,1],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[3503,3,1],[3513,3,1]]}
+7 6 10 {"1":[[4703,1,1],[3503,2,1],[3513,2,1]],"2":[[4703,1,1],[3503,2,1],[3513,2,1]],"3":[[4703,1,1],[3503,2,1],[3513,2,1]]}
+7 11 20 {"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
+3 1 1 {"1":[[4699,1,1],[6709,1,0],[4151,60,1],[6,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,60,1],[6,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,60,1],[6,1,1]]}
+3 2 2 {"1":[[4699,1,1],[6710,1,0],[4151,50,1],[9,1,1]],"2":[[4699,1,1],[6810,1,0],[4151,50,1],[9,1,1]],"3":[[4699,1,1],[6910,1,0],[4151,50,1],[9,1,1]]}
+3 3 3 {"1":[[4699,1,1],[6711,1,0],[4151,40,1],[7,1,1]],"2":[[4699,1,1],[6811,1,0],[4151,40,1],[7,1,1]],"3":[[4699,1,1],[6911,1,0],[4151,40,1],[7,1,1]]}
+3 4 5 {"1":[[4700,1,1],[4151,30,1],[8,1,1]],"2":[[4700,1,1],[4151,30,1],[8,1,1]],"3":[[4700,1,1],[4151,30,1],[8,1,1]]}
+3 6 10 {"1":[[4700,1,1],[4151,20,1],[5,1,1]],"2":[[4700,1,1],[4151,20,1],[5,1,1]],"3":[[4700,1,1],[4151,20,1],[5,1,1]]}
3 11 20 {"1":[[4701,1,1],[4151,15,1],[4,1,1]],"2":[[4701,1,1],[4151,15,1],[4,1,1]],"3":[[4701,1,1],[4151,15,1],[4,1,1]]}
4 1 1 {"1":[[4190,1,1],[6703,1,0],[106,8,1],[103,8,1]],"2":[[4190,1,1],[6803,1,0],[106,8,1],[103,8,1]],"3":[[4190,1,1],[6903,1,0],[106,8,1],[103,8,1]]}
4 2 2 {"1":[[4190,1,1],[6704,1,0],[106,6,1],[103,6,1]],"2":[[4190,1,1],[6804,1,0],[106,6,1],[103,6,1]],"3":[[4190,1,1],[6904,1,0],[106,6,1],[103,6,1]]}
-4 3 3 {"1":[[4191,1,1],[6704,1,0],[106,5,1],[103,5,1]],"2":[[4191,1,1],[6804,1,0],[106,5,1],[103,5,1]],"3":[[4191,1,1],[6904,1,0],[106,5,1],[103,5,1]]}
-4 4 5 {"1":[[4191,1,1],[6705,1,0],[106,4,1],[103,4,1]],"2":[[4191,1,1],[6805,1,0],[106,4,1],[103,4,1]],"3":[[4191,1,1],[6905,1,0],[106,4,1],[103,4,1]]}
-4 6 10 {"1":[[4192,1,1],[6705,1,0],[106,3,1],[103,3,1]],"2":[[4192,1,1],[6805,1,0],[106,3,1],[103,3,1]],"3":[[4192,1,1],[6905,1,0],[106,3,1],[103,3,1]]}
+4 3 3 {"1":[[4190,1,1],[6705,1,0],[106,5,1],[103,5,1]],"2":[[4190,1,1],[6805,1,0],[106,5,1],[103,5,1]],"3":[[4190,1,1],[6905,1,0],[106,5,1],[103,5,1]]}
+4 4 5 {"1":[[4191,1,1],[106,4,1],[103,4,1]],"2":[[4191,1,1],[106,4,1],[103,4,1]],"3":[[4191,1,1],[106,4,1],[103,4,1]]}
+4 6 10 {"1":[[4191,1,1],[106,3,1],[103,3,1]],"2":[[4191,1,1],[106,3,1],[103,3,1]],"3":[[4191,1,1],[106,3,1],[103,3,1]]}
4 11 20 {"1":[[4192,1,1],[106,2,1],[103,2,1]],"2":[[4192,1,1],[106,2,1],[103,2,1]],"3":[[4192,1,1],[106,2,1],[103,2,1]]}
5 1 1 {"1":[[4696,1,1],[6700,1,0],[3504,3,1],[3514,3,1]],"2":[[4696,1,1],[6800,1,0],[3504,3,1],[3514,3,1]],"3":[[4696,1,1],[6900,1,0],[3504,3,1],[3514,3,1]]}
5 2 2 {"1":[[4696,1,1],[6701,1,0],[3504,2,1],[3514,2,1]],"2":[[4696,1,1],[6801,1,0],[3504,2,1],[3514,2,1]],"3":[[4696,1,1],[6901,1,0],[3504,2,1],[3514,2,1]]}
-5 3 3 {"1":[[4697,1,1],[6701,1,0],[3503,4,1],[3513,4,1]],"2":[[4697,1,1],[6801,1,0],[3503,4,1],[3513,4,1]],"3":[[4697,1,1],[6901,1,0],[3503,4,1],[3513,4,1]]}
-5 4 5 {"1":[[4697,1,1],[6702,1,0],[3503,3,1],[3513,3,1]],"2":[[4697,1,1],[6802,1,0],[3503,3,1],[3513,3,1]],"3":[[4697,1,1],[6902,1,0],[3503,3,1],[3513,3,1]]}
-5 6 10 {"1":[[4698,1,1],[6702,1,0],[3503,2,1],[3513,2,1]],"2":[[4698,1,1],[6802,1,0],[3503,2,1],[3513,2,1]],"3":[[4698,1,1],[6902,1,0],[3503,2,1],[3513,2,1]]}
+5 3 3 {"1":[[4696,1,1],[6702,1,0],[3503,4,1],[3513,4,1]],"2":[[4696,1,1],[6802,1,0],[3503,4,1],[3513,4,1]],"3":[[4696,1,1],[6902,1,0],[3503,4,1],[3513,4,1]]}
+5 4 5 {"1":[[4697,1,1],[3503,3,1],[3513,3,1]],"2":[[4697,1,1],[3503,3,1],[3513,3,1]],"3":[[4697,1,1],[3503,3,1],[3513,3,1]]}
+5 6 10 {"1":[[4697,1,1],[3503,2,1],[3513,2,1]],"2":[[4697,1,1],[3503,2,1],[3513,2,1]],"3":[[4697,1,1],[3503,2,1],[3513,2,1]]}
5 11 20 {"1":[[4698,1,1],[3503,1,1],[3513,1,1]],"2":[[4698,1,1],[3503,1,1],[3513,1,1]],"3":[[4698,1,1],[3503,1,1],[3513,1,1]]}
6 1 1 {"1":[[207,1,1],[6723,1,0],[106,8,1],[103,8,1]],"2":[[207,1,1],[6823,1,0],[106,8,1],[103,8,1]],"3":[[207,1,1],[6923,1,0],[106,8,1],[103,8,1]]}
6 2 2 {"1":[[207,1,1],[6724,1,0],[106,6,1],[103,6,1]],"2":[[207,1,1],[6824,1,0],[106,6,1],[103,6,1]],"3":[[207,1,1],[6924,1,0],[106,6,1],[103,6,1]]}
-6 3 3 {"1":[[208,1,1],[6724,1,0],[106,5,1],[103,5,1]],"2":[[208,1,1],[6824,1,0],[106,5,1],[103,5,1]],"3":[[208,1,1],[6924,1,0],[106,5,1],[103,5,1]]}
-6 4 5 {"1":[[208,1,1],[6725,1,0],[106,4,1],[103,4,1]],"2":[[208,1,1],[6825,1,0],[106,4,1],[103,4,1]],"3":[[208,1,1],[6925,1,0],[106,4,1],[103,4,1]]}
-6 6 10 {"1":[[209,1,1],[6725,1,0],[106,3,1],[103,3,1]],"2":[[209,1,1],[6825,1,0],[106,3,1],[103,3,1]],"3":[[209,1,1],[6925,1,0],[106,3,1],[103,3,1]]}
+6 3 3 {"1":[[207,1,1],[6725,1,0],[106,5,1],[103,5,1]],"2":[[207,1,1],[6825,1,0],[106,5,1],[103,5,1]],"3":[[207,1,1],[6925,1,0],[106,5,1],[103,5,1]]}
+6 4 5 {"1":[[208,1,1],[106,4,1],[103,4,1]],"2":[[208,1,1],[106,4,1],[103,4,1]],"3":[[208,1,1],[106,4,1],[103,4,1]]}
+6 6 10 {"1":[[208,1,1],[106,3,1],[103,3,1]],"2":[[208,1,1],[106,3,1],[103,3,1]],"3":[[208,1,1],[106,3,1],[103,3,1]]}
6 11 20 {"1":[[209,1,1],[106,2,1],[103,2,1]],"2":[[209,1,1],[106,2,1],[103,2,1]],"3":[[209,1,1],[106,2,1],[103,2,1]]}
--
Gitblit v1.8.0