From 71960f2d934b7dac4a5f43cb4f3cae6fb4ab4878 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 06 十二月 2018 18:02:26 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 8 ++++----
db/PyMongoDataServer/SysDB/tagChinItem.txt | 14 +++++++-------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index aee6ea3..c5ff6e7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -283,11 +283,11 @@
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 3
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502
-TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
+TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373,4428,4433,4438,4443],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374,4429,4434,4439,4444],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375,4430,4435,4440,4445]}
TreasureSet11 [1, 10] [80, 640] [[982,1], [982, 10]] [0, 0] [4, 40]
TreasureSet21 max(baseRate,min(int(min(curLuck,300)*0.2+min(max(curLuck-300,0),100)*0.4+min(max(curLuck-400,0),200)*1)+max(curLuck-999,0),10000)) [10, 100] 1000
TreasureSet12 [1, 10] [30, 240] [[983,1], [983, 10]] [1440, 0] [2, 20]
-TreasureSet22 min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [3, 30] 1000
+TreasureSet22 min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [2, 20] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index c3d540c..a538297 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -4,7 +4,7 @@
1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4360,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 300 {"1":[4425,1],"2":[4429,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4430,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4440,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,5],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4385,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,5],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4360,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,5],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4380,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 300 {"1":[4425,1],"2":[4429,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,5],"7":[4430,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4440,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 553a97d..478cc59 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1256,13 +1256,13 @@
9020 4 1 绝版魔杖 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 20560 0 1 0 0 0 0 67 497 0 0 68 923 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9021 1 1 绝版长枪 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 25560 0 1 0 0 0 0 67 473 0 0 68 878 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 2 0 0 0 3 0 0 0 0 0 0 1800 0 0 0 0 0 0 0
9022 1 1 绝版魔杖 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 20560 0 1 0 0 0 0 67 497 0 0 68 923 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 5 2 0 0 0 3 0 0 0 0 0 0 1800 0 0 0 0 0 0 0
-9051 5 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 1548 0 0 0 0 67 0 0 0 68 0 0 0 11 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9062 6 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 3688 0 0 0 0 67 0 0 0 68 0 0 0 11 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9073 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2000 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9074 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2500 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9075 8 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10000 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9077 9 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 30000 0 15136 0 0 0 0 67 0 0 0 68 0 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9078 10 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100000 0 15136 0 0 0 0 67 0 0 0 68 0 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9051 5 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 1548 0 0 0 0 67 162 0 0 68 300 0 0 11 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9062 6 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 3688 0 0 0 0 67 365 0 0 68 677 0 0 11 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9073 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2000 0 7472 0 0 0 0 67 594 0 0 68 1102 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9074 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2500 0 7472 0 0 0 0 67 594 0 0 68 1102 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9075 8 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10000 0 7472 0 0 0 0 67 751 0 0 68 1395 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9077 9 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 30000 0 15136 0 0 0 0 67 1238 0 0 68 2300 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9078 10 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100000 0 15136 0 0 0 0 67 1442 0 0 68 2678 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
9995 0 0 GM法师帽子 103 3 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 5 0 47 0 0 0 0 6 999999 0 0 8 999999 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0
9996 0 0 GM之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 50000 0 0 19 800 0 0 23 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9997 0 0 GM仙器 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 200 0 1548 0 0 0 0 67 0 0 0 68 0 0 0 11 15000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0