From 0c4751b45b581c419e6a23121dfd2e13e669ac13 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期二, 25 九月 2018 21:25:12 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 0a53f45..699b57d 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -301,7 +301,7 @@ 50106310 熊猫斗士 441 50106311 海牛侍卫 441 50106312 雷震子 1 -50106313 冰剑士 1 +50106313 极炎剑客 1 50106314 双头火狼 1 50106315 雷蛟 441 50105001 傲世神驹 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc index 27ca0eb..866e5eb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.pyc index 0abff79..3c3062b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt index d90a8ac..52a0a47 100644 --- a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt +++ b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt @@ -66,7 +66,7 @@ 10501001 10050 (86,14) 10501002 10050 (46,19) 10501003 10050 (18,55) -10501004 10050 (32,86) +10501004 10050 (35,89) 10501005 10050 (74,100) 10502001 10050 (101,66) 10601001 10060 (85,21) diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index ffaa46a..e910e19 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -589,7 +589,7 @@ 4218 1 0 灵宠：熊猫斗士 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4219 1 0 灵宠：海牛侍卫 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4220 1 0 灵宠：雷震子 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4221 1 0 灵宠：冰剑士 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4221 1 0 灵宠：极炎剑客 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4222 1 0 灵宠：双头火狼 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4223 1 0 灵宠：雷蛟 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4250 1 0 冰火冥魂碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4209 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 9a90070..d1e9791 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -301,7 +301,7 @@ 50106310 16 0 熊猫斗士 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106311 16 0 海牛侍卫 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106312 16 0 雷震子 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 -50106313 16 0 冰剑士 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 +50106313 16 0 极炎剑客 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 50106314 16 0 双头火狼 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 50106315 16 0 雷蛟 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50105001 16 0 傲世神驹 1 0 1 2 26 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1200 100 0 300 0 2 0 0 0 0 0 0 0 0 0 10 2 203 0 0 0 0 0 0 0 105 1 2 -- Gitblit v1.8.0