From b6eed5b879c8e540032005ed62fcc30a32e9b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Fri, 26 Dec 2025 14:23:01 +0800 Subject: [PATCH] modify --- Client/.claude/settings.local.json | 8 + .../UI/Window/UILoadUpdateWindow.prefab | 1125 +++++------------ Client/Assets/Scenes/Desingn.unity | 618 +++++++-- .../Scripts/Hotfix/GameLogic/HotfixEntry.cs | 1 + .../Scripts/Hotfix/GameLogic/TestMono.cs | 20 + .../Scripts/Hotfix/GameLogic/TestMono.cs.meta | 3 + .../UI/Generate/ui_UILoadUpdateWindow.cs | 19 +- .../Hotfix/GameLogic/UI/TestRecyclerView.cs | 34 + .../GameLogic/UI/TestRecyclerView.cs.meta | 11 + .../GameLogic/UI/TestScrollViewHolder.cs | 9 +- .../Hotfix/GameLogic/UI/UILoadUpdate.cs | 49 +- .../Scripts/Startup/LauncherUIHandler.cs | 1 + .../Scripts/Startup/UI/UIGameLaunchWindow.cs | 2 +- Client/Assets/Test/GameLogic.dll.bytes | Bin 61440 -> 61440 bytes Client/Assets/Test/GameLogic.pdb.bytes | Bin 24940 -> 25208 bytes .../Simulate/DefaultPackage.version | 1 + .../Simulate/DefaultPackage_Simulate.bytes | Bin 0 -> 2643 bytes .../Simulate/DefaultPackage_Simulate.hash | 1 + .../Simulate/DefaultPackage_Simulate.json | 332 +++++ Client/Packages/com.alicizax.unity.framework | 2 +- .../Packages/com.alicizax.unity.ui.extension | 2 +- Client/Packages/manifest.json | 2 +- Client/Packages/packages-lock.json | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 3 +- Client/ProjectSettings/TimelineSettings.asset | 16 + .../UIGenerateConfiguration.asset | 2 +- Client/UserSettings/EditorUserSettings.asset | 4 +- Client/UserSettings/Layouts/default-2022.dwlt | 122 +- 28 files changed, 1359 insertions(+), 1030 deletions(-) create mode 100644 Client/.claude/settings.local.json create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs.meta create mode 100644 Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage.version create mode 100644 Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes create mode 100644 Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash create mode 100644 Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json create mode 100644 Client/ProjectSettings/TimelineSettings.asset diff --git a/Client/.claude/settings.local.json b/Client/.claude/settings.local.json new file mode 100644 index 0000000..2eb0ffe --- /dev/null +++ b/Client/.claude/settings.local.json @@ -0,0 +1,8 @@ +{ + "permissions": { + "allow": [ + "Bash(git rm \"Runtime/RecyclerView/RecyclerViewBuilder.cs\")", + "Bash(git add -A)" + ] + } +} diff --git a/Client/Assets/Bundles/UI/Window/UILoadUpdateWindow.prefab b/Client/Assets/Bundles/UI/Window/UILoadUpdateWindow.prefab index fe67d5b..b2f5e82 100644 --- a/Client/Assets/Bundles/UI/Window/UILoadUpdateWindow.prefab +++ b/Client/Assets/Bundles/UI/Window/UILoadUpdateWindow.prefab @@ -1,5 +1,184 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &13453462280259649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 595079502873929697} + - component: {fileID: 6045476244398503520} + - component: {fileID: 3754033378428747194} + - component: {fileID: 3596253569820580282} + - component: {fileID: 3077084243377102358} + m_Layer: 5 + m_Name: TestViewHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &595079502873929697 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + 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: + - {fileID: 435932265509423207} + m_Father: {fileID: 5086806237606523596} + 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.0030568, y: 171.86} + m_SizeDelta: {x: 250, y: 56.27} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6045476244398503520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + m_CullTransparentMesh: 1 +--- !u!114 &3754033378428747194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} + 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: 0} + 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 + m_ColorType: 0 + m_GradientColor: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_Direction: 0 + m_OriginFlipMode: 0 + m_FlipMode: 0 + m_FlipWithCopy: 1 + m_FlipEdgeHorizontal: 2 + m_FlipEdgeVertical: 5 + m_FlipFillCenter: 3 + m_FlipDirection: 3 +--- !u!114 &3596253569820580282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f0ca321f54751b458b8e51698dab5a8, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 5232094481069283953} +--- !u!114 &3077084243377102358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3754033378428747194} + m_ChildTransitions: [] + _hotkeyAction: {fileID: 0} + _hotkeyPressType: 0 + hoverAudioClip: {fileID: 0} + clickAudioClip: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &526598954257632073 GameObject: m_ObjectHideFlags: 0 @@ -36,13 +215,7 @@ RectTransform: m_Children: - {fileID: 4895621795869014129} - {fileID: 1704299463378025474} - - {fileID: 2889515176016025754} - - {fileID: 5680728806383158631} - - {fileID: 4645770020927040253} - - {fileID: 6056289203651508232} - - {fileID: 8277505350050533328} - - {fileID: 434786077437263718} - - {fileID: 6450832602823646900} + - {fileID: 7522346725214463714} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -118,28 +291,7 @@ MonoBehaviour: mImgBackGround: {fileID: 881789250053677664} mBtnTest: {fileID: 8242433937099588481} mTextTitl: {fileID: 7423448528652229462} - mTextGameTitle: {fileID: 4229038960500937347} - mObjTestList: - - {fileID: 2580813499182288580} - - {fileID: 5217023009503673661} - - {fileID: 2070341851612434847} - - {fileID: 3075848250350631692} - - {fileID: 6906437026743455523} - - {fileID: 1733702088294755917} - mImgTestList: - - {fileID: 4753672883913794088} - - {fileID: 19703495912376014} - - {fileID: 4185039174538723206} - - {fileID: 1057851142068418248} - - {fileID: 6926886040523368586} - - {fileID: 4911364472039860152} - mCanvasGroupTestList: - - {fileID: 8659972988376294145} - - {fileID: 188176691515685520} - - {fileID: 4563810544014715074} - - {fileID: 2060993977344163427} - - {fileID: 2080853874740608963} - - {fileID: 9040300679633372597} + mScrollViewTestList: {fileID: 3482583127883842067} --- !u!114 &2333725313425952563 MonoBehaviour: m_ObjectHideFlags: 0 @@ -183,7 +335,7 @@ MonoBehaviour: uuid: 052a4cdb-50cb-44b3-876f-90639a028620 LoopCount: 1 Name: ---- !u!1 &1733702088294755917 +--- !u!1 &541431694581587512 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -191,307 +343,104 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6450832602823646900} - - component: {fileID: 7414234782880229079} - - component: {fileID: 4911364472039860152} - - component: {fileID: 9040300679633372597} + - component: {fileID: 5086806237606523596} + - component: {fileID: 7689140107931782848} m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*4 1' + m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6450832602823646900 +--- !u!224 &5086806237606523596 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733702088294755917} + m_GameObject: {fileID: 541431694581587512} + 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: + - {fileID: 595079502873929697} + m_Father: {fileID: 7522346725214463714} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7689140107931782848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541431694581587512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!1 &1985100731161123326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 435932265509423207} + - component: {fileID: 1104174360966712646} + - component: {fileID: 5232094481069283953} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &435932265509423207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985100731161123326} 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: 2553447206821208227} + m_Father: {fileID: 595079502873929697} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7414234782880229079 +--- !u!222 &1104174360966712646 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733702088294755917} + m_GameObject: {fileID: 1985100731161123326} m_CullTransparentMesh: 1 ---- !u!114 &4911364472039860152 +--- !u!114 &5232094481069283953 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733702088294755917} + m_GameObject: {fileID: 1985100731161123326} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - 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: 0} - 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 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &9040300679633372597 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733702088294755917} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &2070341851612434847 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6056289203651508232} - - component: {fileID: 3923961494973840968} - - component: {fileID: 4185039174538723206} - - component: {fileID: 4563810544014715074} - m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*2' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6056289203651508232 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070341851612434847} - 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: 2553447206821208227} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3923961494973840968 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070341851612434847} - m_CullTransparentMesh: 1 ---- !u!114 &4185039174538723206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070341851612434847} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - 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: 0} - 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 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &4563810544014715074 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070341851612434847} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &2129114196574798884 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2889515176016025754} - - component: {fileID: 4316998201337448832} - - component: {fileID: 4229038960500937347} - m_Layer: 5 - m_Name: Text@GameTitle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2889515176016025754 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129114196574798884} - 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: 2553447206821208227} - 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: -22.212296, y: 84.000015} - m_SizeDelta: {x: 275.5753, y: 68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4316998201337448832 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129114196574798884} - m_CullTransparentMesh: 1 ---- !u!114 &4229038960500937347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129114196574798884} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd17b8b605f2ba540bac156b5cf5ac77, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -502,17 +451,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: dsadsadsa + m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} + m_sharedMaterial: {fileID: -1232377485662373643, guid: 7cdd102360e32234383f8e3f40da47a9, 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} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -529,15 +478,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35.31 - m_fontSizeBase: 35.31 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -545,12 +494,12 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 + m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -571,135 +520,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} - m_localizationID: 74156087 - m_localizationKey: Input.actiondsad.movedsa ---- !u!1 &2580813499182288580 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5680728806383158631} - - component: {fileID: 5555679621667006311} - - component: {fileID: 4753672883913794088} - - component: {fileID: 8659972988376294145} - m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*0' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5680728806383158631 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2580813499182288580} - 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: 2553447206821208227} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5555679621667006311 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2580813499182288580} - m_CullTransparentMesh: 1 ---- !u!114 &4753672883913794088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2580813499182288580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - 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: 0} - 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 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &8659972988376294145 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2580813499182288580} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!1 &2753172308494168843 GameObject: m_ObjectHideFlags: 0 @@ -789,42 +609,44 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} m_Name: m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled m_Interactable: 1 - m_Mode: 0 + m_TargetGraphic: {fileID: 7970913169150773174} + m_ChildTransitions: [] + _hotkeyAction: {fileID: 0} + _hotkeyPressType: 0 + hoverAudioClip: {fileID: 0} + clickAudioClip: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TransitionData: - targetGraphic: {fileID: 7970913169150773174} - transition: 1 - colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 1} - m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} - m_DisabledColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 0.5} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - spriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - animationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_ChildTransitions: [] - m_UXGroup: {fileID: 0} - hoverAudioClip: {fileID: 0} - clickAudioClip: {fileID: 0} - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_SelectionState: 0 ---- !u!1 &3075848250350631692 +--- !u!1 &3365040644835594956 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -832,58 +654,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8277505350050533328} - - component: {fileID: 6236586742684950751} - - component: {fileID: 1057851142068418248} - - component: {fileID: 2060993977344163427} + - component: {fileID: 7522346725214463714} + - component: {fileID: 7425209180716806519} + - component: {fileID: 162949476695556915} + - component: {fileID: 3482583127883842067} + - component: {fileID: 950606262313515452} m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*3' + m_Name: ScrollView@TestList m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8277505350050533328 +--- !u!224 &7522346725214463714 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3075848250350631692} + m_GameObject: {fileID: 3365040644835594956} 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_Children: + - {fileID: 5086806237606523596} m_Father: {fileID: 2553447206821208227} 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: 100, y: 100} + m_AnchoredPosition: {x: 566.3517, y: -54.552372} + m_SizeDelta: {x: 519.2966, y: 677.1028} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6236586742684950751 +--- !u!222 &7425209180716806519 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3075848250350631692} + m_GameObject: {fileID: 3365040644835594956} m_CullTransparentMesh: 1 ---- !u!114 &1057851142068418248 +--- !u!114 &162949476695556915 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3075848250350631692} + m_GameObject: {fileID: 3365040644835594956} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Material: {fileID: 0} + m_Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -900,184 +724,54 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &2060993977344163427 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3075848250350631692} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &5217023009503673661 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4645770020927040253} - - component: {fileID: 4733251711367251655} - - component: {fileID: 19703495912376014} - - component: {fileID: 188176691515685520} - m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*1' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4645770020927040253 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5217023009503673661} - 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: 2553447206821208227} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4733251711367251655 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5217023009503673661} - m_CullTransparentMesh: 1 ---- !u!114 &19703495912376014 +--- !u!114 &3482583127883842067 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5217023009503673661} + m_GameObject: {fileID: 3365040644835594956} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} + m_Script: {fileID: 11500000, guid: 7efd8e83d2092b347952108134dc37eb, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - 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: 0} - 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 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &188176691515685520 -CanvasGroup: + direction: 0 + alignment: 2 + content: {fileID: 5086806237606523596} + spacing: {x: 0, y: 5} + padding: {x: 0, y: 0} + scroll: 1 + snap: 0 + scrollSpeed: 1 + wheelSpeed: 10 + templates: + - {fileID: 3596253569820580282} + _scrollerTypeName: AlicizaX.UI.Scroller + _scroller: {fileID: 950606262313515452} + _showScrollBar: 0 + _scrollbar: {fileID: 0} + _layoutManagerTypeName: AlicizaX.UI.LinearLayoutManager + _layoutManager: + rid: 6739296565164244992 + references: + version: 2 + RefIds: + - rid: 6739296565164244992 + type: {class: LinearLayoutManager, ns: AlicizaX.UI, asm: AlicizaX.UI.Extension} + data: +--- !u!114 &950606262313515452 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5217023009503673661} + m_GameObject: {fileID: 3365040644835594956} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b7de4cb3a1546e4a9ade6b8dbf8af92, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5796037856908370449 GameObject: m_ObjectHideFlags: 0 @@ -1153,133 +847,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6906437026743455523 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 434786077437263718} - - component: {fileID: 6418218114197472328} - - component: {fileID: 6926886040523368586} - - component: {fileID: 2080853874740608963} - m_Layer: 5 - m_Name: '*Obj#Img#CanvasGroup@Test*4' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &434786077437263718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6906437026743455523} - 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: 2553447206821208227} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6418218114197472328 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6906437026743455523} - m_CullTransparentMesh: 1 ---- !u!114 &6926886040523368586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6906437026743455523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} - 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: 0} - 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 - m_ColorType: 0 - m_GradientColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_Direction: 0 - m_OriginFlipMode: 0 - m_FlipMode: 0 - m_FlipWithCopy: 1 - m_FlipEdgeHorizontal: 2 - m_FlipEdgeVertical: 5 - m_FlipFillCenter: 3 - m_FlipDirection: 3 ---- !u!225 &2080853874740608963 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6906437026743455523} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!1 &6907720724719909649 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scenes/Desingn.unity b/Client/Assets/Scenes/Desingn.unity index 20f77f5..676816c 100644 --- a/Client/Assets/Scenes/Desingn.unity +++ b/Client/Assets/Scenes/Desingn.unity @@ -240,6 +240,185 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &529427120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 529427121} + - component: {fileID: 529427124} + - component: {fileID: 529427123} + - component: {fileID: 529427122} + - component: {fileID: 529427125} + m_Layer: 5 + m_Name: UXImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &529427121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529427120} + 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: + - {fileID: 1801506112} + m_Father: {fileID: 8612589214826263188} + 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: -502.88812, y: 20.006592} + m_SizeDelta: {x: 250, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &529427122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529427120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f0ca321f54751b458b8e51698dab5a8, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1801506113} +--- !u!114 &529427123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529427120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} + m_Color: {r: 1, g: 0, b: 0, 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: 0} + 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 + m_ColorType: 0 + m_GradientColor: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_Direction: 0 + m_OriginFlipMode: 0 + m_FlipMode: 0 + m_FlipWithCopy: 1 + m_FlipEdgeHorizontal: 2 + m_FlipEdgeVertical: 5 + m_FlipFillCenter: 3 + m_FlipDirection: 3 +--- !u!222 &529427124 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529427120} + m_CullTransparentMesh: 1 +--- !u!114 &529427125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529427120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 529427123} + m_ChildTransitions: [] + _hotkeyAction: {fileID: 0} + _hotkeyPressType: 0 + hoverAudioClip: {fileID: 0} + clickAudioClip: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &727435695 GameObject: m_ObjectHideFlags: 0 @@ -269,8 +448,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f09b695799b281842af084a0cb741bdd, type: 3} m_Name: m_EditorClassIdentifier: - _button: {fileID: 0} - interactable: 1 --- !u!4 &727435697 Transform: m_ObjectHideFlags: 0 @@ -489,150 +666,335 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} insertIndex: -1 - addedObject: {fileID: 9163910065153779331} + addedObject: {fileID: 2231168299281511538} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} ---- !u!1001 &616751064842582793 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1162767588} - m_Modifications: - - target: {fileID: 3529610083755649764, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_Name - value: UICardWidget - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_SizeDelta.y - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7369916918447278109, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - propertyPath: m_BlockingMask.m_Bits - value: 4294967295 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3529610083755649764, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - insertIndex: -1 - addedObject: {fileID: 9163910065153779332} - m_SourcePrefab: {fileID: 100100000, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} ---- !u!1 &616751064842582794 stripped +--- !u!1 &1801506111 GameObject: - m_CorrespondingSourceObject: {fileID: 3529610083755649764, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - m_PrefabInstance: {fileID: 616751064842582793} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!224 &9163910065153779331 stripped + serializedVersion: 6 + m_Component: + - component: {fileID: 1801506112} + - component: {fileID: 1801506114} + - component: {fileID: 1801506113} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1801506112 RectTransform: - m_CorrespondingSourceObject: {fileID: 6054056368442846410, guid: b76991d3fd07df84983b6da7daa589c8, type: 3} - m_PrefabInstance: {fileID: 616751064842582793} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &9163910065153779332 + m_GameObject: {fileID: 1801506111} + 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: 529427121} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1801506113 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 616751064842582794} + m_GameObject: {fileID: 1801506111} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7859f2b76d69e044b4e966f48a3607d, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - AnimationNodes: - - rid: 7492395898541965312 + 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} + m_sharedMaterial: {fileID: -1232377485662373643, guid: 7cdd102360e32234383f8e3f40da47a9, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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!222 &1801506114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801506111} + m_CullTransparentMesh: 1 +--- !u!1 &211592613772681152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2231168299281511538} + - component: {fileID: 1614506036562619713} + - component: {fileID: 6279474556444803609} + - component: {fileID: 3519587243261575153} + - component: {fileID: 1215668337962229846} + - component: {fileID: 6279474556444803610} + m_Layer: 5 + m_Name: ScrollView218 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1215668337962229846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b7de4cb3a1546e4a9ade6b8dbf8af92, type: 3} + m_Name: + m_EditorClassIdentifier: + dragStopTime: 0 +--- !u!222 &1614506036562619713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + m_CullTransparentMesh: 1 +--- !u!224 &2231168299281511538 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + 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: + - {fileID: 8612589214826263188} + m_Father: {fileID: 1162767588} + 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: 165.69, y: -0.0041656} + m_SizeDelta: {x: 581.38, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3519587243261575153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7efd8e83d2092b347952108134dc37eb, type: 3} + m_Name: + m_EditorClassIdentifier: + direction: 0 + alignment: 1 + spacing: {x: 0, y: 5} + padding: {x: 0, y: 0} + scroll: 1 + snap: 0 + scrollSpeed: 10 + wheelSpeed: 30 + templates: + - {fileID: 529427122} + content: {fileID: 8612589214826263188} + showScrollBar: 0 + scrollbar: {fileID: 0} + _layoutManagerTypeName: AlicizaX.UI.LinearLayoutManager + layoutManager: + rid: 6739296571988901898 + _scrollerTypeName: AlicizaX.UI.Scroller + scroller: {fileID: 1215668337962229846} references: version: 2 RefIds: - - rid: 7492395898541965312 - type: {class: EntryNode, ns: AlicizaX.AnimationFlow.Runtime, asm: AlicizaX.AnimationFlow.Runtime} - data: - elapsedTime: 0 - Childs: [] - State: 0 - nodePos: {x: 82, y: 224} - uuid: 41567eb1-fe81-4f82-9395-2d5fd101c962 - LoopCount: 1 - Name: + - rid: 6739296571988901898 + type: {class: LinearLayoutManager, ns: AlicizaX.UI, asm: AlicizaX.UI.Extension} + data: +--- !u!114 &3711997151913529392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799260367698656391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!114 &6279474556444803609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + 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: 0.6886792, g: 0.6886792, b: 0.6886792, 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: 0} + 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!114 &6279474556444803610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211592613772681152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 637c97da349bee64fa4b59f2d9ddcdea, type: 3} + m_Name: + m_EditorClassIdentifier: + itemListView: {fileID: 3519587243261575153} +--- !u!1 &7799260367698656391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8612589214826263188} + - component: {fileID: 3711997151913529392} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8612589214826263188 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799260367698656391} + 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: + - {fileID: 529427121} + m_Father: {fileID: 2231168299281511538} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs index 3d9f4da..5dc7a77 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs @@ -44,6 +44,7 @@ namespace GameLogic Log.Info("加载多语言配置表完毕"); GameApp.UI.ShowUISync(); Log.Info("sdadasdas"); + // GameApp.UI.CloseUI(); } /// diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs new file mode 100644 index 0000000..5355c61 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs @@ -0,0 +1,20 @@ +using System; +using UnityEngine; + +namespace GameLogic +{ + public class TestMono : MonoBehaviour + { + [ContextMenu("Show")] + public void Show() + { + GameApp.UI.ShowUISync(); + } + + [ContextMenu("Close")] + public void Close() + { + GameApp.UI.CloseUI(); + } + } +} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta new file mode 100644 index 0000000..fc6702b --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 03d30ebd4c5e46dfad94ef05dec531b1 +timeCreated: 1766630030 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs index 63b6143..a761ae5 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs @@ -1,8 +1,7 @@ using UnityEngine; -using System.Collections.Generic; -using AlicizaX.UI; using UnityEngine.UI; using TMPro; +using AlicizaX.UI; using AlicizaX.UI.Runtime; namespace Game.UI { @@ -25,20 +24,8 @@ namespace Game.UI public TextMeshProUGUI TextTitl => mTextTitl; [SerializeField] - private UXTextMeshPro mTextGameTitle; - public UXTextMeshPro TextGameTitle => mTextGameTitle; - - [SerializeField] - private GameObject[] mObjTestList = new GameObject[6]; - public GameObject[] ObjTestList => mObjTestList; - - [SerializeField] - private UXImage[] mImgTestList = new UXImage[6]; - public UXImage[] ImgTestList => mImgTestList; - - [SerializeField] - private CanvasGroup[] mCanvasGroupTestList = new CanvasGroup[6]; - public CanvasGroup[] CanvasGroupTestList => mCanvasGroupTestList; + private RecyclerView mScrollViewTestList; + public RecyclerView ScrollViewTestList => mScrollViewTestList; #endregion diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs new file mode 100644 index 0000000..f59c1e3 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using AlicizaX.UI; +using UnityEngine; + +public class TestData : ISimpleViewData +{ + public string Name; +} + + +public class TestRecyclerView : MonoBehaviour +{ + public RecyclerView itemListView; + public UGList list; + + void Start() + { + list = UGListCreateHelper.Create(itemListView, (data) => { Debug.Log(data.Name); }); + + List datas = new(); + for (int i = 0; i < 150; i++) + { + datas.Add(new TestData { Name = $"Item {i}" }); + } + + list.Data = datas; + } + + private void OnBtnItemClick(TestData obj) + { + Debug.Log(obj.Name); + } +} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs.meta new file mode 100644 index 0000000..c1b69ca --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestRecyclerView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 637c97da349bee64fa4b59f2d9ddcdea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs index c345bd1..a31d6f2 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs @@ -1,12 +1,19 @@ using System.Collections; using System.Collections.Generic; using AlicizaX.UI; +using TMPro; using UnityEngine; +using UnityEngine.Serialization; public class TestScrollViewHolder : ViewHolder { + [SerializeField] private TextMeshProUGUI text; + public override void BindViewData(T data) { - + if (data is TestData testData) + { + text.text = testData.Name; + } } } diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs index b8dcc41..e426765 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs @@ -9,19 +9,21 @@ using GameLogic.Event; using GameLogic.UI; using UnityEngine; + [UIUpdate] -[Window(UILayer.UI, false, 160)] +[Window(UILayer.UI, false, 3)] public class UILoadUpdate : UITabWindow { - private UICardWidget testa; - private UICardWidget testb; + + protected override void OnInitialize() { baseui.ImgBackGround.color = Color.gray; baseui.BtnTest.onClick.AddListener(OnTestClick); - CreateTest(); + } + protected override void OnRegisterEvent(EventListenerProxy proxy) { proxy.AddUIEvent(OnHandleTestUIOpenEevent); @@ -29,44 +31,16 @@ public class UILoadUpdate : UITabWindow private void OnHandleTestUIOpenEevent(TestUIOpenEvent obj) { - } - private void CreateTest() - { - testa= CreateWidgetSync(baseui.RectTransform); - testb=CreateWidgetSync(baseui.RectTransform); - GameApp.Timer.AddTimer((t) => - { - DestroyTest(); - }, 5f); - } - private void DestroyTest() - { - testa.Destroy(); - testb.Destroy(); - GameApp.Timer.AddTimer((t) => - { - CreateTest(); - }, 10f); - } private void OnTestClick() { - EventPublisher.Publish(new TestUIOpenEvent("Test", false)); + int index = Random.Range(1000, 8000); + Debug.Log(index); + // list.RecyclerView.ScrollTo(index, true); } - public async UniTask TestFuncA() - { - await UniTask.Delay(1000); - Debug.Log("TestFuncA"); - } - - public void TestFuncB() - { - TestFuncA(); - Debug.Log("TestFuncB"); - } protected override void OnOpen() { @@ -77,4 +51,9 @@ public class UILoadUpdate : UITabWindow { Debug.Log("OnClose"); } + + protected override void OnDestroy() + { + Debug.Log("OnDestroy"); + } } diff --git a/Client/Assets/Scripts/Startup/LauncherUIHandler.cs b/Client/Assets/Scripts/Startup/LauncherUIHandler.cs index dc08729..4475798 100644 --- a/Client/Assets/Scripts/Startup/LauncherUIHandler.cs +++ b/Client/Assets/Scripts/Startup/LauncherUIHandler.cs @@ -24,6 +24,7 @@ namespace Unity.Startup.Procedure public static void Dispose() { eventRuntimeHandle.Dispose(); + GameApp.UI.CloseUI(); } private static float _lastUpdateDownloadedSize; diff --git a/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs index a325f8e..d2e4577 100644 --- a/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs +++ b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs @@ -3,7 +3,7 @@ using Game.UI; namespace Unity.Startup { - [Window(UILayer.UI,false,-1)] + [Window(UILayer.UI,false,0)] public class UIGameLaunchWindow:UIWindow { diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 3b37b3ab406c1574b5514d5000223f8911177f72..4532a81d26f54cc8328c64065d21754f2271a6d3 100644 GIT binary patch delta 12223 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 delta 12669 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 O)8vlQL!l495dRM&XwX;y diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index cb01ffb7e5c411bdcc76def3650a28516c65ad5b..55d0375137f071905617f0f0acf223324ae5e8a0 100644 GIT binary patch delta 5459 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 diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage.version b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage.version new file mode 100644 index 0000000..de541bb --- /dev/null +++ b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage.version @@ -0,0 +1 @@ +Simulate \ No newline at end of file diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes new file mode 100644 index 0000000000000000000000000000000000000000..558925828b00c6c202ad2a1004b8eef0d790be65 GIT binary patch literal 2643 zcmaKt-EQ1O6vt0elC+SNkCcmofQXi=7nSXq@h1`&*(9`)wo24AgkCN4<;05DUil+Y zcm^JV3odvHu6P5Ug-ax6#=B|k^{!>vt379a|8vgFIX*gi2M+){*s~&wI4djAT>AYb z9EhaKi<4wrr?irTI!VQGGLdPL$%n8nV_K)xG3A%^T;7M7+qS{k2;11(LF9W^-Tt=X zt-)TJ@XK#uw=88<+Jib1sVwc?S|oXCpB~!AZe7zWfE8GW#?S<`2CwofSu9y>?EQ-$ zK}DI88dZ$)i$q?@vCOKV8^~Us#mRYTvztnV)wjelCV*Agg0q9c%i-ww&B5?!cYgz> zi&ss!pTaQbG);b`Rg!0KwYarNZQhgW`YaP^cIj)_RrORFKU+T*bS$s);?jCkXH_zm zmPpgN{Pu@Kd-;-Cek*Vfl=nT8%qF~4^Z_jm^}B8!ntIovm+_Hd3=^gUd%6fQwf7RX z8bW@aaLstOkTLUELOCw-Dql*u_2{K+!novlkv8e{R^+ZjFXLl4xhX3-w)XPE6!v*v zMjfAC(l(rC$y-{sHvdH*t;esI__-!lH`ZY`sjF!Ss^)V?SZ{s5=d@2+=V$|7(+P4M z=SerV6D~8=aZ|HZYw>0TG?ov{Is61(-<(`fA&Z}Ak< zgf{ZQRO(e;UCNuCy?i{$Gc_zoS4xkonbGcgTa!XfN2Uc<;q-9LK-WQ(RNZq&SE0_5 zOyt*gU~4~P(8l^GrGzVYexHsn$bS06RY`0d+tCGaKU_!1w3X1yKy8vgk8HBxeh9wm@_93{TXaH65DMaiE{?c}B8EdpgrP%mKw~!uHT3sK`l+tPgB;+=0=1Dj z+$~KnjF=-tgapM>%80v?AlFC4LxCfRtEC>#zOBnNA9po%+uf}lqprsU_E8Y?m?G)B zH1b3cxJdBOL0BunU|?RVc4mwNJndpj({ZD5(~vC%*CUP;EK-3BjH6fzPY8lN^-H>v zOO5{5ZUoHkG(8GHx*~Nl;HhnRju2iZl&WT}O|v%Xwd6vKJwkmi zbP)?