1. UI 위(자기자신의 영역만 해당)에 마우스가 있는지 확인할 수 있는 MouseObserver 추가

2. StudioTopBar 의 애니메이션 때문에 클릭이 제대로 되지 않던 문제 수정
This commit is contained in:
wsh
2025-05-28 17:53:30 +09:00
parent 1a4151deee
commit aa5e997bd6
8 changed files with 395 additions and 430 deletions

60
Assets/MouseObserver.cs Normal file
View File

@@ -0,0 +1,60 @@
using System;
using UnityEngine;
using UnityEngine.EventSystems;
namespace Studio
{
public class MouseObserver : MonoBehaviour
{
public Action onMouseExitClick;
public bool isPointerOverSelf;
private RectTransform rectTransform;
private bool prevPointerOverSelf = false;
private void Awake()
{
rectTransform = GetComponent<RectTransform>();
}
private void Update()
{
if (rectTransform == null)
return;
// 마우스가 자신의 UI(RectTransform) 영역 위에 있는지 판별
bool isOver = RectTransformUtility.RectangleContainsScreenPoint(
rectTransform,
Input.mousePosition,
GetEventCamera()
);
if (isOver && !prevPointerOverSelf)
{
isPointerOverSelf = true;
}
else if (!isOver && prevPointerOverSelf)
{
isPointerOverSelf = false;
}
prevPointerOverSelf = isOver;
if (Input.GetMouseButtonDown(0) && !isPointerOverSelf)
{
onMouseExitClick?.Invoke();
}
}
// UI용 카메라 반환 (없으면 null)
private Camera GetEventCamera()
{
if (EventSystem.current != null && EventSystem.current.currentInputModule is StandaloneInputModule sim)
{
return sim.inputOverride?.mousePresent == true ? Camera.main : null;
}
return Camera.main;
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 4d07a6b8336bafe4e8f39c99a7f0055f

View File

@@ -187,10 +187,10 @@ RectTransform:
- {fileID: 2341841808728272538} - {fileID: 2341841808728272538}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3489228134480339777 --- !u!222 &3489228134480339777
CanvasRenderer: CanvasRenderer:
@@ -575,6 +575,7 @@ GameObject:
- component: {fileID: 8460145409993573292} - component: {fileID: 8460145409993573292}
- component: {fileID: 1065617958303419244} - component: {fileID: 1065617958303419244}
- component: {fileID: 7845166429226118018} - component: {fileID: 7845166429226118018}
- component: {fileID: 5910299288388436748}
m_Layer: 5 m_Layer: 5
m_Name: 'Scroll View ' m_Name: 'Scroll View '
m_TagString: Untagged m_TagString: Untagged
@@ -672,6 +673,19 @@ MonoBehaviour:
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &5910299288388436748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814258015848253360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!1 &1031567174989373192 --- !u!1 &1031567174989373192
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -855,6 +869,9 @@ MonoBehaviour:
Button_HierarchyWindow: {fileID: 0} Button_HierarchyWindow: {fileID: 0}
Button_Build: {fileID: 0} Button_Build: {fileID: 0}
Button_Run: {fileID: 0} Button_Run: {fileID: 0}
Button_Play: {fileID: 0}
RunSprite: {fileID: 0}
StopSprite: {fileID: 0}
--- !u!1 &1125765218071084743 --- !u!1 &1125765218071084743
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -981,10 +998,10 @@ RectTransform:
- {fileID: 896393453183667204} - {fileID: 896393453183667204}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -158}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1981890397451977413 --- !u!222 &1981890397451977413
CanvasRenderer: CanvasRenderer:
@@ -2448,6 +2465,7 @@ RectTransform:
- {fileID: 3887689113271058331} - {fileID: 3887689113271058331}
- {fileID: 7764946973617036099} - {fileID: 7764946973617036099}
- {fileID: 1955157107292011281} - {fileID: 1955157107292011281}
- {fileID: 8005125862894477398}
m_Father: {fileID: 7877698569528648585} m_Father: {fileID: 7877698569528648585}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@@ -2493,6 +2511,7 @@ GameObject:
- component: {fileID: 8328654606668070304} - component: {fileID: 8328654606668070304}
- component: {fileID: 6210973074375535068} - component: {fileID: 6210973074375535068}
- component: {fileID: 200161855877576763} - component: {fileID: 200161855877576763}
- component: {fileID: 3250065930650965656}
m_Layer: 5 m_Layer: 5
m_Name: Scroll View m_Name: Scroll View
m_TagString: Untagged m_TagString: Untagged
@@ -2590,6 +2609,19 @@ MonoBehaviour:
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &3250065930650965656
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2957250674401320691}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!1 &3003499110682296744 --- !u!1 &3003499110682296744
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2907,10 +2939,10 @@ RectTransform:
- {fileID: 3488610485283054401} - {fileID: 3488610485283054401}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7519002699685595081 --- !u!222 &7519002699685595081
CanvasRenderer: CanvasRenderer:
@@ -3162,19 +3194,7 @@ MonoBehaviour:
dropdownScrollview: {fileID: 814258015848253360} dropdownScrollview: {fileID: 814258015848253360}
onDeselect: onDeselect:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 8455097612485250242}
m_TargetAssemblyTypeName: XED.UI.UI_ButtonDropdown, Assembly-CSharp
m_MethodName: Close
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
isButtonImageToggle: 1 isButtonImageToggle: 1
buttonCloseColor: {r: 1, g: 1, b: 1, a: 1} buttonCloseColor: {r: 1, g: 1, b: 1, a: 1}
buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1} buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
@@ -3553,10 +3573,10 @@ RectTransform:
- {fileID: 7631676095961012699} - {fileID: 7631676095961012699}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5915613553988833987 --- !u!222 &5915613553988833987
CanvasRenderer: CanvasRenderer:
@@ -3694,10 +3714,10 @@ RectTransform:
- {fileID: 5387168277044041813} - {fileID: 5387168277044041813}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -158}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4247297422581378552 --- !u!222 &4247297422581378552
CanvasRenderer: CanvasRenderer:
@@ -5168,10 +5188,10 @@ RectTransform:
- {fileID: 1653917884358936151} - {fileID: 1653917884358936151}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -90}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3369121211994654138 --- !u!222 &3369121211994654138
CanvasRenderer: CanvasRenderer:
@@ -5586,10 +5606,10 @@ RectTransform:
- {fileID: 810396968189095116} - {fileID: 810396968189095116}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -90}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1538201362206907658 --- !u!222 &1538201362206907658
CanvasRenderer: CanvasRenderer:
@@ -6856,6 +6876,147 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 2 m_HorizontalFit: 2
m_VerticalFit: 2 m_VerticalFit: 2
--- !u!1 &7154896493106496052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8005125862894477398}
- component: {fileID: 689010001557009749}
- component: {fileID: 8459143177192434572}
- component: {fileID: 4834173998568779529}
- component: {fileID: 5577372605771168254}
m_Layer: 5
m_Name: Button_Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8005125862894477398
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7154896493106496052}
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: 2730612551908113454}
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: -60.5}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &689010001557009749
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7154896493106496052}
m_CullTransparentMesh: 1
--- !u!114 &8459143177192434572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7154896493106496052}
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: 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: 21300000, guid: 16ab77a8cc636504bada37c9dd4971ef, 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!114 &4834173998568779529
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7154896493106496052}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 8459143177192434572}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &5577372605771168254
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7154896493106496052}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &7435479725595688598 --- !u!1 &7435479725595688598
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -7512,10 +7673,10 @@ RectTransform:
- {fileID: 1878126261536727837} - {fileID: 1878126261536727837}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -124}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8421465600539947383 --- !u!222 &8421465600539947383
CanvasRenderer: CanvasRenderer:
@@ -8030,10 +8191,10 @@ RectTransform:
- {fileID: 1919708062972643861} - {fileID: 1919708062972643861}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4300145224472273166 --- !u!222 &4300145224472273166
CanvasRenderer: CanvasRenderer:
@@ -8436,19 +8597,7 @@ MonoBehaviour:
dropdownScrollview: {fileID: 2957250674401320691} dropdownScrollview: {fileID: 2957250674401320691}
onDeselect: onDeselect:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 5839202437637941273}
m_TargetAssemblyTypeName: XED.UI.UI_ButtonDropdown, Assembly-CSharp
m_MethodName: Close
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
isButtonImageToggle: 1 isButtonImageToggle: 1
buttonCloseColor: {r: 1, g: 1, b: 1, a: 1} buttonCloseColor: {r: 1, g: 1, b: 1, a: 1}
buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1} buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
@@ -8626,10 +8775,10 @@ RectTransform:
- {fileID: 4551446790370479478} - {fileID: 4551446790370479478}
m_Father: {fileID: 7049248817799997631} m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8129281279843792023 --- !u!222 &8129281279843792023
CanvasRenderer: CanvasRenderer:
@@ -8766,10 +8915,10 @@ RectTransform:
- {fileID: 643449707283617506} - {fileID: 643449707283617506}
m_Father: {fileID: 7049248817799997631} m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3258050494349403066 --- !u!222 &3258050494349403066
CanvasRenderer: CanvasRenderer:
@@ -9075,6 +9224,7 @@ GameObject:
- component: {fileID: 8342071972829302900} - component: {fileID: 8342071972829302900}
- component: {fileID: 4451917240437057383} - component: {fileID: 4451917240437057383}
- component: {fileID: 390466257543398924} - component: {fileID: 390466257543398924}
- component: {fileID: 8767692478267435104}
m_Layer: 5 m_Layer: 5
m_Name: 'Scroll View ' m_Name: 'Scroll View '
m_TagString: Untagged m_TagString: Untagged
@@ -9172,6 +9322,19 @@ MonoBehaviour:
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &8767692478267435104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8879947028565576359}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!1 &8984056952605670238 --- !u!1 &8984056952605670238
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -9208,10 +9371,10 @@ RectTransform:
- {fileID: 7636783790860919037} - {fileID: 7636783790860919037}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -124}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8978547910611737479 --- !u!222 &8978547910611737479
CanvasRenderer: CanvasRenderer:
@@ -9475,19 +9638,7 @@ MonoBehaviour:
dropdownScrollview: {fileID: 8879947028565576359} dropdownScrollview: {fileID: 8879947028565576359}
onDeselect: onDeselect:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 168172015411135660}
m_TargetAssemblyTypeName: XED.UI.UI_ButtonDropdown, Assembly-CSharp
m_MethodName: Close
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
isButtonImageToggle: 1 isButtonImageToggle: 1
buttonCloseColor: {r: 1, g: 1, b: 1, a: 1} buttonCloseColor: {r: 1, g: 1, b: 1, a: 1}
buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1} buttonOpenColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}

