From 6ccc82cff0bc5ecd2734253d4c5ef1ae2bb748da Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 九月 2020 12:24:13 +0800
Subject: [PATCH] 8483 【后端】【主干】【changwei】【bt】协助方和被协助方任何模式不会互相造成伤害（优化协助同一玩家的情况）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.py | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.py
index 2a03542..58b713d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.py
@@ -221,14 +221,7 @@
def CheckFeastWeekPartyActionCnt(curPlayer):
ipyDataMgr = IpyGameDataPY.IPY_Data()
for actionType in ChConfig.AheadFinishWPActList:
- if actionType == ChConfig.Def_WPAct_Horse:
- for i in xrange(ipyDataMgr.GetHorseCount()):
- ipyData = ipyDataMgr.GetHorseByIndex(i)
- index = ipyData.GetHorseID()
- lv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Horser_LV % index, 0, ChConfig.Def_PDictType_Horse)
- if lv:
- AddFeastWeekPartyActionCnt(curPlayer, actionType, index, False)
- elif actionType == ChConfig.Def_WPAct_Pet:
+ if actionType == ChConfig.Def_WPAct_Pet:
petDataPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptPet)
for petDataIndex in range(petDataPack.GetCount()):
petItem = petDataPack.GetAt(petDataIndex)
@@ -281,7 +274,7 @@
#GameWorld.Log(' actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FeastWeekPartyGotTimes % (day, templateID), newGotTimes, ChConfig.Def_PDictType_FeastWeekParty)
for itemID, itemCnt in awardDict.items():
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncFeastWeekPartyPlayerInfo(curPlayer, day, templateID)
return
@@ -318,7 +311,7 @@
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FeastWeekPartyAwardRecord % day, awardRecord | pow(2, getIndex), ChConfig.Def_PDictType_FeastWeekParty)
for itemID, itemCnt, isBind in itemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncFeastWeekPartyPlayerInfo(curPlayer, day)
DataRecordPack.DR_FeastWeekPartyPoint(curPlayer, day, getPoint)
return
--
Gitblit v1.8.0