From 6ce400b6d22b7ead8bc74a258e7061ccc3114d26 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期四, 16 八月 2018 11:36:06 +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_MagicWeapon.pyc | 0 db/PyMongoDataServer/SysDB/tagChinSkill.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 10 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index 81c8997..2eeeace 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc index 57b0b88..1c23cc8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc index 61a9c82..0a2cfa5 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc index 81cd352..2c9324e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc index 35f8337..e4251e2 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.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 fa19b54..e1c9676 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc index e51f1ac..6a6e022 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc index 6ded3cb..0f12a0c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 642fcf3..91ac6a2 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -188,7 +188,7 @@ 979 1 0 钻石充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3000 0 50 0 1 0 0 228 300 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 980 1 0 白金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 228 100 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 981 1 0 黄金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 228 50 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -982 1 0 装备寻宝令 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 248 0 50 0 1 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 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +982 1 0 极品寻宝令 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 248 0 50 0 1 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 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 983 1 0 符印寻宝令 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 98 0 50 0 1 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 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 984 1 0 中型等级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 3 0 50 0 1 0 0 215 1000 400 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 985 1 0 VIP体验卡 80 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 0 0 50 0 1 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 0 2 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/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index d38a3b4..2f8d28f 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -1422,7 +1422,7 @@ 50905 幽冥附体 50905 1 1 2 2 0 7 0 0 0 0 0 0 0 10000 0 0 0 0 0 4023 10000 0 0 4046 1000 5000 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 19030 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50906 天玄秘法 50906 1 1 2 2 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4049 3000 2000 0 0 0 1 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 23681 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50907 混元决 50907 1 1 2 2 0 7 0 0 0 0 0 0 0 15000 0 0 0 0 0 4026 5000 0 14 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 27230 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -50908 甘露回春 50908 1 1 2 2 0 20 0 0 0 0 10 0 0 5000 0 0 0 0 0 65 2000 1 0 116 8000 1 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0 +50908 千幻冥炎 50908 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4024 10000 2500 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 0 0 0 0 0 0 0 2 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50909 神火护身 50909 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 808 1000 20000 50939 4023 10000 5000 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 35041 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50910 元素召唤 50910 1 1 2 2 0 7 0 0 16 6 10 6 0 60000 0 0 0 0 0 1060 50105002 0 0 1013 10000 0 0 4004 10000 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 40174 0 0 0 0 0 0 0 4 0 0 0 0 0 0 50911 森罗万象 50911 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 2000 0 0 4513 500 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 48037 0 0 0 0 0 0 0 4 0 0 0 0 0 0 @@ -2194,7 +2194,7 @@ 55905 幽冥附体 55905 1 1 4 2 0 7 0 0 0 0 0 0 0 10000 0 0 0 0 0 4023 10000 0 0 4046 1000 5000 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 19030 0 0 0 0 0 0 0 0 0 0 0 0 0 0 55906 天玄秘法 55906 1 1 4 2 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4049 3000 2000 0 0 0 1 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 23681 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55907 混元决 55907 1 1 4 2 0 7 0 0 0 0 0 0 0 15000 0 0 0 0 0 4026 5000 0 14 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 27230 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -55908 甘露回春 55908 1 1 4 2 0 20 0 0 0 0 10 0 0 5000 0 0 0 0 0 65 2000 1 0 116 8000 1 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0 +55908 千幻冥炎 55908 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4024 10000 2500 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 0 0 0 0 0 0 0 2 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55909 神火护身 55909 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 808 1000 20000 50939 4023 10000 5000 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 35041 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55910 元素召唤 55910 1 1 4 2 0 7 0 0 16 6 10 6 0 60000 0 0 0 0 0 1060 50105003 0 0 4004 10000 0 0 1013 10000 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 40174 0 0 0 0 0 0 0 4 0 0 0 0 0 0 55911 森罗万象 55911 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 2000 0 0 4513 500 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 48037 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -- Gitblit v1.8.0