View File

@@ -164,11 +164,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
sceneObjects: [] sceneObjects: []
--- !u!224 &11436643 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &63933899 --- !u!1001 &63933899
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -280,147 +275,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 372614007875390604, guid: a1beeb762c585d645829350a5fa6025d, type: 3} m_CorrespondingSourceObject: {fileID: 372614007875390604, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
m_PrefabInstance: {fileID: 1291633837} m_PrefabInstance: {fileID: 1291633837}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &189404504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 189404505}
- component: {fileID: 189404509}
- component: {fileID: 189404508}
- component: {fileID: 189404507}
- component: {fileID: 189404506}
m_Layer: 5
m_Name: Button_Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &189404505
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
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: 11436643}
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: -60.5}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &189404506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &189404507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 189404508}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &189404508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
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: 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: 21300000, guid: 16ab77a8cc636504bada37c9dd4971ef, 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!222 &189404509
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_CullTransparentMesh: 1
--- !u!1 &216528115 --- !u!1 &216528115
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -575,6 +429,24 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 4294967295
m_MaxRayIntersections: 0 m_MaxRayIntersections: 0
--- !u!1 &226583457 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8879947028565576359, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!114 &226583462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 226583457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!1001 &235881573 --- !u!1001 &235881573
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1340,26 +1212,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2005632167464171098, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2005632167464171098, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2005632167464171098, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2005632167464171098, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2005632167464171098, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2341841808728272538, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 2341841808728272538, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
@@ -1396,14 +1248,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2723462224319195380, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2723462224319195380, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@@ -1440,34 +1284,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3668554643432217518, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3668554643432217518, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3853315518555250796, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3853315518555250796, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3853315518555250796, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3853315518555250796, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3853315518555250796, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3887689113271058331, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 3887689113271058331, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@@ -1576,46 +1392,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5361601392682067968, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5361601392682067968, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5361601392682067968, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5361601392682067968, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5361601392682067968, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5387168277044041813, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 5387168277044041813, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
@@ -1624,14 +1400,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5423836360600887679, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5423836360600887679, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5561390586698855397, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 5561390586698855397, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
@@ -1640,14 +1408,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5577405148971638704, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5577405148971638704, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6056756331741652633, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 6056756331741652633, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
@@ -1772,14 +1532,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7419238314919177750, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7419238314919177750, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7631676095961012699, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 7631676095961012699, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
@@ -1820,22 +1572,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7838439719802036811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7838439719802036811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8141392198622949445, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8141392198622949445, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8236132945779869188, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 8236132945779869188, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
@@ -1880,14 +1616,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@@ -1908,42 +1636,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781589723258650888, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781589723258650888, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781589723258650888, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781589723258650888, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781589723258650888, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9041242588782750439, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9041242588782750439, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@@ -1966,11 +1658,17 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: m_AddedGameObjects: []
- targetCorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3} m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 2957250674401320691, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 189404505} addedObject: {fileID: 2049997035}
m_AddedComponents: [] - targetCorrespondingSourceObject: {fileID: 814258015848253360, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
insertIndex: -1
addedObject: {fileID: 1925189016}
- targetCorrespondingSourceObject: {fileID: 8879947028565576359, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
insertIndex: -1
addedObject: {fileID: 226583462}
m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
--- !u!224 &416036583 stripped --- !u!224 &416036583 stripped
RectTransform: RectTransform:
@@ -3014,7 +2712,6 @@ MonoBehaviour:
panel_objectalign: {fileID: 0} panel_objectalign: {fileID: 0}
panel_tooltip: {fileID: 0} panel_tooltip: {fileID: 0}
panel_propertyviewer: {fileID: 0} panel_propertyviewer: {fileID: 0}
panel_thumbnail: {fileID: 0}
panel_objectdistance: {fileID: 0} panel_objectdistance: {fileID: 0}
panel_apiconnectmodal: {fileID: 0} panel_apiconnectmodal: {fileID: 0}
panel_datafiltersetting: {fileID: 0} panel_datafiltersetting: {fileID: 0}
@@ -9953,6 +9650,24 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} m_CorrespondingSourceObject: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3}
m_PrefabInstance: {fileID: 1910195357} m_PrefabInstance: {fileID: 1910195357}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1925189011 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 814258015848253360, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1925189016
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1925189011}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!1 &1958628041 --- !u!1 &1958628041
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -10404,6 +10119,24 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
currentMode: 0 currentMode: 0
--- !u!1 &2049997030 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2957250674401320691, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2049997035
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049997030}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d07a6b8336bafe4e8f39c99a7f0055f, type: 3}
m_Name:
m_EditorClassIdentifier:
isPointerOverSelf: 0
--- !u!224 &2113204526 stripped --- !u!224 &2113204526 stripped
RectTransform: RectTransform:
m_CorrespondingSourceObject: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} m_CorrespondingSourceObject: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3}

