From d0da1e9fb979ece631b20ca01046263d478e9e74 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 17 八月 2018 16:31:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt | 10 +++++-----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5a9ed9d..3a29d5f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -248,7 +248,7 @@
XMZZRobotSkill {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
PayRMB 10
-OSCBillboardOpen {"2":[15,1,2],"1":[200,3,3],"3":[10,4,4],"4":[200,5,5],"5":[6,6,6],"6":[1200000,7,7]} 10
+OSCBillboardOpen {"2":[20,1,2],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[6,6,6],"6":[1200000,7,7]} 10
OSCRankRedpackAward {1:80,(2,5):81}
WeekResetSuccType []
InvestCost {"1":[300],"2":[300],"3":[680,1280,1880]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
index 18f8737..7a2c240 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
@@ -11,11 +11,11 @@
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],[6708,1,0],[4151,50,1],[6,1,1]],"2":[[4699,1,1],[6808,1,0],[4151,50,1],[6,1,1]],"3":[[4699,1,1],[6908,1,0],[4151,50,1],[6,1,1]]}
-3 2 2 {"1":[[4699,1,1],[6709,1,0],[4151,40,1],[9,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,40,1],[9,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,40,1],[9,1,1]]}
-3 3 3 {"1":[[4700,1,1],[6709,1,0],[4151,30,1],[7,1,1]],"2":[[4700,1,1],[6809,1,0],[4151,30,1],[7,1,1]],"3":[[4700,1,1],[6909,1,0],[4151,30,1],[7,1,1]]}
-3 4 5 {"1":[[4700,1,1],[6710,1,0],[4151,25,1],[8,1,1]],"2":[[4700,1,1],[6810,1,0],[4151,25,1],[8,1,1]],"3":[[4700,1,1],[6910,1,0],[4151,25,1],[8,1,1]]}
-3 6 10 {"1":[[4701,1,1],[6710,1,0],[4151,15,1],[5,1,1]],"2":[[4701,1,1],[6810,1,0],[4151,15,1],[5,1,1]],"3":[[4701,1,1],[6910,1,0],[4151,15,1],[5,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]]}
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]]}
--
Gitblit v1.8.0