From 817d3a47abcfb2a5eb7fa140715d0b541f4b5fdf Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 13 十月 2018 10:58:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc | 0
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/tagOrderInfo.txt | 26 +++++++++++++-------------
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
9 files changed, 19 insertions(+), 14 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/Player/PlayerGeTui.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
index f4111e4..7918c04 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.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
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 0cccbf6..0f7dd9c 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -165,20 +165,20 @@
jkjk.68 mrgameios 68 0 5
jkjk.128 mrgameios 128 0 7
jkjk.168 mrgameios 168 0 8
-com.price18.xjlb spyxxjios 18 101 0
-com.price6.xj spyxxjios 6 2 0
-com.price30.xj spyxxjios 30 103 0
-com.price98.xj spyxxjios 98 104 0
-com.price128.xj spyxxjios 128 105 0
-com.price198.xj spyxxjios 198 106 0
-com.price328.xj spyxxjios 328 107 0
-com.price648.xj spyxxjios 648 108 0
+com.price18.xylb spyxxjios 18 101 0
+com.price6.xyxz spyxxjios 6 2 0
+com.price30.xyxz spyxxjios 30 103 0
+com.price98.xzxz spyxxjios 98 104 0
+com.price128.xyxz spyxxjios 128 105 0
+com.price198.xyxz spyxxjios 198 106 0
+com.price328.xyxz spyxxjios 328 107 0
+com.price648.xyxz spyxxjios 648 108 0
com.price1.xj spyxxjios 1 110 0
-com.price6.xjlb spyxxjios 6 0 2
-com.price30.xjlb spyxxjios 30 0 4
-com.price68.xjlb spyxxjios 68 0 5
-com.price128.xjlb spyxxjios 128 0 7
-com.price168.xjlb spyxxjios 168 0 8
+com.price6.xylb spyxxjios 6 0 2
+com.price30.xylb spyxxjios 30 0 4
+com.price68.xylb spyxxjios 68 0 5
+com.price128.xylb spyxxjios 128 0 7
+com.price168.xylb spyxxjios 168 0 8
jisu.18 jisugame 18 101 0
jisu.10 jisugame 10 102 0
jisu.30 jisugame 30 103 0
--
Gitblit v1.8.0