From b97eea77c0dbf7eb2d794c167130378b214fe722 Mon Sep 17 00:00:00 2001 From: cehua_ZWJ <123456> Date: 星期六, 02 三月 2019 11:09:20 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStar.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 14 +++++++++++++- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartPlusLV.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 30 files changed, 13 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 8587714..ebe9f19 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index 300b4dc..9373483 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index f8d0220..d4b3e2a 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini index ebed292..36c4ee6 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini @@ -1450,4 +1450,16 @@ PacketCMD_1=0xAA PacketSubCMD_1=0x08 -PacketCallFunc_1=OnStartLuckyTreasure \ No newline at end of file +PacketCallFunc_1=OnStartLuckyTreasure + +;公共部位星数 +[Operate_EquipStar] +ScriptName = Event\EventSrc\Operate_EquipStar.py +Writer = xdh +Releaser = xdh +RegType = 0 +RegisterPackCount = 1 + +PacketCMD_1=0xA5 +PacketSubCMD_1=0xC5 +PacketCallFunc_1=OnEquipPartStarUp \ No newline at end of file diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 8f3cffe..7f0ddb6 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc index b031453..bdf5f2f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.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 137f29f..2be323d 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/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc index 901cc2d..a9811c1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc index 5b8534b..3615507 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.pyc new file mode 100644 index 0000000..23145b7 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.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 603f634..a5b7769 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/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc index 948e8ce..5002cf1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStarLV.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartPlusLV.pyc similarity index 75% rename from ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStarLV.pyc rename to ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartPlusLV.pyc index d213353..229ba71 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStarLV.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartPlusLV.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStar.pyc new file mode 100644 index 0000000..4048659 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipPartStar.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index 7851f8c..27295a0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc index c453500..7be37e3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc index eae8064..94289f7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc index 3e5de10..52ce115 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc index 04d6fff..c93b921 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index ffe0af5..f8ab8cd 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index 9a2c8d3..16ef7b2 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc index 7473904..150865d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.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 b2e11f3..e7f228d 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/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc index bb0feaf..23d0f53 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.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 a34e80e..02e7fd1 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/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc index 91aa6f3..bb1cb4e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.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 bd9fc94..7295686 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/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc index 00a0a83..88d938a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc index 6af8f5d..077328c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.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 9bdc929..23bdb1b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ -- Gitblit v1.8.0