From c0bfc5f6094ac82edb003578e2b32b776d380105 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 八月 2025 11:38:10 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复武将皮肤同步错误问题;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py                      |    4 ++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py                                  |   11 ++++++-----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py                              |   12 ++++++------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py |    1 +
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index b9d87ad..ab67681 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -19313,7 +19313,7 @@
 
 
 #------------------------------------------------------
-# A8 14 合成结果通知 #tagMCMakeItemAnswer
+# A8 14 操作结果通知 #tagMCMakeItemAnswer
 
 class  tagMCMakeItemAnswer(Structure):
     _pack_ = 1
@@ -19322,7 +19322,7 @@
                   ("SubCmd", c_ubyte),
                   ("MakeType", c_ubyte),    #类型		TMakeItemType
                   ("Result", c_ubyte),    #是否成功
-                  ("MakeItemID", c_int),    #合成的物品ID
+                  ("MakeValue", c_int),    #操作值,如合成时为合成的物品ID
                   ]
 
     def __init__(self):
@@ -19341,7 +19341,7 @@
         self.SubCmd = 0x14
         self.MakeType = 0
         self.Result = 0
-        self.MakeItemID = 0
+        self.MakeValue = 0
         return
 
     def GetLength(self):
@@ -19351,19 +19351,19 @@
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A8 14 合成结果通知 //tagMCMakeItemAnswer:
+        DumpString = '''// A8 14 操作结果通知 //tagMCMakeItemAnswer:
                                 Cmd:%s,
                                 SubCmd:%s,
                                 MakeType:%d,
                                 Result:%d,
-                                MakeItemID:%d
+                                MakeValue:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.MakeType,
                                 self.Result,
-                                self.MakeItemID
+                                self.MakeValue
                                 )
         return DumpString
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
index 6cb2c29..a40cae8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
@@ -251,6 +251,7 @@
     else:
         __doPickupMainItem(curPlayer, itemIndexList)
         
+    ItemCommon.SyncMakeItemAnswer(curPlayer, ShareDefine.Def_mitMainDropItemOP, ChConfig.Def_ComposeState_Sucess, opType)
     return
 
 def __doEquipMainEquip(curPlayer, itemIndexList, isAutoDecompose):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 2efc92e..057f614 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -2164,12 +2164,12 @@
 
 ## =======================================================================================
 
-def SyncMakeItemAnswer(curPlayer, makeType, isSuccess, makeItemID):
+def SyncMakeItemAnswer(curPlayer, makeType, isSuccess, makeValue):
     makeItemAnswer = ChPyNetSendPack.tagMCMakeItemAnswer()
     makeItemAnswer.Clear()
     makeItemAnswer.MakeType = makeType
     makeItemAnswer.Result = isSuccess
-    makeItemAnswer.MakeItemID = makeItemID
+    makeItemAnswer.MakeValue = makeValue
     NetPackCommon.SendFakePack(curPlayer, makeItemAnswer)
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 018f1c9..081a20f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -451,27 +451,28 @@
     Def_mitLVUpStar,          # 升星
     Def_mitKeySell,           # 一键出售
     Def_mitUseFuDai,          # 开福袋回应
-    Def_mitProduceResult,     # 生产采集结果回应
+    Def_mitProduceResult,     # 生产采集结果回应 5
     Def_mitPetEquipMerge,     # 宠物装备合成回应
     Def_mitEquipInherit,      # 装备继承
     Def_mitEquipStarUp,       # 装备升星
     Def_mitEquipMayaPlus,     # 装备玛雅加强
-    Def_mitEquipAddAttr,      # 装备追加
+    Def_mitEquipAddAttr,      # 装备追加 10
     Def_mitEquipSlotting,     # 装备打孔
     Def_mitMakeScroll,        # 卷轴制作
     Def_mitItemCompound,      # 物品合成
     Def_mitMaterialCompound,  # 材料合成
-    Def_mitEquipEvolve,       # 装备进阶
+    Def_mitEquipEvolve,       # 装备进阶 15
     Def_mitSuiteCompound,     # 套装合成
     Def_mitEquipDecompose,    # 装备分解
     Def_mitRefine,            # 炼丹
     Def_mitMWUpLevel,         # 法宝进阶
-    Def_mitRecycleAttrFruit,  # 回收魂石
+    Def_mitRecycleAttrFruit,  # 回收魂石 20
     Def_mitDogzEquipPlus,     # 神兽装备强化
     Def_mitRuneCompound,      # 符印合成
     Def_mitGatherSoulCompound,# 聚魂合成
     Def_mitGatherSoulDecompose,# 聚魂分解
-) = range(1, 25)
+    Def_mitMainDropItemOP,# 主线装备操作 25
+) = range(1, 1 + 25)
 
 #---写死的技能ID---
 

--
Gitblit v1.8.0