From b85693e99689649bb80518d7764271a00af8bc15 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 01 九月 2018 16:33:40 +0800
Subject: [PATCH] Fix: 3156 【后端】仙盟联赛参赛资格受仙盟等级限制
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
index 9c3d2dd..03abf41 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
@@ -90,7 +90,6 @@
successRate = ipyData.GetSuccessRate()
successRateMax = ipyData.GetSuccessRateMax()
addonsCountMax = ipyData.GetAddonsCountMax() # 可叠加的算叠加数量
- msgMark = ipyData.GetSysMark()
# 可使用非固定道具 或 附加道具的 单次合成数默认为1
if unfixedItemIDList or addonsCountMax > 0:
compoundCnt = 1
@@ -183,7 +182,18 @@
# 合成成功
if GameWorld.CanHappen(totalSuccRate, ShareDefine.Def_MaxRateValue):
GameWorld.DebugLog("合成成功: makeItemID=%s,compoundCnt=%s,compoundBindCnt=%s" % (makeItemID, compoundCnt, compoundBindCnt), playerID)
- GiveNewCompoundItem(curPlayer, makeItemID, compoundCnt, compoundBindCnt, wingItemExpInfo, dogzEquipPlusExp, msgMark)
+ userData = GiveNewCompoundItem(curPlayer, makeItemID, compoundCnt, compoundBindCnt, wingItemExpInfo, dogzEquipPlusExp)
+
+ msgMark = ipyData.GetSysMark()
+ paramType = ipyData.GetSysMarkParamType()
+ if msgMark not in ['0', '', '-']:
+ if paramType == 2 and fixedItemIDList and fixedItemCountList:
+ PlayerControl.WorldNotify(0, msgMark, [curPlayer.GetName(), fixedItemCountList[0], fixedItemIDList[0], makeItemID, userData])
+ else:
+ PlayerControl.WorldNotify(0, msgMark, [curPlayer.GetName(), makeItemID, userData])
+
+ # 通知合成成功
+ ItemCommon.SyncMakeItemAnswer(curPlayer, ShareDefine.Def_mitItemCompound, ChConfig.Def_ComposeState_Sucess, makeItemID)
#成功合成1个物品成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_CompoundItemEx, compoundCnt, [makeItemID])
#合成X阶X颜色X星级以上装备
@@ -446,7 +456,7 @@
# @param newItem: 新物品
# @param itemCount: 合成数量
# @return None
-def GiveNewCompoundItem(curPlayer, newItemID, itemCount, compoundBindCnt, wingItemExpInfo, dogzEquipPlusExp, msgMark):
+def GiveNewCompoundItem(curPlayer, newItemID, itemCount, compoundBindCnt, wingItemExpInfo, dogzEquipPlusExp):
compoundUnBindCnt = itemCount - compoundBindCnt
if compoundBindCnt > 0:
@@ -454,20 +464,9 @@
if compoundUnBindCnt > 0:
userData = __GivePlayerCompoundItem(curPlayer, newItemID, compoundUnBindCnt, False, wingItemExpInfo, dogzEquipPlusExp)
- if userData == None:
- return
-
- if msgMark not in ['0', '', '-']:
- PlayerControl.WorldNotify(0, msgMark, [curPlayer.GetName(), newItemID, userData])
-
- # 您获得了物品XX XX个
- #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [newItemID, itemCount])
- # 通知放入特效
- #curPlayer.Sync_GetItemView(newItemID, itemCount)
- # 通知合成成功
- ItemCommon.SyncMakeItemAnswer(curPlayer, ShareDefine.Def_mitItemCompound, ChConfig.Def_ComposeState_Sucess, newItemID)
- #curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitItemCompound, ChConfig.Def_ComposeState_Sucess)
- return True
+ if not userData:
+ return ""
+ return userData
def __GivePlayerCompoundItem(curPlayer, newItemID, itemCount, isBind, wingItemExpInfo, dogzEquipPlusExp):
playerID = curPlayer.GetPlayerID()
--
Gitblit v1.8.0