diff --git a/Assets/Prefabs/AAA/Panel_APISetting.prefab b/Assets/Prefabs/AAA/Panel_APISetting.prefab index 287fa8bd..4730ef36 100644 --- a/Assets/Prefabs/AAA/Panel_APISetting.prefab +++ b/Assets/Prefabs/AAA/Panel_APISetting.prefab @@ -1,5 +1,126 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &481014343202580059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 590017802020962670} + - component: {fileID: 9038546457793394709} + - component: {fileID: 9172210092449072205} + - component: {fileID: 771870714993839680} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &590017802020962670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481014343202580059} + 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: 803119370793947642} + m_Father: {fileID: 1706094893826822341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -20} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9038546457793394709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481014343202580059} + m_CullTransparentMesh: 1 +--- !u!114 &9172210092449072205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481014343202580059} + 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: 0} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &771870714993839680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481014343202580059} + 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: 9172210092449072205} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1123579484062494939 GameObject: m_ObjectHideFlags: 0 @@ -293,7 +414,7 @@ RectTransform: m_Father: {fileID: 2292193592730533127} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -353,7 +474,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4132525226981379914 RectTransform: m_ObjectHideFlags: 0 @@ -497,7 +618,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00005592898} + m_AnchoredPosition: {x: 0, y: -0.0000076293945} m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0, y: 1} --- !u!114 &9012196138664136289 @@ -519,9 +640,9 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 10 - m_ChildForceExpandWidth: 0 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -533,7 +654,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3217445069981175101} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: @@ -552,6 +673,7 @@ GameObject: - component: {fileID: 5033852087416136295} - component: {fileID: 8016085240250503124} - component: {fileID: 652113650489786804} + - component: {fileID: 2855276010289584426} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -572,6 +694,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1048712064310070100} + - {fileID: 590017802020962670} m_Father: {fileID: 4132525226981379914} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -632,6 +755,32 @@ MonoBehaviour: m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &2855276010289584426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712847956919574334} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 24 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3873992900211121500 GameObject: m_ObjectHideFlags: 0 @@ -664,10 +813,10 @@ RectTransform: - {fileID: 723840430366919015} m_Father: {fileID: 7312373301845048671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 755, y: -17.5} - m_SizeDelta: {x: 1510, y: 35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &359056352680538343 CanvasRenderer: @@ -677,6 +826,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3873992900211121500} m_CullTransparentMesh: 1 +--- !u!1 &5601158145357035070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 803119370793947642} + - component: {fileID: 2285956488057284575} + - component: {fileID: 6567809131968607812} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &803119370793947642 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5601158145357035070} + 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: 590017802020962670} + 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: -4, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2285956488057284575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5601158145357035070} + m_CullTransparentMesh: 1 +--- !u!114 &6567809131968607812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5601158145357035070} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &5902316683506033644 GameObject: m_ObjectHideFlags: 0 @@ -1185,9 +1409,9 @@ RectTransform: m_Father: {fileID: 6132375163701409367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3206942666917285615 CanvasRenderer: @@ -1261,7 +1485,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -20} + m_AnchoredPosition: {x: 124, y: -20} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7856226020445061456 @@ -1399,10 +1623,10 @@ RectTransform: - {fileID: 5061233150649686273} m_Father: {fileID: 7312373301845048671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 746.5, y: -57.5} - m_SizeDelta: {x: 1493, y: 25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2021366533682092130 CanvasRenderer: diff --git a/Assets/Prefabs/AAA/Panel_AppSetting.prefab b/Assets/Prefabs/AAA/Panel_AppSetting.prefab index da82e385..9775412a 100644 --- a/Assets/Prefabs/AAA/Panel_AppSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_AppSetting.prefab @@ -78,6 +78,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &267518616636051481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246339890729333897} + - component: {fileID: 5224942143478357411} + - component: {fileID: 2298898259537091264} + - component: {fileID: 3165667785310893327} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1246339890729333897 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267518616636051481} + 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: 5158939677125102524} + m_Father: {fileID: 5953129331582281549} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -20} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5224942143478357411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267518616636051481} + m_CullTransparentMesh: 1 +--- !u!114 &2298898259537091264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267518616636051481} + 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: 0} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &3165667785310893327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267518616636051481} + 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: 2298898259537091264} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &390443891624130289 GameObject: m_ObjectHideFlags: 0 @@ -443,7 +564,7 @@ RectTransform: m_Father: {fileID: 2173614701284704998} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -742,7 +863,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1079630229525563037} m_Direction: 2 m_Value: 1 - m_Size: 0.90957445 + m_Size: 0.7234362 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -780,7 +901,7 @@ RectTransform: m_Father: {fileID: 7828778855423135206} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.81333333} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -2664,6 +2785,81 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &2956074766606821228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5158939677125102524} + - component: {fileID: 79035485055483410} + - component: {fileID: 6745771461912494915} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5158939677125102524 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956074766606821228} + 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: 1246339890729333897} + 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: -4, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &79035485055483410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956074766606821228} + m_CullTransparentMesh: 1 +--- !u!114 &6745771461912494915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956074766606821228} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &3039963189008871181 GameObject: m_ObjectHideFlags: 0 @@ -2696,8 +2892,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 4154993490364831198} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.09042555} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -3214,7 +3410,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -20} + m_AnchoredPosition: {x: 124, y: -20} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4142827298121008476 @@ -4709,6 +4905,7 @@ GameObject: - component: {fileID: 4386968358936639426} - component: {fileID: 1114099184974957602} - component: {fileID: 1924003976417480443} + - component: {fileID: 1623991203930569360} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -4729,6 +4926,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1944997692503844710} + - {fileID: 1246339890729333897} m_Father: {fileID: 1241962839263925396} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -4789,6 +4987,32 @@ MonoBehaviour: m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &1623991203930569360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615702698863090005} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 24 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &5649365663234294130 GameObject: m_ObjectHideFlags: 0 @@ -5636,7 +5860,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1241962839263925396 RectTransform: m_ObjectHideFlags: 0 @@ -6865,9 +7089,9 @@ RectTransform: m_Father: {fileID: 539521883423661061} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -138, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5811604352141285170 CanvasRenderer: @@ -7277,8 +7501,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -20} - m_SizeDelta: {x: -10, y: -40} + m_AnchoredPosition: {x: 5, y: -20.01001} + m_SizeDelta: {x: -10, y: -39.96997} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4972516287552428824 CanvasRenderer: diff --git a/Assets/Prefabs/AAA/Panel_AssetSetting.prefab b/Assets/Prefabs/AAA/Panel_AssetSetting.prefab index 2f7e536b..d6f64cb6 100644 --- a/Assets/Prefabs/AAA/Panel_AssetSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_AssetSetting.prefab @@ -33,10 +33,10 @@ RectTransform: - {fileID: 7944869963516460760} m_Father: {fileID: 6640188506573938184} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 506, y: -23} - m_SizeDelta: {x: 1012, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 507.75, y: 0} + m_SizeDelta: {x: 1015.5, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3763449284824610983 CanvasRenderer: @@ -110,9 +110,9 @@ RectTransform: - {fileID: 1574788119570706247} m_Father: {fileID: 1768715792221632660} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 192.5, y: -75} m_SizeDelta: {x: 385, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4344298587071142668 @@ -571,7 +571,7 @@ RectTransform: m_Father: {fileID: 8707694793802824574} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -767,7 +767,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2585355017195122876 RectTransform: m_ObjectHideFlags: 0 @@ -1334,7 +1334,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 83} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1365027514354629154 MonoBehaviour: @@ -1355,9 +1355,9 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 - m_ChildForceExpandWidth: 0 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -1626,10 +1626,10 @@ RectTransform: - {fileID: 9178825604901992209} m_Father: {fileID: 6640188506573938184} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 506, y: -63} - m_SizeDelta: {x: 1012, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 507.75, y: 0} + m_SizeDelta: {x: 1015.5, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4155085186820051077 CanvasRenderer: @@ -1747,9 +1747,9 @@ RectTransform: - {fileID: 4551188806031680274} m_Father: {fileID: 1768715792221632660} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 192.5, y: -125} m_SizeDelta: {x: 385, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1540283723815529321 @@ -1872,9 +1872,9 @@ RectTransform: - {fileID: 7315736577284997742} m_Father: {fileID: 1768715792221632660} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 192.5, y: -25} m_SizeDelta: {x: 385, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1301166629008626869 @@ -2134,9 +2134,9 @@ RectTransform: m_Father: {fileID: 1328457095791693030} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4104761476638723369 CanvasRenderer: @@ -2418,7 +2418,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7577921240296218080 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/AAA/Panel_AuthSetting.prefab b/Assets/Prefabs/AAA/Panel_AuthSetting.prefab index 24c40522..5519d830 100644 --- a/Assets/Prefabs/AAA/Panel_AuthSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_AuthSetting.prefab @@ -36,6 +36,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0.000061035156} m_SizeDelta: {x: 0, y: 940} m_Pivot: {x: 0, y: 1} +--- !u!1 &523608252726339685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6280150817040499221} + - component: {fileID: 6891004973483555666} + - component: {fileID: 1062001482970285008} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6280150817040499221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523608252726339685} + 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: 384134852129586301} + 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: -4, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6891004973483555666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523608252726339685} + m_CullTransparentMesh: 1 +--- !u!114 &1062001482970285008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523608252726339685} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &3914836039750296631 GameObject: m_ObjectHideFlags: 0 @@ -55,7 +130,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1137729075814093741 RectTransform: m_ObjectHideFlags: 0 @@ -313,7 +388,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -20} + m_AnchoredPosition: {x: 124, y: -20} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569885582811801102 @@ -417,6 +492,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5132115633983918382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 384134852129586301} + - component: {fileID: 6899689832566205423} + - component: {fileID: 1930764840164366164} + - component: {fileID: 2427155469780717059} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &384134852129586301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5132115633983918382} + 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: 6280150817040499221} + m_Father: {fileID: 2027255652184016402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 407, y: -20} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6899689832566205423 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5132115633983918382} + m_CullTransparentMesh: 1 +--- !u!114 &1930764840164366164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5132115633983918382} + 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: 0} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &2427155469780717059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5132115633983918382} + 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: 1930764840164366164} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6045855528765410618 GameObject: m_ObjectHideFlags: 0 @@ -537,8 +733,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8062595932095635429} m_HandleRect: {fileID: 15784257731239013} m_Direction: 2 - m_Value: 0.9999993 - m_Size: 0.90957445 + m_Value: 0.99999976 + m_Size: 0.7234362 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -577,10 +773,10 @@ RectTransform: - {fileID: 612194373705940915} m_Father: {fileID: 1137729075814093741} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -467.5} - m_SizeDelta: {x: -10, y: 855} + m_AnchoredPosition: {x: 5, y: -20.01001} + m_SizeDelta: {x: -10, y: -39.96997} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5949302791304599418 CanvasRenderer: @@ -656,9 +852,9 @@ RectTransform: m_Father: {fileID: 4326941597752374215} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &2212948924550329234 CanvasRenderer: @@ -794,8 +990,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 6220278314096787737} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.090425484} - m_AnchorMax: {x: 1, y: 0.99999994} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -986,6 +1182,7 @@ GameObject: - component: {fileID: 5807375508782300887} - component: {fileID: 2953209255666179952} - component: {fileID: 4076357054240560103} + - component: {fileID: 1976841211235464888} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -1006,6 +1203,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4368433548501013237} + - {fileID: 384134852129586301} m_Father: {fileID: 1137729075814093741} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1066,3 +1264,29 @@ MonoBehaviour: m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &1976841211235464888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9060836248040196581} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 24 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab b/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab index 399b291d..a1f04488 100644 --- a/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -20} + m_AnchoredPosition: {x: 124, y: -20} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8852152493722243205 @@ -294,10 +294,10 @@ RectTransform: - {fileID: 2717841823628880354} m_Father: {fileID: 3223975308629568960} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -467.5} - m_SizeDelta: {x: -10, y: 855} + m_AnchoredPosition: {x: 5, y: -20} + m_SizeDelta: {x: -10, y: -40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6369284238573900535 CanvasRenderer: @@ -526,7 +526,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3223975308629568960 RectTransform: m_ObjectHideFlags: 0 @@ -598,6 +598,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f4f3f0fa060a6649aacba0fba40d2f2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4666349439688147332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8482300560410971999} + - component: {fileID: 8383280730301903559} + - component: {fileID: 1334475179901479267} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8482300560410971999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4666349439688147332} + 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: 5028790971485546160} + 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: -4, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8383280730301903559 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4666349439688147332} + m_CullTransparentMesh: 1 +--- !u!114 &1334475179901479267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4666349439688147332} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &4926575435582612119 GameObject: m_ObjectHideFlags: 0 @@ -632,9 +707,9 @@ RectTransform: m_Father: {fileID: 5650755957313782254} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4311061797419511722 CanvasRenderer: @@ -847,7 +922,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00005592898} - m_SizeDelta: {x: 0, y: 70} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3921430345349587487 MonoBehaviour: @@ -868,9 +943,9 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 10 - m_ChildForceExpandWidth: 0 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -922,7 +997,7 @@ RectTransform: m_Father: {fileID: 3385531099511753728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -998,10 +1073,10 @@ RectTransform: - {fileID: 991176895135798645} m_Father: {fileID: 1169625511504568069} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 746.5, y: -57.5} - m_SizeDelta: {x: 1493, y: 25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4457228034801899014 CanvasRenderer: @@ -1041,6 +1116,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7052161323297123654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5028790971485546160} + - component: {fileID: 2459382531592837118} + - component: {fileID: 6481659693395785038} + - component: {fileID: 8214907833832588607} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5028790971485546160 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7052161323297123654} + 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: 8482300560410971999} + m_Father: {fileID: 2259116729606268750} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -20} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2459382531592837118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7052161323297123654} + m_CullTransparentMesh: 1 +--- !u!114 &6481659693395785038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7052161323297123654} + 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: 0} + 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: 728e2097784c8d14791210ed0d397ddc, 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 &8214907833832588607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7052161323297123654} + 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: 6481659693395785038} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7550659412850873285 GameObject: m_ObjectHideFlags: 0 @@ -1189,6 +1385,7 @@ GameObject: - component: {fileID: 4351725773566367423} - component: {fileID: 984335350130860453} - component: {fileID: 4318902082657323875} + - component: {fileID: 5426377222529295494} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -1209,6 +1406,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3158980244062982849} + - {fileID: 5028790971485546160} m_Father: {fileID: 3223975308629568960} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1269,6 +1467,32 @@ MonoBehaviour: m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &5426377222529295494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975174789400811077} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 24 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &8368413716154182761 GameObject: m_ObjectHideFlags: 0 @@ -1429,10 +1653,10 @@ RectTransform: - {fileID: 5221733307500443071} m_Father: {fileID: 1169625511504568069} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 755, y: -17.5} - m_SizeDelta: {x: 1510, y: 35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4499739423859845948 CanvasRenderer: diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index c9b82de7..b6782a74 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -1966,25 +1966,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: - - target: {fileID: 332073532301362326, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 332073532301362326, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1079630229525563037, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1079630229525563037, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1079630229525563037, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.27656382 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_Pivot.x @@ -1996,27 +1988,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_SizeDelta.x - value: -400 + value: 600 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_SizeDelta.y - value: -185 + value: 720 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_LocalPosition.x @@ -2048,11 +2040,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchoredPosition.x - value: -200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchoredPosition.y - value: -92.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2066,14 +2058,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2570956668320193065, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2570956668320193065, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6916860067061408570, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_Name value: Panel_AppSetting @@ -2082,25 +2066,17 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7010222866720132403, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7010222866720132403, guid: b970071914aa54248b513564c76ca22c, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -138 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2709,19 +2685,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2957796394030257269, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2957796394030257269, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2957796394030257269, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 111 objectReference: {fileID: 0} - target: {fileID: 2957796394030257269, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 3287424241117335584, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchorMax.y @@ -2743,6 +2719,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -25 objectReference: {fileID: 0} + - target: {fileID: 6236778970705745713, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7357093652319228238, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_Name value: Panel_SceneTab @@ -2991,7 +2971,6 @@ MonoBehaviour: panel_openprojectinfo: {fileID: 0} panel_topmenunewprojectinfo: {fileID: 0} panel_topmenuopenprojectinfo: {fileID: 0} - panel_startsetting: {fileID: 0} panel_appsetting: {fileID: 0} panel_authsetting: {fileID: 0} panel_apisetting: {fileID: 0} @@ -3630,52 +3609,40 @@ PrefabInstance: m_Modifications: - target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.x - value: 1015.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 507.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -23 objectReference: {fileID: 0} - target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: -75 - objectReference: {fileID: 0} - - target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} - propertyPath: m_ChildScaleWidth value: 0 objectReference: {fileID: 0} - - target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} - propertyPath: m_ChildControlWidth - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} - propertyPath: m_ChildForceExpandWidth - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3686,27 +3653,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.x - value: -500 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.y - value: -100 + value: 720 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_LocalPosition.x @@ -3738,11 +3705,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: -250 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3758,31 +3725,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -17 objectReference: {fileID: 0} - target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3602097825703806022, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_Name @@ -3794,55 +3761,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: -125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6640188506573938184, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 83 objectReference: {fileID: 0} - target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_SizeDelta.x - value: 1015.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 507.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9128725341301159360, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} - propertyPath: m_IsActive - value: 1 + value: -63 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3959,7 +3922,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1169625511504568069, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_Pivot.x @@ -3971,27 +3934,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_SizeDelta.x - value: -400 + value: 600 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_SizeDelta.y - value: -185 + value: 720 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_LocalPosition.x @@ -4023,11 +3986,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.x - value: -200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.y - value: -92.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4045,45 +4008,69 @@ PrefabInstance: propertyPath: m_Name value: Panel_MQTTSetting objectReference: {fileID: 0} + - target: {fileID: 3997558015574521612, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4097374172079806606, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4097374172079806606, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4523336234919961699, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4523336234919961699, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4523336234919961699, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_SizeDelta.x + value: -17 objectReference: {fileID: 0} - target: {fileID: 4869436020162963593, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4869436020162963593, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4869436020162963593, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_SizeDelta.x + value: 573 objectReference: {fileID: 0} - target: {fileID: 4869436020162963593, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 286.5 objectReference: {fileID: 0} - target: {fileID: 4869436020162963593, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -57.5 objectReference: {fileID: 0} - target: {fileID: 8546368096994044833, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8546368096994044833, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8546368096994044833, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} + propertyPath: m_SizeDelta.x + value: 573 objectReference: {fileID: 0} - target: {fileID: 8546368096994044833, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 286.5 objectReference: {fileID: 0} - target: {fileID: 8546368096994044833, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -17.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -8541,6 +8528,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 247621717870717963, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 247621717870717963, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 247621717870717963, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 247621717870717963, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2762757506943678736, guid: d524adc6297ea50418c16190b3f42f66, type: 3} propertyPath: m_Name value: Panel_AssetManager @@ -8565,6 +8568,42 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3106101528242001925, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3385183036013514552, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3385183036013514552, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3385183036013514552, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3385183036013514552, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4511214995064534852, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4511214995064534852, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4511214995064534852, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4511214995064534852, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4989624515221410691, guid: d524adc6297ea50418c16190b3f42f66, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8810,23 +8849,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -17 objectReference: {fileID: 0} - target: {fileID: 2089303510019304932, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2089303510019304932, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2112941324847836712, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_Name @@ -8838,19 +8877,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_SizeDelta.x + value: 573 objectReference: {fileID: 0} - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 286.5 objectReference: {fileID: 0} - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -57.5 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_Pivot.x @@ -8862,27 +8905,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_SizeDelta.x - value: -400 + value: 600 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_SizeDelta.y - value: -185 + value: 720 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_LocalPosition.x @@ -8914,11 +8957,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.x - value: -200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.y - value: -92.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8934,23 +8977,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7084650721959008719, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7084650721959008719, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7084650721959008719, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_SizeDelta.x + value: 573 objectReference: {fileID: 0} - target: {fileID: 7084650721959008719, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 286.5 objectReference: {fileID: 0} - target: {fileID: 7084650721959008719, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -17.5 objectReference: {fileID: 0} - target: {fileID: 7312373301845048671, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} - propertyPath: m_SizeDelta.y - value: 0 + propertyPath: m_AnchoredPosition.y + value: -0.0000076293945 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -10740,27 +10787,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 15784257731239013, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 15784257731239013, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.99999994 objectReference: {fileID: 0} - target: {fileID: 15784257731239013, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.27656376 objectReference: {fileID: 0} - target: {fileID: 375201435683026176, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 375201435683026176, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 375201435683026176, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -17 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_Pivot.x @@ -10772,27 +10819,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_SizeDelta.x - value: -400 + value: 600 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_SizeDelta.y - value: -185 + value: 720 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_LocalPosition.x @@ -10824,11 +10871,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchoredPosition.x - value: -200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_AnchoredPosition.y - value: -92.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index b83c79aa..c00ff68d 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -17,14 +17,10 @@ namespace Studio.Manage canvas_popup.panel_newprojectinfo.onClickCreate += canvas_static.panel_scenetab.Init; canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_start.Close; canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_newprojectinfo.Close; - canvas_popup.panel_newprojectinfo.onClickCreate += () => canvas_popup.panel_startsetting.Active(true); - canvas_popup.panel_newprojectinfo.onClickCreate += () => canvas_popup.panel_appsetting.Active(true); canvas_popup.panel_openprojectinfo.onClickOpen += canvas_static.panel_scenetab.Init; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_start.Close; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close; - canvas_popup.panel_openprojectinfo.onClickOpen += () => canvas_popup.panel_startsetting.Active(true); - canvas_popup.panel_openprojectinfo.onClickOpen += () => canvas_popup.panel_appsetting.Active(true); canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_static.panel_scenetab.Init; canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_popup.panel_topmenunewprojectinfo.Close; @@ -32,11 +28,6 @@ namespace Studio.Manage canvas_popup.panel_topmenuopenprojectinfo.onClickOpen += canvas_static.panel_scenetab.Init; canvas_popup.panel_topmenuopenprojectinfo.onClickOpen += canvas_popup.panel_topmenuopenprojectinfo.Close; - canvas_popup.panel_startsetting.onClickAppSetting += canvas_popup.panel_appsetting.Active; - canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active; - canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active; - canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active; - canvas_popup.panel_startsetting.onClickAssetSetting += canvas_popup.panel_assetsetting.Active; canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; diff --git a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs index d05ec034..a972d94a 100644 --- a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs @@ -10,7 +10,6 @@ namespace Studio.Manage public StaticCanvasHandler(Canvas_Static canvas_static) { var canvas_Popup = CanvasManager.instance.GetCanvas(); - canvas_static.panel_scenetab.onSceneSettingTab += canvas_Popup.panel_startsetting.Active; GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject; GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject; diff --git a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs index 28a5b32b..663c8c69 100644 --- a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs @@ -17,11 +17,6 @@ namespace Studio.Manage canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_quickstart.Close; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close; - canvas_popup.panel_startsetting.onClickAppSetting += canvas_popup.panel_appsetting.Active; - canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active; - canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active; - canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active; - canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; canvas_popup.panel_3dfactorysetting.onUISetting += canvas_popup.panel_dynamicobjectuisetting.SetData; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 8cac3c7b..470590b7 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -16,7 +16,6 @@ namespace Studio public Panel_TopMenuNewProjectInfo panel_topmenunewprojectinfo; public Panel_TopMenuOpenProjectInfo panel_topmenuopenprojectinfo; - public Panel_StartSetting panel_startsetting; public Panel_AppSetting panel_appsetting; public Panel_AuthSetting panel_authsetting; public Panel_APISetting panel_apisetting; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs index e5cd8a7b..ad320733 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs @@ -6,8 +6,6 @@ namespace Studio.UI public class Canvas_Studio_Popup : CanvasBase { public Panel_SceneTab panel_scenetab; - public Panel_StartSetting panel_startsetting; - public Panel_AppSetting panel_appsetting; public Panel_AuthSetting panel_authsetting; public Panel_APISetting panel_apisetting; public Panel_MQTTSetting panel_mqttsetting; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs index 2a52891f..624a7aa6 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs @@ -19,6 +19,7 @@ namespace Studio.UI public Action onClose; + public Button Button_Close; public void Active(bool isActive) { SetActive(isActive); @@ -34,6 +35,7 @@ namespace Studio.UI Button_AddAPIConnectionItem.onClick.AddListener(OnClickAddAPIConnectionItemButton); apiConnectionItems.Clear(); + Button_Close.onClick.AddListener(() => Active(false)); } private void OnClickAddAPIConnectionItemButton() { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs index 657933d9..33ba96a1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs @@ -37,6 +37,7 @@ namespace Studio.UI private float ratio; public Action onClose; + public Button Button_Close; public void Active(bool isActive) { @@ -52,6 +53,7 @@ namespace Studio.UI Button_ImageSelected.onClick.AddListener(OnClickImageSelectedButton); Toggle_AutoStart.onValueChanged.AddListener(OnAutoStartValuedChanged); Button_LanguagePack.onClick.AddListener(OnClickLanguagePackButton); + Button_Close.onClick.AddListener(() => Active(false)); SetAnimationStyleDropdown(); SetProgressBarStyleDropdown(); diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AuthSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AuthSetting.cs index d6cf8870..cc1f82b6 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AuthSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AuthSetting.cs @@ -1,10 +1,18 @@ using UnityEngine; +using UnityEngine.UI; using XRLib.UI; namespace Studio.UI { public class Panel_AuthSetting : PanelBase { + public Button Button_Close; + + public override void AfterAwake() + { + Button_Close.onClick.AddListener(() => Active(false)); + } + public void Active(bool isActive) { SetActive(isActive); diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_MQTTSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_MQTTSetting.cs index 84b15e28..39f0af41 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_MQTTSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_MQTTSetting.cs @@ -16,6 +16,7 @@ namespace Studio.UI private UI_MQTTConnection prf_MQTTConnectionItem; private List mqttConnectionItems = new List(); public Action onClose; + public Button Button_Close; public void Active(bool isActive) { @@ -32,6 +33,8 @@ namespace Studio.UI Button_AddMQTTConnectionItem.onClick.AddListener(OnClickAddAPIConnectionItemButton); mqttConnectionItems.Clear(); + + Button_Close.onClick.AddListener(() => Active(false)); } private void OnClickAddAPIConnectionItemButton() { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs index 2710d68f..3503dadb 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs @@ -68,22 +68,26 @@ namespace Studio.UI private void OnClickMQTTSetting() { - throw new NotImplementedException(); + Debug.Log("On TopMenu Click MQTT Setting"); + CanvasManager.instance.GetCanvas().panel_mqttsetting.SetActive(true); } private void OnClickAPISetting() { - throw new NotImplementedException(); + Debug.Log("On TopMenu Click API Setting"); + CanvasManager.instance.GetCanvas().panel_apisetting.SetActive(true); } private void OnClickAuthSetting() { - throw new NotImplementedException(); + Debug.Log("On TopMenu Click Auth Setting"); + CanvasManager.instance.GetCanvas().panel_authsetting.SetActive(true); } private void OnClickAppSetting() { - throw new NotImplementedException(); + Debug.Log("On TopMenu Click App Setting"); + CanvasManager.instance.GetCanvas().panel_appsetting.SetActive(true); } private void OnClickNewProject()