UI 2차 추가 수정

This commit is contained in:
정영민
2025-03-28 09:50:00 +09:00
parent 85b4742485
commit 105c6c3ee7
10 changed files with 236 additions and 60 deletions

View File

@@ -976,7 +976,7 @@ MonoBehaviour:
CloseButton: {fileID: 0} CloseButton: {fileID: 0}
CurrentDate: {fileID: 0} CurrentDate: {fileID: 0}
CurrentTime: {fileID: 0} CurrentTime: {fileID: 0}
fadeTime: 0.5 fadeTime: 0.2
--- !u!1 &2898945362052975825 --- !u!1 &2898945362052975825
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -3845,7 +3845,7 @@ MonoBehaviour:
CloseButton: {fileID: 2515168148136674645} CloseButton: {fileID: 2515168148136674645}
CurrentDate: {fileID: 4901537819349924945} CurrentDate: {fileID: 4901537819349924945}
CurrentTime: {fileID: 7945408392820960553} CurrentTime: {fileID: 7945408392820960553}
fadeTime: 0.5 fadeTime: 0.2
--- !u!1 &8634851171478773832 --- !u!1 &8634851171478773832
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -1042,7 +1042,7 @@ MonoBehaviour:
m_Padding: m_Padding:
m_Left: 2 m_Left: 2
m_Right: 2 m_Right: 2
m_Top: 19 m_Top: 0
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 3 m_ChildAlignment: 3
m_Spacing: 17.5 m_Spacing: 17.5

View File