View File

@@ -48,8 +48,10 @@ namespace Studio.Command
searchAsset.assetData.RemoveTransform(searchAsset.renderObject.transform); searchAsset.assetData.RemoveTransform(searchAsset.renderObject.transform);
searchAsset.renderObject.gameObject.SetActive(false); searchAsset.renderObject.gameObject.SetActive(false);
objects.Add(searchAsset.renderObject); objects.Add(searchAsset.renderObject);
connector.connectedAssets.Remove(searchAsset);
} }
connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem); connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
connector.connectedAssets.Remove(connectedAsset);
} }
foreach(var o in objects) foreach(var o in objects)
@@ -81,7 +83,9 @@ namespace Studio.Command
searchAsset.assetData.AddTransformToRender(searchAsset.renderObject.transform); searchAsset.assetData.AddTransformToRender(searchAsset.renderObject.transform);
searchAsset.renderObject.gameObject.SetActive(true); searchAsset.renderObject.gameObject.SetActive(true);
objects.Add(searchAsset.renderObject); objects.Add(searchAsset.renderObject);
connector.connectedAssets.Add(searchAsset);
} }
connector.connectedAssets.Add(connectedAsset);
objects.Add(connectedAsset.renderObject); objects.Add(connectedAsset.renderObject);
} }

