From 026013cee7cc6e760335cbc715d20fa53bf76ee6 Mon Sep 17 00:00:00 2001 From: CeHua_TRX <526616766@qq.com> Date: 星期一, 03 十二月 2018 16:59:20 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc | 0 db/PyMongoDataServer/SysDB/tagChinSkill.txt | 9 +++++---- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0 10 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc index 758afdb..fdac69e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.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 f6ab94b..659eb2b 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/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc index 1f1804d..a85e081 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc index 7d0aab0..8d44f65 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.pyc index 2555108..589a678 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc index dff90b6..80b0c4d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index f5c905e..4598ccc 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index c711b4a..54da3c8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc index 68b8912..2c80321 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index f077f05..a611400 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -575,8 +575,9 @@ 21017 攻速符 21017 1 1 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 17 1500 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 900000 0 0 0 0 0 0 0 0 0 3 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21018 防御符 21018 1 1 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 13 100 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 900000 0 0 0 0 0 0 0 0 0 3 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21019 好运符 21019 1 1 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 46 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3600000 0 0 0 0 0 0 0 0 0 3 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -21020 骑宠的怨念 21020 1 2 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1800000 0 0 0 0 0 0 0 0 0 3 10 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -21021 骑宠的怨念 21020 2 2 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1800000 0 0 0 0 0 0 0 0 0 3 10 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +21020 骑宠的怨念 21020 1 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1800000 0 0 0 0 0 0 0 0 0 3 10 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +21021 骑宠的怨念 21020 2 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1800000 0 0 0 0 0 0 0 0 0 3 10 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +21022 骑宠的怨念 21020 3 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1800000 0 0 0 0 0 0 0 0 0 3 10 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 22000 Vip7特权加成 22000 1 4 0 0 0 5 0 0 0 0 40 6 0 240000 0 0 0 0 0 76 500 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 22001 Vip7特权加成 22000 2 4 0 0 0 5 0 0 0 0 40 6 0 240000 0 0 0 0 0 76 1000 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 22002 Vip7特权加成 22000 3 4 0 0 0 5 0 0 0 0 40 6 0 240000 0 0 0 0 0 76 1500 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -1746,7 +1747,7 @@ 51188 折光 51165 24 25 2 3 0 20 0 0 0 0 0 0 0 0 55000 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 10000 0 0 0 0 0 0 51135 10 0 0 0 0 0 2 66000 0 0 0 0 0 0 0 4 0 51101 0 0 0 0 51189 折光 51165 25 25 2 3 0 7 0 0 0 0 0 0 0 0 55000 0 0 0 0 4019 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 51135 10 0 0 0 0 0 2 70000 0 0 0 0 0 0 0 4 0 51101 0 0 0 0 50900 烈焰之怒 50900 1 1 2 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -50901 清心诀 50901 1 1 2 2 0 16 1 0 0 0 10 0 0 45000 0 0 0 0 0 4023 10000 3500 0 2004 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 750 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +50901 无敌决 50901 1 1 2 2 0 16 1 0 0 0 10 0 0 45000 0 0 0 0 0 4023 10000 3500 0 2004 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 750 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50902 乾元雷 50902 1 1 2 2 0 7 0 0 3 8 41 8 0 12000 0 0 0 0 0 1010 50000 0 0 1056 100 0 0 1200 5 0 0 4004 2000 0 0 1062 100000 0 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 9280 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50903 狂暴怒意 50903 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 4500 0 0 17 3000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 12623 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50904 九转玄功 50904 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 0 0 83 1000 1 0 77 1000 1 0 83 1000 1 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 15022 0 0 0 0 0 0 0 4 0 0 0 0 0 0 @@ -3159,7 +3160,7 @@ 56189 折光 56165 25 25 4 3 0 7 0 0 0 0 0 0 0 0 55000 0 0 0 0 4019 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 56135 10 0 0 0 0 0 2 70000 0 0 0 0 0 0 0 4 0 56100 0 0 0 0 55890 爆破key 55890 1 1 4 3 0 1 0 0 39 0 10 0 0 0 0 0 0 0 0 1014 55865 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55900 烈焰之怒 55900 1 1 4 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -55901 清心诀 55901 1 1 4 2 0 16 1 0 0 0 10 0 0 45000 0 0 0 0 0 4023 10000 3500 0 2004 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 750 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +55901 无敌决 55901 1 1 4 2 0 16 1 0 0 0 10 0 0 45000 0 0 0 0 0 4023 10000 3500 0 2004 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 750 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 0 0 0 0 0 0 0 55902 乾元雷 55902 1 1 4 2 0 7 0 0 3 8 41 8 0 12000 0 0 0 0 0 1010 50000 0 0 1056 100 0 0 1200 5 0 0 4004 2000 0 0 1062 100000 0 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 9280 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55903 狂暴怒意 55903 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 4500 0 0 17 3000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 12623 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55904 九转玄功 55904 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 0 0 83 1000 1 0 77 1000 1 0 83 1000 1 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 15022 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -- Gitblit v1.8.0