@@ -244,6 +244,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 9077426054224426697} - {fileID: 9077426054224426697}
- {fileID: 1421685370006874090}
- {fileID: 985731249611372072} - {fileID: 985731249611372072}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -430,11 +431,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 7443211741384927328} - {fileID: 7443211741384927328}
m_Father: {fileID: 1541597435073435897} m_Father: {fileID: 2563419348715790888}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 29, y: -17} m_AnchoredPosition: {x: 344, y: -16}
m_SizeDelta: {x: 48, y: 24} m_SizeDelta: {x: 48, y: 24}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8393330851982402915 --- !u!222 &8393330851982402915
@@ -644,7 +645,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1421685370006874090}
- {fileID: 6252902951189616221} - {fileID: 6252902951189616221}
m_Father: {fileID: 9077426054224426697} m_Father: {fileID: 9077426054224426697}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@@ -2841,7 +2841,7 @@ MonoBehaviour:
CloseButton: {fileID: 0} CloseButton: {fileID: 0}
CurrentDate: {fileID: 0} CurrentDate: {fileID: 0}
CurrentTime: {fileID: 0} CurrentTime: {fileID: 0}
fadeTime: 0.5 fadeTime: 0.2
--- !u!1 &7022080237990091709 --- !u!1 &7022080237990091709
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -119,8 +119,8 @@ Material:
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0, g: 0, b: 1, a: 0.000000007450581} - _BaseColor: {r: 0, g: 0, b: 1, a: 0.000000014901161}
- _Color: {r: 0, g: 0, b: 1, a: 0.000000007450581} - _Color: {r: 0, g: 0, b: 1, a: 0.5}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@@ -16606,8 +16606,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1808.4498, y: -29.079956} m_AnchoredPosition: {x: 1808.4, y: -30.5}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 61, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &83516659 --- !u!114 &83516659
MonoBehaviour: MonoBehaviour:
@@ -16673,7 +16673,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -73912,7 +73912,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 582.3334, y: -30.5} m_AnchoredPosition: {x: 582.3334, y: -30.5}
m_SizeDelta: {x: 128, y: 50} m_SizeDelta: {x: 138, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &364709508 --- !u!114 &364709508
MonoBehaviour: MonoBehaviour:
@@ -73978,7 +73978,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -77207,7 +77207,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.789978, y: 152.9} m_AnchoredPosition: {x: 0, y: 150}
m_SizeDelta: {x: 34, y: 34} m_SizeDelta: {x: 34, y: 34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &379440003 --- !u!114 &379440003
@@ -117019,12 +117019,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 964127729}
- {fileID: 1455663152} - {fileID: 1455663152}
m_Father: {fileID: 495533499} m_Father: {fileID: 495533499}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5.5, y: -400.4} m_AnchoredPosition: {x: 5.5, y: -402.09998}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &587908795 --- !u!114 &587908795
@@ -125884,7 +125885,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6.29, y: -215.5} m_AnchoredPosition: {x: 5.5, y: -210.09998}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &631707864 --- !u!114 &631707864
@@ -158001,6 +158002,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1664826789211949129, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -933.25006
objectReference: {fileID: 0}
- target: {fileID: 2260595169506849184, guid: 1fc88af379a7a364fb3d26a826fa4561, - target: {fileID: 2260595169506849184, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3} type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@@ -158101,6 +158107,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3612442029170579425, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3}
propertyPath: m_SizeDelta.x
value: 1866.5
objectReference: {fileID: 0}
- target: {fileID: 7133962274756680921, guid: 1fc88af379a7a364fb3d26a826fa4561, - target: {fileID: 7133962274756680921, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3} type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@@ -158111,6 +158122,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7133962274756680921, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9054515635504360399, guid: 1fc88af379a7a364fb3d26a826fa4561, - target: {fileID: 9054515635504360399, guid: 1fc88af379a7a364fb3d26a826fa4561,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@@ -176822,7 +176838,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5.8, y: -167} m_AnchoredPosition: {x: 5.5, y: -162.1}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &753637369 --- !u!114 &753637369
@@ -178423,8 +178439,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 119, y: -30.5} m_AnchoredPosition: {x: 118.660034, y: -30.5}
m_SizeDelta: {x: 210, y: 50} m_SizeDelta: {x: 237.33, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &761672150 --- !u!114 &761672150
MonoBehaviour: MonoBehaviour:
@@ -178490,7 +178506,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -234005,6 +234021,81 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 960408011} m_GameObject: {fileID: 960408011}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &961193229
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 961193230}
- component: {fileID: 961193232}
- component: {fileID: 961193231}
m_Layer: 5
m_Name: Image_MiniMapActive
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &961193230
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961193229}
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: 1638360486}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &961193231
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961193229}
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: abf7a59d5066c4a43baaa762e40bb0aa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &961193232
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961193229}
m_CullTransparentMesh: 1
--- !u!1 &962107996 --- !u!1 &962107996
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -234732,6 +234823,81 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 964105322} m_GameObject: {fileID: 964105322}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &964127728
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 964127729}
- component: {fileID: 964127731}
- component: {fileID: 964127730}
m_Layer: 5
m_Name: Image_FloorControlActive
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &964127729
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 964127728}
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: 587908794}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &964127730
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 964127728}
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: abf7a59d5066c4a43baaa762e40bb0aa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &964127731
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 964127728}
m_CullTransparentMesh: 1
--- !u!1 &965421842 --- !u!1 &965421842
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -266457,8 +266623,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 303.66663, y: -30.5} m_AnchoredPosition: {x: 306.32996, y: -30.5}
m_SizeDelta: {x: 128, y: 50} m_SizeDelta: {x: 138, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1138471069 --- !u!114 &1138471069
MonoBehaviour: MonoBehaviour:
@@ -266524,7 +266690,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -273223,8 +273389,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 442.99997, y: -30.5} m_AnchoredPosition: {x: 444.33, y: -30.5}
m_SizeDelta: {x: 128, y: 50} m_SizeDelta: {x: 138, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1169875601 --- !u!114 &1169875601
MonoBehaviour: MonoBehaviour:
@@ -273290,7 +273456,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -303414,7 +303580,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.789978, y: 186.9} m_AnchoredPosition: {x: 0, y: 186.9}
m_SizeDelta: {x: 34, y: 34} m_SizeDelta: {x: 34, y: 34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1340366681 --- !u!114 &1340366681
@@ -332368,8 +332534,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1867.5502, y: -29.079956} m_AnchoredPosition: {x: 1869.4, y: -30.5}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 61, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1495267554 --- !u!114 &1495267554
MonoBehaviour: MonoBehaviour:
@@ -332435,7 +332601,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@@ -354824,7 +354990,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6.290001, y: -311.89978} m_AnchoredPosition: {x: 5.5, y: -306.09998}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1612592512 --- !u!114 &1612592512
@@ -360653,12 +360819,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 961193230}
- {fileID: 281906883} - {fileID: 281906883}
m_Father: {fileID: 495533499} m_Father: {fileID: 495533499}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6.29, y: -263.6} m_AnchoredPosition: {x: 5.5, y: -258.09998}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1638360487 --- !u!114 &1638360487
@@ -377695,7 +377862,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6.290001, y: -351.89978} m_AnchoredPosition: {x: 5.5, y: -354.09998}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1715653677 --- !u!114 &1715653677
@@ -404160,7 +404327,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.789978, y: 113} m_AnchoredPosition: {x: 0, y: 113}
m_SizeDelta: {x: 34, y: 34} m_SizeDelta: {x: 34, y: 34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1836944052 --- !u!114 &1836944052
@@ -429541,8 +429708,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1747.85, y: -29.079956} m_AnchoredPosition: {x: 1747.4, y: -30.5}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 61, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1965143522 --- !u!114 &1965143522
MonoBehaviour: MonoBehaviour:
@@ -429608,7 +429775,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

