From a54bc6b67c9caf65ca0ff81ab4c33dad83b50661 Mon Sep 17 00:00:00 2001
From: cehua_lyf <1251614069@qq.com>
Date: 星期二, 15 一月 2019 16:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 731e209..87e4889 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -270,7 +270,7 @@
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
-RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110], 1, 5, 30], 2:[[40108002], [111,112,113], 1, 2, 60]}}
+RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108], 1, 2, 60], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125], 1, 10, 30]}}
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
@@ -333,4 +333,4 @@
GatherSoulLevelUp int(4529520*(0+0.02*(level/49.0)+0.08*pow(level/49.0,2)+0.2*pow(level/49.0,3)+0.3*pow(level/49.0,4)+0.4*pow(level/49.0,5))-4529520*(0+0.02*((level-1)/49.0)+0.08*pow((level-1)/49.0,2)+0.2*pow((level-1)/49.0,3)+0.3*pow((level-1)/49.0,4)+0.4*pow((level-1)/49.0,5))) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
GatherSoulPackCount 150
ShareUseCntItem [[2387,2428,2430],[2388,2429]]
-GodWeaponStone {102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}
+ChangeOldItem {102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 01bdfce..d3509c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -10,7 +10,7 @@
3 300 2 {"1":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
4 6 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
4 30 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
-4 300 2 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
+4 300 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
5 6 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
5 30 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
5 100 2 {"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index f39d361..09f069c 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -7,7 +7,7 @@
6 10333|20333 1 0 1134 4
7 10337|20337 1 0 1134 3
8 10335|20335 1 0 1134 3
-9 2335 1 1 1132 12
+9 2335 1 1 1132 16
10 10431|20431 1 0 1135 6
11 10432|20432 1 0 1135 5
12 10434|20434 1 0 1135 5
@@ -15,7 +15,7 @@
14 10433|20433 1 0 1135 4
15 10437|20437 1 0 1135 3
16 10435|20435 1 0 1135 3
-17 2337 1 1 1133 12
+17 2337 1 1 1133 24
18 10531|20531 1 0 1136 6
19 10532|20532 1 0 1136 5
20 10534|20534 1 0 1136 5
--
Gitblit v1.8.0