From 7b84b51a87133e69369e69cd475b774be8fd347e Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期三, 09 一月 2019 16:45:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 40 ++++++++++----------
db/PyMongoDataServer/PySysDB/tagActWeekParty.txt | 2
db/PyMongoDataServer/PySysDB/tagWeekParty.txt | 40 +++++++++++++------
3 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
index cc29e64..2194c4f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -1,2 +1,2 @@
CfgID StartDate EndDate IsDayReset ResetType LimitLV TemplateID PointAward
-1 8 15 1 1 110 [[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300]] {0:{100:[(5408,1,1)]},1:{100:[(5408,1,1)]},2:{100:[(5408,1,1)]},3:{100:[(5408,1,1)]},4:{100:[(5408,1,1)]},5:{100:[(5408,1,1)]},6:{100:[(5408,1,1)]},}
+1 8 15 1 1 110 [[1400,1500,200,300,400,500,700,900,1000,1102],[1600,1700,201,302,400,500,700,900,1000,1102],[1400,1800,200,301,400,500,600,700,900,1000,1100],[1500,1600,201,301,401,500,701,901,1000,1102],[1400,1900,201,301,401,500,700,900,1000,1102],[1600,1700,201,302,400,500,701,901,1000,1102],[1400,1800,200,301,400,500,700,901,1000,1100]] {0:{280:[(5408,1,1)]},1:{280:[(5408,1,1)],380:[(181,1,1)]},2:{250:[(5408,1,1)]},3:{310:[(5408,1,1)],410:[(181,1,1)]},4:{360:[(5408,1,1)]},5:{320:[(5408,1,1)],420:[(181,1,1)]},6:{280:[(5408,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index abb151a..eb83dae 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -471,23 +471,23 @@
taptap.android.jbch 904100357 18 111 0
taptap.android.ntlc 904100357 30 112 0
taptap.android.jszq 904100357 98 113 0
-yile_mhtj_bjsb_18 yilegame 18 101 0
-yile_mhtj_cz_6 yilegame 6 2 0
-yile_mhtj_cz_30 yilegame 30 103 0
-yile_mhtj_cz_98 yilegame 98 104 0
-yile_mhtj_cz_128 yilegame 128 105 0
-yile_mhtj_cz_198 yilegame 198 106 0
-yile_mhtj_cz_328 yilegame 328 107 0
-yile_mhtj_cz_648 yilegame 648 108 0
-yile_mhtj_cz_1 yilegame 1 110 0
-yile_mhtj_lb_6 yilegame 6 0 2
-yile_mhtj_lb_30 yilegame 30 0 4
-yile_mhtj_lb_68 yilegame 68 0 5
-yile_mhtj_lb_128 yilegame 128 0 7
-yile_mhtj_lb_168 yilegame 168 0 8
-yile_mhtj_lb_18 yilegame 18 0 3
-yile_mhtj_lb_98 yilegame 98 0 6
-yile_mhtj_lb_198 yilegame 198 0 9
-yile_mhtj_jbch_18 yilegame 18 111 0
-yile_mhtj_ntlc_30 yilegame 30 112 0
-yile_mhtj_jszq_98 yilegame 98 113 0
+yile_mhtj_bjsb_18 yileiOS 18 101 0
+yile_mhtj_cz_6 yileiOS 6 2 0
+yile_mhtj_cz_30 yileiOS 30 103 0
+yile_mhtj_cz_98 yileiOS 98 104 0
+yile_mhtj_cz_128 yileiOS 128 105 0
+yile_mhtj_cz_198 yileiOS 198 106 0
+yile_mhtj_cz_328 yileiOS 328 107 0
+yile_mhtj_cz_648 yileiOS 648 108 0
+yile_mhtj_cz_1 yileiOS 1 110 0
+yile_mhtj_lb_6 yileiOS 6 0 2
+yile_mhtj_lb_30 yileiOS 30 0 4
+yile_mhtj_lb_68 yileiOS 68 0 5
+yile_mhtj_lb_128 yileiOS 128 0 7
+yile_mhtj_lb_168 yileiOS 168 0 8
+yile_mhtj_lb_18 yileiOS 18 0 3
+yile_mhtj_lb_98 yileiOS 98 0 6
+yile_mhtj_lb_198 yileiOS 198 0 9
+yile_mhtj_jbch_18 yileiOS 18 111 0
+yile_mhtj_ntlc_30 yileiOS 30 112 0
+yile_mhtj_jszq_98 yileiOS 98 113 0
diff --git a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
index 7eec2fc..183fee9 100644
--- a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
@@ -1,14 +1,28 @@
TemplateID ActionType TotalTimes SingleTimes Reward Point
-100 1 20 10 [(2341,1,1)] 10
-200 2 4 2 [(2341,1,1)] 10
-300 3 10 1 [(2341,1,1)] 10
-400 4 10 1 [(2341,1,1)] 10
-500 5 20 1 [(2341,1,1)] 10
-600 6 3 3 [(2341,1,1)] 10
-700 7 6 1 [(2341,1,1)] 10
-800 8 28 2 [(2341,1,1)] 10
-900 9 20 10 [(2341,1,1)] 10
-1000 10 5 1 [(2341,1,1)] 10
-1100 11 3 1 [(2341,1,1)] 10
-1200 12 20 1 [(2341,1,1)] 10
-1300 13 3 1 [(2341,1,1)] 10
+100 1 20 10 [(2426,1,1)] 10
+200 2 2 2 [(2426,1,1)] 10
+201 2 3 2 [(2426,1,1)] 10
+300 3 2 1 [(2426,1,1)] 10
+301 3 3 1 [(2426,1,1)] 10
+302 3 5 1 [(2426,1,1)] 10
+400 4 2 1 [(2426,1,1)] 10
+401 4 3 1 [(2426,1,1)] 10
+500 5 5 1 [(2426,1,1)] 10
+600 6 1 1 [(2426,1,1)] 10
+700 7 3 1 [(2426,1,1)] 10
+701 7 4 1 [(2426,1,1)] 10
+800 8 1 1 [(2426,1,1)] 10
+900 9 5 1 [(2426,1,1)] 10
+901 9 8 1 [(2426,1,1)] 10
+1000 10 1 1 [(2426,1,1)] 10
+1100 11 2 5 [(2427,1,1)] 20
+1101 11 3 5 [(2427,1,1)] 20
+1102 11 4 5 [(2427,1,1)] 20
+1200 12 1 1 [(2427,1,1)] 60
+1300 13 1 1 [(2427,1,1)] 60
+1400 14 1 1 [(2426,1,1)] 10
+1500 15 1 1 [(2426,1,1)] 10
+1600 16 1 1 [(2426,1,1)] 10
+1700 17 1 1 [(2426,1,1)] 10
+1800 18 1 1 [(2426,1,1)] 10
+1900 19 1 1 [(2426,1,1)] 10
--
Gitblit v1.8.0