From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 22 ++++------------------
1 files changed, 4 insertions(+), 18 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 1cc2a94..7c1e8a9 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
@@ -2509,7 +2509,7 @@
equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
for equipIndex in range(0, equipPack.GetCount()):
#备用装备栏不处理
- if equipIndex not in ChConfig.Type_Equip_CanTake :
+ if equipIndex not in ShareDefine.RoleEquipType:
continue
curEquip = equipPack.GetAt(equipIndex)
if curEquip.IsEmpty():
@@ -3755,8 +3755,8 @@
itemStarLV = GameWorld.ToIntDef(curActionNode.GetAttribute("starLV"), 0)
#物品是否绑定
- bind = True if curActionNode.GetAttribute("bind") else False
-
+ bind = True if GameWorld.ToIntDef(curActionNode.GetAttribute("bind")) else False
+
#物品是否套装化
isSuite = True if curActionNode.GetAttribute("suite") else False
@@ -7232,21 +7232,7 @@
totallv = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
return PlayerHorse.GetHorseSumLV(curPlayer) >= totallv
-##2阶强化防具套装件数
-# @param None
-# @return None <Suitplus value="cnt"/>
-def ConditionType_Suitplus(curPlayer, curMission, curActionNode):
- needCnt = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
-
- equipSuitTypeDict = IpyGameDataPY.GetFuncEvalCfg('EquipSuitType')
- groupCnt = 0 #2阶强化防具套装件数
- for groupType, equipIndexList in equipSuitTypeDict.items():
- for i in equipIndexList:
- suiteInfo = ChEquip.GetSuiteInfoByPlace(curPlayer, i)
- for suiteType, lv in suiteInfo.items():
- if lv >= 2 and int(groupType) == 1 and suiteType == 2:
- groupCnt +=1
- return groupCnt >= needCnt
+
##法宝激活个数
# @param None
--
Gitblit v1.8.0