From 84272f2db09e6d95d9e232442821bf8d3ed1a69e Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期一, 22 十月 2018 22:03:07 +0800 Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0 --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 11 files changed, 1 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index cd4dff9..fb491bd 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index bbfabc6..4efc1be 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc index 288f553..22018a6 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc index e17e869..d0f6667 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc index 464d16f..8ebcb51 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc new file mode 100644 index 0000000..8195e91 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc index 13bd036..4265033 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc index 84ed322..3f9f80d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc index bb4210c..c97adef 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 74780f7..11068c9 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 3e260e7..f932bef 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -283,6 +283,7 @@ 1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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 1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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 1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 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 +1600 1 0 后裔之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 236 111 250 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 2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0