View File

@@ -141,14 +141,14 @@ namespace CHN
{ {
m.color = new Color(m.color.r,m.color.g,m.color.b,alpha); m.color = new Color(m.color.r,m.color.g,m.color.b,alpha);
} }
if (alpha > 0.5f) if (alpha > 0.7f)
{ {
alpha = 0.5f; alpha = 0.7f;
coeff = -coeff; coeff = -coeff;
} }
else if (alpha < 0f) else if (alpha < 0.3f)
{ {
alpha = 0f; alpha = 0.3f;
coeff = -coeff; coeff = -coeff;
} }
else else
@@ -160,10 +160,10 @@ namespace CHN
IEnumerator OneFlash() IEnumerator OneFlash()
{ {
float alpha = 0f; float alpha = 0f;
float coeff = 0.05f; float coeff = 0.2f;
if (flashCount == 0) if (flashCount == 0)
{ {
while (alpha < 0.5f) while (alpha < 0.7f)
{ {
yield return new WaitForSeconds(0.05f); yield return new WaitForSeconds(0.05f);

View File

@@ -15,14 +15,17 @@ public class Panel_ToolBar : PanelBase
public Button Button_QuarterView; public Button Button_QuarterView;
public Button Button_SholuderView; public Button Button_SholuderView;
private Button Button_DashBoard; private Button Button_DashBoard;
private Image Image_DashboardActive;
private Button Button_CustomView; private Button Button_CustomView;
private Button Button_Minimap; private Button Button_Minimap;
private Button Button_Record; private Button Button_Record;
private Image Image_Record_Play;
private Button Button_Capture; private Button Button_Capture;
private Button Button_FloorControl; private Button Button_FloorControl;
private Image Image_DashboardActive;
private Image Image_Record_Play;
private Image Image_MiniMapActive;
private Image Image_FloorControlActive;
private CaptureBase capture; private CaptureBase capture;
public Action<ViewMode> onClickCameraView; public Action<ViewMode> onClickCameraView;
@@ -78,6 +81,9 @@ public class Panel_ToolBar : PanelBase
} }
private void OnClickFloorControl() private void OnClickFloorControl()
{ {
var isActive = Image_FloorControlActive.gameObject.activeSelf ? false : true;
Image_FloorControlActive.gameObject.SetActive(isActive);
onClickFloorControl?.Invoke(); onClickFloorControl?.Invoke();
} }
@@ -124,6 +130,9 @@ public class Panel_ToolBar : PanelBase
private void OnClickMinimap() private void OnClickMinimap()
{ {
var isActive = Image_MiniMapActive.gameObject.activeSelf ? false : true;
Image_MiniMapActive.gameObject.SetActive(isActive);
onClickMiniMap?.Invoke(); onClickMiniMap?.Invoke();
} }

View File

@@ -380,7 +380,7 @@
"sttm": "0826", "sttm": "0826",
"totm": "", "totm": "",
"goaltime": "1440", "goaltime": "1440",
"ptotm": "2025-03-28 08:05:56", "ptotm": "2025-03-29 08:40:39",
"psttm": "2025-03-26 08:26:01" "psttm": "2025-03-26 08:26:01"
}, },
"isCheck": false "isCheck": false
@@ -555,7 +555,7 @@
"sttm": "0751", "sttm": "0751",
"totm": "", "totm": "",
"goaltime": "1439", "goaltime": "1439",
"ptotm": "2025-03-28 08:49:26", "ptotm": "2025-03-29 09:32:18",
"psttm": "2025-03-26 07:51:03" "psttm": "2025-03-26 07:51:03"
}, },
"isCheck": false "isCheck": false
@@ -590,7 +590,7 @@
"sttm": "0833", "sttm": "0833",
"totm": "", "totm": "",
"goaltime": "1439", "goaltime": "1439",
"ptotm": "2025-03-28 08:49:32", "ptotm": "2025-03-29 09:32:11",
"psttm": "2025-03-26 08:33:18" "psttm": "2025-03-26 08:33:18"
}, },
"isCheck": false "isCheck": false
@@ -660,7 +660,7 @@
"sttm": "0842", "sttm": "0842",
"totm": "", "totm": "",
"goaltime": "2990", "goaltime": "2990",
"ptotm": "2025-03-28 07:59:18", "ptotm": "2025-03-29 09:32:34",
"psttm": "2025-03-26 08:42:28" "psttm": "2025-03-26 08:42:28"
}, },
"isCheck": false "isCheck": false
@@ -730,7 +730,7 @@
"sttm": "0754", "sttm": "0754",
"totm": "", "totm": "",
"goaltime": "2879", "goaltime": "2879",
"ptotm": "2025-03-29 07:57:58", "ptotm": "2025-03-30 09:32:26",
"psttm": "2025-03-26 07:54:51" "psttm": "2025-03-26 07:54:51"
}, },
"isCheck": false "isCheck": false
@@ -765,7 +765,7 @@
"sttm": "0833", "sttm": "0833",
"totm": "", "totm": "",
"goaltime": "1439", "goaltime": "1439",
"ptotm": "2025-03-28 08:50:17", "ptotm": "2025-03-29 09:32:43",
"psttm": "2025-03-26 08:33:27" "psttm": "2025-03-26 08:33:27"
}, },
"isCheck": false "isCheck": false
@@ -800,10 +800,10 @@
"sttm": "0753", "sttm": "0753",
"totm": "", "totm": "",
"goaltime": "1439", "goaltime": "1439",
"ptotm": "2025-03-28 08:50:24", "ptotm": "2025-03-29 09:32:02",
"psttm": "2025-03-26 07:53:20" "psttm": "2025-03-26 07:53:20"
}, },
"isCheck": true "isCheck": false
}, },
{ {
"completeInfo": { "completeInfo": {
@@ -1097,7 +1097,7 @@
"worknm": "U/SONIC WELD-2", "worknm": "U/SONIC WELD-2",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "가동중", "statusnm": "지그교환",
"itemcd": "24298734", "itemcd": "24298734",
"itemdesc": "SCOOP ASM-DRV LINK LUB", "itemdesc": "SCOOP ASM-DRV LINK LUB",
"pjtcd": "GF9", "pjtcd": "GF9",
@@ -1115,7 +1115,7 @@
"sttm": "0757", "sttm": "0757",
"totm": "", "totm": "",
"goaltime": "675", "goaltime": "675",
"ptotm": "2025-03-28 12:13:11", "ptotm": "2025-03-28 17:34:37",
"psttm": "2025-03-26 07:57:23" "psttm": "2025-03-26 07:57:23"
}, },
"isCheck": false "isCheck": false
@@ -1132,7 +1132,7 @@
"worknm": "OILSUCTION PIPE", "worknm": "OILSUCTION PIPE",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "가동", "statusnm": "가동",
"itemcd": "55511445", "itemcd": "55511445",
"itemdesc": "PIPE ASM-O/PMP SUC", "itemdesc": "PIPE ASM-O/PMP SUC",
"pjtcd": "CSS 50V LM2", "pjtcd": "CSS 50V LM2",
@@ -1325,7 +1325,7 @@
"sttm": "1621", "sttm": "1621",
"totm": "", "totm": "",
"goaltime": "147", "goaltime": "147",
"ptotm": "2025-03-28 08:59:50", "ptotm": "2025-03-28 11:13:08",
"psttm": "2025-03-26 16:21:06" "psttm": "2025-03-26 16:21:06"
}, },
"isCheck": false "isCheck": false
@@ -1465,7 +1465,7 @@
"sttm": "0759", "sttm": "0759",
"totm": "", "totm": "",
"goaltime": "436", "goaltime": "436",
"ptotm": "2025-03-28 08:36:54", "ptotm": "2025-03-28 15:56:37",
"psttm": "2025-03-26 07:59:34" "psttm": "2025-03-26 07:59:34"
}, },
"isCheck": false "isCheck": false
@@ -1535,7 +1535,7 @@
"sttm": "0759", "sttm": "0759",
"totm": "", "totm": "",
"goaltime": "447", "goaltime": "447",
"ptotm": "2025-03-28 15:25:46", "ptotm": "2025-03-28 15:35:48",
"psttm": "2025-03-26 07:59:05" "psttm": "2025-03-26 07:59:05"
}, },
"isCheck": false "isCheck": false