From 127a019a1b3a4c7a47c1976803a2475ef803b175 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 30 Mar 2021 18:13:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=BD=92=E5=85=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91=E6=BC=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 67b62f0bb9..19cdec3efa 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -28,6 +28,7 @@ function RoleTalismanPanelV2:InitComponent() this.advanceBtn=Util.GetGameObject(this.gameObject,"AdvanceBtn")--进阶按钮 this.advanceBtnRedPot=Util.GetGameObject(this.gameObject,"AdvanceBtn/redPoint") this.RecallBtn=Util.GetGameObject(this.gameObject,"RecallBtn")--归元按钮 + this.RecallBtn:GetComponent("Image").sprite = Util.LoadSprite("r_fabao_guiyuan_zh") this.leftBtn = Util.GetGameObject(this.gameObject, "LeftBtn") this.rightBtn = Util.GetGameObject(this.gameObject, "RightBtn") this.helpBtn= Util.GetGameObject(this.transform, "HelpBtn") From 7d9a5a62ba6f77311207ff49e3348410b4fe44a2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 30 Mar 2021 18:18:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A9=E4=B9=A6=E7=A7=98=E5=8D=B7=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainPanel.prefab | 8 +- .../TianShuMiJuanMainPanel.prefab | 81 ++++++++++++++++++- .../~Lua/Modules/Main/MainPanel.lua | 2 +- .../TianShuMiJuan/TianShuMiJuanMainPanel.lua | 2 +- 4 files changed, 84 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index e06049d8ef..4ec58270e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -21918,6 +21918,7 @@ RectTransform: - {fileID: 687320386229130930} - {fileID: 6744555661118315554} - {fileID: 743071135} + - {fileID: 3578757564134258929} m_Father: {fileID: 1473827928010218247} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -50458,7 +50459,6 @@ RectTransform: - {fileID: 1586863079} - {fileID: 1741493654907866535} - {fileID: 6762574921092838611} - - {fileID: 3578757564134258929} m_Father: {fileID: 1473827928010218247} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -68215,12 +68215,12 @@ RectTransform: - {fileID: 707361313758567888} - {fileID: 4727042863211309282} - {fileID: 8730123036785111556} - m_Father: {fileID: 7682634954648963246} - m_RootOrder: 13 + m_Father: {fileID: 3124962570895569612} + m_RootOrder: 10 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: 1250, y: -24} + m_AnchoredPosition: {x: -135, y: -12} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6609285755703667079 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab index e1b94fe52c..41575c6db8 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab @@ -523,7 +523,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.000020082896, y: 50} + m_AnchoredPosition: {x: -0.000023068309, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &455843809901100221 @@ -1567,8 +1567,8 @@ 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: 1.4, y: 22.8} - m_SizeDelta: {x: 770.4, y: 1690.8} + m_AnchoredPosition: {x: 1.4, y: 29.35} + m_SizeDelta: {x: 770.4, y: 1677.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5714166555136849712 GameObject: @@ -1789,6 +1789,7 @@ RectTransform: - {fileID: 8396209728857207438} - {fileID: 755367653517614665} - {fileID: 6156001182195207221} + - {fileID: 7644560317432511499} m_Father: {fileID: 6860202946281388347} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2045,6 +2046,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7113916807625438323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7644560317432511499} + - component: {fileID: 551462396334624459} + - component: {fileID: 7868212924542620862} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7644560317432511499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7113916807625438323} + 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: [] + m_Father: {fileID: 6861030463589856289} + m_RootOrder: 9 + 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: 1.2, y: -776.8} + m_SizeDelta: {x: 749.9, y: 83.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &551462396334624459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7113916807625438323} + m_CullTransparentMesh: 0 +--- !u!114 &7868212924542620862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7113916807625438323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f3efca0b27d32994690f0ed37669a3c6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7552524817855075317 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index f949b7240f..f47a0f9a01 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -148,7 +148,7 @@ function this:InitComponent() this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld") this.btnWaiDi:SetActive(false) this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero") - this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan") + this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer7/btnTianShuMiJuan") this.operateIcon = { [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200), diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index a760f78c85..a58109f28b 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -42,7 +42,7 @@ function TianShuMiJuanMainPanel:InitComponent() self.fetterItem = Util.GetGameObject(self.gameObject,"fetterItem") local grid = Util.GetGameObject(self.gameObject,"bg/fetterGrid") local v21 = grid.transform.rect - self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,0)) + self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,25)) self.empty = Util.GetGameObject(self.gameObject,"bg/NoneImage") end