From d81bb018d0cb883702d329ceda1776680a5417b9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 10 一月 2019 10:51:46 +0800
Subject: [PATCH] 5730 【后端】【1.5】时装功能开发(时装穿脱通知修改)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 9143b94..c0b8d23 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
@@ -59,6 +59,7 @@
import PlayerMagicWeapon
import PlayerBossReborn
import PlayerFairyCeremony
+import PlayerWeekParty
import PlayerHorse
import FBCommon
import PyGameData
@@ -1221,7 +1222,7 @@
def __RunAnswerAction(curPlayer, curMission, answersNode):
actionsNode = __FindAnswerActionNode(curPlayer, curMission, answersNode)
if actionsNode == None or actionsNode.IsEmpty():
- GameWorld.Log('__RunAnswerAction找不到回答节点')
+ GameWorld.DebugLog('__RunAnswerAction找不到回答节点--%s'%curMission.GetMissionID())
return
__DoAnswerActionNode(curPlayer, curMission, actionsNode)
@@ -4890,7 +4891,7 @@
# @return 无
# @remarks 跑环任务结束处理，删除或者随机下一个
def __RunAroundMission(curPlayer, missionID, curMissionData, curActionNode):
- GameWorld.Log("__RunAroundMission----%s"%missionID)
+ GameWorld.Log("__RunAroundMission----%s"%missionID, curPlayer.GetID())
#任务完成，触发随机跑环
run_event = GameWorld.ToIntDef(curActionNode.GetAttribute("run_around"), 0)
firstMissionID = GameWorld.ToIntDef(curActionNode.GetAttribute("id"), 0)
@@ -4927,8 +4928,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
@@ -4976,9 +4978,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)
@@ -5233,14 +5235,18 @@
def OnAroundMissionFinish(curPlayer, missionType, addCnt=1):
#跑环任务id列表
# 活跃度
+ GameWorld.Log(' 跑环完成触发活跃度 missionType=%s'%missionType, curPlayer.GetPlayerID())
if missionType == QuestCommon.Def_Mission_Type_RunDaily:
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_DailyRunMission, addCnt)
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_TaskCRun, addCnt)
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_RunTask, addCnt)
PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RunTask, addCnt)
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_RunTask, addCnt)
elif missionType == QuestCommon.Def_Mission_Type_RunFamily:
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyRunMission, addCnt)
PlayerFamily.AddFamilyActivity(curPlayer, ShareDefine.FamilyActive_Task, addCnt)
+ else:
+ GameWorld.Log(' 跑环完成触发活跃度异常 missionType=%s'%missionType, curPlayer.GetPlayerID())
return
@@ -5435,7 +5441,7 @@
# @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)
+ GameWorld.Log("DoType_Set_Run_Around_Reward---%s"%curMissionID, curPlayer.GetID())
idNameStr = curActionNode.GetAttribute("id_name")
if curMission and idNameStr != "":
questID = GameWorld.ToIntDef(curMission.GetProperty(idNameStr), 0)
@@ -5535,8 +5541,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))
@@ -5874,6 +5886,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