Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_hzl

2018-09-28 ca4c0e15a7900c1f9002009efde9674af47ba37a

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetChestsUseCount.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -1,4 +1,4 @@
BoxID    BoxLV    SelectList    FixedItem    Probability1    RandCount1    Probability2    RandCount2     JobItem    MoneyType    MoneyCount    NeedNotifyItemList

BoxID    BoxLV    SelectList    FixedItem    Probability1    RandCount1    Probability2    RandCount2    ProbabilitySpec     JobItem    MoneyType    MoneyCount    NeedNotifyItemList

2200    0        103_2|102_5|101_10                        0    0    

2201    0        106_1|105_1|104_4                        0    0    

2202    0        4305_8                        0    0    

@@ -173,5 +173,5 @@
2386    0            [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]]    1    [[10000,[4251,1]]]    [[9000,0],[10000,1]]                [4251]

2387    0        8353_1    [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]]    4    [[740,[8354,1]],[2222,[8205,1]],[3703,[8218,1]],[5185,[8231,1]],[6666,[8244,1]],[8148,[8257,1]],[8481,[8206,1]],[8814,[8219,1]],[9148,[8232,1]],[9481,[8245,1]],[9814,[8258,1]],[9851,[8207,1]],[9888,[8220,1]],[9925,[8233,1]],[9962,[8246,1]],[10000,[8259,1]]]    [[7300,0],[10000,1]]                [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]

2388    0            [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]]    1                        

2389    0        8353_2    [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]]    7    [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]]    [[7750,0],[10000,1]]                [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]

2389    0        8353_2    [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]]    7    [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]]    [[7750,0],[10000,1]]    {2:[[2000,[8208,1]],[4000,[8221,1]],[6000,[8234,1]],[8000,[8247,1]],[10000,[8260,1]]], 10:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]}                [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]

2390                [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]]    1