diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 92f8a932..d7c55759 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -1542,6 +1542,468 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7844719208258716390, guid: 96b73e9674fb61c489cee99ad24c044c, type: 3} m_PrefabInstance: {fileID: 455884375451432191} m_PrefabAsset: {fileID: 0} +--- !u!1001 &445006263 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 545811781} + m_Modifications: + - target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -338 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -383 + objectReference: {fileID: 0} + - target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -158 + objectReference: {fileID: 0} + - target: {fileID: 3356956008821289435, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: -107 + objectReference: {fileID: 0} + - target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -83.5 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.5 + objectReference: {fileID: 0} + - target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Name + value: Panel_DataRepository + objectReference: {fileID: 0} + - target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -293 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -48 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -48 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -203 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -428 + objectReference: {fileID: 0} + - target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -68 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -248 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -113 + objectReference: {fileID: 0} + - target: {fileID: 8345779493912287860, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: -440 + objectReference: {fileID: 0} + - target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} +--- !u!224 &445006264 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + m_PrefabInstance: {fileID: 445006263} + m_PrefabAsset: {fileID: 0} --- !u!1 &481136642 GameObject: m_ObjectHideFlags: 0 @@ -1782,6 +2244,7 @@ RectTransform: - {fileID: 416036583} - {fileID: 1223093458} - {fileID: 1265526094} + - {fileID: 445006264} m_Father: {fileID: 1981809316} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1834,6 +2297,7 @@ MonoBehaviour: panel_multilingualsettingmodal: {fileID: 0} panel_loggingmodal: {fileID: 0} panel_exitchecker: {fileID: 0} + panel_datarepository: {fileID: 0} panel_dataconnectmodal: {fileID: 0} panel_alarmconnectmodal: {fileID: 0} panel_dynamicobjectinfo: {fileID: 0} diff --git a/Assets/Scripts/Studio/Connect/Constants.cs b/Assets/Scripts/Studio/Connect/Constants.cs index f9dc0086..aa4978cf 100644 --- a/Assets/Scripts/Studio/Connect/Constants.cs +++ b/Assets/Scripts/Studio/Connect/Constants.cs @@ -5,11 +5,8 @@ namespace Studio.Conifg public class Constants { public static string APIDomain; - public static int APIPort; - public static string MQTTDomain; - public static int MQTTPort; } } diff --git a/Assets/Scripts/Studio/Connect/StudioRepoistory.cs b/Assets/Scripts/Studio/Connect/StudioRepoistory.cs index 7451a3ba..00d68326 100644 --- a/Assets/Scripts/Studio/Connect/StudioRepoistory.cs +++ b/Assets/Scripts/Studio/Connect/StudioRepoistory.cs @@ -1,16 +1,11 @@ -using Best.HTTP.JSON.LitJson; -using Best.MQTT; +using Best.MQTT; using Best.MQTT.Packets.Builders; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using RTG; using Studio.Conifg; using Studio.Setting.Connect; using System; using System.Collections.Generic; -using System.IO; using System.Text; -using System.Threading; using System.Threading.Tasks; using UnityEngine; @@ -34,8 +29,7 @@ namespace Studio public Action>> OnTopicList; public StudioRepoistory() { - Debug.Log($"11MQTT Domain{Constants.MQTTDomain} , MQTTPORT{Constants.MQTTPort}"); - MQTTCreateConnect(); + //MQTTCreateConnect(); Application.quitting += OnDestroy; } diff --git a/Assets/Scripts/Studio/Connect/StudioService.cs b/Assets/Scripts/Studio/Connect/StudioService.cs index 9191a537..c9cf6889 100644 --- a/Assets/Scripts/Studio/Connect/StudioService.cs +++ b/Assets/Scripts/Studio/Connect/StudioService.cs @@ -24,19 +24,8 @@ namespace Studio public class StudioService : UnitySingleton { - #region Singleton - - #endregion - private Dictionary>> listenerIdMap; private StudioRepoistory repository; - public bool isConnected - { - get - { - return repository.isConnected; - } - } private Dictionary updateTime = new(); private int totalRequestPacket; private int totalResponsePacket; @@ -57,15 +46,6 @@ namespace Studio public event Action> onAPIDataLoaded; public event Action>, TimeSpan> onMQTTDataLoaded; - private void Awake() - { - Constants.MQTTDomain = "220.90.135.190"; - Constants.MQTTPort = 8088; - //Constants.APIDomain = "220.90.135.190"; - //Constants.APIPort = 23000; - ConnectMQTT(); - } - public void ConnectMQTT() { this.repository = new StudioRepoistory(); diff --git a/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs b/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs new file mode 100644 index 00000000..115565b1 --- /dev/null +++ b/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs @@ -0,0 +1,86 @@ +using Best.MQTT; +using Best.MQTT.Packets.Builders; +using Studio.Util; +using System; +using System.Text; +using UnityEngine; + +namespace Studio.Connection +{ + //¿¬°á ½ÇÆÐ½Ã, ¸Þ½ÃÁö 1ȸ ¼ö½Å½Ã »ç¶óÁö´Â Àӽà Ŭ¶óÀ̾ðÆ®. ÅäÇÈ Çϳª¸¸ ¹ÞÀ»¼ö ÀÖÀ½. + public class TemporaryMQTTClient + { + MQTTClient client; + string domain; + int port; + string topic; + Action callback; + public TemporaryMQTTClient(string domain, int port, string topic, Action callback) + { + this.domain = domain; + this.port = port; + this.topic = topic; + this.callback = callback; + var optionBuilder = new ConnectionOptionsBuilder() + .WithTCP(domain, port) + .Build(); + + client = new MQTTClient(optionBuilder); + client.OnConnected += OnConnectedMQTT; + client.OnStateChanged += OnStateChangedMQTT; + client.OnDisconnect += OnDisconnectedMQTT; + client.OnError += OnErrorMQTT; + client.BeginConnect(ConnectPacketBuilderCallback); + } + + public override string ToString() + { + return $"domain={domain}, port={port}, topic={topic}"; + } + + + private void OnTopic(MQTTClient client, SubscriptionTopic topic, string topicName, ApplicationMessage message) + { + string payload = Encoding.UTF8.GetString(message.Payload.Data, message.Payload.Offset, message.Payload.Count); + Debug.Log($"Temporary MQTT is OnTopic. {ToString()}, msg={payload}"); + callback(payload); + Disconnect(); + } + + private ConnectPacketBuilder ConnectPacketBuilderCallback(MQTTClient client, ConnectPacketBuilder builder) + { + return builder.WithKeepAlive(60); + } + void Disconnect() + { + client.CreateUnsubscribePacketBuilder(topic) + .BeginUnsubscribe(); + client.CreateDisconnectPacketBuilder() + .BeginDisconnect(); + } + + private void OnErrorMQTT(MQTTClient client, string error) + { + Debug.Log($"Temporary MQTT Client Error. {ToString()}, error={error}"); + //Disconnect(); + } + + private void OnDisconnectedMQTT(MQTTClient client, DisconnectReasonCodes reasonCode, string reasonMessage) + { + Debug.Log($"Temporary MQTT Client Disconnected. {ToString()}, reason={reasonCode}, msg={reasonMessage}"); + } + + private void OnStateChangedMQTT(MQTTClient client, ClientStates oldState, ClientStates newState) + { + Debug.Log($"Temporary MQTT Client is StateChanged. {ToString()}, old={oldState}, new={newState}"); + } + + private void OnConnectedMQTT(MQTTClient client) + { + Debug.Log($"Temporary MQTT Client is OnConnected. {ToString()}"); + client.CreateBulkSubscriptionBuilder() +.WithTopic(new SubscribeTopicBuilder(topic).WithMessageCallback(OnTopic)) +.BeginSubscribe(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs.meta b/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs.meta new file mode 100644 index 00000000..7b07d369 --- /dev/null +++ b/Assets/Scripts/Studio/Connect/TemporaryMQTTClient.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8fadcb9cef997184ab5ca4fd6275e798 \ No newline at end of file diff --git a/Assets/SceneDataContainer.cs b/Assets/Scripts/Studio/SceneDataContainer.cs similarity index 100% rename from Assets/SceneDataContainer.cs rename to Assets/Scripts/Studio/SceneDataContainer.cs diff --git a/Assets/SceneDataContainer.cs.meta b/Assets/Scripts/Studio/SceneDataContainer.cs.meta similarity index 100% rename from Assets/SceneDataContainer.cs.meta rename to Assets/Scripts/Studio/SceneDataContainer.cs.meta diff --git a/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs b/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs index 3d8da205..eee9f6bd 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; using System; using Studio.Util; using Studio.Conifg; +using Studio.Connection; +using System.Linq; namespace Studio { @@ -49,17 +51,21 @@ namespace Studio Debug.Log("On Click MQTT Test"); onMQTTTest?.Invoke(); - Constants.MQTTDomain = InputField_Domain.text; - Constants.MQTTPort = int.Parse(InputField_Port.text); - //StudioService.instance.ConnectMQTT(); + var domain = InputField_Domain.text; + var port = int.Parse(InputField_Port.text); + List topics = new(); foreach (UI_InputTopicItem item in inputTopicItems) { - StudioService.instance.SubscribeMQTT(item.InputField_Topic.text); - - //panel_DataRepository = FindAnyObjectByType(FindObjectsInactive.Include); - //panel_DataRepository.mqttConnected = true; + topics.Add(item.InputField_Topic.text); } + + var tmpClient = new TemporaryMQTTClient(domain, port, topics.First(), OnTopicTest); + } + + void OnTopicTest(string payload) + { + Debug.Log($"MQTT Test result = {payload}"); } private void OnClickRemoveItemButton() { diff --git a/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs b/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs index d5e70459..197c62aa 100644 --- a/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs +++ b/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; +using UnityEngine; namespace Best.HTTP.Shared.Databases { @@ -212,8 +213,12 @@ namespace Best.HTTP.Shared.Databases return true; using (var fileStream = HTTPManager.IOService.CreateFileStream(this.MetadataFileName, Best.HTTP.Shared.PlatformSupport.FileSystem.FileStreamModes.Create)) - using (var stream = new BufferedStream(fileStream)) - this.MetadataService.SaveTo(stream); + { + using (var stream = new BufferedStream(fileStream)) + { + this.MetadataService.SaveTo(stream); + } + } if (this.Options.UseHashFile) { diff --git a/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs b/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs index b0318fc8..003c97aa 100644 --- a/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs +++ b/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using Best.HTTP.Shared.Databases.MetadataIndexFinders; +using UnityEngine; namespace Best.HTTP.Shared.Databases { diff --git a/Packages/com.tivadar.best.http/Runtime/Shared/Extensions/HeartbeatManager.cs b/Packages/com.tivadar.best.http/Runtime/Shared/Extensions/HeartbeatManager.cs index b9e5569d..7854c811 100644 --- a/Packages/com.tivadar.best.http/Runtime/Shared/Extensions/HeartbeatManager.cs +++ b/Packages/com.tivadar.best.http/Runtime/Shared/Extensions/HeartbeatManager.cs @@ -110,7 +110,7 @@ namespace Best.HTTP.Shared.Extensions } catch (Exception ex) { - HTTPManager.Logger.Exception("HeartbeatManager", heartbeat.GetType().Name, ex, null); + HTTPManager.Logger.Exception("HeartbeatManager@", heartbeat.GetType().Name, ex, null); } } }