From f126c33445b6a7115a3409468af059c7da1ffbaa Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 17 九月 2018 20:04:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +- CoreServerGroup/GameServer/PySysDB/tagFamily.txt | 20 ++++++++++---------- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt index f80f015..70d8e14 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt @@ -1,11 +1,11 @@ familyLV memberCnt deputyLeaderCnt eliteCnt needMoney weekMissionMoneyMax bossFBCnt -1 21 1 5 930000 11392500 1 -2 22 1 5 1860000 11935000 2 -3 23 1 5 3022500 12477500 3 -4 24 1 5 5812500 13020000 3 -5 25 1 5 15112500 13562500 4 -6 26 1 5 24180000 14105000 4 -7 27 1 5 48360000 14647500 5 -8 28 1 5 120900000 15190000 5 -9 29 1 5 362700000 15732500 6 -10 30 1 5 465000000 16275000 6 +1 21 1 5 310000 11392500 1 +2 22 1 5 930000 11935000 2 +3 23 1 5 2015000 12477500 3 +4 24 1 5 4068750 13020000 3 +5 25 1 5 11082500 13562500 4 +6 26 1 5 18538000 14105000 4 +7 27 1 5 38688000 14647500 5 +8 28 1 5 100750000 15190000 5 +9 29 1 5 314340000 15732500 6 +10 30 1 5 0 16275000 6 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc index 14fced5..1868338 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index b0747b9..5a3bab9 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -126,7 +126,7 @@ 2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1 [19] 2340 0 [[3000,[181,10]],[6000,[181,15]],[8000,[181,20]],[9000,[181,25]],[10000,[181,30]]] 1 2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2100,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14] -2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1 +2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 20 2343 0 181_50 2344 0 181_120 2345 0 105_8 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index c4675a7..d17fe52 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -319,7 +319,7 @@ 50105017 4 10002 战士xp 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 151 0 0 0 0 0 0 0 0 15 2 4 0 0 0 0 1 0 0 102 0 1 50105018 4 10002 法师xp 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 251 0 0 0 0 0 0 0 0 15 2 4 0 0 0 0 1 0 0 102 0 1 50105019 4 10002 境界压制 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 23031 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1 -50105020 4 10002 速度压制 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 23031 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1 +50105020 4 10002 速度压制 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 1 0 0 0 2 6 51101 0 0 0 0 0 0 0 0 15 2 10 0 0 0 0 1 0 0 102 0 1 50105021 4 10002 变羊 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 0 2 6 23031 0 0 0 0 0 0 0 0 15 2 3 3 0 0 0 1 0 0 102 0 1 50107001 3 0 召唤元素 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 100 0 10 0 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1 50107002 3 10002 治疗图腾 65 0 727 757 16 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 432 46 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 6395 0 0 0 0 0 0 0 62 1 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 3e0ba40..f5974e4 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -776,7 +776,7 @@ 50701 吸收后爆炸 50701 1 1 2 0 0 1 0 0 2 3 40 0 0 40000 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 10000 3000 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 50800 嗜天风暴 50800 1 1 2 1 0 15 0 0 2 4 40 4 0 90000 0 0 0 0 0 1314 5 0 0 1010 30000 0 0 9999 800 1 0 1200 6 0 0 0 0 0 0 0 0 0 0 10000 4000 0 0 0 0 0 0 0 0 0 0 0 0 2 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0 51000 黑暗嘲讽 51000 1 1 2 1 0 1 0 0 1 0 41 8 0 30000 0 0 0 0 0 1010 30000 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 51001 0 0 0 0 0 0 0 0 0 0 2 5525 0 0 0 0 0 0 0 2 0 0 0 0 0 0 -51001 嘲讽buff 51001 1 1 2 1 0 14 0 0 1 0 41 6 0 30000 0 0 0 0 0 78 2000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500 0 0 0 0 0 0 0 0 0 0 0 0 2 5525 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +51001 嘲讽buff 51001 1 1 2 1 0 14 0 0 1 0 41 6 0 30000 0 0 0 0 0 78 2000 4 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 5525 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51100 束缚陷阱 51100 1 1 2 1 0 13 0 0 16 0 41 8 0 30000 0 0 0 0 0 1060 50105020 0 0 0 0 0 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 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0 51101 狂斧召唤 51101 1 1 2 1 0 1 0 0 2 6 41 0 0 10000 0 0 0 0 0 17 9500 4 0 0 0 0 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 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0 50005 旋枪 50005 1 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2800 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 0 0 0 0 50000 0 0 0 0 0 0 2 149 0 0 0 0 0 0 0 4 0 50000 0 0 0 0 @@ -1550,7 +1550,7 @@ 55801 狂斧召唤 55801 1 1 4 1 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 35000 0 0 9999 1000 0 0 1200 6 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 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0 56000 护主邪刃 56000 1 1 4 1 0 1 0 0 1 0 41 8 0 30000 0 0 0 0 0 1010 30000 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 56001 0 0 0 0 0 0 0 0 0 0 2 5525 0 0 0 0 0 0 0 2 0 0 0 0 0 0 56001 护主邪刃 56001 1 1 4 1 0 14 0 0 1 0 41 8 0 30000 0 0 0 0 0 78 2000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500 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 -56100 变羊术 56100 1 1 4 1 0 14 0 0 1 0 41 6 0 30000 0 0 0 0 0 1063 1 0 0 16 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500 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 +56100 变羊术 56100 1 1 4 1 0 14 0 0 1 0 41 6 0 30000 0 0 0 0 0 1063 50105021 0 0 16 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500 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 55005 燎原 55005 1 25 4 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2800 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 0 0 0 0 55000 0 0 0 0 0 0 2 149 0 0 0 0 0 0 0 4 0 55000 0 0 0 0 55006 燎原 55005 2 25 4 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 3100 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 0 0 0 0 55000 0 0 0 0 0 0 2 317 0 0 0 0 0 0 0 4 0 55000 0 0 0 0 55007 燎原 55005 3 25 4 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 3400 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 0 0 0 0 55000 0 0 0 0 0 0 2 504 0 0 0 0 0 0 0 4 0 55000 0 0 0 0 -- Gitblit v1.8.0