From ef27fb890fcada845b648d8c8c4b83a880f68ebe Mon Sep 17 00:00:00 2001 From: cehua-HWJ35 <hwj35@163.com> Date: 星期三, 23 一月 2019 15:18:53 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagChests.txt | 10 +++++++++- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintZXEquipSkill.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 16 ++++++++++++---- db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc | 0 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc index a8bff6b..1ea8062 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintZXEquipSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintZXEquipSkill.pyc new file mode 100644 index 0000000..cfe3843 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintZXEquipSkill.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc index 8ae5989..014871f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt index ca6a89b..78e8b41 100644 --- a/db/PyMongoDataServer/PySysDB/tagChests.txt +++ b/db/PyMongoDataServer/PySysDB/tagChests.txt @@ -234,10 +234,18 @@ 2442 0 0 0 1 1 2443 0 0 0 0 1 2444 0 0 0 0 1 -2445 0 0 0 0 1 +2445 0 0 0 1 1 2446 0 0 0 0 1 2447 0 0 0 0 1 2448 0 0 0 0 1 +2449 0 0 0 1 0 +2450 0 0 0 1 1 +2451 0 0 0 1 1 +2452 0 0 0 1 1 +2453 0 0 0 1 1 +2454 0 0 0 1 1 +2455 0 0 0 1 1 +2456 0 0 0 1 1 2457 0 0 0 0 1 2458 0 0 0 0 1 2459 0 0 0 0 1 diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index d4cd36c..1789565 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -228,13 +228,21 @@ 2439 8209_1|8222_1|8235_1|8248_1|8261_1 [8209,8222,8235,8248,8261] 2440 2439_1 [2439] 2441 5806_1|5807_1|5808_1 -2442 [[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]] 1 +2442 [[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]] 1 [7204,7209,7214,7219,7224,7229,7234,7239,7244,7249,7254,7259] 2443 7205_1|7210_1|7215_1|7220_1|7225_1|7230_1|7235_1|7240_1|7245_1|7250_1|7255_1|7260_1 -2444 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1 -2445 8211_1|8224_1|8237_1|8250_1|8263_1 -2446 8209_1|8222_1|8235_1|8245_1|8258_1 +2444 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1 [4320,4315,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375] +2445 [[2000,[821211]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]] 1 [8211,8224,8237,8250,8263] +2446 8209_1|8222_1|8248_1|8232_1|8258_1 2447 8209_1|8219_1|8245_1|8232_1|8258_1 2448 8206_1|8219_1|8245_1|8232_1|8258_1 +2449 8211_1|8224_1|8237_1|8250_1|8263_1 +2450 [[2000,[8212,1]],[4000,[8225,1]],[6000,[8238,1]],[8000,[8251,1]],[10000,[8264,1]]] 1 [8212,8225,8238,8251,8264] +2451 [[2000,[8213,1]],[4000,[8226,1]],[6000,[8239,1]],[8000,[8252,1]],[10000,[8265,1]]] 1 [8213,8226,8239,8252,8265] +2452 7110_1|7115_1|7120_1|7125_1 [7105,7110,7115,7120,7125] +2453 [[833,[7205,1]],[1666,[7210,1]],[2499,[7215,1]],[3332,[7220,1]],[4165,[7225,1]],[4998,[7230,1]],[5831,[7235,1]],[6664,[7240,1]],[7497,[7245,1]],[8330,[7250,1]],[9163,[7255,1]],[10000,[7260,1]]] 1 [7205,7210,7215,7220,7225,7230,7235,7240,7245,7250,7255,7260] +2454 [[833,[7203,1]],[1666,[7208,1]],[2499,[7213,1]],[3332,[7218,1]],[4165,[7223,1]],[4998,[7228,1]],[5831,[7233,1]],[6664,[7238,1]],[7497,[7243,1]],[8330,[7248,1]],[9163,[7253,1]],[10000,[7258,1]]] 1 +2455 [[1,[3798,1]],[101,[3512,1]],[201,[3502,1]],[251,[196,1]],[256,[225,1]],[456,[15,1]],[2156,[4678,1]],[3856,[19,1]],[6928,[181,30]],[10000,[4105,30]]] 1 [3798,3512,3502,196,225,15,4678] +2456 [[5,[4251,1]],[15,[225,1]],[115,[196,1]],[215,[4182,1]],[515,[15,1]],[1515,[4677,1]],[4015,[5407,3]],[7008,[14,3]],[10000,[913,1]]] 1 [4251,225,196,4182,15,4677] 2457 3506_1|3516_1 2458 3504_1|3514_1 2459 3503_1|3513_1 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 0ea0967..3ac685a 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -702,8 +702,8 @@ 2452 1 0 红色核心随机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 2453 1 0 红色魂随机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 2454 1 0 紫色魂随机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 -2455 1 0 惊喜限购礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -2456 1 0 幸运限购礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +2455 1 0 惊喜限购礼宝 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +2456 1 0 幸运限购礼宝 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2457 1 0 6级宝石自选包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2458 1 0 4级宝石自选包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 2459 1 0 3级宝石自选包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0