From d5be708536129713a9e6530f2e2ed0c36c7241b2 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期二, 04 九月 2018 20:09:59 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 8bfe2e1..6975772 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -206,8 +206,8 @@
205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1
-208 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1
-209 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1
+208 9077 9075 3 5305 10 0 10000 0 0 EquipComposeSuccess1 1
+209 9078 9077 3 5306 20 0 10000 0 0 EquipComposeSuccess2 1
210 3502 0 0 3501 3 0 10000 0 0 0 1
211 3503 0 0 3502 3 0 10000 0 0 0 1
212 3504 0 0 3503 3 0 10000 0 0 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 8327136..57d3853 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -33,6 +33,8 @@
109 3 0 256 1 1 [] 0 0 0 0 1 1 1268 0 0
110 3 0 4207 1 1 [] 0 0 0 150 1 1 5888 0 0
111 3 0 257 1 1 [] 0 0 0 150 1 1 5888 0 0
+112 3 0 5305 1 0 [] 0 0 0 300 0 1 200 0 0
+113 3 0 5306 1 0 [] 0 0 0 400 0 1 300 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
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index 2dbd8d6..e7fad80 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,7 +1,7 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
1 0 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 200 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 250 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
+1 200 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
+1 250 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
2 0 {"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
2 200 {"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
2 250 {"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
--
Gitblit v1.8.0