From eb09695125269e84954be20abbca89f7ffe462e7 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期五, 11 一月 2019 10:35:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 11 ++++++-----
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
7 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index e0fe955..81ae794 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
index fddd73f..6d1a60e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index a58fc96..2c8060f 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -212,3 +212,5 @@
2423 [[25,[3804,1]],[125,[3803,1]],[275,[5408,1]],[285,[5409,1]],[335,[4607,1]],[435,[4606,1]],[585,[2348,1]],[605,[2425,1]],[1405,[7105,5]],[1905,[5303,60]],[2405,[5412,10]],[3605,[8353,6]],[5200,[2324,2]],[6400,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 {2:[[10000,[2348,1]]],8:[[10000,[4607,1]]],20:[[10000,[5408,1]]]} [3804,3803,5408,5409,4607,4606,2348,2425]
2424 4184_2|1025_15|952_3|913_1 [913]
2425 7110_1|7115_1|7120_1|7125_1 [7110,7115,7120,7125]
+2426 [[1300,[2107,3]],[1500,[2389,1]],[1600,[5410,1]],[1800,[181,10]],[2000,[4151,10]],[2100,[14,1]],[3000,[101,5]],[5000,[181,1]],[7000,[4151,1]],[10000,[5303,10]]] 1 [2107,2389,5410]
+2427 [[1300,[2107,3]],[1500,[2389,1]],[1700,[2390,1]],[1900,[5410,1]],[2100,[5411,1]],[2500,[14,3]],[3000,[103,1]],[5000,[181,5]],[7000,[4151,5]],[10000,[5303,50]]] [2107,2389,2390,5410,5411]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c899140..928a087 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -285,7 +285,7 @@
InvestMaxDay {"1":31,"2":7}
InvestRedPackAward {2:51,3:50}
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 3
-GoldInvestLVLimit 300
+GoldInvestLVLimit 3_300|4_400|5_500
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,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]
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 9dcb304..6b50b23 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -227,12 +227,12 @@
653 42 1 704 0 3_50000 0 0 110 10
654 42 1 708 0 3_50000 0 0 110 10
655 70 1 5 0 3_50000 0 0 110 10
-656 71 1 5 0 3_50000 0 0 110 10
+656 71 1 5 0 3_50000 0 0
657 92 5 4|1|1 0 3_50000 0 0 110 10
658 63 1 7 0 3_50000 0 0 110 10
659 92 5 1|2|1 0 3_50000 0 0 110 10
661 50 15 0 0 3_50000 0 0 110 10
-662 70 1 6 0 3_50000 0 0 110 10
+662 70 1 6 0 3_50000 0 0
663 62 1 98 0 3_50000 0 0 110 10
667 127 30 6 0 3_50000 0 0 110 10
668 127 36 6 0 3_50000 0 0 110 10
@@ -378,6 +378,7 @@
1003 36 1 60203014 0 3_50000 0 0 111 10
1004 39 1 7|5 0 3_50000 0 0 111 10
1005 130 80 0 0 3_50000 0 0 111 10
+1006 71 1 5 0 3_50000 0 0 111 10
1021 50 17 0 0 3_50000 0 0 111 10
1022 129 1 5 0 3_50000 0 0 111 10
1023 131 10 20302002 0 3_50000 0 0 111 10
@@ -388,7 +389,7 @@
1028 62 1 182 0 3_50000 0 0 111 10
1029 42 1 808 0 3_50000 0 0 111 10
1030 92 2 6|1|1 0 3_50000 0 0 111 10
-1031 71 1 6 0 3_50000 0 0 111 10
+1031 71 1 6 0 3_50000 0 0
1041 50 18 0 0 3_50000 0 0 111 10
1042 62 1 236 0 3_50000 0 0 111 10
1043 36 1 60203015 0 3_50000 0 0 111 10
@@ -400,7 +401,7 @@
1049 39 3 7|5 0 3_50000 0 0 111 10
1050 42 1 904 0 3_50000 0 0 111 10
1051 92 3 6|1|1 0 3_50000 0 0 111 10
-1052 70 1 7 0 3_50000 0 0 111 10
+1052 70 1 7 0 3_50000 0 0
1053 132 1 1 0 3_50000 0 0 111 10
1054 132 2 1 0 3_50000 0 0 111 10
1055 132 1 3 0 3_50000 0 0 111 10
@@ -417,7 +418,7 @@
1066 39 4 7|5 0 3_50000 0 0 111 10
1067 39 5 7|5 0 3_50000 0 0 111 10
1068 92 5 6|1|1 0 3_50000 0 0 111 10
-1069 71 1 7 0 3_50000 0 0 111 10
+1069 71 1 7 0 3_50000 0 0
1070 127 6 7 0 3_50000 0 0 111 10
1071 127 12 7 0 3_50000 0 0 111 10
1072 127 18 7 0 3_50000 0 0 111 10
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 80ce273..62b0f68 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -36,7 +36,7 @@
110 1 70 7_500
110 2 150 8
110 3 200 10
-110 4 260 50800|55800|60800
+110 4 240 50800|55800|60800
201 0 0 50900|55900|60900
202 0 0 50901|55901|60901
203 0 0 50902|55902|60902
@@ -64,7 +64,7 @@
111 1 110 6_20000
111 2 180 9
111 3 200 1
-111 4 220 51000|56000|61000
+111 4 200 51000|56000|61000
112 0 0
112 1 80 7_1000
112 2 90 6_20000
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b3fce46..56944f4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -620,6 +620,8 @@
2423 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2424 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2425 1 0 红色核心选择宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 5000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2426 1 0 巡礼礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2427 1 0 巡礼豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 600 0 0 0 0 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 840 0 0 0 0 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1080 0 0 0 0 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