diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab index 7af5eab743..6d27cadf59 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab @@ -3300,7 +3300,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8326139279270606670} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3731,7 +3731,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1506076805567942679 RectTransform: m_ObjectHideFlags: 0 @@ -3744,7 +3744,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8326139279270606670} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9615,7 +9615,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 186, y: 173} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2816885767294164763 CanvasRenderer: @@ -9645,7 +9645,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a758002a909c6bf478516e8eb95c858e, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9933,7 +9933,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8326139279270606670 RectTransform: m_ObjectHideFlags: 0 @@ -9946,17 +9946,18 @@ RectTransform: m_LocalScale: {x: 0.00375, y: 0.00375, z: 0.00375} m_Children: - {fileID: 6729611954407434404} + - {fileID: 6877614142805537581} - {fileID: 1506076805567942679} - {fileID: 4316996340489144221} - - {fileID: 1242545660724548743} - {fileID: 8785975016839982017} + - {fileID: 1242545660724548743} m_Father: {fileID: 7526951454861482041} 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: -4.529297, y: -116.52936} - m_SizeDelta: {x: 184, y: 175} + m_SizeDelta: {x: 209, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6890477205070885592 CanvasRenderer: @@ -12951,6 +12952,7 @@ GameObject: - component: {fileID: 8785975016839982017} - component: {fileID: 5358707250023257511} - component: {fileID: 2735952571733594883} + - component: {fileID: 6504770767060340688} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -12974,8 +12976,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: 0, y: -137.3} - m_SizeDelta: {x: 160, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5358707250023257511 CanvasRenderer: @@ -13012,13 +13014,28 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u725B\u6C14\u51B2\u5929\n" +--- !u!114 &6504770767060340688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6330414708180383424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6563309646254628160 GameObject: m_ObjectHideFlags: 0 @@ -14367,12 +14384,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8326139279270606670} - m_RootOrder: 3 + m_RootOrder: 5 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: 2, y: 0} - m_SizeDelta: {x: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6420057363979630889 CanvasRenderer: @@ -14402,7 +14419,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16416,6 +16433,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8988738584801447416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6877614142805537581} + - component: {fileID: 2576360448304305248} + - component: {fileID: 4051953131191126230} + m_Layer: 0 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6877614142805537581 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8988738584801447416} + 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: 8326139279270606670} + m_RootOrder: 1 + 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_SizeDelta: {x: 205, y: 109} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2576360448304305248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8988738584801447416} + m_CullTransparentMesh: 0 +--- !u!114 &4051953131191126230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8988738584801447416} + 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: e1443944b35bf714c9f3a8758f1a4673, 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 &9101366379023895999 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index 2ea45d7b4b..30a9691782 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -254,10 +254,12 @@ end function this.TabAdapter(tab, index, status) local tabLab = Util.GetGameObject(tab, "Text") local tabImage = Util.GetGameObject(tab,"Image") + Util.GetGameObject(tab,"select"):SetActive(status=="select") tabImage:GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status]) -- tabImage:GetComponent("Image"):SetNativeSize() tabLab:GetComponent("Text").text = _TabData[index].name tabLab:GetComponent("Text").color = _TabFontColor[status] + -- tabImage.transform.localPosition = Vector3.New( tabImage.transform.localPosition.x, _TabImagePos[status], 0); end --切换视图