View File

@@ -165,14 +165,19 @@ namespace Studio.Manage
.ThenBy(asset => asset.hierarchyItem.GetSiblingIndex()) .ThenBy(asset => asset.hierarchyItem.GetSiblingIndex())
.Select(asset => CreateAssetData(asset)) .Select(asset => CreateAssetData(asset))
.ToList(); .ToList();
curProjectData = CreateProjectData(assetDatas); curProjectData = CreateProjectData(assetDatas);
string json = JsonConvert.SerializeObject(curProjectData, Formatting.Indented); string json = JsonConvert.SerializeObject(curProjectData, Formatting.Indented);
FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write); using (FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write))
StreamWriter writer = new StreamWriter(fs, System.Text.Encoding.Unicode); {
using (StreamWriter writer = new StreamWriter(fs, System.Text.Encoding.Unicode))
{
writer.Write(json); writer.Write(json);
writer.Close(); writer.Close();
} }
}
}
public AssetData CreateAssetData(ConnectedAsset asset) public AssetData CreateAssetData(ConnectedAsset asset)
{ {

View File

@@ -61,19 +61,21 @@ namespace Studio
public override void AfterAwake() public override void AfterAwake()
{ {
var raycaster = GameObject.FindAnyObjectByType<Raycaster>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>(); var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
var childPanels = GetComponentsInChildren<PanelBase>(true);
panel_dynamicobjectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; panel_dynamicobjectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
var raycaster = GameObject.FindAnyObjectByType<Raycaster>();
raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip; raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip;
raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip; raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip;
foreach (var panel in GetComponentsInChildren<PanelBase>(true)) foreach (var panel in childPanels)
{ {
panel.onEnableEvent += SetPanelAsLastSibling; panel.onEnableEvent += SetPanelAsLastSibling;
} }
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
canvasHandler = new PopupCanvasHandler(this); canvasHandler = new PopupCanvasHandler(this);

View File

@@ -22,12 +22,20 @@ namespace Studio.UI
[SerializeField] Color textOpenColor; [SerializeField] Color textOpenColor;
[SerializeField] TextMeshProUGUI ButtonName; [SerializeField] TextMeshProUGUI ButtonName;
private bool isOpen = false; private bool isOpen = false;
// Start is called before the first frame update MouseObserver mouseObserver;
void Awake() void Awake()
{ {
if (isButtonImageToggle) buttonImage = GetComponent<Image>(); if (isButtonImageToggle) buttonImage = GetComponent<Image>();
dropdownScrollview.transform.localScale = closeScale; dropdownScrollview.gameObject.SetActive(false);
gameObject.AddComponent<MeshRenderer>(); mouseObserver = dropdownScrollview.GetComponent<MouseObserver>();
mouseObserver.onMouseExitClick += Close;
var buttons = dropdownScrollview.GetComponentsInChildren<Button>();
foreach (var button in buttons)
{
button.onClick.AddListener(Close);
}
//gameObject.AddComponent<MeshRenderer>();
} }
public virtual void Open() public virtual void Open()
@@ -40,7 +48,7 @@ namespace Studio.UI
buttonImage.color = buttonOpenColor; buttonImage.color = buttonOpenColor;
ButtonName.color = textOpenColor; ButtonName.color = textOpenColor;
} }
dropdownScrollview.transform.localScale = Vector3.one; dropdownScrollview.gameObject.SetActive(true);
//StopAllCoroutines(); //StopAllCoroutines();
//StartCoroutine(CoroutineOpen()); //StartCoroutine(CoroutineOpen());
} }
@@ -58,7 +66,7 @@ namespace Studio.UI
ButtonName.color = textCloseColor; ButtonName.color = textCloseColor;
} }
dropdownScrollview.transform.localScale = closeScale; dropdownScrollview.gameObject.SetActive(false);
// StopAllCoroutines(); // StopAllCoroutines();
// StartCoroutine(CoroutineClose()); // StartCoroutine(CoroutineClose());
} }