From 21a2c083131b384854e763da1495d992fbed903c Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期四, 15 十一月 2018 17:56:48 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 6 +++--- db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc index 18f978a..a5eb5d8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt index 3528f53..c8b355b 100644 --- a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt @@ -1,9 +1,9 @@ -NPCID LineID Time index Star LV ItemList -60203001 0 25 0 4 [0,200] [(4151,2,2)] -60203002 1 30 1 8 [0,200] [(4151,2,2)] -60203003 2 35 2 12 [0,200] [(4151,2,2)] -60203004 3 40 3 15 [0,200] [(4151,2,2)] -60203005 4 40 0 4 [201,500] [(4151,2,2)] -60203006 5 50 1 8 [201,500] [(4151,2,2)] -60203007 6 60 2 12 [201,500] [(4151,2,2)] -60203008 7 65 3 15 [201,500] [(4151,2,2)] +index Star LV ItemList +0 4 [0,200] [[4151,2,2]] +1 8 [0,200] [[4151,2,3]] +2 12 [0,200] [[4151,2,4]] +3 15 [0,200] [[4151,2,5]] +0 4 [201,500] [[4151,2,6]] +1 8 [201,500] [[4151,2,7]] +2 12 [201,500] [[4151,2,8]] +3 15 [201,500] [[4151,2,9]] diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 5f08189..293571f 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -623,9 +623,9 @@ 31703002 2 0 猿王 25 2 88 88 89 0 0 0 30000 13 0 0 0 0 0 0 0 0 3000 3478 0 0 300 2 4 23010 0 0 0 0 0 0 0 0 10 2 359 0 0 0 0 1 1013 0 53 1 1 31703003 2 0 冰魔 25 2 88 88 89 0 0 0 30000 13 0 0 0 0 0 0 0 0 3000 3478 0 0 300 2 4 23010 0 0 0 0 0 0 0 0 10 2 359 0 0 0 0 1 1238 0 53 1 1 31703004 2 0 魔将 25 2 88 88 89 0 0 0 30000 13 0 0 0 0 0 0 0 0 3000 3478 0 0 300 2 4 23010 0 0 0 0 0 0 0 0 10 2 359 0 0 0 0 1 1406 0 53 1 1 -31704001 2 0 人皇守卫 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 -31704002 2 0 人皇守卫 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 -31704003 2 0 古之人皇 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 50 1 1 +31704001 1 0 人皇守卫 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 +31704002 1 0 人皇守卫 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 +31704003 1 0 古之人皇 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 50 1 1 31801001 2 0 魂灵 260 0 4811 4811 0 0 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 6 0 0 0 0 0 0 0 0 0 20 2 8032498 0 0 0 0 1 0 0 1 1 1 31801002 2 0 魔剑 265 0 4970 4970 0 0 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 6 0 0 0 0 0 0 0 0 0 20 2 8607219 0 0 0 0 1 0 0 1 1 1 31801003 2 0 熔岩巨鳄 270 0 5089 5089 0 0 0 0 0 1400 0 0 0 0 0 0 0 0 2000 384345 35 0 300 2 6 0 0 0 0 0 0 0 0 0 20 2 9482304 0 0 0 0 1 0 0 1 1 1 -- Gitblit v1.8.0