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 3b37b3a..4532a81 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index cb01ffb..55d0375 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ 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 0000000..5589258 Binary files /dev/null and b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash new file mode 100644 index 0000000..db4909e --- /dev/null +++ b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash @@ -0,0 +1 @@ +a9923b1a \ No newline at end of file diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json new file mode 100644 index 0000000..10565d3 --- /dev/null +++ b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json @@ -0,0 +1,332 @@ +{ + "FileVersion": "2025.9.30", + "EnableAddressable": true, + "SupportExtensionless": true, + "LocationToLower": false, + "IncludeAssetGUID": false, + "ReplaceAssetPathWithAddress": false, + "OutputNameStyle": 0, + "BuildBundleType": 1, + "BuildPipeline": "EditorSimulateBuildPipeline", + "PackageName": "DefaultPackage", + "PackageVersion": "Simulate", + "PackageNote": "2025/12/25 13:43:46", + "AssetList": [ + { + "Address": "Click", + "AssetPath": "Assets/Bundles/Audios/UI/Click.wav", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "Hover", + "AssetPath": "Assets/Bundles/Audios/UI/Hover.wav", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "tables_tbachievement", + "AssetPath": "Assets/Bundles/Configs/bytes/tables_tbachievement.bytes", + "AssetGUID": "", + "AssetTags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "BundleID": 2, + "DependBundleIDs": [] + }, + { + "Address": "LocalizationTable", + "AssetPath": "Assets/Bundles/Configs/LocalizationTable.asset", + "AssetGUID": "", + "AssetTags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "BundleID": 1, + "DependBundleIDs": [] + }, + { + "Address": "AlicizaX.Framework.Runtime.dll", + "AssetPath": "Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameBase.dll", + "AssetPath": "Assets/Bundles/DLL/GameBase.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameLib.dll", + "AssetPath": "Assets/Bundles/DLL/GameLib.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameLogic.dll", + "AssetPath": "Assets/Bundles/DLL/GameLogic.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameProto.dll", + "AssetPath": "Assets/Bundles/DLL/GameProto.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "mscorlib.dll", + "AssetPath": "Assets/Bundles/DLL/mscorlib.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "System.Core.dll", + "AssetPath": "Assets/Bundles/DLL/System.Core.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "UniTask.Runtime.dll", + "AssetPath": "Assets/Bundles/DLL/UniTask.Runtime.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "Unity.InputSystem.dll", + "AssetPath": "Assets/Bundles/DLL/Unity.InputSystem.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "Map1000", + "AssetPath": "Assets/Bundles/Scenes/Map1000.unity", + "AssetGUID": "", + "AssetTags": [ + "Scenes" + ], + "BundleID": 4, + "DependBundleIDs": [] + }, + { + "Address": "MyShaderVariants", + "AssetPath": "Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants", + "AssetGUID": "", + "AssetTags": [ + "ShaderVariants" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "Hotkey Component", + "AssetPath": "Assets/Bundles/UI/Component/Hotkey Component.prefab", + "AssetGUID": "", + "AssetTags": [ + "UI" + ], + "BundleID": 5, + "DependBundleIDs": [] + }, + { + "Address": "dsadsa", + "AssetPath": "Assets/Bundles/UI/Window/dsadsa.prefab", + "AssetGUID": "", + "AssetTags": [ + "UI" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "UICardWidget", + "AssetPath": "Assets/Bundles/UI/Window/UICardWidget.prefab", + "AssetGUID": "", + "AssetTags": [ + "UI" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "UILoadUpdateWindow", + "AssetPath": "Assets/Bundles/UI/Window/UILoadUpdateWindow.prefab", + "AssetGUID": "", + "AssetTags": [ + "UI" + ], + "BundleID": 8, + "DependBundleIDs": [] + } + ], + "BundleList": [ + { + "BundleName": "assets_bundles_audios_ui.bundle", + "UnityCRC": 0, + "FileHash": "77cdb65b7cfb324f9e511e95ee2e394f", + "FileCRC": 0, + "FileSize": 35951, + "Encrypted": false, + "Tags": [ + "Audios" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_configs.bundle", + "UnityCRC": 0, + "FileHash": "3a378d308429cd99b280d880a27af478", + "FileCRC": 0, + "FileSize": 5280, + "Encrypted": false, + "Tags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_configs_bytes.bundle", + "UnityCRC": 0, + "FileHash": "589b0dd91da2eee9c4e3146135170d34", + "FileCRC": 0, + "FileSize": 281, + "Encrypted": false, + "Tags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_dll.bundle", + "UnityCRC": 0, + "FileHash": "ba45bd2617fcfa1e64a95d7741dc8012", + "FileCRC": 0, + "FileSize": 4342272, + "Encrypted": false, + "Tags": [ + "DLL" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_scenes_map1000.bundle", + "UnityCRC": 0, + "FileHash": "4530edb970dd229fed5dd3259fee4ece", + "FileCRC": 0, + "FileSize": 12277, + "Encrypted": false, + "Tags": [ + "Scenes" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_ui_component_hotkey_component.bundle", + "UnityCRC": 0, + "FileHash": "bc3db7c732b0a641c72c594787b6027a", + "FileCRC": 0, + "FileSize": 24744, + "Encrypted": false, + "Tags": [ + "UI" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_ui_window_dsadsa.bundle", + "UnityCRC": 0, + "FileHash": "b63a46898c5fc9d7c7ddf1c887ca0642", + "FileCRC": 0, + "FileSize": 3325, + "Encrypted": false, + "Tags": [ + "UI" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_ui_window_uicardwidget.bundle", + "UnityCRC": 0, + "FileHash": "abe9622ac433e5d039830d047bb7d28f", + "FileCRC": 0, + "FileSize": 6852, + "Encrypted": false, + "Tags": [ + "UI" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_ui_window_uiloadupdatewindow.bundle", + "UnityCRC": 0, + "FileHash": "82253a65841b8f1db612149ec8c9a317", + "FileCRC": 0, + "FileSize": 54180, + "Encrypted": false, + "Tags": [ + "UI" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "unityshaders.bundle", + "UnityCRC": 0, + "FileHash": "c9f21eee9f3febcafa65a26802cf31f0", + "FileCRC": 0, + "FileSize": 3518, + "Encrypted": false, + "Tags": [ + "ShaderVariants" + ], + "DependBundleIDs": [] + } + ] +} \ No newline at end of file diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index d06c59d..0d80bcf 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit d06c59ddf81cf228c7676fb3dc4e619259a39d1d +Subproject commit 0d80bcfa5b6b10a9684a64ec9dd9d29aa5991a28 diff --git a/Client/Packages/com.alicizax.unity.ui.extension b/Client/Packages/com.alicizax.unity.ui.extension index fc993a1..26c205d 160000 --- a/Client/Packages/com.alicizax.unity.ui.extension +++ b/Client/Packages/com.alicizax.unity.ui.extension @@ -1 +1 @@ -Subproject commit fc993a1dbebbbddd5d76f9ba63c68c1909754012 +Subproject commit 26c205ddc0ba7167abd365b425d286a20c94115a diff --git a/Client/Packages/manifest.json b/Client/Packages/manifest.json index e36a2c8..ab65afe 100644 --- a/Client/Packages/manifest.json +++ b/Client/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.23", - "com.unity.inputsystem": "1.13.1", + "com.unity.inputsystem": "1.7.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.universal": "17.0.3", "com.unity.scriptablebuildpipeline": "2.1.4", diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json index 61ecd59..a542644 100644 --- a/Client/Packages/packages-lock.json +++ b/Client/Packages/packages-lock.json @@ -137,7 +137,7 @@ "url": "https://packages.unity.cn" }, "com.unity.inputsystem": { - "version": "1.13.1", + "version": "1.7.0", "depth": 0, "source": "registry", "dependencies": { diff --git a/Client/ProjectSettings/EditorBuildSettings.asset b/Client/ProjectSettings/EditorBuildSettings.asset index 8bf45f3..16b8488 100644 --- a/Client/ProjectSettings/EditorBuildSettings.asset +++ b/Client/ProjectSettings/EditorBuildSettings.asset @@ -9,5 +9,4 @@ EditorBuildSettings: path: Assets/Scenes/Main.unity guid: 3a0b1916be2731d44840741d972ef135 m_configObjects: - com.unity.input.settings.actions: {fileID: -944628639613478452, guid: b4afa3a338f48c74ebb04c9ee13f9ab0, type: 3} - m_UseUCBPForAssetBundles: 0 + com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 916c72588b6bc6e48a022e8c82e6438f, type: 3} diff --git a/Client/ProjectSettings/TimelineSettings.asset b/Client/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b21943a --- /dev/null +++ b/Client/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 3f9ebec..40e6642 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -71,4 +71,4 @@ MonoBehaviour: GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic/UI//Generate UIPrefabRootPath: Assets/Bundles/UI LoadType: 1 - UIScriptGeneratorRuleHelper: Aliciza.UXTool.AlicizaUXUIGeneratorRuleHelper + UIScriptGeneratorRuleHelper: AlicizaX.UXTool.AlicizaUXUIGeneratorRuleHelper diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index a42cbfa..f0e4658 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -30,13 +30,13 @@ EditorUserSettings: value: 54010c54510c5a5f5a0a0973477b0a4414151a2b757925367a7e4a6ab1b66260 flags: 0 RecentlyUsedSceneGuid-7: - value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 + value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a flags: 0 RecentlyUsedSceneGuid-8: value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d flags: 0 RecentlyUsedSceneGuid-9: - value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a + value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index e16aaf3..a02c740 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Console + m_Title: Project m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -40,9 +40,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 491 - width: 542 - height: 456 + y: 360 + width: 386 + height: 587 m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 542 + width: 386 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -173,7 +173,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 153 + controlID: 166 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,8 +192,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 542 - height: 491 + width: 386 + height: 360 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 542 + x: 386 y: 0 - width: 382 + width: 273 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 49 + controlID: 51 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 382 + width: 273 height: 461 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} @@ -271,10 +271,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 461 - width: 382 + width: 273 height: 486 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 924 + x: 659 y: 0 - width: 353 + width: 245 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -321,9 +321,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1277 + x: 904 y: 0 - width: 643 + width: 1016 height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -353,9 +353,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 564 - width: 541 - height: 435 + y: 433 + width: 385 + height: 566 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 541 - height: 414 - m_Scale: {x: 0.28177083, y: 0.28177083} - m_Translation: {x: 270.5, y: 207} + width: 385 + height: 545 + m_Scale: {x: 0.20052083, y: 0.20052083} + m_Translation: {x: 192.5, y: 272.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -734.6396 + y: -1358.961 width: 1920 - height: 1469.2792 + height: 2717.922 m_MinimalGUI: 1 - m_defaultScale: 0.28177083 - m_LastWindowPixelSize: {x: 541, y: 435} + m_defaultScale: 0.20052083 + m_LastWindowPixelSize: {x: 385, y: 566} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,8 +522,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 541 - height: 470 + width: 385 + height: 339 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -867,7 +867,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 9 + index: 10 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -1064,9 +1064,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 422.91672, y: 565.4434, z: 2.556824} + m_Target: {x: 994.2338, y: 1001.762, z: 215.8432} speed: 2 - m_Value: {x: 422.91672, y: 565.4434, z: 2.556824} + m_Value: {x: 994.2338, y: 1001.762, z: 215.8432} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1116,9 +1116,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 248.39851 + m_Target: 3.4710739 speed: 2 - m_Value: 248.39851 + m_Value: 3.4710739 m_Ortho: m_Target: 1 speed: 2 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 542 - y: 73 - width: 380 + x: 1 + y: 19 + width: 271 height: 440 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,25 +1180,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6c6d0000 - m_LastClickedID: 28012 - m_ExpandedIDs: 04fbffff426d0000546d0000926d0000ba6d0000dc6d0000fe6d0000 + m_SelectedIDs: 546e0000 + m_LastClickedID: 28244 + m_ExpandedIDs: dee3ffff60f3ffff70f3ffff78f3ffff84f3ffff90f3ffff206e0000546e00005c6e0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: UICanvas + m_OriginalName: UICanvas m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -3216 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 542 - y: 534 - width: 380 + x: 1 + y: 480 + width: 271 height: 465 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 924 + x: 659 y: 73 - width: 351 + width: 243 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1283,7 +1283,7 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 + m_SearchArea: 2 m_Folders: [] m_Globs: [] m_OriginalText: @@ -1300,7 +1300,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 000000007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000 + m_ExpandedIDs: 000000000c7100000e71000010710000127100001471000016710000187100001a7100001c7100001e71000020710000227100002471000026710000287100002a7100002c7100002e71000030710000327100003471000036710000387100003a7100003c7100003e71000040710000427100004471000046710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1325,10 +1325,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 332} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000 + m_ExpandedIDs: ffffffff000000000c7100000e71000010710000127100001471000016710000187100001a7100001c7100001e71000020710000227100002471000026710000287100002a7100002c7100002e71000030710000327100003471000036710000387100003a7100003c7100003e71000040710000427100004471000046710000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1404,9 +1404,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1277 + x: 904 y: 73 - width: 642 + width: 1015 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1421,11 +1421,11 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 167 + m_CachedPref: -167 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 152 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: