From 3249a0b642eb7d0660d4679cd1c80d601528727b Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Fri, 15 Nov 2024 10:53:19 +0800 Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Background_Template.prefab | 8 +- .../BgSetting_Color_ItemTemplate.prefab | 132 +++++++++++++++++- .../RomItemTemplate.prefab | 132 ++++++++++++++++-- .../RoomItemTemplate.prefab | 132 ++++++++++++++++-- .../Assets/Scene/AxibugEmuOnline.Client.unity | 8 +- .../Assets/Script/Manager/RomLib/RomFile.cs | 2 + .../Script/UI/BgSettingsUI/BgSetting_Color.cs | 2 +- .../Assets/Script/UI/GamesUI/RomItem.cs | 9 +- .../Script/UI/GamesUI/RomListMenuItem.cs | 4 +- .../Script/UI/ItemPresent/ItemPresent.cs | 2 +- .../Assets/Script/UI/MainMenuController.cs | 1 + .../Assets/Script/UI/MenuItem.cs | 16 ++- .../Assets/Script/UI/RoomUI/RoomItem.cs | 5 +- .../Assets/Script/UI/UITool.cs | 9 +- 14 files changed, 414 insertions(+), 48 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab index 43c10b3..1a78bec 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab @@ -541,10 +541,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ffb0963e9596ce489953bcef1bf3d86, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 0} + spline: {fileID: 0} Descript: {fileID: 3380485461544738227} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 2619187604372594158} @@ -731,8 +731,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1d1e3e91ac34bc8468f357ee247ffb6a, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 m_menuItemRoot: {fileID: 0} SubMenuItemTemplate: {fileID: 0} alphaGroup: {fileID: 0} @@ -1008,7 +1006,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 500, y: 200} + m_CellSize: {x: 500, y: 100} m_Spacing: {x: 0, y: 20} m_Constraint: 1 m_ConstraintCount: 1 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab index 547e210..76e2bb4 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8789823129857705082} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -369,10 +369,12 @@ MonoBehaviour: m_EditorClassIdentifier: Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 6534898873012636952} + spline: {fileID: 4812759387377418448} Descript: {fileID: 3380485461544738227} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 2619187604372594158} - InfoNode: {fileID: 0} + InfoNode: {fileID: 6788248266412682264} SubMenuItemGroup: {fileID: 0} SelectScale: 1 UnSelectScale: 0.85 @@ -409,6 +411,7 @@ RectTransform: m_Children: - {fileID: 6095356919362338847} - {fileID: 6797116381500671839} + - {fileID: 6673031368290035463} - {fileID: 8126322204359135913} m_Father: {fileID: 8754483333502849411} m_RootOrder: 2 @@ -433,10 +436,10 @@ MonoBehaviour: m_Padding: m_Left: 20 m_Right: 0 - m_Top: 0 + m_Top: 13 m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 10 + m_ChildAlignment: 0 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -599,7 +602,8 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 8986746042327041630} m_Father: {fileID: 8789823129857705082} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -665,6 +669,85 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1.5, y: 1.5} m_UseGraphicAlpha: 1 +--- !u!1 &5468696000904882177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8986746042327041630} + - component: {fileID: 952406696262539679} + - component: {fileID: 6534898873012636952} + m_Layer: 5 + m_Name: subTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8986746042327041630 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468696000904882177} + 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_Children: [] + m_Father: {fileID: 6095356919362338847} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 580, y: 33} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &952406696262539679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468696000904882177} + m_CullTransparentMesh: 1 +--- !u!114 &6534898873012636952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5468696000904882177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 300 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 4324234 --- !u!1 &6688216270065609628 GameObject: m_ObjectHideFlags: 0 @@ -677,7 +760,7 @@ GameObject: - component: {fileID: 5682159953164052307} - component: {fileID: 4812759387377418448} m_Layer: 5 - m_Name: Image + m_Name: spline m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -778,3 +861,38 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9036340599819825964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6673031368290035463} + m_Layer: 5 + m_Name: space + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6673031368290035463 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9036340599819825964} + 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_Children: [] + m_Father: {fileID: 8789823129857705082} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab index e73dfa6..f549c79 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8789823129857705082} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -79,6 +79,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: DESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTION +--- !u!1 &691794202561892957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1188556931387892201} + - component: {fileID: 2202468443856696916} + - component: {fileID: 999260425140749620} + m_Layer: 5 + m_Name: subTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1188556931387892201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691794202561892957} + 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_Children: [] + m_Father: {fileID: 6095356919362338847} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 580, y: 33} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2202468443856696916 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691794202561892957} + m_CullTransparentMesh: 1 +--- !u!114 &999260425140749620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691794202561892957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 300 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 4324234 --- !u!1 &734025543935719296 GameObject: m_ObjectHideFlags: 0 @@ -684,14 +763,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f236de3ffaafd4149a3b7395e05b8d07, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 999260425140749620} + spline: {fileID: 72627194734755216} Descript: {fileID: 3380485461544738227} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 2619187604372594158} - InfoNode: {fileID: 0} + InfoNode: {fileID: 6788248266412682264} SubMenuItemGroup: {fileID: 0} SelectScale: 1 UnSelectScale: 0.8 @@ -719,6 +798,41 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &3387258383767365065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7783773379985343815} + m_Layer: 5 + m_Name: space + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7783773379985343815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3387258383767365065} + 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_Children: [] + m_Father: {fileID: 8789823129857705082} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3993825260653792697 GameObject: m_ObjectHideFlags: 0 @@ -752,6 +866,7 @@ RectTransform: m_Children: - {fileID: 6095356919362338847} - {fileID: 3242981749023616473} + - {fileID: 7783773379985343815} - {fileID: 8126322204359135913} m_Father: {fileID: 8754483333502849411} m_RootOrder: 2 @@ -776,10 +891,10 @@ MonoBehaviour: m_Padding: m_Left: 20 m_Right: 0 - m_Top: 0 + m_Top: 40 m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 20 + m_ChildAlignment: 0 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -943,7 +1058,8 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 1188556931387892201} m_Father: {fileID: 8789823129857705082} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab index 6334c42..5241953 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8789823129857705082} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -79,6 +79,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: DESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTION +--- !u!1 &553998820245994894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6315089719013752772} + - component: {fileID: 335732242433612964} + - component: {fileID: 5992617271927144214} + m_Layer: 5 + m_Name: subTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6315089719013752772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553998820245994894} + 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_Children: [] + m_Father: {fileID: 6095356919362338847} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 580, y: 33} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &335732242433612964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553998820245994894} + m_CullTransparentMesh: 1 +--- !u!114 &5992617271927144214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553998820245994894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 300 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 4324234 --- !u!1 &734025543935719296 GameObject: m_ObjectHideFlags: 0 @@ -609,14 +688,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 321002db0a5429f4da7529d85c93799c, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 5992617271927144214} + spline: {fileID: 1135952883384385484} Descript: {fileID: 3380485461544738227} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 2619187604372594158} - InfoNode: {fileID: 0} + InfoNode: {fileID: 6788248266412682264} SubMenuItemGroup: {fileID: 0} SelectScale: 1 UnSelectScale: 0.85 @@ -677,6 +756,7 @@ RectTransform: m_Children: - {fileID: 6095356919362338847} - {fileID: 2553088066574421578} + - {fileID: 7153585803608375682} - {fileID: 8126322204359135913} m_Father: {fileID: 8754483333502849411} m_RootOrder: 2 @@ -701,10 +781,10 @@ MonoBehaviour: m_Padding: m_Left: 20 m_Right: 0 - m_Top: 0 + m_Top: 40 m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 20 + m_ChildAlignment: 0 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -868,7 +948,8 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 6315089719013752772} m_Father: {fileID: 8789823129857705082} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1196,3 +1277,38 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8947967495049136558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7153585803608375682} + m_Layer: 5 + m_Name: space + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7153585803608375682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8947967495049136558} + 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_Children: [] + m_Father: {fileID: 8789823129857705082} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity index 33fd3b1..3cd801f 100644 --- a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity +++ b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity @@ -2499,7 +2499,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchorMax.x @@ -13645,7 +13645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} propertyPath: m_AnchorMax.x @@ -13754,7 +13754,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} propertyPath: m_AnchorMax.x @@ -13907,7 +13907,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} propertyPath: m_AnchorMax.x diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/RomLib/RomFile.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/RomLib/RomFile.cs index 0508534..9d91321 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/RomLib/RomFile.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/RomLib/RomFile.cs @@ -37,6 +37,8 @@ namespace AxibugEmuOnline.Client public string Alias => IsUserRom ? Path.GetFileNameWithoutExtension(FileName) : webData.romName; /// 描述 public string Descript => IsUserRom ? string.Empty : webData.desc; + /// 游戏类型 + public string GameTypeDes => IsUserRom ? string.Empty : webData.gType; /// 小图URL public string ImageURL => IsUserRom ? string.Empty : webData.imgUrl; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs b/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs index b2f1817..2943e65 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs @@ -31,7 +31,7 @@ namespace AxibugEmuOnline.Client var color = Datacontext.CurrentColor; Icon.GetMaterial().SetColor("_Color1", color.color1); Icon.GetMaterial().SetColor("_Color2", color.color2); - SetBaseInfo("ɫ", color.Name); + SetBaseInfo("ɫ", "ɫ", color.Name); } public void SetDependencyProperty(object data) diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomItem.cs b/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomItem.cs index dd81d0b..abeefb8 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomItem.cs @@ -59,11 +59,11 @@ namespace AxibugEmuOnline.Client { if (!m_romfile.InfoReady) { - SetBaseInfo(string.Empty, string.Empty); + SetBaseInfo("ȡ", "---", "---"); } else { - SetBaseInfo(m_romfile.Alias, m_romfile.Descript); + SetBaseInfo(m_romfile.Alias, m_romfile.Descript, m_romfile.GameTypeDes); App.CacheMgr.GetSpriteCache(m_romfile.ImageURL, (img, url) => { if (url != m_romfile.ImageURL) return; @@ -90,7 +90,8 @@ namespace AxibugEmuOnline.Client } } - private void Update() + + protected override void Update() { DownloadingFlag.SetActiveEx(false); FileReadyFlag.SetActiveEx(false); @@ -107,6 +108,8 @@ namespace AxibugEmuOnline.Client { FileReadyFlag.SetActiveEx(true); } + + base.Update(); } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomListMenuItem.cs index aacebc1..7786123 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/GamesUI/RomListMenuItem.cs @@ -76,7 +76,7 @@ namespace AxibugEmuOnline.Client public override void OnExcute() { - OverlayManager.Input((OnSearchCommit, "Rom", null)); + OverlayManager.Input((OnSearchCommit, "Rom", m_romListUI.SearchKey)); } private void OnSearchCommit(string text) @@ -92,7 +92,7 @@ namespace AxibugEmuOnline.Client public override bool Visible => !string.IsNullOrWhiteSpace(m_ui.SearchKey); - public OptMenu_ShowAll(RomListMenuItem romListUI,Sprite icon = null) : base("ʾȫ", icon) + public OptMenu_ShowAll(RomListMenuItem romListUI, Sprite icon = null) : base("ʾȫ", icon) { m_ui = romListUI; } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/ItemPresent/ItemPresent.cs b/AxibugEmuOnline.Client/Assets/Script/UI/ItemPresent/ItemPresent.cs index f2ea41b..b3de33a 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/ItemPresent/ItemPresent.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/ItemPresent/ItemPresent.cs @@ -507,7 +507,7 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout proxy.UpdateDP(); } - m_dataDirty = true; + //m_dataDirty = true; } public Dictionary CacheItemScripts => _cacheItemScripts; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/MainMenuController.cs b/AxibugEmuOnline.Client/Assets/Script/UI/MainMenuController.cs index 35b94f9..e97d2cd 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/MainMenuController.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/MainMenuController.cs @@ -171,6 +171,7 @@ namespace AxibugEmuOnline.Client.UI { public Sprite Icon; public string Name; + public string SubTitle; public string Description; public MenuItem OverrideTemplate; public List SubMenus; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs index 815613c..093db7a 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs @@ -13,6 +13,10 @@ namespace AxibugEmuOnline.Client.UI [SerializeField] protected Text Txt; [SerializeField] + protected Text SubTitle; + [SerializeField] + protected Image spline; + [SerializeField] protected Text Descript; [SerializeField] protected Transform Root; @@ -42,7 +46,7 @@ namespace AxibugEmuOnline.Client.UI { Reset(); - SetBaseInfo(data.Name, data.Description); + SetBaseInfo(data.Name, data.Description, data.SubTitle); SetIcon(data.Icon); if (SubMenuItemGroup != null) SubMenuItemGroup.Init(data.SubMenus); } @@ -59,15 +63,17 @@ namespace AxibugEmuOnline.Client.UI if (ShadowIcon != null) ShadowIcon.gameObject.SetActive(false); if (InfoNode != null) InfoNode.alpha = 0; + if (spline != null) spline.SetAlpha(0); if (ShadowIcon != null) ShadowIcon.gameObject.SetActiveEx(false); if (SubMenuItemGroup != null) SubMenuItemGroup.SetSelect(false); } - protected void SetBaseInfo(string name, string descript) + protected void SetBaseInfo(string name, string descript, string subTitle) { this.name = name; if (Txt != null) Txt.text = name; + if (SubTitle != null) SubTitle.text = subTitle; if (Descript != null) Descript.text = descript; } @@ -91,11 +97,11 @@ namespace AxibugEmuOnline.Client.UI if (progressTween != null) { progressTween.Kill(); progressTween = null; } - progressTween = DOTween.To(() => m_progress, (x) => m_progress = x, m_select ? 1 : 0, 5) - .SetSpeedBased().OnUpdate(() => + progressTween = DOTween.To(() => m_progress, (x) => m_progress = x, m_select ? 1 : 0, 0.3f) + .OnUpdate(() => { if (InfoNode != null) InfoNode.alpha = m_progress; - + if (spline != null) spline.SetAlpha(m_progress); Root.localScale = Vector3.one * Mathf.Lerp(UnSelectScale, SelectScale, m_progress); }); } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs b/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs index 6db698c..94e1c14 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/RoomUI/RoomItem.cs @@ -65,7 +65,7 @@ namespace AxibugEmuOnline.Client { var hostNick = roomInfo.GetHostNickName(); roomInfo.GetRoomPlayers(out var cur, out var max); - SetBaseInfo(string.Empty, $"{hostNick}ķ - {cur}/{max}"); + SetBaseInfo("--", $"{hostNick}ķ", $"{cur}/{max}"); SetIcon(null); roomInfo.FetchRomFileInRoomInfo(EnumPlatform.NES, (room, romFile) => @@ -80,9 +80,10 @@ namespace AxibugEmuOnline.Client }); } - private void Update() + protected override void Update() { UpdateRomInfoView(); + base.Update(); } private void UpdateRomInfoView() diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/UITool.cs b/AxibugEmuOnline.Client/Assets/Script/UI/UITool.cs index 0034716..9ea68bf 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/UITool.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/UITool.cs @@ -8,7 +8,6 @@ namespace AxibugEmuOnline.Client public static class UITool { private static Dictionary _caches = new Dictionary(); - public static Material GetMaterial(this Graphic graphic) { if (_caches.TryGetValue(graphic, out var material)) @@ -23,11 +22,17 @@ namespace AxibugEmuOnline.Client return cloneMat; } } - public static void SetMaterial(this Graphic graphic, Material material) { graphic.material = material; _caches.Remove(graphic); } + + public static void SetAlpha(this Graphic graphic, float alpha) + { + var temp = graphic.color; + temp.a = alpha; + graphic.color = temp; + } } }