Skip to content

Commit

Permalink
Merge pull request #93 from MidraLab/fix/menu_ui
Browse files Browse the repository at this point in the history 
メニューのUIの修正
  • Loading branch information
@ayutaz
ayutaz authored Jan 26, 2025
2 parents 12b9a1f + 56f276c commit ac6ca6e
Show file tree
Hide file tree
Showing 11 changed files with 1,535 additions and 815 deletions.
2 changes: 1 addition & 1 deletion Assets/uDesktopMascot/Editor/PostBuildProcessor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ private struct Stat

private static bool TryGetUnixMode(string path, out UInt16 mode)
{
#if !UNITY_EDITOR_WIN
#if UNITY_EDITOR_OSX
if (sys_stat(path, out var stat) == 0)
{
mode = stat.st_mode;
Expand Down
Binary file modified Assets/uDesktopMascot/Images/UI/menu_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/uDesktopMascot/Images/UI/menu_button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Assets/uDesktopMascot/Images/UI/menu_button.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 72 additions & 57 deletions Assets/uDesktopMascot/Prefab/MenuButton.prefab
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,61 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3903742024286823450
--- !u!1 &3452299637799663405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 912795695803733151}
- component: {fileID: 3538511351678612190}
- component: {fileID: 5564781069511012402}
- component: {fileID: 2400614796734426947}
- component: {fileID: 4791987971422063645}
- component: {fileID: 5298659109303676727}
- component: {fileID: 5124148846117514422}
- component: {fileID: 7075264929463694279}
- component: {fileID: 4884648774827072320}
m_Layer: 5
m_Name: MenuButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &912795695803733151
--- !u!224 &4791987971422063645
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3903742024286823450}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_GameObject: {fileID: 3452299637799663405}
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: 1
m_Children:
- {fileID: 4062184340451456059}
- {fileID: 1844523633514830876}
- {fileID: 5172950257487607225}
- {fileID: 3014552690699433569}
m_Father: {fileID: 0}
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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3538511351678612190
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5298659109303676727
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3903742024286823450}
m_GameObject: {fileID: 3452299637799663405}
m_CullTransparentMesh: 1
--- !u!114 &5564781069511012402
--- !u!114 &5124148846117514422
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3903742024286823450}
m_GameObject: {fileID: 3452299637799663405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
Expand All @@ -78,13 +79,13 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2400614796734426947
--- !u!114 &7075264929463694279
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3903742024286823450}
m_GameObject: {fileID: 3452299637799663405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
Expand Down Expand Up @@ -117,65 +118,79 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5564781069511012402}
m_Interactable: 0
m_TargetGraphic: {fileID: 5124148846117514422}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6845451677381643339
--- !u!114 &4884648774827072320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3452299637799663405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6dcd782f03954b5b9a4eebb7a3bec646, type: 3}
m_Name:
m_EditorClassIdentifier:
icon: {fileID: 115914020716615690}
buttonText: {fileID: 648360911962570205}
--- !u!1 &4904533303166342515
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4062184340451456059}
- component: {fileID: 138839204594407655}
- component: {fileID: 1774386116682985281}
- component: {fileID: 6018721579187306676}
- component: {fileID: 5172950257487607225}
- component: {fileID: 2843506385453128315}
- component: {fileID: 648360911962570205}
- component: {fileID: 1089995998360424670}
m_Layer: 5
m_Name: AppName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4062184340451456059
--- !u!224 &5172950257487607225
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6845451677381643339}
m_GameObject: {fileID: 4904533303166342515}
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: 1
m_Children: []
m_Father: {fileID: 912795695803733151}
m_Father: {fileID: 4791987971422063645}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 11.5}
m_SizeDelta: {x: -10, y: 22.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &138839204594407655
m_AnchoredPosition: {x: 0, y: -2}
m_SizeDelta: {x: -10, y: 12}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &2843506385453128315
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6845451677381643339}
m_GameObject: {fileID: 4904533303166342515}
m_CullTransparentMesh: 1
--- !u!114 &1774386116682985281
--- !u!114 &648360911962570205
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6845451677381643339}
m_Enabled: 1
m_GameObject: {fileID: 4904533303166342515}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
Expand All @@ -188,7 +203,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u7D42\u4E86"
m_text: "\u30E2\u30C7\u30EB\u5909\u66F4"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a4ac5cd8892e24e4790c00e0ef00a927, type: 2}
m_sharedMaterial: {fileID: 3991398196324383077, guid: a4ac5cd8892e24e4790c00e0ef00a927, type: 2}
Expand All @@ -215,7 +230,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 15.65
m_fontSize: 8.25
m_fontSizeBase: 22
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -259,13 +274,13 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6018721579187306676
--- !u!114 &1089995998360424670
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6845451677381643339}
m_GameObject: {fileID: 4904533303166342515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
Expand All @@ -275,7 +290,7 @@ MonoBehaviour:
m_TableReference:
m_TableCollectionName: GUID:e0bc4458d73676a429c1b840d5dbc577
m_TableEntryReference:
m_KeyId: 0
m_KeyId: 557971768283136
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
Expand All @@ -284,7 +299,7 @@ MonoBehaviour:
m_UpdateString:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1774386116682985281}
- m_Target: {fileID: 648360911962570205}
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
m_MethodName: set_text
m_Mode: 0
Expand All @@ -299,58 +314,58 @@ MonoBehaviour:
references:
version: 2
RefIds: []
--- !u!1 &8343439061973879386
--- !u!1 &8763230723378036996
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1844523633514830876}
- component: {fileID: 7948539759944148421}
- component: {fileID: 4305971467649175396}
- component: {fileID: 3014552690699433569}
- component: {fileID: 4029895149101096775}
- component: {fileID: 115914020716615690}
m_Layer: 5
m_Name: AppIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1844523633514830876
--- !u!224 &3014552690699433569
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8343439061973879386}
m_GameObject: {fileID: 8763230723378036996}
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: 1
m_Children: []
m_Father: {fileID: 912795695803733151}
m_Father: {fileID: 4791987971422063645}
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: 7.5}
m_SizeDelta: {x: -25, y: -25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -24, y: -24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7948539759944148421
--- !u!222 &4029895149101096775
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8343439061973879386}
m_GameObject: {fileID: 8763230723378036996}
m_CullTransparentMesh: 1
--- !u!114 &4305971467649175396
--- !u!114 &115914020716615690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8343439061973879386}
m_GameObject: {fileID: 8763230723378036996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
Expand All @@ -364,7 +379,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 848e351b400100a48877c913854575fb, type: 3}
m_Sprite: {fileID: 21300000, guid: 60a8c3461b0862643ba8d5218da29b14, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/uDesktopMascot/Prefab/MenuButton.prefab.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ac6ca6e

Please sign in to comment.