diff --git a/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG b/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG new file mode 100644 index 0000000000..e471351e4c Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG differ diff --git a/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG.meta b/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG.meta new file mode 100644 index 0000000000..6ce0a025da --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Activities/OPX145.PNG.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cef9fddca1165094c981f958f7f86b49 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 218d61a196df7284c8a68e7205f1bf8f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab index 378d93ffb2..372fcc90e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab @@ -347,7 +347,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.000014544, y: 747.17786} + m_AnchoredPosition: {x: -0.000014544, y: 772.93787} m_SizeDelta: {x: 1080, y: 4.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164265030893954701 @@ -749,7 +749,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: -563.19995} + m_AnchoredPosition: {x: 0, y: -589.9994} m_SizeDelta: {x: 1080, y: 1490.01} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1514387076519238599 @@ -780,7 +780,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: 3caf39f3691ec3e4b9293af992abdcf9, type: 3} + m_Sprite: {fileID: 21300000, guid: 9521959de5831b04d90806abb50442bc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -995,7 +995,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5808250650198748761 RectTransform: m_ObjectHideFlags: 0 @@ -1013,7 +1013,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 960} - m_SizeDelta: {x: 1080, y: 816} + m_SizeDelta: {x: 1080, y: 101.36} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3916898085917912523 CanvasRenderer: @@ -1043,8 +1043,8 @@ 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: c64be4907cc279b4db93b2c3bb10798a, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1819,7 +1819,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: 355.14} + m_AnchoredPosition: {x: 0, y: 380.9} m_SizeDelta: {x: 1080, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4633612411572144839 @@ -1893,8 +1893,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.000061035, y: -326.6} - m_SizeDelta: {x: 1080, y: 144.7} + m_AnchoredPosition: {x: 0, y: -228.23997} + m_SizeDelta: {x: 1082, y: 293} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7798340295634743629 CanvasRenderer: @@ -1917,14 +1917,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13207549, g: 0.12646851, b: 0.12646851, a: 1} + 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: 0} + m_Sprite: {fileID: 21300000, guid: 3028b068b309b47409a50dd817c9eea2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3225,7 +3225,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: 675.065} + m_AnchoredPosition: {x: 0, y: 700.825} m_SizeDelta: {x: 1080, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5887046596240099614 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab index 86f119e97a..344ae8d733 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab @@ -36,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 652, y: -523} + m_AnchoredPosition: {x: 210, y: -204} m_SizeDelta: {x: 594.2, y: 100.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &525679525 @@ -14623,7 +14623,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 632, y: -411} + m_AnchoredPosition: {x: 180, y: -92} m_SizeDelta: {x: 594.2, y: 100.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8654007591988496273 @@ -14809,7 +14809,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -412} - m_SizeDelta: {x: 1082, y: 632} + m_SizeDelta: {x: 1155, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7798801616929473648 CanvasRenderer: @@ -14839,7 +14839,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: 03fb36e1221f0d7459a024785fdc566a, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ca262000cda7fd44b29819283372abc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14848,6 +14848,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3636362835180579010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3582609947690256146} + - component: {fileID: 1228702176543234053} + - component: {fileID: 1244197388758675587} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3582609947690256146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636362835180579010} + 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: 2542118471955123022} + 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, y: 909} + m_SizeDelta: {x: 1080, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1228702176543234053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636362835180579010} + m_CullTransparentMesh: 0 +--- !u!114 &1244197388758675587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636362835180579010} + 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: 420d1d17a3d5ced4cb07001dd98f9852, 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 &3809959360782257665 GameObject: m_ObjectHideFlags: 0 @@ -34379,7 +34453,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2542118471955123022} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -34440,7 +34514,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2494416448225732453 RectTransform: m_ObjectHideFlags: 0 @@ -34526,6 +34600,7 @@ RectTransform: m_Children: - {fileID: 908440470530249504} - {fileID: 984156290069449932} + - {fileID: 3582609947690256146} - {fileID: 1898452653011862347} - {fileID: 4693936238204026768} - {fileID: 4510560238410325023} @@ -34567,12 +34642,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2542118471955123022} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.0049629, y: 68.799805} - m_SizeDelta: {x: 1080, y: 137.7} + m_AnchoredPosition: {x: 0.0049629, y: 143} + m_SizeDelta: {x: 1082, y: 293} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5129970432395700810 CanvasRenderer: @@ -34595,14 +34670,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.050980397, g: 0.06666667, b: 0.078431375, a: 1} + 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: 0} + m_Sprite: {fileID: 21300000, guid: 3028b068b309b47409a50dd817c9eea2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -39478,7 +39553,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2542118471955123022} - m_RootOrder: 4 + 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}