From ba7f290f762ba6ecef7fa57cdfec0ea886cac418 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 17 九月 2018 17:13:34 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc | 0 5 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index fd68fb0..7753b27 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -320,6 +320,7 @@ 50105018 法师xp 1 50105019 境界压制 1 50105020 速度压制 1 +50105021 变羊 1 50107001 召唤元素 1 50107002 治疗图腾 65 50108001 遗失物资(大) 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc index 964f71b..7c7ee87 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc index f0f00c4..49e417a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc index 722916c..c086b80 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 90291f0..c4675a7 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -320,6 +320,7 @@ 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 +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 50108001 14 0 遗失物资(大) 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1 -- Gitblit v1.8.0