cehua_wcy
2018-12-19 cfcd2d373ba60c90c080c8d584d4c52fa1fc49fe
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
20个文件已修改
61421 ■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/LoginServer/LoginServer.exe 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/LoginServer/LoginServer.map 61120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/LoginServer/LoginServer.tds 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagDailyAction.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFBFunc.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagGatherSoul.txt 225 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -2,4 +2,4 @@
1    OpenServer    []    []    5    5    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    {0:["FlashRushToBuy3",[]]}    []    []    100    1    [[200,201,202,203,204]]
2    New1    []    []    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    900    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208]]
3    December12    []    []    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    900    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208]]
4    December25    []    []    2018-12-12    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208,209]]
4    December25    []    []    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208,209]]
CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
@@ -19,3 +19,4 @@
18    {}    0    {}
19    {}    0    {}
20    {}    0    {}
21    {"0":[[12,0],[17,0]]}    120    {}
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -22,3 +22,4 @@
52010    0
31010    0
31340    0
32010    0
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -103,3 +103,4 @@
151    105    0    0
155    300    0    0
156    300    0    0
157    150    0    0
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
12    0    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000
13    3    4    5    6    10    11    12    15    16    17    20    20    22    24    26    28
14    2    3    4    5    8    9    10    13    14    15    20    16    18    20    22    24
15    0    0    0    2    3    4    4    5    6    7    8    9    10    11    12    12
15    1    1    1    2    3    4    4    5    6    7    8    9    10    11    12    12
16    0    0    1    1    1    2    2    2    3    3    3    5    6    6    6    6
17    1    1    2    2    3    3    4    4    4    4    4    4    4    4    4    4
18    0    0    0    0    1    1    2    2    2    2    2    2    2    2    2    2
CoreServerGroup/LoginServer/LoginServer.exe
Binary files differ
CoreServerGroup/LoginServer/LoginServer.map
Diff too large
CoreServerGroup/LoginServer/LoginServer.tds
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
Binary files differ
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -2,4 +2,4 @@
1    5    5    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    100    1    [[200,201,202,203,204]]    SellMail5    
2    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    900    100    0    [[205,206,207,208]]    SellMail5    
3    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    900    100    0    [[205,206,207,208]]    SellMail5    
4    2018-12-12    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    100    0    [[205,206,207,208,209]]    SellMail5
4    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    900    100    0    [[205,206,207,208,209]]    SellMail5
db/PyMongoDataServer/PySysDB/tagDailyAction.txt
@@ -19,3 +19,4 @@
18    2500    2    0    0
19    5    2    0    0
20    1    2    0    0
21    10    2    0    0
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -27,3 +27,4 @@
28    1    18    108    50    1    50
29    1    20    151    1    20    20
30    2    31340    156    1    20    20
31    2    32010    157    1    10    100
db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -22,3 +22,4 @@
52010    5    2    0    0    0    25    0    0    1    180    0    0    0
31010    3    2    0    0    0    0    0    0    0    180    0    0    0
31340    2    2    0    0    0    0    0    0    1    180    0    0    0
32010    10    2    0    0    0    0    0    0    0    31    0    0    0
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -103,3 +103,4 @@
151    105    0    0    0    0
155    300    0    0    0    0
156    300    0    0    0    0
157    150    0    0    0    0
db/PyMongoDataServer/PySysDB/tagGatherSoul.txt
@@ -1,139 +1,94 @@
ID    AttrType    soulStage
7201    7    0
7202    7    0
7203    7    0
7204    7    0
7205    7    0
7206    6    0
7207    6    0
7208    6    0
7209    6    0
7210    6    0
7211    46    0
7212    46    0
7213    46    0
7214    46    0
7215    46    0
7216    63    0
7217    63    0
7218    63    0
7219    63    0
7220    63    0
7221    64    0
7222    64    0
7223    64    0
7224    64    0
7225    64    0
7226    65    0
7227    65    0
7228    65    0
7229    65    0
7230    65    0
7231    66    0
7232    66    0
7233    66    0
7234    66    0
7235    66    0
7236    42    0
7237    42    0
7238    42    0
7239    42    0
7240    42    0
7241    41    0
7242    41    0
7243    41    0
7244    41    0
7245    41    0
7246    27    0
7247    27    0
7248    27    0
7249    27    0
7250    27    0
7251    8    0
7252    8    0
7253    8    0
7254    8    0
7255    8    0
7256    26    0
7257    26    0
7258    26    0
7259    26    0
7260    26    0
7261    26|46    0
7262    26|46    0
7263    26|46    0
7264    26|46    0
7265    26|46    0
7266    8|66    0
7267    8|66    0
7268    8|66    0
7269    8|66    0
7270    8|66    0
7271    7|41    0
7272    7|41    0
7273    7|41    0
7274    7|41    0
7275    7|41    0
7276    6|42    0
7277    6|42    0
7278    6|42    0
7279    6|42    0
7280    6|42    0
7281    64|65    0
7282    64|65    0
7283    64|65    0
7284    64|65    0
7285    64|65    0
7286    11    0
7287    11    0
7288    11    0
7289    11    0
7290    11    0
7291    11|15    0
7292    11|15    0
7293    11|15    0
7294    11|15    0
7295    11|15    0
7296    14    0
7297    14    0
7298    14    0
7299    14    0
7300    14    0
7301    17    0
7302    17    0
7303    17    0
7304    17    0
7305    17    0
7306    28    0
7307    28    0
7308    28    0
7309    28    0
7310    28    0
7311    29    0
7312    29    0
7313    29    0
7314    29    0
7315    29    0
7316    27|14    0
7317    27|14    0
7318    27|14    0
7319    27|14    0
7320    27|14    0
7321    64|17    0
7322    64|17    0
7323    64|17    0
7324    64|17    0
7325    64|17    0
7326    63|28    0
7327    63|28    0
7328    63|28    0
7329    63|28    0
7330    63|28    0
7331    65|29    0
7332    65|29    0
7333    65|29    0
7334    65|29    0
7335    65|29    0
7201    6    0
7202    6    0
7203    6    0
7204    6    0
7205    6    0
7206    7    0
7207    7    0
7208    7    0
7209    7    0
7210    7    0
7211    8    0
7212    8    0
7213    8    0
7214    8    0
7215    8    0
7216    46    0
7217    46    0
7218    46    0
7219    46    0
7220    46    0
7221    42    0
7222    42    0
7223    42    0
7224    42    0
7225    42    0
7226    41    0
7227    41    0
7228    41    0
7229    41    0
7230    41    0
7231    43    0
7232    43    0
7233    43    0
7234    43    0
7235    43    0
7236    26    0
7237    26    0
7238    26    0
7239    26    0
7240    26    0
7241    27    0
7242    27    0
7243    27    0
7244    27    0
7245    27    0
7246    35    0
7247    35    0
7248    35    0
7249    35    0
7250    35    0
7251    36    0
7252    36    0
7253    36    0
7254    36    0
7255    36    0
7256    32    0
7257    32    0
7258    32    0
7259    32    0
7260    32    0
7261    6|42    0
7262    6|42    0
7263    6|42    0
7264    6|42    0
7265    6|42    0
7266    7|41    0
7267    7|41    0
7268    7|41    0
7269    7|41    0
7270    7|41    0
7271    8|43    0
7272    8|43    0
7273    8|43    0
7274    8|43    0
7275    8|43    0
7276    46|32    0
7277    46|32    0
7278    46|32    0
7279    46|32    0
7280    46|32    0
7281    35|36    0
7282    35|36    0
7283    35|36    0
7284    35|36    0
7285    35|36    0
7286    26|27    0
7287    26|27    0
7288    26|27    0
7289    26|27    0
7290    26|27    0
7106    2    0
7107    2    0
7108    2    0
db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt
@@ -1,18 +1,17 @@
AttrType    AttrInfo1    AttrInfo2    AttrInfo3    AttrInfo4    AttrInfo5
7    int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.7    5_725|4_238|3_25|2_15|1_10    0_1.5|1_1.6
6    int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.8    5_14459|4_4722|3_480|2_288|1_192    0_1.5|1_1.7
46    (level-1)*100    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_1200|4_600|3_300|2_180|1_120    0_1.5|1_1.8
63    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2800|4_1400|3_700|2_420|1_280    0_1.5|1_1.9
64    (level-1)*500*1.3    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_3520|4_1760|3_880|2_528|1_352    0_1.5|1_1.10
65    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2080|4_1040|3_520|2_312|1_208    0_1.5|1_1.11
66    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2280|4_1140|3_570|2_342|1_228    0_1.5|1_1.12
42    (level-1)*600    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_1480|4_740|3_370|2_222|1_148    0_1.5|1_1.13
41    (level-1)*400    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_880|4_440|3_220|2_132|1_88    0_1.5|1_1.14
27    (level-1)*25    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_964|4_482|3_241|2_145|1_96    0_1.5|1_1.15
8    int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_623|4_270|3_104|2_63|1_42    0_1.5|1_1.16
26    (level-1)*50    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_1348|4_674|3_337|2_202|1_135    0_1.5|1_1.17
11    (level-1)*20    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_520|4_260|3_130|2_78|1_52    0_1.5|1_1.18
14    (level-1)*40    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_640|4_320|3_160|2_96|1_64    0_1.5|1_1.19
17    (level-1)*50    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_440|4_220|3_110|2_66|1_44    0_1.5|1_1.20
28    (level-1)*40    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_240|4_120|3_60|2_36|1_24    0_1.5|1_1.21
29    (level-1)*30    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_280|4_140|3_70|2_42|1_28    0_1.5|1_1.22
6    (level-1)*100    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.7    5_725|4_238|3_25|2_15|1_10    0_1.5|1_1.6
7    (level-1)*100    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.8    5_14459|4_4722|3_480|2_288|1_192    0_1.5|1_1.7
8    (level-1)*100    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_1200|4_600|3_300|2_180|1_120    0_1.5|1_1.8
46    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2800|4_1400|3_700|2_420|1_280    0_1.5|1_1.9
42    (level-1)*500*1.3    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_3520|4_1760|3_880|2_528|1_352    0_1.5|1_1.10
41    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2080|4_1040|3_520|2_312|1_208    0_1.5|1_1.11
43    (level-1)*500    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_2280|4_1140|3_570|2_342|1_228    0_1.5|1_1.12
26    (level-1)*600    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_1480|4_740|3_370|2_222|1_148    0_1.5|1_1.13
27    (level-1)*400    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_880|4_440|3_220|2_132|1_88    0_1.5|1_1.14
35    (level-1)*25    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_964|4_482|3_241|2_145|1_96    0_1.5|1_1.15
36    (level-1)*100    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_623|4_270|3_104|2_63|1_42    0_1.5|1_1.16
32    (level-1)*50    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_1348|4_674|3_337|2_202|1_135    0_1.5|1_1.17
2    (level-1)*20    1_0.3|2_0.45|3_0.6|4_0.75|5_1    2_1.5|3_1.6|4_1.9    5_520|4_260|3_130|2_78|1_52    0_1.5|1_1.18
3    (level-1)*40    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_640|4_320|3_160|2_96|1_64    0_1.5|1_1.19
4    (level-1)*50    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_440|4_220|3_110|2_66|1_44    0_1.5|1_1.20
5    (level-1)*40    1_0.2|2_0.3|3_0.5|4_0.7|5_1    2_1.5|3_1.6|4_1.9    5_240|4_120|3_60|2_36|1_24    0_1.5|1_1.21
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -1,14 +1,14 @@
ID    RelatedID    CanBackTimes    NormalCostJade    VipCostJade    JadeReward    CostCopper    CopperReward
1    0    0    5    0    {"exp":"tjgExp"}    0    {"exp":"tjgExp*80/100"}
2    1    0    2    0    {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"}    0    {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
3    2    0    10    0    {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}    0    {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
4    3    0    15    0    {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]}    0    {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5    5    0    15    30    {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}    0    {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6    6    1    15    50    {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]}    0    {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
7    10    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"10"}]}    0    {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"5"}]}
8    14    0    8    0    {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]}    0    {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
9    8    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2407,"ItemCount":"1"}]}    0    {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2410,"ItemCount":"1"}]}
10    7    0    50    0    {"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}    0    {"exp":"96000*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,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}    0    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
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)+2*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)+2*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)+2*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(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":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]}    0    {"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(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":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]}
13    12    0    20    0    {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"}    0    {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
ID    RelatedID    CanBackTimes    NormalCostJade    VipCostJade    JadeReward    CostCopper    CopperReward     JobItem
1    0    0    5    0    {"exp":"tjgExp"}    0    {"exp":"tjgExp*80/100"}
2    1    0    2    0    {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"}    0    {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
3    2    0    10    0    {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}    0    {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
4    3    0    15    0    {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]}    0    {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5    5    0    15    30    {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}    0    {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6    6    1    15    50    {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]}    0    {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
7    10    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"10"}]}    0    {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"5"}]}
8    14    0    8    0    {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]}    0    {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
9    8    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2407,"ItemCount":"1"}]}    0    {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2410,"ItemCount":"1"}]}
10    7    0    50    0    {"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}    0    {"exp":"96000*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,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}    0    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
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)+2*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)+2*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)+2*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(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":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]}    0    {"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(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":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]}
13    12    0    20    0    {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"}    0    {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
12    0    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000    3000
13    3    4    5    6    10    11    12    15    16    17    20    20    22    24    26    28
14    2    3    4    5    8    9    10    13    14    15    20    16    18    20    22    24
15    0    0    0    2    3    4    4    5    6    7    8    9    10    11    12    12
15    1    1    1    2    3    4    4    5    6    7    8    9    10    11    12    12
16    0    0    1    1    1    2    2    2    3    3    3    5    6    6    6    6
17    1    1    2    2    3    3    4    4    4    4    4    4    4    4    4    4
18    0    0    0    0    1    1    2    2    2    2    2    2    2    2    2    2