From 2af64e0aa0a6d8c4aea5fed79986adfa364a1ace Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 19:38:10 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（Add: C1 03 跨服PK玩家历史赛季信息 #tagMCCrossRealmPKPlayerHisSeasonInfo）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 b17f56f..76b967e 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
@@ -4825,7 +4825,7 @@
mission_1.SetProperty(Def_Around_AllCount, allCount)
EventShell.EventRespons_RunTaskAllCnt(curPlayer, curMissionData.Type, allCount)
- GameWorld.DebugLog("删除任务allCount %s, RUNCOUNT=%s" % (allCount, RUNCOUNT))
+ GameWorld.Log("删除任务allCount %s, RUNCOUNT=%s" % (allCount, RUNCOUNT))
if allCount < RUNCOUNT:
@@ -4890,6 +4890,7 @@
# @return 无
# @remarks 跑环任务结束处理，删除或者随机下一个
def __RunAroundMission(curPlayer, missionID, curMissionData, curActionNode):
+ GameWorld.Log("__RunAroundMission----%s"%missionID)
#任务完成，触发随机跑环
run_event = GameWorld.ToIntDef(curActionNode.GetAttribute("run_around"), 0)
firstMissionID = GameWorld.ToIntDef(curActionNode.GetAttribute("id"), 0)
@@ -4926,8 +4927,9 @@
#总跑环次数已满，不可再做
- if run_event == Def_Run_Around_Over_1 and allCount >= RUNCOUNT:
- return
+ if run_event == Def_Run_Around_Over_1:
+ if allCount >= RUNCOUNT or aroundCount >= AROUNDCOUNT:
+ return
nextMissionID = 0
nextMission = None
@@ -4975,9 +4977,9 @@
if curMissionData.Type == QuestCommon.Def_Mission_Type_RunFamily:
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_TaskFRun, 1)
- if allCount < RUNCOUNT:
- nextMissionID = __OverRandRunAround(curPlayer, curMissionData)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RunTaskNextMissionID % curMissionData.Type, nextMissionID)
+# if allCount < RUNCOUNT:
+# nextMissionID = __OverRandRunAround(curPlayer, curMissionData)
+# PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RunTaskNextMissionID % curMissionData.Type, nextMissionID)
@@ -5433,6 +5435,8 @@
# @return 返回值无意义
# @remarks 设置跑环任务奖励 <set_run_around_reward multiple="指定倍数" id_name="任务ID存储key" />
def DoType_Set_Run_Around_Reward(curPlayer, curMission, curActionNode):
+ curMissionID = curMission.GetMissionID()
+ GameWorld.Log("DoType_Set_Run_Around_Reward---%s"%curMissionID)
idNameStr = curActionNode.GetAttribute("id_name")
if curMission and idNameStr != "":
questID = GameWorld.ToIntDef(curMission.GetProperty(idNameStr), 0)
@@ -5441,7 +5445,6 @@
if curMission == None:
curMission = QuestCommon.AddNewMission(curPlayer, questID)
- curMissionID = curMission.GetMissionID()
curMissionData = FindQuestFunc(curMissionID)
if not curMissionData:
return
@@ -5533,8 +5536,14 @@
#给物品奖励
itemInfo = []
if item_id and item_count:
- AddEventItem(curPlayer, curMission, item_id, item_count, bind=True)
itemInfo = [[item_id, item_count, True]]
+ packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, 1)
+ if 1 > packSpace:
+ PlayerControl.NotifyCode(curPlayer, "UnionTask_Reward")
+ PlayerControl.SendMailByKey("UnionTaskReward", [curPlayer.GetID()], itemInfo)
+ else:
+ AddEventItem(curPlayer, curMission, item_id, item_count, bind=True)
+
GameWorld.DebugLog("任务：%d 获得经验:%d,钱=%s,物品ID=%s,物品数量=%s"
% (curMission.GetMissionID(), exp, money, item_id, item_count))
@@ -5872,6 +5881,11 @@
#记录副本对应的任务ID
if FBCommon.GetRecordMapID(mapID) in [ChConfig.Def_FBMapID_ClearDevil, ChConfig.Def_FBMapID_MagicWeapon]:
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqFBMissionID, curMission.GetMissionID())
+ missionID = curMission.GetMissionID()
+ curMissionData = FindQuestFunc(missionID)
+ if curMissionData:
+ missionType = curMissionData.Type
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqFBMissionType, missionType)
return
#---------------------------------------------------------------------
--
Gitblit v1.8.0