From a9b52e68349dd562a8e826b298f8e2bb45230ad3 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Thu, 27 May 2021 15:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EndLessTreasurePanel.prefab | 2 +-
.../~Lua/Modules/Map/View/EndLessMapView.lua | 23 +++++++++++++++++--
.../TreasureOfHeaven/EndLessTreasurePanel.lua | 2 +-
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
index fb9a400e5f..52a69da3ff 100644
--- a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
@@ -684,7 +684,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: d7dd1cf3a6c679649b6c1e170565acf6, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3e841952f1989d54197a27b3341467d6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
index 043d005f2c..c5ff614264 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
@@ -213,6 +213,25 @@ function EndLessMapView:BindEvent()
EndLessMapManager.openedFormat = true
end)
end)
+
+ Util.AddClick(this.TargetRoot, function ()
+ if ctrlView.GetCallListCount() > 1 then
+ PopupTipPanel.ShowTip(Language[11259])
+ return
+ end
+ if not this:CanClick() then return end
+ MonsterCampManager.preType = 2
+ UIManager.OpenPanel(UIName.TrialRewardPopup,EndLessMapManager.SetRewardData(),function(id,rewardFunc)
+ NetManager.TakeMissionRewardRequest(TaskTypeDef.wujinfuben,id,function (msg)
+ UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
+ this:RefreshTargetRoote()
+ if rewardFunc then
+ rewardFunc()
+ end
+ end)
+ end)
+ end,1)
+ end)
BindRedPointObject(RedPointType.wujinMission,this.btnNoteRed)
Util.AddClick(this.btnNote, function ()
if this.curMission.state == 1 then
@@ -389,14 +408,14 @@ function EndLessMapView:RefreshTargetRoote()
if this.curMission.state == 2 then
this.TargetBtn1.gameObject:SetActive(true) --未完成
this.TargetBtn2.gameObject:SetActive(false) --以达成
- this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.progress,this.curMission.value)
+ this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.progress,this.curMission.value)
else
this.TargetBtn1.gameObject:SetActive(false)
this.TargetBtn2.gameObject:SetActive(true)
if this.curMission.index == #EndLessMapManager.mission and this.curMission.state == 0 then
this.TargetRootText.text = "已完成全部任务"
else
- this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.value,this.curMission.value)
+ this.TargetRootText.text = string.format("%s(%s/%s)",this.curMission.Desc,this.curMission.value,this.curMission.value)
end
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
index 367448fe44..4254d13726 100644
--- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua
@@ -33,7 +33,7 @@ function EndLessTreasurePanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.quesBtn,function()
- UIManager.OpenPanel(UIName.HelpPopup,1,self.helpPosition.x,self.helpPosition.y)
+ UIManager.OpenPanel(UIName.HelpPopup,93,self.helpPosition.x,self.helpPosition.y)
end)
end