From 68466c0fffffd083dab0b9089aeeef101f0f05c4 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 29 Jul 2021 11:18:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=AF=E6=9C=AC=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/NewCarbon/CarbonsPanel.prefab | 24 +++++++++---------- .../Modules/Carbon/NewCarbon/CarbonsPanel.lua | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 6663b9231d..35b434623a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -278,7 +278,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7180480316198442812} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -360,8 +360,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: -268.1, y: 469.3} - m_SizeDelta: {x: 274, y: 300} + m_AnchoredPosition: {x: -268.1, y: 434.7} + m_SizeDelta: {x: 274, y: 241.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2919010425323436214 CanvasRenderer: @@ -407,7 +407,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 2616828843611983892} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -758,7 +758,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6346546485856201853} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -840,8 +840,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: -295.9, y: -40.9} - m_SizeDelta: {x: 250, y: 400} + m_AnchoredPosition: {x: -295.9, y: -75.1} + m_SizeDelta: {x: 250, y: 468.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4208572497002420159 CanvasRenderer: @@ -1090,7 +1090,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5446762531847647535} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -2407,7 +2407,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5036688087282659812} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -3479,7 +3479,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: 34} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6359389777143201629 @@ -3888,7 +3888,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: 34} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7703640978867281762 @@ -4398,7 +4398,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 4497440218633784089} m_OnClick: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 814dcb4b36..4f623955a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -33,7 +33,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔 objName = "monster", nameImg = "f_fuben_fubenming_04", - btnPos = Vector2(-39,-110), + btnPos = Vector2(0,-50), redPointType = RedPointType.EpicExplore, effect1 = "Fx_XinMoShiLian", effect2 = "Fx_XinMoShiLian_S", @@ -51,7 +51,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图 objName = "fightlevel", nameImg = "f_fuben_fubenming_07", - btnPos = Vector2(5,-224), + btnPos = Vector2(0,-167), redPointType = RedPointType.FightLevel, effect1 = "ImgBg/Fx_ShanHeSheJiTu", effect2 = "Fx_ShanHeSheJiTu_S",