From 34685c7cb8fce068386cbefa0dbc6d75da396cc4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 26 Apr 2022 18:25:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/CompoundHero/CompoundHeroPanel.prefab | 94 +++++++++---------- .../~Lua/Modules/Explore/ExploreMainPanel.lua | 3 +- .../~Lua/View/JumpViewNew.lua | 6 +- 3 files changed, 53 insertions(+), 50 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index c4a62d2c4c..6884e8b7ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -465,10 +465,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4573983830629001742 CanvasRenderer: @@ -1269,10 +1269,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 580, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713829247308178245 CanvasRenderer: @@ -1462,10 +1462,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 720, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043128608018388249 CanvasRenderer: @@ -1774,7 +1774,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6489381859193902079 RectTransform: m_ObjectHideFlags: 0 @@ -3060,10 +3060,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2026494486082166274 CanvasRenderer: @@ -3803,10 +3803,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 440, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5309317615122532976 CanvasRenderer: @@ -4457,7 +4457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1441774295091081370 RectTransform: m_ObjectHideFlags: 0 @@ -4831,10 +4831,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 608, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7065973308383303497 CanvasRenderer: @@ -6847,10 +6847,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3428141315978654585 CanvasRenderer: @@ -9266,10 +9266,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 272, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7795520682918704533 CanvasRenderer: @@ -10710,7 +10710,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4608755924365892055 RectTransform: m_ObjectHideFlags: 0 @@ -10726,10 +10726,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 790, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3532145455492184999 CanvasRenderer: @@ -11105,10 +11105,10 @@ RectTransform: m_Father: {fileID: 9200963702838850311} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 776, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6460921918868668529 CanvasRenderer: @@ -13348,10 +13348,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -50} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5713593700809359769 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index 6710736e8f..1460e8af38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -90,7 +90,8 @@ function ExploreMainPanel:InitComponent() self.rankBtn:SetActive(false) self.taskBtn = Util.GetGameObject(self.gameObject, "btns/taskBtn") self.taskBtn:SetActive(false) - self.shopBtn = Util.GetGameObject(self.gameObject, "btns/shopBtn") + self.shopBtn = Util.GetGameObject(self.gameObject, "btns/shopBtn") + self.shopBtn:SetActive(false) end --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index bf24fe474c..49c1736f7c 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -62,10 +62,12 @@ function JumpViewNew:OnOpen(jumpId,heroConfig,parent) self.desc.text = "完成至尊降世可直接获得玉皇大帝" elseif self.jumpSData.Type == JumpType.Lottery then self.costIconPos.gameObject:SetActive(false) - self.desc.text = "设为心愿神将会有更高概率" + --self.desc.text = "设为心愿神将会有更高概率" + self.desc.text = "使用点将神符抽取神将" elseif self.jumpSData.Type == JumpType.Lottery then self.costIconPos.gameObject:SetActive(false) - self.desc.text = "设为心愿神将会有更高概率" + --self.desc.text = "设为心愿神将会有更高概率" + self.desc.text = "使用点将神符抽取神将" elseif self.jumpSData.Type == JumpType.ElementDrawCard then self.info.text = GetLanguageStrById(self.jumpSData.Title) self.costIconPos.gameObject:SetActive(false)