From 2a41f04515a5cc91e285cf00e9330dc035e26765 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 四月 2019 16:09:14 +0800
Subject: [PATCH] 3287 【2.0】娲皇遗迹S通关异常自动退出副本
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py
index 100ed76..be64102 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.py
@@ -26,6 +26,7 @@
import ItemControler
import ChPyNetSendPack
import Operate_EquipStone
+import PlayerFeastWeekParty
import DataRecordPack
import PlayerGodWeapon
import NetPackCommon
@@ -140,6 +141,7 @@
def AddWeekPartyActionCnt(curPlayer, actionID, addCnt=1, isAdd=True, isCompatible=False, isSync=True):
'''增加周狂欢相关活动完成次数'''
+ PlayerFeastWeekParty.AddFeastWeekPartyActionCnt(curPlayer, actionID, addCnt, isAdd, isCompatible, isSync)
#判断活动是否开启
if not addCnt:
return
@@ -147,8 +149,11 @@
state = actWeekPartyInfo.get(ShareDefine.ActKey_State, 0)
cfgID = actWeekPartyInfo.get(ShareDefine.ActKey_CfgID, 0)
- if not state or not cfgID:
+ if not cfgID:
return
+ if not state and actionID not in ChConfig.AheadFinishWPActList:
+ return
+
actBossIpyData = IpyGameDataPY.GetIpyGameData("ActWeekParty", cfgID)
if not actBossIpyData:
return
@@ -279,7 +284,7 @@
#GameWorld.Log(' actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekPartyGotTimes % (day, templateID), newGotTimes, ChConfig.Def_PDictType_WeekParty)
for itemID, itemCnt in awardDict.items():
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncWeekPartyPlayerInfo(curPlayer, day, templateID)
return
@@ -316,7 +321,7 @@
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekPartyAwardRecord % day, awardRecord | pow(2, getIndex), ChConfig.Def_PDictType_WeekParty)
for itemID, itemCnt, isBind in itemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
SyncWeekPartyPlayerInfo(curPlayer, day)
DataRecordPack.DR_WeekPartyPoint(curPlayer, day, getPoint)
return
--
Gitblit v1.8.0