From e249e0870a34a6aecb9a534e276948b1d7421c24 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期二, 28 八月 2018 13:54:05 +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_MergeBoss.pyc | 0 db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 9 ++++----- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0 7 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc index f884266..cb796db 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc index 508cf0e..5f06689 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc index 204f92e..273ab67 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc index 9097eae..0aea2d4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.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 f436d35..d522673 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/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt index 19e9405..d257896 100644 --- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt +++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt @@ -1,9 +1,8 @@ TemplateID NeedCostGold AwardIndex AwardItemList NotifyKey -1 500 0 [(101,10,1),(141,10,1)] -1 1000 1 [(101,20,1),(141,20,1)] -1 2000 2 [(101,30,1),(141,30,1)] ConsumptionRebate3 -1 5000 3 [(101,40,1),(141,40,1)] ConsumptionRebate3 -1 10000 4 [(101,50,1),(141,50,1)] ConsumptionRebate2 +1 128 0 [(912,1,1)] ConsumptionRebate3 +1 588 1 [(4184,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3 +1 1588 2 [(51,1,1),(143,50,1),(4151,30,1)] ConsumptionRebate3 +1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(03,8,1)] ConsumptionRebate2 2 500 0 [(4651,10,1),(4652,10,1)] 2 1000 1 [(4651,20,1),(4652,20,1)] 2 2000 2 [(4651,30,1),(4652,30,1)] ConsumptionRebate3 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 3683e23..8530f4c 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -609,7 +609,7 @@ 23025 娲皇八层Boss眩晕 23025 1 1 0 0 3100 1 0 0 2 5 41 6 0 36000 0 0 0 0 0 1010 50000 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 11052 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 23024 第四层加血 23024 1 1 0 0 0 2 0 0 8 5 141 20 0 30000 0 0 0 0 0 1000 1000 0 5 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 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 300000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 -23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 50000 0 0 1013 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 +23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 47000 斗战之力 47000 1 1 2 9 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4004 10000 0 0 4503 1000 0 0 4508 0 0 0 1011 1 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 1384 0 0 0 0 0 0 0 0 0 50000 0 0 0 0 47010 月耀千里 47010 1 1 2 9 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4004 10000 0 0 4045 2 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 0 0 0 0 0 0 0 2 1778 0 0 0 0 0 0 0 0 0 50100 0 0 0 0 47020 磐龙魔弑 47020 1 1 2 9 0 17 0 0 1 8 41 8 0 0 0 0 0 0 0 4004 5000 0 0 121 5000 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 8166 0 0 0 0 0 0 0 4 0 50200 0 0 0 0 -- Gitblit v1.8.0