From 0e9a8a34b73ae76a45a6f84c411f2d20e8d5092f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 13 九月 2018 20:49:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagRealm.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 14 ++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index ca95af5..c6df148 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -271,7 +271,7 @@
TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
-OpenServerRedPacketCfg 3 10 3600 50
+OpenServerRedPacketCfg 3 10 3600 50 5
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
FirstGoldTryItem 1_6621|2_6622 1_10221|2_20221 9 100
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 03c2f06..079914f 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -107,3 +107,17 @@
572 mrgame 68 0 5
573 mrgame 128 0 7
574 mrgame 168 0 8
+sgsbl.18 815035927 18 101 0
+sgsbl.6 815035927 6 2 0
+sgsbl.30 815035927 30 103 0
+sgsbl.98 815035927 98 104 0
+sgsbl.128 815035927 128 105 0
+sgsbl.198 815035927 198 106 0
+sgsbl.328 815035927 328 107 0
+sgsbl.648 815035927 648 108 0
+sgsbl.1 815035927 1 110 0
+sgsbl.ios.6 815035927 6 0 2
+sgsbl.ios.30 815035927 30 0 4
+sgsbl.ios.68 815035927 68 0 5
+sgsbl.ios.128 815035927 128 0 7
+sgsbl.ios.168 815035927 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index c950136..ae3ded2 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -15,4 +15,4 @@
50106307 2 GetPet1 4215 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
50106309 5 GetPet14 4217 1 1000 1 50 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
50106310 4 GetPet15 4218 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
-50106311 3 GetPet16 4219 1 1000 1 30 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
+50106311 3 GetPet16 4219 1 1000 1 30 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index d578f68..acc4684 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,24 +1,24 @@
Lv IsBigRealm NeedPoint NeedGood NeedNum NeedActiveTreasure AddAttrType AddAttrNum BossID SitTime TeamAward
0 0 450 0 0 0 6|7 0|0 61103000 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
1 0 540 0 0 0 6|7 4700|230 61103001 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-2 1 600 0 0 0 6|7 9900|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
+2 1 600 0 0 0 6|7 9900|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
3 0 800 0 0 0 6|7|19 18700|940|1000 61103002 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
4 0 950 0 0 0 6|7|19 25100|1260|1000 61103003 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-5 1 1510 0 0 0 6|7|19 32300|1620|1000 61203002 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,3,1),(103,1,1)]}
+5 1 1510 0 0 0 6|7|19 32300|1620|1000 61203002 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
6 0 1160 0 0 0 6|7|19 44300|2220|3000 61103004 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-7 1 1250 0 0 0 6|7|19 53300|2670|3000 61203003 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,3,1),(103,1,1)]}
+7 1 1250 0 0 0 6|7|19 53300|2670|3000 61203003 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
8 0 1390 0 0 0 6|7|19|18 68200|3410|3000|2000 61103005 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-9 1 2290 0 0 0 6|7|19|18 79300|3970|3000|2000 61203004 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,1,1),(103,3,1)]}
+9 1 2290 0 0 0 6|7|19|18 79300|3970|3000|2000 61203004 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
10 0 2360 0 0 0 6|7|19|18 97600|4880|3000|5000 61103006 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
11 0 2410 0 0 0 6|7|19|18 111300|5560|3000|5000 61103007 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-12 1 4830 0 0 0 6|7|19|18 126400|6320|3000|5000 61203005 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,1,1),(103,3,1)]}
+12 1 4830 0 0 0 6|7|19|18 126400|6320|3000|5000 61203005 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
13 0 3950 0 0 0 6|7|19|18|49 151500|7570|3000|5000|3000 61103008 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
14 0 4650 0 0 0 6|7|19|18|49 170000|8500|3000|5000|3000 61103009 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-15 1 8420 0 0 0 6|7|19|18|49 190400|9520|3000|5000|3000 61203006 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,2,1),(103,5,1)]}
+15 1 8420 0 0 0 6|7|19|18|49 190400|9520|3000|5000|3000 61203006 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
16 0 4910 0 0 0 6|7|19|18|49 224000|11200|7000|5000|3000 61103010 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
17 0 5620 0 0 0 6|7|19|18|49 248600|12430|7000|5000|3000 61103011 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-18 1 11230 0 0 0 6|7|19|18|49 275600|13780|7000|5000|3000 61203007 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,2,1),(103,5,1)]}
+18 1 11230 0 0 0 6|7|19|18|49 275600|13780|7000|5000|3000 61203007 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
19 0 6320 0 0 0 6|7|19|18|49|20 320000|16000|7000|5000|3000|2000 61103012 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
20 0 7020 0 0 0 6|7|19|18|49|20 352400|17620|7000|5000|3000|2000 61103013 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-21 1 14040 0 0 0 6|7|19|18|49|20 387600|19380|7000|5000|3000|2000 61203008 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,2,1),(103,5,1)]}
+21 1 14040 0 0 0 6|7|19|18|49|20 387600|19380|7000|5000|3000|2000 61203008 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(2263,1,1)]}
22 0 8320 0 0 0 6|7|19|18|49|20 445200|22260|7000|10000|3000|2000 61103014 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
--
Gitblit v1.8.0