From e62040bd4e7e9a1f2d085ff8234e9103716115c0 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期五, 25 一月 2019 00:33:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index f506718..71cc332 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,7 +1,13 @@
 RangListType	Condition	Gift
-2	10	{"1":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
-1	160	{"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
-3	8	{"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
-4	180	{"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
-5	5	{"1":[[3513,2],[3503,2]],"2":[[3513,2],[3503,2]],"3":[[3513,2],[3503,2]]}
-6	1000000	{"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
+2	20	{"1":[[181,10],[101,10]],"2":[[181,10],[101,10]],"3":[[181,10],[101,10]]}
+2	10	{"1":[[181,5],[101,5]],"2":[[181,5],[101,5]],"3":[[181,5],[101,5]]}
+8	30	{"1":[[4151,10],[101,10]],"2":[[4151,10],[101,10]],"3":[[4151,10],[101,10]]}
+8	15	{"1":[[4151,5],[101,5]],"2":[[4151,5],[101,5]],"3":[[4151,5],[101,5]]}
+10	30	{"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+10	15	{"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
+3	25	{"1":[[2206,1],[4303,2]],"2":[[2206,1],[4303,2]],"3":[[2206,1],[4303,2]]}
+3	15	{"1":[[2206,1],[4303,1]],"2":[[2206,1],[4303,1]],"3":[[2206,1],[4303,1]]}
+7	100	{"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+7	50	{"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
+6	2400000	{"1":[[4151,10],[4303,2]],"2":[[4151,10],[4303,2]],"3":[[4151,10],[4303,2]]}
+6	1000000	{"1":[[4151,5],[4303,1]],"2":[[4151,5],[4303,1]],"3":[[4151,5],[4303,1]]}

--
Gitblit v1.8.0