From ae163ba2db1b35770de4a8373b012440267eec99 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 十月 2018 19:49:24 +0800
Subject: [PATCH] 4145 【后端】人物粉色品质防具装备的合成与拆解

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                                  |    6 +++++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc                         |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                 |    1 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc |    0 
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                              |    0 
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                                              |    0 
 7 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 48392ee..8186072 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 838e063..b2729d9 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 0cc7f26..dcaa38f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -96,12 +96,16 @@
 Writer = wdb
 Releaser = wdb
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 PacketCMD_1=0xA3
 PacketSubCMD_1=0x03
 PacketCallFunc_1=OnItemCompound
 
+PacketCMD_2=0xA3
+PacketSubCMD_2=0x13
+PacketCallFunc_2=OnItemDecompound
+
 ;装备宝石
 [EquipStone]
 ScriptName = Event\EventSrc\Operate_EquipStone.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 392b2a9..2a314b5 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/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
index a1b189a..2b6d7a3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.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 1a1024c..5a69ebb 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/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6682246..451476e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -47,6 +47,7 @@
 RuneAwardColor	{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21):[(1000000,1)]}	0	0	0	0
 PreFourAward	{101:[(4316,3)],102:[(4316,3)],103:[(4316,2),(4317,1)],104:[(4316,2),(4317,1)]}				
 RuneTowerSweepBuy	2	25			
+ItemDecompound	103|104|105|106|107	6	0	0	0
 ComposeAddonsType	101|102|103|104|105|106|107	0	0	0	0
 ComposeAddonsQuality	1|2	0	0	0	0
 ComposeAddonsFormula	min(int((800+100*itemClassLV)*(0.6+(itemColor-2)*0.4)),2500)	0	0	0	0

--
Gitblit v1.8.0