diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index ab0623ce..aaf699ca 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -948,43 +948,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 643449707283617506, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1084,23 +1084,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2641865167890791995, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1120,23 +1120,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3407360332968577993, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1208,43 +1208,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1272,23 +1272,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y @@ -1464,23 +1464,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7049248817799997631, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y @@ -1556,43 +1556,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1604,23 +1604,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1660,23 +1660,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2381,6 +2381,7 @@ RectTransform: - {fileID: 1439596647} - {fileID: 1085911555} - {fileID: 1712022043} + - {fileID: 740571666} - {fileID: 1195713950} - {fileID: 917198748} - {fileID: 110380560} @@ -3074,6 +3075,112 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} m_PrefabInstance: {fileID: 722122562} m_PrefabAsset: {fileID: 0} +--- !u!1001 &740571665 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 545811781} + m_Modifications: + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_SizeDelta.x + value: 318 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_SizeDelta.y + value: 972.8 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchoredPosition.x + value: -344 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -44 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Name + value: Panel_AGV + objectReference: {fileID: 0} + - target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} +--- !u!224 &740571666 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + m_PrefabInstance: {fileID: 740571665} + m_PrefabAsset: {fileID: 0} --- !u!1 &749092879 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs index c4b90d8b..55844266 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs @@ -1,4 +1,5 @@ using Studio.AssetTool; +using Studio.Manage; using Studio.VirtualFactory.Info; using System; using System.Collections; @@ -62,6 +63,7 @@ namespace Studio.Staic.STKC bodySpeed = 0.3f; liftSpeed = 0.3f; onMotionStart = StartAnim; + ManagerHub.instance.Get().onRun += OnPlayStart; //이벤트 걸어둔다.. //+= OnPlayStart } diff --git a/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs b/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs index bb86ec80..fe4c0f75 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs @@ -1,5 +1,4 @@ using TMPro; -using UnityEditor.Localization.Plugins.XLIFF.V20; using UnityEngine; using UnityEngine.UI; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs b/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs index 565bc6ca..15db79a2 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs @@ -1,11 +1,7 @@ -using Studio; using System.Collections; using System.Collections.Generic; -using TMPro; -using UnityEditor.Animations; using UnityEngine; using UnityEngine.UI; -using XRLib; using XRLib.UI; namespace Studio.UI @@ -26,7 +22,7 @@ namespace Studio.UI RectTransform MiniMapScreen; RectTransform Image_MiniMapIcon; RectTransform MiniMapHeightButtons; - + RectMask2D rectMask2D; Vector2 worldMin; @@ -98,7 +94,7 @@ namespace Studio.UI float yPos = Mathf.Lerp(0, HeightSelectBar.rect.height, normalizedY); float height = yPos * unit; newButton.UpdateHeight(height); - + StartCoroutine(CaptureImageAtHeight(newButton, height)); } @@ -134,7 +130,7 @@ namespace Studio.UI float maxHeight = float.MinValue; float minHeight = float.MaxValue; - foreach (var twinObject in twinObjects) + foreach (var twinObject in twinObjects) { Renderer[] renderers = twinObject.GetComponentsInChildren(); @@ -274,7 +270,7 @@ namespace Studio.UI { GameObject headerChildObject = headerChild.gameObject; - if (headerChildObject != Button_Minimize.gameObject) + if (headerChildObject != Button_Minimize.gameObject) { headerChildObject.SetActive(false); }