From 302503dbb84246e666f32d843bdad4b6bc6836a9 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 18 九月 2018 18:01:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 26 +++---
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 1
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 32 ++++----
CoreServerGroup/GameServer/GameServerConfig/DirtyList/DirtyList.txt | 29 +++++++
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 15 +++
db/PyMongoDataServer/PySysDB/tagTreasure.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 32 ++++----
CoreServerGroup/GameServer/Script/GM/Commands/SetHorsePetPlayerCount.pyc | 0
db/PyMongoDataServer/PySysDB/tagDogz.txt | 13 +++
db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt | 20 ++--
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 18 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCInfo.pyc | 0
13 files changed, 124 insertions(+), 66 deletions(-)
diff --git a/CoreServerGroup/GameServer/GameServerConfig/DirtyList/DirtyList.txt b/CoreServerGroup/GameServer/GameServerConfig/DirtyList/DirtyList.txt
index 7ae61e5..fe53356 100644
--- a/CoreServerGroup/GameServer/GameServerConfig/DirtyList/DirtyList.txt
+++ b/CoreServerGroup/GameServer/GameServerConfig/DirtyList/DirtyList.txt
@@ -20291,3 +20291,32 @@
鈻�
鍏呭��
瀹㈡湇
+寰俊
+VX
+濞佷俊
+钖囦俊
+钁充俊
+婧︿俊
+weixin
+WX
+鍔犳垜寰俊
+鍔犳垜濞佷俊
+鍔犳垜钖囦俊
+鍔犳垜钁充俊
+鍔犳垜婧︿俊
+鍔犳垜VX
+鏂版父鎴�
+鍙﹀涓�涓父鎴�
+鍒殑娓告垙
+鏂板紑娓告垙
+鍏朵粬娓告垙
+鐢佃瘽
+鎵嬫満
+QQ
+qq
+q
+V淇�
+寰甔
+鏂板紑鐨勬父鎴�
+V+X
+鍔燰
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index fd1c809..7693f17 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -11,13 +11,13 @@
15 65 0 0
16 125 0 0
20 110 0 0
-21 115 0 0
-22 115 0 0
-23 115 0 0
+21 113 0 0
+22 113 0 0
+23 113 0 0
24 2 0 0
28 800 0 0
34 70 0 0
-36 0 10901 0
+36 210 0 0
40 2 0 0
60 112 0 0
61 30 0 0
@@ -32,28 +32,28 @@
79 2 0 0
80 36 0 0
81 28 0 0
-82 0 10801 0
-83 250 0 0
+82 155 0 0
+83 180 0 0
84 110 0 0
85 60 0 0
86 80 0 0
87 0 30101 0
88 105 0 0
89 110 0 0
-90 155 0 0
-91 0 11001 0
-92 205 0 0
-93 0 10903 0
+90 170 0 0
+91 180 0 0
+92 210 0 0
+93 240 0 0
94 16 0 0
95 39 0 0
96 800 0 0
-97 0 10703 0
+97 170 0 0
98 110 0 0
99 96 0 0
100 100 0 0
101 110 0 0
102 100 0 0
-103 160 0 0
+103 155 0 0
104 0 0 0
105 0 0 0
106 0 10200 0
@@ -75,7 +75,7 @@
123 100 0 0
124 90 0 0
125 55 0 0
-126 0 10803 0
+126 115 0 0
127 85 0 0
128 35 0 0
129 120 0 0
@@ -85,9 +85,9 @@
133 52 0 0
134 400 0 0
135 110 0 0
-136 250 0 0
-137 205 0 0
-138 0 11003 0
+136 180 0 0
+137 210 0 0
+138 260 0 0
139 110 0 0
140 0 0
141 0 0
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetHorsePetPlayerCount.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetHorsePetPlayerCount.pyc
new file mode 100644
index 0000000..8fbf4d9
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/SetHorsePetPlayerCount.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCInfo.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCInfo.pyc
index 94fadc8..02c07d7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCInfo.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCInfo.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDogz.txt b/db/PyMongoDataServer/PySysDB/tagDogz.txt
index c6c18d4..94894cc 100644
--- a/db/PyMongoDataServer/PySysDB/tagDogz.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDogz.txt
@@ -5,3 +5,16 @@
4 6|7|8 3000|300|150 50900|50901 2|2|2|2|2
5 6|7|8 4000|400|200 50900|50901 2|3|3|3|3
6 6|7|8 5000|500|250 50900|50901 3|3|4|4|4
+7 6|7|8 1000|100|51 50900|50901 2|2|2|2|2
+8 6|7|8 2000|200|101 50900|50901 2|3|3|3|3
+9 6|7|8 3000|300|151 50900|50901 3|3|4|4|4
+10 6|7|8 4000|400|201 50900|50901 2|2|2|2|2
+11 6|7|8 5000|500|251 50900|50901 2|3|3|3|3
+12 6|7|8 1000|100|52 50900|50901 3|3|4|4|4
+13 6|7|8 2000|200|102 50900|50901 2|2|2|2|2
+14 6|7|8 3000|300|152 50900|50901 2|3|3|3|3
+15 6|7|8 4000|400|202 50900|50901 3|3|4|4|4
+16 6|7|8 5000|500|252 50900|50901 2|2|2|2|2
+17 6|7|8 1000|100|53 50900|50901 2|3|3|3|3
+18 6|7|8 2000|200|103 50900|50901 3|3|4|4|4
+19 6|7|8 3000|300|153 50900|50901 3|3|4|4|4
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 93097b3..232893e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -32,7 +32,7 @@
41110 21 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203013,1,1,1,1,1]]
41110 22 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203014,1,1,1,1,1]]
31080 0 31080 82 500 0 4001 1 30 0 0 0 [20,18] [10,180,10]
-31140 0 31140 250 500 0 4004 1 20 330 956 1 [16,14] [5,300,50,10] [[101,31401001,42,12],[102,31403001,7,2]]
+31140 0 31140 180 500 0 4004 1 20 330 956 1 [16,14] [5,300,50,10] [[101,31401001,42,12],[102,31403001,7,2]]
31150 0 31150 0 0 0 4007 1|2|2|3|3|4 80 0 0 0 [132,45] [30,12]
31170 0 31170 110 0 0 0 0 0 0 0 0 [76,15] [(26,33000,33000)]
31180 0 31180 110 500 0 0 0 0 0 0 0 [112,24] [10,600,15, [340,260,200,150]]
@@ -45,14 +45,14 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [5,1800,15,101]
-51010 0 51010 160 500 0 0 0 0 0 0 0 [24,20,3] [10,600,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,10]]
-51010 1 51010 160 500 0 0 0 0 0 0 0 [70,19,3] [10,600,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [536000, [141,10]]
-51010 2 51010 160 500 0 0 0 0 0 0 0 [126,9,3] [10,600,10] [{5101031:1, 5101032:1}] [152,38,38,38,38] [665000, [141,15]]
-51010 3 51010 160 500 0 0 0 0 0 0 0 [30,62,3] [10,600,10] [{5101041:0, 5101042:1}] [155,38,38,38,38] [812000, [142,10]]
-51010 4 51010 160 500 0 0 0 0 0 0 0 [84,63,3] [10,600,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [975500, [142,15]]
-51010 5 51010 160 500 0 0 0 0 0 0 0 [137,73,3] [10,600,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [153,38,38,38,38] [1157000, [143,10]]
-51010 6 51010 160 500 0 0 0 0 0 0 0 [14,114,3] [10,600,10] [{5101071:1, 5101072:0}] [155,38,38,38,38] [1356500, [143,15]]
-51010 7 51010 160 500 0 0 0 0 0 0 0 [71,111,3] [10,600,10] [{5101081:1}] [220,38,38,38,38] [1573500, [144,10]]
+51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [10,600,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,10]]
+51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [10,600,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [536000, [141,10]]
+51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [10,600,10] [{5101031:1, 5101032:1}] [152,38,38,38,38] [665000, [141,15]]
+51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [10,600,10] [{5101041:0, 5101042:1}] [155,38,38,38,38] [812000, [142,10]]
+51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [10,600,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [975500, [142,15]]
+51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [10,600,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [153,38,38,38,38] [1157000, [143,10]]
+51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [10,600,10] [{5101071:1, 5101072:0}] [155,38,38,38,38] [1356500, [143,15]]
+51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [10,600,10] [{5101081:1}] [220,38,38,38,38] [1573500, [144,10]]
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,50,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 150 500 0 0 0 0 0 0 0 [208,24] [10,1800,50,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,50,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index d76097f..c60c09e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -11,13 +11,13 @@
15 65 0 0 0
16 125 0 0 0
20 110 0 0 0
-21 115 0 0 0
-22 115 0 0 0
-23 115 0 0 0
+21 113 0 0 0
+22 113 0 0 0
+23 113 0 0 0
24 2 0 0 0
28 800 0 0 0
34 70 0 0 104060
-36 0 10901 0 0
+36 210 0 0 0
40 2 0 0 0
60 112 0 0 0
61 30 0 0 0
@@ -32,28 +32,28 @@
79 2 0 0 0
80 36 0 0 0
81 28 0 0 0
-82 0 10801 0 0
-83 250 0 0 0
+82 155 0 0 0
+83 180 0 0 0
84 110 0 0 0
85 60 0 0 0
86 80 0 0 104080
87 0 30101 0 0
88 105 0 0 0
89 110 0 0 0
-90 155 0 0 0
-91 0 11001 0 0
-92 205 0 0 0
-93 0 10903 0 0
+90 170 0 0 0
+91 180 0 0 0
+92 210 0 0 0
+93 240 0 0 0
94 16 0 0 0
95 39 0 0 0
96 800 0 0 0
-97 0 10703 0 0
+97 170 0 0 0
98 110 0 0 0
99 96 0 0 0
100 100 0 0 0
101 110 0 0 0
102 100 0 0 0
-103 160 0 0 0
+103 155 0 0 0
104 0 0 0 101010
105 0 0 0 101100
106 0 10200 0 0
@@ -75,7 +75,7 @@
123 100 0 0 0
124 90 0 0 0
125 55 0 0 0
-126 0 10803 0 0
+126 115 0 0 0
127 85 0 0 0
128 35 0 0 0
129 120 0 0 0
@@ -85,9 +85,9 @@
133 52 0 0 0
134 400 0 0 0
135 110 0 0 0
-136 250 0 0 0
-137 205 0 0 0
-138 0 11003 0 0
+136 180 0 0 0
+137 210 0 0 0
+138 260 0 0 0
139 110 0 0 0
140 0 0 0
141 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 1f7803d..79d8e29 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -136,3 +136,18 @@
test.libao.68 test 68 0 5
test.libao.128 test 128 0 7
test.libao.168 test 168 0 8
+xj.18 spxjgame 18 101 0
+xj.10 spxjgame 10 102 0
+xj.30 spxjgame 30 103 0
+xj.98 spxjgame 98 104 0
+xj.128 spxjgame 128 105 0
+xj.198 spxjgame 198 106 0
+xj.328 spxjgame 328 107 0
+xj.648 spxjgame 648 108 0
+xj.3000 spxjgame 3000 109 0
+xj.1 spxjgame 1 110 0
+xj.android.6 spxjgame 6 0 2
+xj.android.30 spxjgame 30 0 4
+xj.android.68 spxjgame 68 0 5
+xj.android.128 spxjgame 128 0 7
+xj.android.168 spxjgame 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 1ba6dea..232bfaa 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -10,5 +10,5 @@
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
-12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(4*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
+12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 0a9f598..ab2a288 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -273,6 +273,7 @@
761 112 1 2122 0 0 0 0 0
762 112 1 2123 0 0 0 0 0
763 112 1 2124 0 0 0 0 0
+764 1 120 0 0 0 0 0 0
771 28 1 0 0 0 0 0 6
772 54 1 4|1|2 0 0 0 0 7
773 50 6 0 0 0 0 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasure.txt b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
index 70fe961..658a8f5 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
@@ -25,7 +25,7 @@
212 2 211 712|842
213 2 212 713|843
214 2 213 714|844
-301 3 0
+301 3 0 764
302 3 0 761
303 3 0 762
304 3 0 763
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
index f88e8e5..676b88d 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
@@ -1,11 +1,11 @@
PrivilegeID EffectValue singleValue maxValue attr itemAward successList
-1 0 {"6":10000,"7":200} 1061|1021
-2 0 3 180 {"7":50} 1063|1023
-3 0 1062|1022
-4 10000 1064|1024
-5 0 4 0 {"7":100} 1066|1026
-6 0 1 0 {"6":12000} 1065|1025
-7 0 5 450 {"26":200} 1068|1028
-8 0 {"86":5000} 1067|1027
-9 0 {"87":5000} 1069|1029
-10 0 0 0 [[5303,50,1]] 1070|1030
+1 0 {"6":10000,"7":200}
+2 0 3 180 {"7":50}
+3 0
+4 10000
+5 0 4 0 {"7":100}
+6 0 1 0 {"6":12000}
+7 0 5 450 {"26":200}
+8 0 {"86":5000}
+9 0 {"87":5000}
+10 0 0 0 [[5303,50,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 6dd3c4d..9a377fe 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -12,30 +12,30 @@
105 0 0
105 1 20
105 2 30 50200|55200|60200
-105 3 20 6
+105 3 20 6_10000
106 0 0
106 1 20
106 2 60 7_300
106 3 80 50300|55300|60300
107 0 0
-107 1 50 301
-107 2 110 6_15000
-107 3 140
+107 1 50 1
+107 2 110 3
+107 3 140 2
107 4 110 50500|55500|60500
108 0 0
-108 1 70
-108 2 160 7_500
-108 3 120
+108 1 70 4
+108 2 160 6
+108 3 120 5
108 4 150 50600|55600|60600
109 0 0
-109 1 70
-109 2 130 6_20000
-109 3 130
+109 1 70 6_20000
+109 2 130 7
+109 3 130 8
109 4 120 50700|55700|60700
110 0 0
-110 1 80
-110 2 170 7_800
-110 3 220
+110 1 80 7_800
+110 2 170 10
+110 3 220 9
110 4 220 50800|55800|60800
201 0 0 50900|55900|60900
202 0 0 50901|55901|60901
--
Gitblit v1.8.0