diff --git a/Art_Atlas/10Email.spriteatlasv2 b/Art_Atlas/10Email.spriteatlasv2 index db6bb9bb..d4cf4fe3 100644 --- a/Art_Atlas/10Email.spriteatlasv2 +++ b/Art_Atlas/10Email.spriteatlasv2 @@ -18,4 +18,10 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: bd066d79b99a9c84db3c76bd2c004d46, type: 3} - {fileID: 21300000, guid: f8db21af4ae1bdf409f3eee59cbdc7dd, type: 3} - {fileID: 21300000, guid: 52ca864499ae9d949b49412be9e9941d, type: 3} + - {fileID: 21300000, guid: 008ec5ec6dab5ef46980602ae70b47db, type: 3} + - {fileID: 21300000, guid: ab3a187ee01e95c46b937535349bb17e, type: 3} + - {fileID: 21300000, guid: 76b06142ea20425479ea00374d02203e, type: 3} + - {fileID: 21300000, guid: 814db346421ee8547923a065af622ba9, type: 3} + - {fileID: 21300000, guid: 6c66a761cea15dc44a6c1b9121eb0d99, type: 3} + - {fileID: 21300000, guid: 55bfafed769c128439c24666c18ff69f, type: 3} m_IsVariant: 0 diff --git a/Art_Atlas/AtlasConfig.json b/Art_Atlas/AtlasConfig.json index 0bf15ab5..ea604c2b 100644 --- a/Art_Atlas/AtlasConfig.json +++ b/Art_Atlas/AtlasConfig.json @@ -1592,7 +1592,13 @@ "Assets/Art_SubModule/yyzl/10Email/image/email_pic_white.png", "Assets/Art_SubModule/yyzl/10Email/image/mail_icn_maozhuayin.png", "Assets/Art_SubModule/yyzl/10Email/image/merge_pic_mail_jindu.png", - "Assets/Art_SubModule/yyzl/10Email/image/merge_pic_mail_panel.png" + "Assets/Art_SubModule/yyzl/10Email/image/merge_pic_mail_panel.png", + "Assets/Art_SubModule/yyzl/10Email/image/10Email_bg_bottom.png", + "Assets/Art_SubModule/yyzl/10Email/image/10Email_bg_top.png", + "Assets/Art_SubModule/yyzl/10Email/image/10Email_bg_tw1.png", + "Assets/Art_SubModule/yyzl/10Email/image/10Email_bg_tw2.png", + "Assets/Art_SubModule/yyzl/10Email/image/10Email_img_mail.png", + "Assets/Art_SubModule/yyzl/10Email/image/merge_pic_mail_panel2.png" ] }, { @@ -2172,7 +2178,9 @@ "Assets/Art_SubModule/yyzl/Common/Small/TurnTable.png", "Assets/Art_SubModule/yyzl/Common/Small/collect_btn_big_blue.png", "Assets/Art_SubModule/yyzl/Common/Small/com_icn_flash.png", - "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/new_Production_energy_LV1.png" + "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/new_Production_energy_LV1.png", + "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_default.png", + "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_selected.png" ] }, { diff --git a/Art_Atlas/Common.spriteatlasv2 b/Art_Atlas/Common.spriteatlasv2 index 82667f0f..6e4900cb 100644 --- a/Art_Atlas/Common.spriteatlasv2 +++ b/Art_Atlas/Common.spriteatlasv2 @@ -185,4 +185,9 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 68369748f953a8149862063b02c2b93f, type: 3} - {fileID: 21300000, guid: 3f58193bf1828b34591d4e5847551c54, type: 3} - {fileID: 21300000, guid: 118fd5a2e79fbc54cb0e5b4f3294271f, type: 3} + - {fileID: 21300000, guid: 944ed5daf0a971b448dc1991c78308d7, type: 3} + - {fileID: 21300000, guid: 4d8b860e3bf992b44b4d9abed211eacf, type: 3} + - {fileID: 21300000, guid: f0ede3ba985ed0342bb8be5eb8416eed, type: 3} + - {fileID: 21300000, guid: bdae942aae4385444a8421ea1e7b5bb3, type: 3} + - {fileID: 21300000, guid: 904b96a856e81184d94c9604dc5f3a46, type: 3} m_IsVariant: 0 diff --git a/Art_Bytes/ArtAtlasConfig.bytes b/Art_Bytes/ArtAtlasConfig.bytes index 6d23c284..3725e8c5 100644 Binary files a/Art_Bytes/ArtAtlasConfig.bytes and b/Art_Bytes/ArtAtlasConfig.bytes differ diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index 1eadfc8c..ca5070e6 100644 Binary files a/Art_Bytes/ArtResourceConfig.bytes and b/Art_Bytes/ArtResourceConfig.bytes differ diff --git a/Art_Json/Common/CommonBackground.json b/Art_Json/Common/CommonBackground.json index 9951487c..903701d9 100644 --- a/Art_Json/Common/CommonBackground.json +++ b/Art_Json/Common/CommonBackground.json @@ -249,6 +249,14 @@ "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/homepage_icn_big_yellow2.png", "SpineAssetPath": "", "SpineAnimName": "" + }, + { + "Id": 32, + "Name": "merge_pic_Panel_mergebg_green", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_pic_Panel_mergebg_green.png", + "SpineAssetPath": "", + "SpineAnimName": "" } ] } \ No newline at end of file diff --git a/Art_Json/Common/CommonIcon.json b/Art_Json/Common/CommonIcon.json index d42d4652..cf4211c0 100644 --- a/Art_Json/Common/CommonIcon.json +++ b/Art_Json/Common/CommonIcon.json @@ -225,6 +225,22 @@ "SpritePath": "Assets/Art_SubModule/yyzl/22GiftPack/image/activity_icn_piggypink.png", "SpineAssetPath": "", "SpineAnimName": "" + }, + { + "Id": 30, + "Name": "Common_bd_default", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_default.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 31, + "Name": "Common_bd_selected", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/Common_bd_selected.png", + "SpineAssetPath": "", + "SpineAnimName": "" } ] } \ No newline at end of file diff --git a/Art_SO/Common/CommonBackground.asset b/Art_SO/Common/CommonBackground.asset index 63dd1fca..0f188d6f 100644 --- a/Art_SO/Common/CommonBackground.asset +++ b/Art_SO/Common/CommonBackground.asset @@ -263,3 +263,11 @@ MonoBehaviour: SpineAsset: {fileID: 0} SpineAssetPath: SpineAnimName: + - Id: 32 + Name: merge_pic_Panel_mergebg_green + Desc: + Sprite: {fileID: 21300000, guid: 9cdbe400240012b4aab7706dbb03473a, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_pic_Panel_mergebg_green.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/Art_SO/Common/CommonIcon.asset b/Art_SO/Common/CommonIcon.asset index 29836a0b..9d0fb348 100644 --- a/Art_SO/Common/CommonIcon.asset +++ b/Art_SO/Common/CommonIcon.asset @@ -239,3 +239,19 @@ MonoBehaviour: SpineAsset: {fileID: 0} SpineAssetPath: SpineAnimName: + - Id: 30 + Name: Common_bd_default + Desc: + Sprite: {fileID: 21300000, guid: bdae942aae4385444a8421ea1e7b5bb3, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/Common_bd_default.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 31 + Name: Common_bd_selected + Desc: + Sprite: {fileID: 21300000, guid: 904b96a856e81184d94c9604dc5f3a46, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/Common_bd_selected.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/yyzl/10Email/EmailItem.prefab b/yyzl/10Email/EmailItem.prefab index 7c38e006..19833887 100644 --- a/yyzl/10Email/EmailItem.prefab +++ b/yyzl/10Email/EmailItem.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1042083204766465796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7232437621472961823} + - component: {fileID: 2851209829889718930} + - component: {fileID: 8132535705641707771} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7232437621472961823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042083204766465796} + 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: 8611828822354067268} + 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: 0} + m_SizeDelta: {x: 77, y: 63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2851209829889718930 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042083204766465796} + m_CullTransparentMesh: 1 +--- !u!114 &8132535705641707771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042083204766465796} + 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: 1da91eb4801b9c44da6c420ecbb56fcc, 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 &1085710724759246355 GameObject: m_ObjectHideFlags: 0 @@ -93,7 +168,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8844983222305037566 RectTransform: m_ObjectHideFlags: 0 @@ -259,7 +334,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -324, y: 7} - m_SizeDelta: {x: 150, y: 140} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1772022038127230195 CanvasRenderer: @@ -289,7 +364,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5acbb99815b739b44b657d66e801dbec, type: 3} + m_Sprite: {fileID: 21300000, guid: 2c06042a4c4d0a44091dc4ea8851153f, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -392,7 +467,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3173523724732765644 RectTransform: m_ObjectHideFlags: 0 @@ -526,12 +601,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7122640562384042555} + - {fileID: 7232437621472961823} m_Father: {fileID: 2326408780123518111} 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.5, y: 120} - m_SizeDelta: {x: 125, y: 125} + m_AnchoredPosition: {x: 45, y: -20} + m_SizeDelta: {x: 85, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6529363281394869594 CanvasRenderer: @@ -605,15 +681,17 @@ RectTransform: - {fileID: 2350708373831253061} - {fileID: 317919003705392463} - {fileID: 5660604182776250187} + - {fileID: 7065781794057938919} - {fileID: 8844983222305037566} - {fileID: 8792368013371949216} + - {fileID: 3507022875515338308} - {fileID: 2326408780123518111} m_Father: {fileID: 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: -87.5, y: -662} - m_SizeDelta: {x: 867, y: 230} + m_SizeDelta: {x: 867, y: 220} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8924096785605058175 CanvasRenderer: @@ -643,7 +721,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 97e567c677dbc56418475454d967e4f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 904b96a856e81184d94c9604dc5f3a46, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -838,16 +916,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5530953305517796833} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2326408780123518111} + m_Father: {fileID: 8164043746222182538} 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: 40.2} + m_AnchoredPosition: {x: -139, y: -23} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2982899741501592938 @@ -912,7 +990,7 @@ MonoBehaviour: m_fontSizeMin: 2 m_fontSizeMax: 30 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1136,7 +1214,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3507022875515338308} - {fileID: 3357216875210308293} - {fileID: 3173523724732765644} - {fileID: 8611828822354067268} @@ -1168,8 +1245,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1323,7 +1400,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7122640562384042555 RectTransform: m_ObjectHideFlags: 0 @@ -1599,6 +1676,153 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7775726288210512696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7065781794057938919} + - component: {fileID: 3140254485198458640} + - component: {fileID: 1266974611894238904} + - component: {fileID: 7574743004654754525} + m_Layer: 5 + m_Name: TitleUnread + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7065781794057938919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7775726288210512696} + 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: 8164043746222182538} + 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, y: 47} + m_SizeDelta: {x: 422.1656, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3140254485198458640 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7775726288210512696} + m_CullTransparentMesh: 1 +--- !u!114 &1266974611894238904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7775726288210512696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 762a1c76c61ff6f44864797c01cf0c88, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Dear players,sorry about the update issus + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 092f67588c55fa649ab678f822abd112, 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_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 28.75 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 2 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7574743004654754525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7775726288210512696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7921279187381696221 GameObject: m_ObjectHideFlags: 0 @@ -1693,7 +1917,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3357216875210308293 RectTransform: m_ObjectHideFlags: 0 @@ -1710,8 +1934,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.5, y: 120} - m_SizeDelta: {x: 125, y: 125} + m_AnchoredPosition: {x: 45, y: -20} + m_SizeDelta: {x: 85, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1772780890671035074 CanvasRenderer: diff --git a/yyzl/10Email/EmailMainPanel.prefab b/yyzl/10Email/EmailMainPanel.prefab index bb21f631..d5c7a619 100644 --- a/yyzl/10Email/EmailMainPanel.prefab +++ b/yyzl/10Email/EmailMainPanel.prefab @@ -124,7 +124,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5454289129456882560 RectTransform: m_ObjectHideFlags: 0 @@ -216,7 +216,7 @@ RectTransform: m_Father: {fileID: 5071859731155141048} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.7019738} m_AnchoredPosition: {x: 0, y: 70} m_SizeDelta: {x: 17, y: 151} m_Pivot: {x: 0.5, y: 0.5} @@ -1431,9 +1431,9 @@ RectTransform: m_Father: {fileID: 913432075698242888} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -18.6, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7354645005298159151 CanvasRenderer: @@ -2058,7 +2058,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 0} + m_SizeDelta: {x: 800, y: 1477.69} m_Pivot: {x: 0, y: 1} --- !u!222 &3046553524651731328 CanvasRenderer: @@ -3054,7 +3054,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 53.45 + m_fontSize: 51 m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -4042,7 +4042,7 @@ MonoBehaviour: m_Top: 20 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 15 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/yyzl/Common/Small/Common_bd_selected.png.meta b/yyzl/Common/Small/Common_bd_selected.png.meta index 79182201..5aeb71c8 100644 --- a/yyzl/Common/Small/Common_bd_selected.png.meta +++ b/yyzl/Common/Small/Common_bd_selected.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 67, y: 68, z: 67, w: 67} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []