diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index fe8c9be348..00d68f50cf 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -719,7 +719,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 3.5} - m_SizeDelta: {x: 38, y: 28} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &797751979057340142 CanvasRenderer: @@ -749,7 +749,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1635,7 +1635,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -165, y: 7.5} - m_SizeDelta: {x: 38, y: 34} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &797336218532973764 CanvasRenderer: @@ -1665,7 +1665,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1708,10 +1708,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} 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: 75, y: -285} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798130740508122842 CanvasRenderer: @@ -1756,7 +1756,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 6.8} - m_SizeDelta: {x: 24, y: 34} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798257669748220544 CanvasRenderer: @@ -1786,7 +1786,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2186,7 +2186,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 3.4} - m_SizeDelta: {x: 30, y: 38} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798224863221350350 CanvasRenderer: @@ -2216,7 +2216,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3823,10 +3823,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} 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: 75, y: -105} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976417882928787122 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab index d9cf540f5f..3c74514ae6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab @@ -7924,8 +7924,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u699C\u5355\u4E3A\u7A7A" LanguageIndex: 10239 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/MapRoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/MapRoleInfoPopup.prefab index 78ba56d1a9..228fe7652c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/MapRoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/MapRoleInfoPopup.prefab @@ -257,7 +257,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167, y: 2.7999992} - m_SizeDelta: {x: 30, y: 38} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222481059554260102 CanvasRenderer: @@ -287,7 +287,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -947,7 +947,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167, y: 2.7999992} - m_SizeDelta: {x: 38, y: 34} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222567242587202814 CanvasRenderer: @@ -977,7 +977,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1450,7 +1450,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167, y: 2.7999992} - m_SizeDelta: {x: 38, y: 28} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222862651648804964 CanvasRenderer: @@ -1480,7 +1480,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1989,7 +1989,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167, y: 2.7999992} - m_SizeDelta: {x: 30, y: 40} + m_SizeDelta: {x: 57, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222675800132168886 CanvasRenderer: @@ -2019,7 +2019,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: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} + m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3291,7 +3291,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167, y: 2.7999992} - m_SizeDelta: {x: 24, y: 34} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222364655859266858 CanvasRenderer: @@ -3321,7 +3321,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index f731a4675e..930658e2ba 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -1833,7 +1833,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -165.3, y: 3.1} - m_SizeDelta: {x: 33.13, y: 24.41} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48855175827932511 CanvasRenderer: @@ -1863,7 +1863,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3087,7 +3087,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -163.6, y: 3.1} - m_SizeDelta: {x: 20.51, y: 29.05} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4446688450659526956 CanvasRenderer: @@ -3117,7 +3117,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3842,7 +3842,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -165.3, y: 4.23} - m_SizeDelta: {x: 28.22, y: 35.75} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &436989753160709639 CanvasRenderer: @@ -3872,7 +3872,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4683,9 +4683,9 @@ RectTransform: m_Father: {fileID: 4624725292118211212} 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: 155.29999, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 155.29999, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2932693287766199764 @@ -4927,10 +4927,10 @@ RectTransform: m_Father: {fileID: 5965757037642302380} 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: 75, y: -275} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6285193575067262387 CanvasRenderer: @@ -4975,7 +4975,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -167.54, y: 3.1} - m_SizeDelta: {x: 33.53, y: 30} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3584701828980934667 CanvasRenderer: @@ -5005,7 +5005,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5519,10 +5519,10 @@ RectTransform: m_Father: {fileID: 5965757037642302380} 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: 75, y: -115} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8424932215199477144 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index e47bbd423e..dff567f14a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -2683,7 +2683,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 19, y: 0} - m_SizeDelta: {x: 38, y: 28} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7986682960859058855 CanvasRenderer: @@ -2713,7 +2713,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7957,7 +7957,7 @@ ParticleSystem: --- !u!199 &4438878257103928366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9713,7 +9713,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 19, y: 0} - m_SizeDelta: {x: 24, y: 34} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8787225431285198687 CanvasRenderer: @@ -9743,7 +9743,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11899,7 +11899,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 19, y: 0} - m_SizeDelta: {x: 30, y: 38} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8932703381685927677 CanvasRenderer: @@ -11929,7 +11929,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17476,7 +17476,7 @@ ParticleSystem: --- !u!199 &5360006036325542636 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20007,7 +20007,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 19, y: 0} - m_SizeDelta: {x: 38, y: 34} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5234115287811132633 CanvasRenderer: @@ -20037,7 +20037,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 557a6b4d88..9a9b36204e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -62407,7 +62407,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -165, y: 7.5} - m_SizeDelta: {x: 38, y: 34} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4698054813086648997 CanvasRenderer: @@ -62437,7 +62437,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -64683,7 +64683,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 3.5} - m_SizeDelta: {x: 38, y: 28} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1899064678678648267 CanvasRenderer: @@ -64713,7 +64713,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67216,8 +67216,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: -162.9, y: 3.4} - m_SizeDelta: {x: 30, y: 38} + m_AnchoredPosition: {x: -164.8, y: 3.4} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5404277517500071059 CanvasRenderer: @@ -67247,7 +67247,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67951,8 +67951,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: -162.9, y: 3.5} - m_SizeDelta: {x: 38, y: 28} + m_AnchoredPosition: {x: -164.8, y: 3.5} + m_SizeDelta: {x: 53, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5403804700344196531 CanvasRenderer: @@ -67982,7 +67982,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: 9660e6c75a612964a93f5e3427660237, type: 3} + m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -68763,8 +68763,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: -163.9, y: 7} - m_SizeDelta: {x: 30, y: 40} + m_AnchoredPosition: {x: -164.8, y: 2.8} + m_SizeDelta: {x: 57, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5404266243847186345 CanvasRenderer: @@ -68794,7 +68794,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: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} + m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -70025,8 +70025,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: -165, y: 7.5} - m_SizeDelta: {x: 38, y: 34} + m_AnchoredPosition: {x: -164.8, y: 7.5} + m_SizeDelta: {x: 63, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5403388939551625113 CanvasRenderer: @@ -70056,7 +70056,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: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} + m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -70681,8 +70681,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: -162.9, y: 6.8} - m_SizeDelta: {x: 24, y: 34} + m_AnchoredPosition: {x: -164.8, y: 6.8} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5404319085793845725 CanvasRenderer: @@ -70712,7 +70712,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73950,7 +73950,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -163.9, y: 7} - m_SizeDelta: {x: 30, y: 40} + m_SizeDelta: {x: 57, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7094696430322536921 CanvasRenderer: @@ -73980,7 +73980,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: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} + m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -76248,7 +76248,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 6.8} - m_SizeDelta: {x: 24, y: 34} + m_SizeDelta: {x: 68, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4912067356288216712 CanvasRenderer: @@ -76278,7 +76278,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: e210732dc67423e4697757b14a4f1f50, type: 3} + m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -78113,7 +78113,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -162.9, y: 3.4} - m_SizeDelta: {x: 30, y: 38} + m_SizeDelta: {x: 64, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5394742500617632117 CanvasRenderer: @@ -78143,7 +78143,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: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 06f30dfe3c..eb71ee6d36 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -572,8 +572,8 @@ PropertyTypeIconDef = { -- [5] = "r_hero_sudu", [1] = "r_hero_jinengdian01", [2] = "r_hero_jinengdian02", - [3] = "r_hero_jinengdian03", - [4] = "r_hero_jinengdian04", + [3] = "r_hero_jinengdian04", + [4] = "r_hero_jinengdian03", [5] = "r_hero_jinengdian05", } diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua index b1a27cdb7b..49650f6492 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua @@ -12,7 +12,7 @@ function PokemonGetInfoPopup:InitComponent() this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack") this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot") this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text") - this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/PokemonInfo/starGrid(Clone)") + this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)") --属性 for i = 0, 4 do diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index 00101cb39b..d4644d4815 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -171,6 +171,8 @@ function PokemonInfoPanel:BindEvent() --飘战力 PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) end) + this.OnShowData() + -- this.OnShowRedPoint() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 54a8578770..ffc8089f49 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -185,7 +185,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) PokemonGoListRedPoin[liveIndex]:SetActive(upLvRed or upStarRed) upZhenInfo:SetActive(true) Util.GetGameObject(go, "upZhenInfo/titleImage/nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curData.id).Name - Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = "等级"..curData.lv + Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv.."级" local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive") for key, value in pairs(live2dList) do if key == liveIndex then @@ -200,7 +200,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) local starSize = Vector2.New(65,65) PokemonManager.SetHeroStars(Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), curData.star,1,starSize) -- Util.AddOnceClick( Util.GetGameObject(go, "upZhenInfo/upZhenClick"), function() - -- UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonDatas()) + -- UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonUpZhenDatas()) -- end) --英雄长按 local heroClick=Util.GetGameObject(PokemonList[liveIndex],"DragView"..liveIndex) @@ -208,7 +208,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) -- end, 0.5) Util.AddOnceClick(heroClick, function() if isClick then - UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonDatas()) + UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonUpZhenDatas()) end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index d5eed07507..6db259170b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -90,6 +90,16 @@ function this.GetPokemonDatas() return list end --获取所有灵兽数据 +function this.GetPokemonUpZhenDatas() + local formationUpZhens = {} + for i = 1, #pokemonFormation do + if pokemons[pokemonFormation[i].pokemonId] then + table.insert(formationUpZhens, pokemons[pokemonFormation[i].pokemonId]) + end + end + return formationUpZhens +end +--获取所有灵兽数据 function this.GetPokemonResolveDatas() local curAllPokemonList = {} local list=this.GetAllPokemonFormationDids() @@ -111,14 +121,19 @@ for i = 1,#ids do this.RemoveSinglePokemonData(id) end end ---获取当前可上阵的所有灵兽数据 -function this.GetCanUpZhenPokemonDatas() +--获取当前可上阵的所有灵兽数据 curUpZhenPokemonData 如果不为空就时替换上阵操作 +function this.GetCanUpZhenPokemonDatas(curUpZhenPokemonData) local upZhenSidList = this.GetAllPokemonFormationSids() local curAllPokemonList = {} for key, value in pairs(pokemons) do if not upZhenSidList[value.id] then table.insert(curAllPokemonList,value) end + if curUpZhenPokemonData then + if value.id == curUpZhenPokemonData.id and value.dynamicId ~= curUpZhenPokemonData.dynamicId then + table.insert(curAllPokemonList,value) + end + end end return curAllPokemonList end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua index ccb6268bd6..16303f42c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua @@ -141,9 +141,9 @@ function PokemonUpStarSuccessPanel:OnOpen(_curPokemonData) local curUpStarConfig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId) local nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId) this.skillImg1.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon)) - this.skillLvTxt2.text = nextSkillId%10 + this.skillLvTxt2.text = nextSkillConFig.Level this.skillImg.sprite = Util.LoadSprite(GetResourcePath(curUpStarConfig.Icon)) - this.skillLvTxt1.text = curSkillId%10 + this.skillLvTxt1.text = curUpStarConfig.Level end function PokemonUpStarSuccessPanel:GetEquipSkillData(skillId) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index 7a1a436e2f..db8784aab4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -131,7 +131,7 @@ function this.SingPokemonDataShow(_go,_itemData) local starSize = Vector2.New(50,50) SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5)) Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() - UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) + UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas()) end) end function this.SingPokemonChipDataShow(_go,_itemData) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index 68fb489c1f..a35263f47a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -40,7 +40,11 @@ function this:OnShow(_parent,_curUpZhenPokemonData,_upZhenIndex) parent = _parent curUpZhenPokemonData = _curUpZhenPokemonData upZhenIndex = _upZhenIndex - polemonList = PokemonManager.GetCanUpZhenPokemonDatas() + if curUpZhenPokemonData then + polemonList = PokemonManager.GetCanUpZhenPokemonDatas(curUpZhenPokemonData) + else + polemonList = PokemonManager.GetCanUpZhenPokemonDatas() + end table.sort(polemonList, function(a,b) if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then if a.star == b.star then @@ -96,7 +100,7 @@ function this.SingleItemDataShow(_go,_itemData) FormationManager.CheckHeroIdExist() local pokemonInfoPanem = UIManager.GetOpenPanel(UIName.PokemonInfoPanel) if pokemonInfoPanem then - pokemonInfoPanem.RefreshShow(_itemData,PokemonManager.GetPokemonDatas()) + pokemonInfoPanem.RefreshShow(_itemData,PokemonManager.GetPokemonUpZhenDatas()) end parent:ClosePanel() end) @@ -132,7 +136,7 @@ function this.SingleItemDataShow(_go,_itemData) end end) Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() - UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) + UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas()) end) end