From bbfd46899c042d8b72877b50ef19ca27d5c5244e Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期五, 24 八月 2018 17:59:02 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagSuccess.txt | 10 +++++----- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagBossReborn.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc | 0 7 files changed, 7 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 42f1aeb..0cfd58d 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/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index b124259..c82ae04 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc index 752c1f7..a949b70 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc index 7d6d1df..ee7a08c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc index 82c83a4..e395cae 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt index eb173b7..c71dc58 100644 --- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt +++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt @@ -5,7 +5,7 @@ 1 4 10 1 [(21,10,1),(2341,1,1)] 1 5 20 1 [(21,20,1),(2341,1,1)] 1 6 3 3 [(21,100,1),(1128,1,1)] -1 7 6 1 [(21,10,1),(2341,1,1,1)] +1 7 6 1 [(21,10,1),(2341,1,1)] 1 8 28 2 [(21,10,1),(2341,1,1)] 1 9 20 10 [(21,20,1),(2341,1,1)] 1 10 5 1 [(21,20,1),(2341,1,1)] @@ -17,7 +17,7 @@ 2 4 10 1 [(21,10,1),(2341,1,1)] 2 5 20 1 [(21,20,1),(2341,1,1)] 2 6 3 3 [(21,100,1),(1128,1,1)] -2 7 6 1 [(21,10,1),(2341,1,1,1)] +2 7 6 1 [(21,10,1),(2341,1,1)] 2 8 28 2 [(21,10,1),(2341,1,1)] 2 9 20 10 [(21,20,1),(2341,1,1)] 2 10 5 1 [(21,20,1),(2341,1,1)] diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index eae6bee..3d2ac36 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -246,17 +246,17 @@ 763 112 1 2124 0 0 0 0 0 771 36 10 10101001 0 0 0 0 6 772 5 10 0 0 0 0 0 7 -773 48 8 0 0 0 0 0 8 +773 48 20 0 0 0 0 0 8 774 81 20 31080 0 0 0 0 9 -775 10 1 100|10 0 0 0 0 10 -776 58 1 50106001|10 0 0 0 0 11 +775 10 1 100|20 0 0 0 0 10 +776 58 1 50106001|20 0 0 0 0 11 777 19 10 0 0 0 0 0 12 778 78 3 0 0 0 0 0 13 -779 27 7 15 0 0 0 0 14 +779 27 7 25 0 0 0 0 14 780 28 3 0 0 0 0 0 15 781 54 1 4|1|1 0 0 0 0 16 782 42 1 208 0 0 0 0 17 -783 1 140 0 0 0 0 0 18 +783 1 150 0 0 0 0 0 18 784 6 1 0 0 0 0 0 19 785 50 6 0 0 0 0 0 20 786 12 5 0 0 0 0 0 21 -- Gitblit v1.8.0