diff --git a/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_4.png.meta b/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_4.png.meta index f1fd31a67..cb136f988 100644 --- a/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_4.png.meta +++ b/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_4.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 28, y: 28, z: 28, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 074f699d4..543c14923 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index c00ee715e..3ef36815b 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/module/shop/shop_const.lua.bytes b/Assets/lua/app/module/shop/shop_const.lua.bytes index afe50a2e8..9080b989b 100644 Binary files a/Assets/lua/app/module/shop/shop_const.lua.bytes and b/Assets/lua/app/module/shop/shop_const.lua.bytes differ diff --git a/Assets/lua/app/ui/sign/cell/sign_week_cell.lua.bytes b/Assets/lua/app/ui/sign/cell/sign_week_cell.lua.bytes index 0f861ad48..1934dd15e 100644 Binary files a/Assets/lua/app/ui/sign/cell/sign_week_cell.lua.bytes and b/Assets/lua/app/ui/sign/cell/sign_week_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/sign/comp/sign_week_comp.lua.bytes b/Assets/lua/app/ui/sign/comp/sign_week_comp.lua.bytes index a82ef63c8..017a4ceba 100644 Binary files a/Assets/lua/app/ui/sign/comp/sign_week_comp.lua.bytes and b/Assets/lua/app/ui/sign/comp/sign_week_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes b/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes index e3df634dc..c2df29823 100644 Binary files a/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes and b/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes index 53808184d..7e3222f5a 100644 Binary files a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/privilege_card/privilege_card_data.lua.bytes b/Assets/lua/app/userdata/privilege_card/privilege_card_data.lua.bytes index da4853ecf..8cdf48d6b 100644 Binary files a/Assets/lua/app/userdata/privilege_card/privilege_card_data.lua.bytes and b/Assets/lua/app/userdata/privilege_card/privilege_card_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes index 9d03ebd5d..58d0f3652 100644 Binary files a/Assets/lua/app/userdata/talent/talent_data.lua.bytes and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/prefabs/ui/sign/sign_main_ui.prefab b/Assets/prefabs/ui/sign/sign_main_ui.prefab index a5d93103d..8362543b6 100644 --- a/Assets/prefabs/ui/sign/sign_main_ui.prefab +++ b/Assets/prefabs/ui/sign/sign_main_ui.prefab @@ -727,7 +727,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} + m_Sprite: {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1668,8 +1668,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 56, y: -5} - m_SizeDelta: {x: 72, y: 78} + m_AnchoredPosition: {x: 85, y: -3} + m_SizeDelta: {x: 132, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6408737136447763040 CanvasRenderer: @@ -1699,7 +1699,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0068587080dd0488dad9da673f466698, type: 3} + m_Sprite: {fileID: 21300000, guid: bd3cdfd63768e3442ab4908a5f300e19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1947,7 +1947,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 0} + m_SizeDelta: {x: 540, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &4964843966816019046 CanvasRenderer: @@ -2118,6 +2118,10 @@ PrefabInstance: propertyPath: m_Name value: sign_week_comp objectReference: {fileID: 0} + - target: {fileID: 7578790876813054411, guid: 05d609bf89383464f86b1e2029a66a8a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05d609bf89383464f86b1e2029a66a8a, type: 3} --- !u!224 &758776590108975882 stripped diff --git a/Assets/prefabs/ui/sign/sign_week_comp.prefab b/Assets/prefabs/ui/sign/sign_week_comp.prefab index cb47f1cac..d073adad3 100644 --- a/Assets/prefabs/ui/sign/sign_week_comp.prefab +++ b/Assets/prefabs/ui/sign/sign_week_comp.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 61ce1ccf20ce6ba4b9518ae50c0bf728, type: 3} + m_Texture: {fileID: 2800000, guid: a9db43737faa448148ac02b282d9b24b, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -106,11 +106,11 @@ RectTransform: m_Father: {fileID: 6569408701357907310} m_RootOrder: 3 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: 10, y: -35} - m_SizeDelta: {x: 270, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 117, y: 28} + m_SizeDelta: {x: 340, y: 40} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &644707961204990406 CanvasRenderer: m_ObjectHideFlags: 0 @@ -149,7 +149,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294901759 - m_fontColor: {r: 1, g: 1, b: 0.99607843, a: 1} + m_fontColor: {r: 0.73333335, g: 1, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: @@ -173,7 +173,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 28 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -369,7 +369,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 2.9} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2283576838234297015 @@ -400,7 +400,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a0c02a1ed5650c448a8a19e37b31609a, type: 3} + m_Sprite: {fileID: 21300000, guid: bb3bc9c3abcc44f96aaeee600ba2c129, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -445,7 +445,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: 217.9, y: 47.7} + m_AnchoredPosition: {x: 217.9, y: 48} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4149836180711068561 @@ -479,14 +479,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.09019608, g: 0.53333336, b: 0.78431374, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -667,7 +667,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -87.3} - m_SizeDelta: {x: 636, y: 140} + m_SizeDelta: {x: 656, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &75296235594275441 MonoBehaviour: @@ -882,7 +882,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: 51, y: 2.7} + m_AnchoredPosition: {x: 25, y: 0} m_SizeDelta: {x: 253, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8982708322895892843 @@ -928,7 +928,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1237034937665842167 RectTransform: m_ObjectHideFlags: 0 @@ -1004,7 +1004,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2651417972476611083 RectTransform: m_ObjectHideFlags: 0 @@ -1233,10 +1233,10 @@ RectTransform: m_Father: {fileID: 3320486693178282334} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 134} - m_SizeDelta: {x: 680, y: -616} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -496} + m_SizeDelta: {x: 694, y: 648} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8685223406488530310 CanvasRenderer: @@ -1266,7 +1266,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4d7877e142604451784a7f315059b028, type: 3} + m_Sprite: {fileID: 21300000, guid: 73a7753b7a9b94237ac52eeede7e0755, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1330,7 +1330,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4423834148459590894 RectTransform: m_ObjectHideFlags: 0 @@ -1424,7 +1424,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: -130, y: 3} + m_AnchoredPosition: {x: -155, y: 0} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4607854957867678781 @@ -1464,7 +1464,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 217.9, y: 1} - m_SizeDelta: {x: 142, y: 72} + m_SizeDelta: {x: 134, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5587971013107875705 CanvasRenderer: @@ -1494,7 +1494,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5adee46260b493943a3faedd37435a99, type: 3} + m_Sprite: {fileID: 21300000, guid: c82e97263b05a4b4380d9849f16d7912, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1570,7 +1570,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 554eab72f7e2df342966b25bb015e124, type: 3} + m_Texture: {fileID: 2800000, guid: ea54e73e0b21a48cb955eafbea8cd472, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1604,17 +1604,17 @@ RectTransform: m_GameObject: {fileID: 5209237635607875603} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1237034937665842167} m_Father: {fileID: 6569408701357907310} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 210, y: 29} - m_SizeDelta: {x: 42, y: 44} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -283, y: -17} + m_SizeDelta: {x: 86, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3153691997059120044 CanvasRenderer: @@ -1644,7 +1644,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 87a7452c9489a664baecde1ba0f16a2f, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1689,7 +1689,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: 4} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 120, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3730911956484322578 @@ -1747,8 +1747,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1824,7 +1824,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: 4} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 120, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5982562468688645846 @@ -1882,12 +1882,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 + m_fontSize: 24 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 22 + m_fontSizeMax: 26 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1965,7 +1965,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 217.9, y: 1} - m_SizeDelta: {x: 142, y: 81} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8544401100397619043 CanvasRenderer: @@ -1995,8 +1995,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2051,9 +2051,9 @@ RectTransform: m_Father: {fileID: 6569408701357907310} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 210, y: 29} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -283, y: 28} m_SizeDelta: {x: 40, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3365295432050921507 @@ -2084,7 +2084,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3} + m_Sprite: {fileID: 21300000, guid: 521bce08b21fa8149b2e2f053c935d8e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2127,10 +2127,10 @@ RectTransform: m_Father: {fileID: 5118445166119638045} 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: 0, y: 7.5} - m_SizeDelta: {x: -20, y: -25} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 136, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8308762471222813264 CanvasRenderer: @@ -2314,11 +2314,11 @@ RectTransform: m_Father: {fileID: 6819961728119119920} 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: 13.049988, y: -7.5999985} - m_SizeDelta: {x: 473.9, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 36, y: -16} + m_SizeDelta: {x: 420, y: 40} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &9017777625502732456 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2374,12 +2374,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 20 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 14 - m_fontSizeMax: 24 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -2451,10 +2451,10 @@ RectTransform: m_Father: {fileID: 6569408701357907310} m_RootOrder: 4 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: 217, y: -59.6} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 217, y: 4} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8726339745400843106 CanvasRenderer: @@ -2484,8 +2484,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2753,7 +2753,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: -10} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5518475818363326999 @@ -2784,7 +2784,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 156e0fd603636ea43841d960f99b6967, type: 2} @@ -2793,8 +2793,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4283456289 - m_fontColor: {r: 0.12941177, g: 0.35686275, b: 0.3137255, a: 1} + rgba: 4290209861 + m_fontColor: {r: 0.27058825, g: 0.40784314, b: 0.7176471, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2811,8 +2811,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2894,7 +2894,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -406} - m_SizeDelta: {x: 0, y: 128} + m_SizeDelta: {x: 0, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6036314337175902170 CanvasRenderer: @@ -2924,8 +2924,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a1058ae55cb314f41a22a23e78e15013, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8d317fbd760a04cac8498a3f189687e5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2967,11 +2967,11 @@ RectTransform: m_Father: {fileID: 6819961728119119920} m_RootOrder: 0 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: -25.2, y: 26.3} - m_SizeDelta: {x: 400, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 36, y: 19} + m_SizeDelta: {x: 420, y: 40} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &8830777779757392167 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3010,7 +3010,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4283562495 - m_fontColor: {r: 1, g: 0.9764706, b: 0.31764707, a: 1} + m_fontColor: {r: 1, g: 0.9098039, b: 0.30980393, a: 1} m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: @@ -3032,7 +3032,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 14 - m_fontSizeMax: 30 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -3207,11 +3207,11 @@ RectTransform: m_Father: {fileID: 6569408701357907310} 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: -87.1} - m_SizeDelta: {x: 283, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 117, y: -17} + m_SizeDelta: {x: 340, y: 40} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &7454152384219220838 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3243,14 +3243,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4278982706 - m_fontColor: {r: 0.19607843, g: 0.09411765, b: 0.047058824, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3274,7 +3274,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 26 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -3399,8 +3399,8 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 640 - cellHeight: 150 + cellWidth: 656 + cellHeight: 148 perLineNum: 1 --- !u!222 &8866231340137205760 CanvasRenderer: @@ -3466,7 +3466,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 63, y: 6.200012} + m_AnchoredPosition: {x: 47, y: 0} m_SizeDelta: {x: 60, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7911117179709171372 @@ -3484,7 +3484,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8514486228672991315} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -3620,8 +3620,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -255} - m_SizeDelta: {x: 500, y: 117} + m_AnchoredPosition: {x: 13, y: -255} + m_SizeDelta: {x: 472, y: 112} m_Pivot: {x: 0, y: 1} --- !u!222 &7937455962922882760 CanvasRenderer: @@ -3651,7 +3651,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c7f408ac8d5a32c47b818eb7b82ccc0b, type: 3} + m_Sprite: {fileID: 21300000, guid: e60d512e7468a4164b708fc4a4438f43, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3699,7 +3699,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 30, y: -95} - m_SizeDelta: {x: 255, y: 34} + m_SizeDelta: {x: 256, y: 34} m_Pivot: {x: 0, y: 1} --- !u!222 &638958058042725494 CanvasRenderer: @@ -3729,7 +3729,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} + m_Sprite: {fileID: 21300000, guid: 79b105ace3ad8d747a6cdd5d9e08c890, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3815,7 +3815,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4282805530 - m_fontColor: {r: 0.101960786, g: 0.42745098, b: 0.27450982, a: 1} + m_fontColor: {r: 0.09019608, g: 0.53333336, b: 0.78431374, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3837,7 +3837,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 16 - m_fontSizeMax: 30 + m_fontSizeMax: 26 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -3919,11 +3919,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -3973,6 +3977,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name value: reward_cell_1 @@ -4034,11 +4042,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -4088,6 +4100,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name value: reward_cell @@ -4149,11 +4165,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -4203,6 +4223,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name value: reward_cell_2