From 013c0bee13f90274bf002a053adfaf3b56412bb0 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 11 Jan 2024 14:48:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Mission/MissionDailyPanel.prefab | 38 +++++++++---------- .../Mission/MissionDailyPanel_Daily.lua | 13 ++++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index f08644afef..3178275045 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -491,7 +491,6 @@ RectTransform: - {fileID: 1951701982656022217} - {fileID: 224571543260260692} - {fileID: 224757499911877870} - - {fileID: 4826355522651964615} m_Father: {fileID: 5972105892328137991} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6352,7 +6351,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -8.5} + m_AnchoredPosition: {x: 0.000030517578, y: -8.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7428001346248983693 @@ -12007,7 +12006,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2262702332955478732 RectTransform: m_ObjectHideFlags: 0 @@ -12024,7 +12023,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 87, y: 33.7} + m_AnchoredPosition: {x: 92.1, y: 19.5} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7895992200681348081 @@ -12418,7 +12417,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 7.282501, y: -42.309998} + m_AnchoredPosition: {x: 7.282501, y: 270.77} m_SizeDelta: {x: 540.86, y: 117.26999} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1355342698239200449 @@ -48586,7 +48585,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 313.08} m_SizeDelta: {x: 555.43, y: 267.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4640449547165834735 @@ -49117,7 +49116,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4826355522651964615 RectTransform: m_ObjectHideFlags: 0 @@ -49125,8 +49124,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2937329641480198077} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2043502879209550072} @@ -49134,13 +49133,13 @@ RectTransform: - {fileID: 2487905685182905083} - {fileID: 2076662406885589760} - {fileID: 4412924170859136249} - m_Father: {fileID: 224313943697672796} + m_Father: {fileID: 5972105892328137991} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -26.8, y: 242.8} + m_SizeDelta: {x: 1410.1, y: 2272.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8299542437698576553 CanvasRenderer: @@ -74139,7 +74138,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -137.6, y: 31.92} + m_AnchoredPosition: {x: -137.6, y: 345} m_SizeDelta: {x: 243.14, y: 38.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &967488413435487852 @@ -74163,7 +74162,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.95686275, g: 0.9137255, b: 0.79607844, a: 1} + m_Color: {r: 0.6320754, g: 0.41923624, b: 0.08646317, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79586,7 +79585,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -252, y: 59} + m_AnchoredPosition: {x: -252, y: 55} m_SizeDelta: {x: 297, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7281135729660457134 @@ -120388,6 +120387,7 @@ RectTransform: - {fileID: 224249769613752612} - {fileID: 2143589712445288076} - {fileID: 6281143381095193529} + - {fileID: 4826355522651964615} m_Father: {fileID: 615676898313634675} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -174217,7 +174217,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 5.67, y: 84.99} + m_AnchoredPosition: {x: 5.67, y: 398.06998} m_SizeDelta: {x: 271.43, y: 53.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2136750833206370620 @@ -174548,7 +174548,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3766131170455723064 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua index 925fba928a..f59d23aa92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua @@ -36,7 +36,7 @@ function this:InitComponent(gameObject) this.ScrollView.moveTween.Strength = 1 this.NoviceItemList={}--存储itemview 重复利用 - this.boxItemGrid = Util.GetGameObject(gameObject, "rewardBg/RewardPanel/ViewRect/grid").transform + this.boxItemGrid = Util.GetGameObject(gameObject, "RewardPanel/ViewRect/grid").transform for i = 1, 3 do boxList[i] = Util.GetGameObject(gameObject, "rewardBg/btnList/BoxBtn"..i) allMissionDailyBoxItemPres[i] = SubUIManager.Open(SubUIConfig.ItemView, this.boxItemGrid) @@ -45,13 +45,13 @@ function this:InitComponent(gameObject) this.BoxSix = Util.GetGameObject(gameObject, "rewardBg/BoxSix") this.BoxNine = Util.GetGameObject(gameObject, "rewardBg/BoxNine") - this.RewardPanelGetInfo = Util.GetGameObject(gameObject, "rewardBg/RewardPanel/getInfo") - this.RewardPanelGrid = Util.GetGameObject(gameObject, "rewardBg/RewardPanel/ViewRect/grid") - this.RewardPanel = Util.GetGameObject(gameObject, "rewardBg/RewardPanel") - this.rewardMaskBtn = Util.GetGameObject(gameObject, "rewardBg/RewardPanel/rewardMaskBtn") + this.RewardPanelGetInfo = Util.GetGameObject(gameObject, "RewardPanel/getInfo") + this.RewardPanelGrid = Util.GetGameObject(gameObject, "RewardPanel/ViewRect/grid") + this.RewardPanel = Util.GetGameObject(gameObject, "RewardPanel") + this.rewardMaskBtn = Util.GetGameObject(gameObject, "RewardPanel/rewardMaskBtn") this.progressBottom = Util.GetGameObject(gameObject, "rewardBg/progressBottom/Image"):GetComponent("Image") this.totalPro = Util.GetGameObject(gameObject, "rewardBg/totalProImage/totalPro"):GetComponent("Text") - this.getInfo = Util.GetGameObject(gameObject, "rewardBg/RewardPanel/getInfo"):GetComponent("Text") + this.getInfo = Util.GetGameObject(gameObject, "RewardPanel/getInfo"):GetComponent("Text") end function this:BindEvent() @@ -80,6 +80,7 @@ function this:OnShow(_parent,...) fun = args[1] this.rectMask.enabled=true this.OnShowData(true,true) + this.RewardPanel:SetActive(false) end function this:OnSortingOrderChange(sortingOrder) for i, v in pairs(this.NoviceItemList) do