【家园】任务
parent
197b28b3da
commit
a1301a4a22
|
|
@ -13414,6 +13414,8 @@ GameObject:
|
|||
- component: {fileID: 6922651342968358476}
|
||||
- component: {fileID: 7373727961574174983}
|
||||
- component: {fileID: 1911902584995919038}
|
||||
- component: {fileID: 4993973745716627708}
|
||||
- component: {fileID: 5672764524386550084}
|
||||
m_Layer: 5
|
||||
m_Name: Task
|
||||
m_TagString: Untagged
|
||||
|
|
@ -13477,6 +13479,67 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &4993973745716627708
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8105888415788446762}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1911902584995919038}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &5672764524386550084
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8105888415788446762}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &8176492333252237573
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1414,6 +1414,7 @@ TaskTypeDef = {
|
|||
NiuQiChongTian = 11,--牛气冲天任务
|
||||
wujinfuben = 12,--牛气冲天任务
|
||||
JourneyWithWind = 13,--缥缈之旅任务
|
||||
HomeLandTask = 14,--家园升级任务
|
||||
}
|
||||
|
||||
--商品类型
|
||||
|
|
|
|||
|
|
@ -69,4 +69,36 @@ function this.ResumeCost(_data,_str,func)
|
|||
func(data[16])
|
||||
end
|
||||
|
||||
--设置任务
|
||||
function this.SetRewardData()
|
||||
local dataList = {}
|
||||
local transform = {
|
||||
[0] = 2,
|
||||
[1] = 1,
|
||||
[2] = 0,
|
||||
}
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HomeLandTask)) do
|
||||
local data = {}
|
||||
data.Id = v.Id
|
||||
local taskData = TaskManager.GetTypeTaskInfo(TaskTypeDef.HomeLandTask,v.Id)
|
||||
data.info = string.format("%s(%s/%s)",v.ContentsShow,taskData.progress,v.Values[2][1])
|
||||
data.BoxReward = v.Reward
|
||||
data.state = transform[taskData.state]
|
||||
table.insert(dataList,data)
|
||||
end
|
||||
return dataList
|
||||
end
|
||||
|
||||
--等级总和
|
||||
-- function this.GetLevelNum()
|
||||
-- local num = 0
|
||||
-- for index, value in ipairs(this.BuildData) do
|
||||
-- if value.level then
|
||||
-- num = num + value.level
|
||||
-- end
|
||||
-- end
|
||||
-- LogYellow("等级总和:"..num)
|
||||
-- return num
|
||||
-- end
|
||||
|
||||
return HomeLandManager
|
||||
|
|
@ -20,6 +20,10 @@ function HomeLand:InitComponent()
|
|||
self.RightUp = Util.GetGameObject(self.map,"RightUp")
|
||||
self.RightDown = Util.GetGameObject(self.map,"RightDown")
|
||||
|
||||
--btns
|
||||
self.taskBtn = Util.GetGameObject(self.RightUp,"Task")
|
||||
self.yunYouBtn = Util.GetGameObject(self.RightUp,"YunYou")
|
||||
|
||||
--产出详情框
|
||||
self.GainDetail = Util.GetGameObject(self.map,"GainDetail")
|
||||
self.maskBtn = Util.GetGameObject(self.GainDetail,"mask")
|
||||
|
|
@ -138,12 +142,7 @@ function HomeLand:BindEvent()
|
|||
PopupTipPanel.ShowTip("摘星阁")
|
||||
end)
|
||||
|
||||
|
||||
|
||||
--帮助按钮
|
||||
-- Util.AddClick(self.helpBtn, function()
|
||||
-- UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.HomeLand, self.helpPosition.x,self.helpPosition.y)
|
||||
-- end)
|
||||
--产出详情框
|
||||
Util.AddClick(self.maskBtn, function()
|
||||
bool = false
|
||||
self.maskBtn:SetActive(bool)
|
||||
|
|
@ -154,6 +153,20 @@ function HomeLand:BindEvent()
|
|||
self:SetDetailBar()
|
||||
end)
|
||||
|
||||
--右侧按钮们
|
||||
Util.AddClick(self.taskBtn, function()
|
||||
MonsterCampManager.preType = 5
|
||||
UIManager.OpenPanel(UIName.TrialRewardPopup,HomeLandManager.SetRewardData(),function(id,rewardFunc)
|
||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.HomeLandTask,id, function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||
if rewardFunc then
|
||||
rewardFunc()
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end,5)
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
function HomeLand:AddListener()
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ function TrialRewardPopup:InitComponent()
|
|||
pres[1]=Util.GetGameObject(this.panel,"Scroll/Pre")
|
||||
pres[2]=Util.GetGameObject(this.panel,"Scroll/Pre3")
|
||||
pres[4]=Util.GetGameObject(this.panel,"Scroll/Pre4")
|
||||
pres[5]=Util.GetGameObject(this.panel,"Scroll/Pre3")
|
||||
scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,pres[MonsterCampManager.preType], nil,
|
||||
Vector2.New(this.scroll.transform.rect.width,this.scroll.transform.rect.height),1,1,Vector2.New(0,5))
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
|
||||
|
|
@ -26,6 +27,7 @@ function TrialRewardPopup:InitComponent()
|
|||
scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||
scrollView.moveTween.MomentumAmount = 1
|
||||
scrollView.moveTween.Strength = 2
|
||||
scrollView.elastic = false
|
||||
end
|
||||
|
||||
function TrialRewardPopup:BindEvent()
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function this.InitTypeTaskList(_userMissionList)
|
|||
userMissionList.takeTimes = _userMissionList[i].takeTimes
|
||||
userMissionList.heroId = _userMissionList[i].heroId
|
||||
userMissionList.lock = _userMissionList[i].lock
|
||||
--LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
|
||||
LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
|
||||
if not TypeTaskData[_userMissionList[i].type] then
|
||||
TypeTaskData[_userMissionList[i].type] = {}
|
||||
end
|
||||
|
|
@ -206,7 +206,7 @@ end
|
|||
function this.RefreshTypeTaskInfo(taskInfoList)
|
||||
for i = 1, #taskInfoList do
|
||||
local taskInfo = taskInfoList[i]
|
||||
--LogRed("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
|
||||
LogRed("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
|
||||
this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId,taskInfo.lock)
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged)
|
||||
|
|
|
|||
Loading…
Reference in New Issue