From e688ec2125b9e1932226e5a602adf25201befebe Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 七月 2019 15:21:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
index 0a44a21..76d25bf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
@@ -118,7 +118,6 @@
costEquipPlaceList = ipyData.GetCostEquipPlace()
costEquipColorList = ipyData.GetCostEquipColor()
isJobLimit = ipyData.GetIsJobLimit()
- suitTotalRate = ipyData.GetSuitTotalRate()
itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
delEquipIndexList = []
totalEquipStars = ChEquip.GetTotalEquipStars(curPlayer)
@@ -144,15 +143,11 @@
return result
if isJobLimit and not ItemCommon.CheckJob(curPlayer, costEquip):
return result
-
- isSuite = 1 if costEquip.GetSuiteID() else 0
-
- rateIpyData = IpyGameDataPY.GetIpyGameData('EquipStarUpRate', ItemCommon.GetItemClassLV(costEquip),
- itemColor, equipPlace, isSuite
- )
- if not rateIpyData:
+ if ItemCommon.GetItemClassLV(costEquip) != classLV:
return result
- curRate += rateIpyData.GetRate()
+
+ addRate = ipyData.GetSuitRate() if costEquip.GetSuiteID() else ipyData.GetUnSuitRate()
+ curRate += addRate
delEquipIndexList.append(index)
if totalEquipStars < IpyGameDataPY.GetFuncCfg('EquipStarCustomized'):
curRate = 100
--
Gitblit v1.8.0