diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index e93cff6ccc..e6682ae4f6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -5920,7 +5920,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6630273786794472594 RectTransform: m_ObjectHideFlags: 0 @@ -79797,7 +79797,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -98435,7 +98435,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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} @@ -98568,7 +98568,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9120872265090628817 RectTransform: m_ObjectHideFlags: 0 @@ -103730,10 +103730,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} 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: 301.025, y: -60.5} - m_SizeDelta: {x: 250, y: 83} + 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 &5004630570938477890 CanvasRenderer: @@ -104548,7 +104548,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7018165708038573099 RectTransform: m_ObjectHideFlags: 0 @@ -107682,7 +107682,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1508773176926603313 RectTransform: m_ObjectHideFlags: 0 @@ -182990,7 +182990,7 @@ GameObject: m_Component: - component: {fileID: 7091221103254606304} - component: {fileID: 4126130421337636326} - - component: {fileID: 7395140692376747490} + - component: {fileID: 6367947356042607426} m_Layer: 5 m_Name: upImage m_TagString: Untagged @@ -183025,7 +183025,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7085036036722072500} m_CullTransparentMesh: 0 ---- !u!114 &7395140692376747490 +--- !u!114 &6367947356042607426 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -183034,26 +183034,31 @@ MonoBehaviour: m_GameObject: {fileID: 7085036036722072500} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 0.7607844, b: 0.5019608, 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: 63c662f4131eabb49b8146b253b55b11, 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 + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5DF2\u4E0A\u9635" --- !u!1 &7112695192181725970 GameObject: m_ObjectHideFlags: 0 @@ -192794,10 +192799,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} 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: 301.025, y: -143.5} - m_SizeDelta: {x: 250, y: 83} + 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 &3769464419337462616 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 3db19cd85d..b4a0f7ccc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -125,7 +125,7 @@ function this.SingleHeroDataShow(go,_heroData) Util.SetParticleSortLayer(starGrid, sort + 1) local choosed =Util.GetGameObject(_go.transform, "choosed") local formationMask =Util.GetGameObject(_go.transform, "formationMask") - Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") + Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Text").text ="已上阵"--this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") formationMask:SetActive(heroData.isFormation ~= "" and heroData.isFormations[1] ~= FormationTypeDef.EXPEDITION) local lockMask =Util.GetGameObject(_go.transform, "lockMask") lockMask:SetActive(heroData.lockState == 1) @@ -253,7 +253,7 @@ function this.QuickSelectListData(type) if type == 1 then selectHeroData={} for k, v in pairs(tarHero) do - if LengthOfTable(selectHeroData)