diff --git a/Assets/arts/textures/ui/common/common_bg_46.png.meta b/Assets/arts/textures/ui/common/common_bg_46.png.meta index 410404020..592e0fe37 100644 --- a/Assets/arts/textures/ui/common/common_bg_46.png.meta +++ b/Assets/arts/textures/ui/common/common_bg_46.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: 12, y: 12, z: 12, w: 12} 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/arts/textures/ui/fund/fund_bg_1_1.png.meta b/Assets/arts/textures/ui/fund/fund_bg_1_1.png.meta index e74410642..4555ebad3 100644 --- a/Assets/arts/textures/ui/fund/fund_bg_1_1.png.meta +++ b/Assets/arts/textures/ui/fund/fund_bg_1_1.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: 240, y: 23, z: 361, w: 67} 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/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 1b98e435e..e1c86ac74 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes index 2ec945168..053634532 100644 Binary files a/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes and b/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab index a4aee507c..75dbbbb8e 100644 --- a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab @@ -147,7 +147,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: -95, y: 0} + m_AnchoredPosition: {x: -107, y: 0} m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6836071231361248482 @@ -188,7 +188,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4280559665 - m_fontColor: {r: 0.19215687, g: 0.15686275, b: 0.14117648, a: 1} + m_fontColor: {r: 0.34117648, g: 0.1254902, b: 0.50980395, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -205,12 +205,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -667,7 +667,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: 170, y: 0} + m_AnchoredPosition: {x: 174, y: 0} m_SizeDelta: {x: 260, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1557445239623208300 @@ -708,7 +708,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278197941 - m_fontColor: {r: 0.70980394, g: 0.11764706, b: 0, a: 1} + m_fontColor: {r: 0.34117648, g: 0.1254902, b: 0.50980395, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -725,12 +725,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1353,7 +1353,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 100, y: 48} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6067300755569451790 CanvasRenderer: @@ -1383,7 +1383,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d442af07ea02c6b4eb6b62361f921729, type: 3} + m_Sprite: {fileID: 21300000, guid: c71812f16075047a4bed5d180498065c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1428,11 +1428,11 @@ RectTransform: m_Father: {fileID: 7447859251256879210} m_RootOrder: 0 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: 47, y: 0} - m_SizeDelta: {x: 190, y: 76} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -183, y: 0} + m_SizeDelta: {x: 156, y: 68} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1068612609602852098 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1461,8 +1461,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1787,11 +1787,11 @@ RectTransform: m_Father: {fileID: 5803352611547744195} m_RootOrder: 0 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: 24, y: 17} - m_SizeDelta: {x: 394, y: 46} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 280, y: 46} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9140028355339004701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1830,7 +1830,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4286316445 - m_fontColor: {r: 0.6156863, g: 1, b: 0.48235294, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1847,14 +1847,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 20 m_fontSizeMax: 30 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2133,13 +2133,14 @@ RectTransform: m_Children: - {fileID: 3271065317867163963} - {fileID: 6370813537043075987} + - {fileID: 9144740701880374163} m_Father: {fileID: 3696810091675979774} 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: -2, y: -226} - m_SizeDelta: {x: 412, y: 78} + m_AnchoredPosition: {x: 31, y: -224} + m_SizeDelta: {x: 286, y: 96} m_Pivot: {x: 0, y: 1} --- !u!222 &4559766042588961237 CanvasRenderer: @@ -2162,15 +2163,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.9411765} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5da8fae6f60c59845b0bd13f86d15bc4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 51055eb9cf4f94f28b380c0a96047c79, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2462,7 +2463,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 362} + m_SizeDelta: {x: 1280, y: 373} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4594304111367787504 CanvasRenderer: @@ -3220,7 +3221,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: 636, y: 140} + m_SizeDelta: {x: 656, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5358921860271559653 CanvasRenderer: @@ -3250,8 +3251,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8efe15bf06dad4244bf59791f5725025, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9e9516f6479744f4288e52e5b3280fe1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4198,6 +4199,10 @@ MonoBehaviour: hashName: 358724593 objectType: 0 gameObject: {fileID: 6895459077583918704} + - name: fund_chapter_comp.top.bg.icon + hashName: 2309050998 + objectType: 0 + gameObject: {fileID: 7769961789488248626} --- !u!1 &3597599737446636465 GameObject: m_ObjectHideFlags: 0 @@ -4515,10 +4520,10 @@ RectTransform: m_Father: {fileID: 579018460426849032} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8937208383380877637 CanvasRenderer: @@ -4551,14 +4556,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 156e0fd603636ea43841d960f99b6967, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4281159839 - m_fontColor: {r: 0.62352943, g: 0.3137255, b: 0.1764706, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4866,7 +4871,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -5137,7 +5142,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: 170, y: 0} + m_AnchoredPosition: {x: 175, y: 0} m_SizeDelta: {x: 250, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2358955453396330985 @@ -5354,7 +5359,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 554eab72f7e2df342966b25bb015e124, type: 3} + m_Sprite: {fileID: 21300000, guid: 5ff5fc316cf674fcc80fd6e254bd3d81, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5424,7 +5429,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -5797,11 +5802,11 @@ RectTransform: m_Father: {fileID: 5803352611547744195} 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: 24, y: -19} - m_SizeDelta: {x: 394, y: 46} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -19} + m_SizeDelta: {x: 40, y: 46} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544252558585464748 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5832,15 +5837,15 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4289917951 - m_fontColor: {r: 1, g: 0.9529412, b: 0.69803923, a: 1} + rgba: 4285857649 + m_fontColor: {r: 0.44313726, g: 1, b: 0.45490196, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5857,14 +5862,14 @@ 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: 20 m_fontSizeMax: 30 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -6013,7 +6018,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 19, y: 31} - m_SizeDelta: {x: 38, y: 38} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7732875022604163676 CanvasRenderer: @@ -6043,7 +6048,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c0b873750f9ad5044b8b09d65afe7d68, type: 3} + m_Sprite: {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6761,7 +6766,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0aa7ff8ca803e4343b3819a5b90e8387, type: 3} + m_Sprite: {fileID: 21300000, guid: 10c00b3e5d1b44cffb56c18e794f1b36, type: 3} m_FillDirection: 3 m_Value: 0.5 m_FillCenter: 1 @@ -8331,6 +8336,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7769961789488248626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9144740701880374163} + - component: {fileID: 7072438123778311633} + - component: {fileID: 3766777354865879900} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9144740701880374163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7769961789488248626} + 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_Children: [] + m_Father: {fileID: 5803352611547744195} + 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: -19} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7072438123778311633 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7769961789488248626} + m_CullTransparentMesh: 1 +--- !u!114 &3766777354865879900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7769961789488248626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7777972157789908996 GameObject: m_ObjectHideFlags: 0 @@ -8368,8 +8449,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: 180, y: 0} - m_SizeDelta: {x: 190, y: 76} + m_AnchoredPosition: {x: 183, y: 0} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1578853590489959477 CanvasRenderer: @@ -8399,8 +8480,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 @@ -8489,7 +8570,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3f1601ed78df5734992699bafa4c108a, type: 3} + m_Sprite: {fileID: 21300000, guid: 353ef30cc6e714f6bacf52da53a72e1c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8534,8 +8615,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: -255, y: 0} - m_SizeDelta: {x: 110, y: 50} + m_AnchoredPosition: {x: -258, y: 0} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4436938344080803942 CanvasRenderer: @@ -8575,7 +8656,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4280559665 - m_fontColor: {r: 0.19215687, g: 0.15686275, b: 0.14117648, a: 1} + m_fontColor: {r: 0.34117648, g: 0.1254902, b: 0.50980395, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -8592,12 +8673,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -8651,7 +8732,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1575718888451073066 RectTransform: m_ObjectHideFlags: 0 @@ -8882,7 +8963,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -9354,7 +9435,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: 27, y: -120} + m_AnchoredPosition: {x: 29, y: -63} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0, y: 1} --- !u!222 &3497311488892055765 @@ -9388,7 +9469,7 @@ 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: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9399,8 +9480,8 @@ MonoBehaviour: m_enableVertexGradient: 1 m_colorMode: 2 m_fontColorGradient: - topLeft: {r: 1, g: 0.94509804, b: 0.44313726, a: 1} - topRight: {r: 1, g: 0.94509804, b: 0.44313726, a: 1} + topLeft: {r: 1, g: 0.73333335, b: 0.44313726, a: 1} + topRight: {r: 1, g: 0.73333335, b: 0.44313726, a: 1} bottomLeft: {r: 1, g: 1, b: 1, a: 1} bottomRight: {r: 1, g: 1, b: 1, a: 1} m_fontColorGradientPreset: {fileID: 0} @@ -9491,7 +9572,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: -93.698975, y: 0} + m_AnchoredPosition: {x: -106, y: 0} m_SizeDelta: {x: 210, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5088553909644021567 @@ -9565,10 +9646,10 @@ RectTransform: m_Father: {fileID: 8293837076606017094} 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: -376} - m_SizeDelta: {x: 680, y: -698} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 264} + m_SizeDelta: {x: 680, y: 582} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8578553726053284260 CanvasRenderer: @@ -9627,8 +9708,8 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 636 - cellHeight: 160 + cellWidth: 656 + cellHeight: 150 perLineNum: 1 --- !u!114 &1431096996995606663 MonoBehaviour: @@ -9650,7 +9731,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 277f605e171ee2e40948455ffb093785, type: 3} + m_Sprite: {fileID: 21300000, guid: bc7004c8934a949c1841793f5cf82e6f, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9814,7 +9895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 636, y: 160} + m_SizeDelta: {x: 656, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7091434184345059590 MonoBehaviour: @@ -9941,7 +10022,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -10152,11 +10233,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.70000005 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10206,6 +10291,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 @@ -10267,11 +10356,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.70000005 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10321,6 +10414,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 @@ -10382,11 +10479,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.70000005 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10436,6 +10537,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 @@ -10497,11 +10602,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.70000005 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.70000005 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10551,6 +10660,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 diff --git a/Assets/prefabs/ui/fund/fund_level_comp.prefab b/Assets/prefabs/ui/fund/fund_level_comp.prefab index 838ec5d09..7ed793249 100644 --- a/Assets/prefabs/ui/fund/fund_level_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_level_comp.prefab @@ -10049,7 +10049,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 277f605e171ee2e40948455ffb093785, type: 3} + m_Sprite: {fileID: 21300000, guid: bc7004c8934a949c1841793f5cf82e6f, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1