Merge pull request 'Panel_Start Setting,App Setting 디자인 적용' (#112) from sjm/250528 into main

Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/112
This commit was merged in pull request #112.
This commit is contained in:
2025-05-28 13:35:51 +09:00
6 changed files with 1034 additions and 1324 deletions

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 4a1d48d42fb1a3745ac549ee8a7dc869
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 543b0b976a536f3a195577dd11f805cb
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_CatalogRequestsTimeout: 0

View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 50, y: 0, z: 50, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

File diff suppressed because it is too large Load Diff

View File

@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 5410305237387619584}
- component: {fileID: 2861081032386749877}
- component: {fileID: 3526026811731855620}
- component: {fileID: 3301002146232492349}
m_Layer: 5
m_Name: Toggle_AuthSetting
m_TagString: Untagged
@@ -35,9 +36,9 @@ RectTransform:
- {fileID: 2596988996425497024}
m_Father: {fileID: 5415421396721871911}
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: 200, y: -52.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5410305237387619584
@@ -68,7 +69,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -121,11 +122,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2861081032386749877}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &3301002146232492349
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 522847655149368589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &680796425980981834
GameObject:
m_ObjectHideFlags: 0
@@ -267,7 +283,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -404,9 +420,9 @@ RectTransform:
- {fileID: 2433811602346908521}
m_Father: {fileID: 5415421396721871911}
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: 200, y: -17.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5851157329846886569
@@ -437,7 +453,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -490,7 +506,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2385361322007026763}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
@@ -508,7 +524,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -2}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1132907136703894087
GameObject:
@@ -584,8 +600,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -720,8 +736,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1039,7 +1055,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2979940503107961155}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
@@ -1118,8 +1134,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1238,7 +1254,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1388,6 +1404,7 @@ GameObject:
- component: {fileID: 6073780239663242522}
- component: {fileID: 8378885652016308535}
- component: {fileID: 8175762798521410827}
- component: {fileID: 3952929521072397083}
m_Layer: 5
m_Name: Toggle_MQTTSetting
m_TagString: Untagged
@@ -1411,9 +1428,9 @@ RectTransform:
- {fileID: 4237388401581516903}
m_Father: {fileID: 5415421396721871911}
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: 200, y: -122.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6073780239663242522
@@ -1444,7 +1461,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1497,11 +1514,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 8378885652016308535}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &3952929521072397083
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2780813550474746232}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &2831728763685212542
GameObject:
m_ObjectHideFlags: 0
@@ -1969,8 +2001,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2105,8 +2137,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2178,6 +2210,7 @@ GameObject:
- component: {fileID: 7675279395722932038}
- component: {fileID: 8640113132482359271}
- component: {fileID: 3066354958932631838}
- component: {fileID: 3891303720174205123}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@@ -2242,6 +2275,21 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3891303720174205123
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5906891490987607186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &7280161044621465099
GameObject:
m_ObjectHideFlags: 0
@@ -2300,7 +2348,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2375,7 +2423,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2404,6 +2452,7 @@ GameObject:
- component: {fileID: 63617555276793385}
- component: {fileID: 3995109217507155576}
- component: {fileID: 327447223630134517}
- component: {fileID: 616389516660989770}
m_Layer: 5
m_Name: Toggle_APISetting
m_TagString: Untagged
@@ -2427,9 +2476,9 @@ RectTransform:
- {fileID: 3060064463523730758}
m_Father: {fileID: 5415421396721871911}
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: 200, y: -87.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &63617555276793385
@@ -2460,7 +2509,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2513,11 +2562,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 3995109217507155576}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &616389516660989770
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7410169318399637521}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &7760239339309219648
GameObject:
m_ObjectHideFlags: 0
@@ -2576,7 +2640,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2605,6 +2669,7 @@ GameObject:
- component: {fileID: 3699255322847400887}
- component: {fileID: 7787229179050832729}
- component: {fileID: 693345390380284954}
- component: {fileID: 5985483412012896340}
m_Layer: 5
m_Name: Toggle_AssetSetting
m_TagString: Untagged
@@ -2628,9 +2693,9 @@ RectTransform:
- {fileID: 5897254447948056194}
m_Father: {fileID: 5415421396721871911}
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: 200, y: -157.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3699255322847400887
@@ -2661,7 +2726,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2714,11 +2779,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 7787229179050832729}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &5985483412012896340
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8358864612680385020
GameObject:
m_ObjectHideFlags: 0
@@ -2736,7 +2816,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4361438021496185155
RectTransform:
m_ObjectHideFlags: 0
@@ -2758,8 +2838,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: 0, y: -95}
m_SizeDelta: {x: 0, y: -190}
m_AnchoredPosition: {x: 0, y: -92.5}
m_SizeDelta: {x: 0, y: -185}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4350688116203905947
CanvasRenderer:
@@ -2841,7 +2921,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

File diff suppressed because it is too large Load Diff

View File

@@ -85,6 +85,16 @@ namespace Studio.UI
selectedToggle = TabToggles.GetFirstActiveToggle();
var image = toggle.transform.GetChild(0).GetComponent<Image>();
image.gameObject.SetActive(isOn);
TextMeshProUGUI text = toggle.GetComponentInChildren<TextMeshProUGUI>();
if (isOn)
{
text.color = Color.white;
}
else
{
text.color = Color.black;
}
}
private void OnClickAppSettingButton(bool isOn)
{