diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab index 314888e16d..c39734645a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonGetInfoPopup.prefab @@ -1058,8 +1058,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -49.399994, y: 47.5} - m_SizeDelta: {x: 154, y: 139} + m_AnchoredPosition: {x: -21.7, y: 39.7} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1287097097289589055 CanvasRenderer: @@ -1089,7 +1089,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: 87b3cd7ab5ab3854db979a44d7e17767, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b75ff76a0993041ac8b194fbeb0c19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1329,10 +1329,10 @@ RectTransform: m_Father: {fileID: 1286417523841341701} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0024719238, y: 30} - m_SizeDelta: {x: 0, y: 102.59} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.0012359619, y: 45.02} + m_SizeDelta: {x: 933.99756, y: 68.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1284263027637220287 CanvasRenderer: @@ -1355,7 +1355,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.99607843, b: 0.8666667, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1363,9 +1363,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 50 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 56 @@ -1736,12 +1736,12 @@ RectTransform: m_Children: - {fileID: 6302636436601990190} m_Father: {fileID: 5755686125626719865} - m_RootOrder: 0 + 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} - m_AnchoredPosition: {x: 0.0062604, y: -47.4} - m_SizeDelta: {x: 373.8, y: 469.8} + m_AnchoredPosition: {x: 0.0062604, y: -28} + m_SizeDelta: {x: 373.8, y: 454.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &839139242251914855 CanvasRenderer: @@ -1854,6 +1854,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3735871402104001072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6029515885579771427} + - component: {fileID: 9187076534440948259} + - component: {fileID: 8438694783569404724} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6029515885579771427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735871402104001072} + 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: 5755686125626719865} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 11.829987, y: 12.469971} + m_SizeDelta: {x: -48.99, y: -51.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9187076534440948259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735871402104001072} + m_CullTransparentMesh: 0 +--- !u!114 &8438694783569404724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735871402104001072} + 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: db524d3ca12854646b84559dd3e346a3, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4019208874521308343 GameObject: m_ObjectHideFlags: 0 @@ -2581,8 +2655,10 @@ RectTransform: m_GameObject: {fileID: 5546315562738673783} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6029515885579771427} + - {fileID: 3467042426095822491} - {fileID: 6566066761052901280} - {fileID: 2739669693656712167} m_Father: {fileID: 1286417523841341701} @@ -2591,7 +2667,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0024674796, y: -9.5} - m_SizeDelta: {x: 934.5, y: 1268.7} + m_SizeDelta: {x: 1000, y: 1300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5757870973222865289 CanvasRenderer: @@ -2621,7 +2697,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: 2ac0991f398537e409ada574046b899c, type: 3} + m_Sprite: {fileID: 21300000, guid: 940944b9f77bb9a438ec3375abe29832, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2889,12 +2965,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5755686125626719865} - m_RootOrder: 1 + 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} - m_AnchoredPosition: {x: -0.012508, y: -320} - m_SizeDelta: {x: 934.53, y: 629.5} + m_AnchoredPosition: {x: -0.012508, y: -283.9} + m_SizeDelta: {x: 934.5, y: 625.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7376003713966556564 CanvasRenderer: @@ -2972,6 +3048,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 350, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6619901961297464532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4802893966280285949} + - component: {fileID: 4440393045263167545} + - component: {fileID: 3904019180504882124} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4802893966280285949 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619901961297464532} + 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: 3467042426095822491} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 46.2} + m_SizeDelta: {x: 642, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4440393045263167545 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619901961297464532} + m_CullTransparentMesh: 0 +--- !u!114 &3904019180504882124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619901961297464532} + 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: b105068399c35b842b41ad874dae29f0, 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 &6643174275679044315 GameObject: m_ObjectHideFlags: 0 @@ -3670,6 +3820,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8107660102859098137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3467042426095822491} + - component: {fileID: 8465650839951507680} + - component: {fileID: 6363455424331169746} + m_Layer: 5 + m_Name: TitleBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3467042426095822491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107660102859098137} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: + - {fileID: 4802893966280285949} + m_Father: {fileID: 5755686125626719865} + 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: 598.6} + m_SizeDelta: {x: 666, y: 124} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8465650839951507680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107660102859098137} + m_CullTransparentMesh: 0 +--- !u!114 &6363455424331169746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107660102859098137} + 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: 23f48f30ffa61104f8558bd46c51b2cd, 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 &8181136603907725158 GameObject: m_ObjectHideFlags: 0