From e66d14919eac8641199fad599285e175d00de54b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 25 八月 2018 16:59:53 +0800
Subject: [PATCH] Fix: 1705 【BUG】八卦炉满级人物战力下降(优化八卦炉满级判断逻辑);
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
index 62699e6..b5ad849 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
@@ -1935,12 +1935,12 @@
itemID = GameWorld.ToIntDef(curConditionNode.GetAttribute("itemID"), 0)
if maxItemCnt and itemID: #未收集的道具个数乘以单价
haveCnt = ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptItem, itemID)
- conditionValue = max(0, maxItemCnt-haveCnt)*value
+ conditionValue = max(0, maxItemCnt-haveCnt)*conditionValue
conditionType = curConditionNode.GetAttribute("type")
moneyType = int(curConditionNode.GetAttribute("moneytype"))
-
+ #GameWorld.Log(' conditionValue=%s,maxItemCnt=%s,itemID=%s'%(conditionValue,maxItemCnt,itemID))
goldValue = curPlayer.GetGold()
goldPaperValue = curPlayer.GetGoldPaper()
@@ -7142,14 +7142,14 @@
soulID = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
return bool(PlayerMagicWeapon.GetIsActiveMWSoul(curPlayer, soulID))
-##S级通关X层娲皇遗迹
+##X级通关X层娲皇遗迹
# @param None
-# @return None <Passqueenrelecs value="lineID"/>
+# @return None <Passqueenrelecs value="lineID" grade="grade"/>
def ConditionType_Passqueenrelecs(curPlayer, curMission, curActionNode):
lineID = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
grade = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False, [ChConfig.Def_FBMapID_QueenRelics])
- maxGrade = len(FBCommon.GetFBLineGrade(ChConfig.Def_FBMapID_QueenRelics, lineID))
- return grade >=maxGrade
+ needGrade = GameWorld.ToIntDef(curActionNode.GetAttribute("grade"), 0)
+ return grade >=needGrade
##坐骑总等级
# @param None
@@ -7170,7 +7170,7 @@
for i in equipIndexList:
suiteInfo = ChEquip.GetSuiteInfoByPlace(curPlayer, i)
for suiteType, lv in suiteInfo.items():
- if lv >= 2 and groupType == 1 and suiteType == 2:
+ if lv >= 2 and int(groupType) == 1 and suiteType == 2:
groupCnt +=1
return groupCnt >= needCnt
--
Gitblit v1.8.0