From ded57d286f18d6734dda5eff19a7c108015130b9 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 14 八月 2018 17:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 12 ++----
db/PyMongoDataServer/PySysDB/tagBossReborn.txt | 46 ++++++++++++-----------
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 36 +++++++++---------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
5 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index d07d89e..48d3977 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -59,7 +59,7 @@
OpenServerRedPacketRain 200
GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会]
BillBoardPlayerLoginNotify [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],] 100 300
-BossRebornTotalPoint 1968|2952|3936|4920 26|51|101|9999
+BossRebornTotalPoint 1744|2616|3488|4360 26|51|101|9999
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
index 428f769..6939fb6 100644
--- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
@@ -1,23 +1,25 @@
TemplateID Id TotalTimes SingleTimes Reward
-1 1 3 1 [(21,20,1),(11,2,1)]
-1 2 4 1 [(21,20,1),(11,2,1)]
-1 3 10 1 [(21,20,1),(11,2,1)]
-1 4 10 1 [(21,20,1),(11,2,1)]
-1 5 20 1 [(21,20,1),(11,2,1)]
-1 6 3 3 [(21,20,1),(11,2,1)]
-1 7 3 1 [(21,20,1),(11,2,1)]
-1 8 30 2 [(21,20,1),(11,2,1)]
-1 9 20 10 [(21,20,1),(11,2,1)]
-1 10 5 1 [(21,20,1),(11,2,1)]
-1 11 5 1 [(21,20,1),(11,2,1)]
-2 1 3 1 [(21,20,1),(11,2,1)]
-2 2 4 1 [(21,20,1),(11,2,1)]
-2 3 10 1 [(21,20,1),(11,2,1)]
-2 4 10 1 [(21,20,1),(11,2,1)]
-2 5 20 1 [(21,20,1),(11,2,1)]
-2 6 3 3 [(21,20,1),(11,2,1)]
-2 7 3 1 [(21,20,1),(11,2,1)]
-2 8 30 2 [(21,20,1),(11,2,1)]
-2 9 20 10 [(21,20,1),(11,2,1)]
-2 10 5 1 [(21,20,1),(11,2,1)]
-2 11 5 1 [(21,20,1),(11,2,1)]
+1 1 3 1 [(21,20,1),(11,1,1)]
+1 2 4 1 [(21,20,1),(11,1,1)]
+1 3 10 1 [(21,10,1),(11,1,1)]
+1 4 10 1 [(21,10,1),(11,1,1)]
+1 5 20 1 [(21,20,1),(11,1,1)]
+1 6 3 3 [(21,50,1),(1128,1,1)]
+1 7 3 1 [(21,20,1),(11,1,1)]
+1 8 30 2 [(21,10,1),(11,1,1)]
+1 9 20 10 [(21,10,1),(11,1,1)]
+1 10 5 1 [(21,10,1),(11,1,1)]
+1 12 3 1 [(21,10,1),(11,1,1)]
+1 13 20 1 [(21,15,1),(11,1,1)]
+2 1 3 1 [(21,20,1),(11,1,1)]
+2 2 4 1 [(21,20,1),(11,1,1)]
+2 3 10 1 [(21,10,1),(11,1,1)]
+2 4 10 1 [(21,10,1),(11,1,1)]
+2 5 20 1 [(21,20,1),(11,1,1)]
+2 6 3 3 [(21,50,1),(1128,1,1)]
+2 7 3 1 [(21,20,1),(11,1,1)]
+2 8 30 2 [(21,10,1),(11,1,1)]
+2 9 20 10 [(21,10,1),(11,1,1)]
+2 10 5 1 [(21,10,1),(11,1,1)]
+2 12 3 1 [(21,10,1),(11,1,1)]
+2 13 20 1 [(21,15,1),(11,1,1)]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index f28e927..f9b777a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -244,7 +244,7 @@
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
-OSCRankRedpackAward {1:80,(2,5):81,(6,20):82}
+OSCRankRedpackAward {1:80,(2,5):81}
WeekResetSuccType []
InvestCost {"1":[300],"2":[300],"3":[680,1280,1880]}
InvestMaxDay {"1":31,"2":28}
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index f8dd731..f51ce97 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -33,24 +33,24 @@
sn.android.98.b 226114725 98 0 6
sn.android.128.a 226114725 128 0 7
sn.android.168.a 226114725 168 0 8
-lxj.ios.18 508021130 18 101 0
-lxj.ios.6 508021130 6 2 0
-lxj.ios.30 508021130 30 103 0
-lxj.ios.98 508021130 98 104 0
-lxj.ios.128 508021130 128 105 0
-lxj.ios.198 508021130 198 106 0
-lxj.ios.328 508021130 328 107 0
-lxj.ios.648 508021130 648 108 0
-lxj.ios.3000 508021130 3000 109 0
-lxj.ios.01 508021130 1 110 0
-lxj.ios.1.a 508021130 1 0 1
-lxj.ios.6.a 508021130 6 0 2
-lxj.ios.6.b 508021130 6 0 3
-lxj.ios.30.a 508021130 30 0 4
-lxj.ios.68.a 508021130 68 0 5
-lxj.ios.98.b 508021130 98 0 6
-lxj.ios.128.a 508021130 128 0 7
-lxj.ios.168.a 508021130 168 0 8
+lxj.18 508021130 18 101 0
+lxj.6 508021130 6 2 0
+lxj.30 508021130 30 103 0
+lxj.98 508021130 98 104 0
+lxj.128 508021130 128 105 0
+lxj.198 508021130 198 106 0
+lxj.328 508021130 328 107 0
+lxj.648 508021130 648 108 0
+lxj.3000 508021130 3000 109 0
+lxj.01 508021130 1 110 0
+lxj.1.a 508021130 1 0 1
+lxj.6.a 508021130 6 0 2
+lxj.6.b 508021130 6 0 3
+lxj.30.a 508021130 30 0 4
+lxj.68.a 508021130 68 0 5
+lxj.98.b 508021130 98 0 6
+lxj.128.a 508021130 128 0 7
+lxj.168.a 508021130 168 0 8
lxj.Android.18 813015059 18 101 0
lxj.Android.10 813015059 10 102 0
lxj.Android.30 813015059 30 103 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 447d96e..14a95ba 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -29,20 +29,16 @@
103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0
105 3 0 967 1 0 [] 0 0 0 300 0 1 128 0 0
-106 3 0 4202 1 1 [] 0 0 0 0 1 1 388 0 0
-107 3 0 250 1 1 [] 0 0 0 0 1 1 388 0 0
-108 3 0 4205 1 1 [] 0 0 0 120 1 1 988 0 0
-109 3 0 256 1 1 [] 0 0 0 120 1 1 988 0 0
+108 3 0 4205 1 1 [] 0 0 0 0 1 1 988 0 0
+109 3 0 256 1 1 [] 0 0 0 0 1 1 988 0 0
110 3 0 4207 1 1 [] 0 0 0 150 1 1 3888 0 0
111 3 0 257 1 1 [] 0 0 0 150 1 1 3888 0 0
151 4 0 181 1 1 [] 0 0 0 0 0 2 10 0 0
152 4 0 952 1 1 [] 0 0 0 0 0 2 25 0 0
153 4 0 4101 1 1 [] 0 0 0 0 0 2 688 0 0
154 4 0 911 1 1 [] 0 0 0 0 0 2 15 0 0
-155 4 0 4202 1 1 [] 0 0 0 0 1 2 388 0 0
-156 4 0 250 1 1 [] 0 0 0 0 1 2 388 0 0
-157 4 0 4205 1 1 [] 0 0 0 120 1 2 1588 0 0
-158 4 0 256 1 1 [] 0 0 0 120 1 2 1588 0 0
+157 4 0 4205 1 1 [] 0 0 0 0 1 2 1588 0 0
+158 4 0 256 1 1 [] 0 0 0 0 1 2 1588 0 0
159 4 0 4207 1 1 [] 0 0 0 150 1 2 8888 0 0
160 4 0 257 1 1 [] 0 0 0 150 1 2 8888 0 0
161 4 0 914 1 1 [] 0 0 0 0 0 2 20 0 0
--
Gitblit v1.8.0