diff --git a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab index fe2181e1..e5478a72 100644 --- a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab +++ b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab @@ -307,10 +307,10 @@ RectTransform: - {fileID: 2641865167890791995} m_Father: {fileID: 8236132945779869188} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -22} + m_SizeDelta: {x: 210, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3489228134480339777 CanvasRenderer: @@ -1090,10 +1090,10 @@ RectTransform: - {fileID: 6894040108453440889} m_Father: {fileID: 5106551296758095294} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -124} + m_SizeDelta: {x: 290, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5212800262809355448 CanvasRenderer: @@ -1467,10 +1467,10 @@ RectTransform: - {fileID: 6467883027692677993} m_Father: {fileID: 6340558249613605857} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.0695, y: -56} + m_SizeDelta: {x: 190.139, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1981890397451977413 CanvasRenderer: @@ -3282,10 +3282,10 @@ RectTransform: - {fileID: 6668256650124147009} m_Father: {fileID: 5106551296758095294} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -22} + m_SizeDelta: {x: 290, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7527628306696851762 CanvasRenderer: @@ -3862,10 +3862,10 @@ RectTransform: - {fileID: 3488610485283054401} m_Father: {fileID: 3612353324306706568} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -56} + m_SizeDelta: {x: 230, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7519002699685595081 CanvasRenderer: @@ -4810,10 +4810,10 @@ RectTransform: - {fileID: 7631676095961012699} m_Father: {fileID: 3612353324306706568} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -22} + m_SizeDelta: {x: 230, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5915613553988833987 CanvasRenderer: @@ -4950,10 +4950,10 @@ RectTransform: - {fileID: 239898139430097969} m_Father: {fileID: 8236132945779869188} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -124} + m_SizeDelta: {x: 210, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4247297422581378552 CanvasRenderer: @@ -7313,10 +7313,10 @@ RectTransform: - {fileID: 4934558975903239102} m_Father: {fileID: 8236132945779869188} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -90} + m_SizeDelta: {x: 210, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3369121211994654138 CanvasRenderer: @@ -8007,10 +8007,10 @@ RectTransform: - {fileID: 7773128163535172080} m_Father: {fileID: 5106551296758095294} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -158} + m_SizeDelta: {x: 290, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1538201362206907658 CanvasRenderer: @@ -9512,10 +9512,10 @@ RectTransform: - {fileID: 8983976402599428563} m_Father: {fileID: 5106551296758095294} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -90} + m_SizeDelta: {x: 290, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8819351641869115221 CanvasRenderer: @@ -9655,7 +9655,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 262, y: 75} + m_SizeDelta: {x: 262, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &852701277637592919 CanvasRenderer: @@ -11877,10 +11877,10 @@ RectTransform: - {fileID: 3407360332968577993} m_Father: {fileID: 8236132945779869188} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -56} + m_SizeDelta: {x: 210, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4300145224472273166 CanvasRenderer: @@ -12545,10 +12545,10 @@ RectTransform: - {fileID: 6769054886412449106} m_Father: {fileID: 5106551296758095294} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -56} + m_SizeDelta: {x: 290, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6487236260048461744 CanvasRenderer: @@ -12978,10 +12978,10 @@ RectTransform: - {fileID: 4551446790370479478} m_Father: {fileID: 7049248817799997631} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64.48075, y: -22} + m_SizeDelta: {x: 118.9615, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8129281279843792023 CanvasRenderer: @@ -13118,10 +13118,10 @@ RectTransform: - {fileID: 643449707283617506} m_Father: {fileID: 7049248817799997631} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64.48075, y: -56} + m_SizeDelta: {x: 118.9615, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3258050494349403066 CanvasRenderer: @@ -13431,10 +13431,10 @@ RectTransform: - {fileID: 290966527929266020} m_Father: {fileID: 6340558249613605857} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.0695, y: -22} + m_SizeDelta: {x: 190.139, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8978547910611737479 CanvasRenderer: diff --git a/Assets/Prefabs/AAA/Panel_ToastMessage.prefab b/Assets/Prefabs/AAA/Panel_ToastMessage.prefab new file mode 100644 index 00000000..0afb0b6f --- /dev/null +++ b/Assets/Prefabs/AAA/Panel_ToastMessage.prefab @@ -0,0 +1,273 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &446023340544832848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 131453539068456586} + - component: {fileID: 2209117580846228876} + - component: {fileID: 6377229603796770285} + m_Layer: 0 + m_Name: Image_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &131453539068456586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446023340544832848} + 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: 1985167945211234460} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 100, y: 25} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &2209117580846228876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446023340544832848} + m_CullTransparentMesh: 1 +--- !u!114 &6377229603796770285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446023340544832848} + 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.48235294, g: 0.7254902, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4986e28c0e91a7646bf3239c3fc6a4ce, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2164931036245486078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985167945211234460} + - component: {fileID: 3750046009461159708} + - component: {fileID: 7197471718471839916} + m_Layer: 0 + m_Name: Panel_ToastMessage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1985167945211234460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164931036245486078} + 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: 131453539068456586} + - {fileID: 6963996282222852724} + m_Father: {fileID: 0} + 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!222 &3750046009461159708 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164931036245486078} + m_CullTransparentMesh: 1 +--- !u!114 &7197471718471839916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164931036245486078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 342dbf6aa759fab499828fbf940b0dd7, type: 3} + m_Name: + m_EditorClassIdentifier: + padding: {x: 20, y: 10} +--- !u!1 &4465495780181571190 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6963996282222852724} + - component: {fileID: 3715185425270121652} + - component: {fileID: 1382572807270572463} + m_Layer: 0 + m_Name: Text_Message + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6963996282222852724 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465495780181571190} + 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: 1985167945211234460} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 200, y: 25} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3715185425270121652 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465495780181571190} + m_CullTransparentMesh: 1 +--- !u!114 &1382572807270572463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465495780181571190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, 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: 16 + m_fontSizeBase: 16 + 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_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 4 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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} diff --git a/Assets/Prefabs/AAA/Panel_ToastMessage.prefab.meta b/Assets/Prefabs/AAA/Panel_ToastMessage.prefab.meta new file mode 100644 index 00000000..1da6e762 --- /dev/null +++ b/Assets/Prefabs/AAA/Panel_ToastMessage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e9508decb91c2994f92851c5c4315f57 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AAA/Panel_Tooltip.prefab b/Assets/Prefabs/AAA/Panel_Tooltip.prefab index c5cee9eb..abde0fc6 100644 --- a/Assets/Prefabs/AAA/Panel_Tooltip.prefab +++ b/Assets/Prefabs/AAA/Panel_Tooltip.prefab @@ -270,4 +270,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee8826b08a67ea84ba1b9d407b34f551, type: 3} m_Name: m_EditorClassIdentifier: - padding: {x: 20, y: 10} + padding: {x: 30, y: 10} diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs index e65d9a3b..3a99beaa 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs @@ -119,6 +119,8 @@ namespace Studio.Command searchAsset.renderObject.gameObject.SetActive(true); } } + + CanvasManager.instance.GetCanvas().panel_toastmessage.ActivateMessage("Copy"); } public void Undo() diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 83073a88..fa6b8339 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -49,6 +49,7 @@ namespace Studio public Panel_DataConnectModal panel_dataconnectmodal; public Panel_AlarmConnectModal panel_alarmconnectmodal; internal Panel_MQTTTestResult panel_mqtttestresult; + public Panel_ToastMessage panel_toastmessage; private void Awake() { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs new file mode 100644 index 00000000..869bb360 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs @@ -0,0 +1,48 @@ +using System.Collections; +using TMPro; +using UnityEngine; +using XRLib.UI; + +namespace Studio.UI +{ + public class Panel_ToastMessage : PanelBase + { + RectTransform Image_bg; + TextMeshProUGUI Text_Message; + + public Vector2 padding = new Vector2(20f, 10f); + private float delay = 1f; + + public override void AfterAwake() + { + transform.SetAsLastSibling(); + } + + public void ActivateMessage(string message) + { + Text_Message.text = message; + + UpdateBackgroundSize(); + gameObject.SetActive(true); + StartCoroutine(AutoDeactivateAfterDelay()); + } + + public void DeactivateMessage() + { + gameObject.SetActive(false); + } + + private IEnumerator AutoDeactivateAfterDelay() + { + yield return new WaitForSeconds(delay); + DeactivateMessage(); + } + + void UpdateBackgroundSize() + { + float textWidth = Text_Message.preferredWidth; + float textHeight = Text_Message.preferredHeight; + Image_bg.sizeDelta = new Vector2(textWidth + padding.x, textHeight + padding.y); + } + } +} diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs.meta b/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs.meta new file mode 100644 index 00000000..da7c1bfa --- /dev/null +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ToastMessage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 342dbf6aa759fab499828fbf940b0dd7 \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs b/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs index d31a4acf..52d7b727 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_Tooltip.cs @@ -15,6 +15,8 @@ namespace Studio.UI TextMeshProUGUI text_tooltip; public Vector2 padding = new Vector2(20f, 10f); + private float standardScreenWidth = 1920f; + private float standardScreenHeight = 1080f; public override void AfterAwake() { @@ -73,21 +75,12 @@ namespace Studio.UI { Vector2 mousePos = Input.mousePosition; - float bgSizeX = image_bg.sizeDelta.x / 2; - float bgSizeY = image_bg.sizeDelta.y / 2; + float bgSizeX = image_bg.sizeDelta.x / 2 * Screen.width / standardScreenWidth; + float bgSizeY = image_bg.sizeDelta.y / 2 * Screen.height / standardScreenHeight; - float movePosX = mousePos.x + bgSizeX; + float movePosX = (mousePos.x + bgSizeX); float movePosY = mousePos.y - bgSizeY; - if (mousePos.x + image_bg.sizeDelta.x > Screen.width) - { - movePosX = mousePos.x - bgSizeX; - } - if (mousePos.y - image_bg.sizeDelta.y < 0) - { - movePosY = mousePos.y + bgSizeY; - } - Vector2 movePos = new Vector2(movePosX, movePosY); image_bg.transform.position = movePos;