From 9c24c2cc7a0ec84bf75695ad907226b98248d87c Mon Sep 17 00:00:00 2001 From: cehua-HWJ35 <hwj35@163.com> Date: 星期二, 26 二月 2019 16:52:50 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 12 ++++++++++++ CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index 72acaae..073e46d 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 6fa7c91..adcd64a 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/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt index e777a5d..353205a 100644 --- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt @@ -262,6 +262,18 @@ 286 0 8427 0 8421|8422|8424|8425 5 5414 1600 0 10000 0 0 0 EquipComposeSuccess10 1 287 0 8428 0 8421|8422|8424|8425 5 5414 1600 0 10000 0 0 0 EquipComposeSuccess10 1 288 0 8429 0 8421|8422|8424|8425 5 5414 1600 0 10000 0 0 0 EquipComposeSuccess10 1 +320 0 8430 0 8431|8432|8434|8435 5 5413 250 0 10000 0 0 0 EquipComposeSuccess11 1 +321 0 8433 0 8431|8432|8434|8435 5 5413 250 0 10000 0 0 0 EquipComposeSuccess11 1 +322 0 8436 0 8431|8432|8434|8435 5 5414 6500 0 10000 0 0 0 EquipComposeSuccess11 1 +323 0 8437 0 8431|8432|8434|8435 5 5414 6500 0 10000 0 0 0 EquipComposeSuccess11 1 +324 0 8438 0 8431|8432|8434|8435 5 5414 6500 0 10000 0 0 0 EquipComposeSuccess11 1 +325 0 8439 0 8431|8432|8434|8435 5 5414 6500 0 10000 0 0 0 EquipComposeSuccess11 1 +326 0 8440 0 8441|8442|8444|8445 5 5413 470 0 10000 0 0 0 EquipComposeSuccess12 1 +327 0 8443 0 8441|8442|8444|8445 5 5413 470 0 10000 0 0 0 EquipComposeSuccess12 1 +328 0 8446 0 8441|8442|8444|8445 5 5414 15600 0 10000 0 0 0 EquipComposeSuccess12 1 +329 0 8447 0 8441|8442|8444|8445 5 5414 15600 0 10000 0 0 0 EquipComposeSuccess12 1 +330 0 8448 0 8441|8442|8444|8445 5 5414 15600 0 10000 0 0 0 EquipComposeSuccess12 1 +331 0 8449 0 8441|8442|8444|8445 5 5414 15600 0 10000 0 0 0 EquipComposeSuccess12 1 220 0 3502 0 0 0 3501 3 0 10000 0 0 0 0 1 221 0 3503 0 0 0 3502 3 0 10000 0 0 0 0 1 222 0 3504 0 0 0 3503 3 0 10000 0 0 0 0 1 -- Gitblit v1.8.0