Compare commits
67 Commits
jym/250623
...
pgd/202507
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b66fdd0f3 | ||
| b799cf829d | |||
|
|
e95e2bde14 | ||
|
|
4f863885ab | ||
|
|
ce6cf04fcd | ||
| 4287c02bca | |||
|
|
da4e29d0af | ||
|
|
63895136ca | ||
| 5151fc3d0b | |||
| 2657b5ae12 | |||
| 8393201152 | |||
|
|
fb419b8009 | ||
|
|
8f8de3d19a | ||
|
|
351f7f8d33 | ||
| 37663571f2 | |||
| 58ba89edd6 | |||
| 42a178c3fa | |||
| 720b0755a8 | |||
| ef25aa75c2 | |||
| 58abe8cb1f | |||
| e7be4f65a7 | |||
| 41b02ffecf | |||
| 8d690f6ead | |||
|
|
6c4aa2fb76 | ||
|
|
ee2b11d19c | ||
|
|
f6c25e1180 | ||
|
|
968e46ec16 | ||
|
|
70af2d5a38 | ||
|
|
9a7ea9f689 | ||
|
|
6674608e3c | ||
| f0d115751b | |||
|
|
958e9d1fec | ||
| ba7cd3c0d0 | |||
|
|
de125cd8b8 | ||
|
|
e446fe6282 | ||
|
|
713a428960 | ||
|
|
9ddf268722 | ||
|
|
ae2f9c1857 | ||
| a07de37142 | |||
| 31fb41bbb7 | |||
| 286fc53324 | |||
|
|
eaca30883b | ||
|
|
ffc15fb3b1 | ||
|
|
6600428e1c | ||
|
|
696c39b452 | ||
|
|
20fd855e2a | ||
|
|
1979585566 | ||
|
|
dc867997b9 | ||
|
|
ce287ba9df | ||
|
|
9f2828f9c4 | ||
|
|
a06b7b47c6 | ||
| 3f3d636d1a | |||
| ddcf05a8ec | |||
| 175554b506 | |||
| 7f63a6bd35 | |||
|
|
6214a58c79 | ||
|
|
d405525cc0 | ||
|
|
b8233087c4 | ||
|
|
df79a5a884 | ||
|
|
f87a7ed987 | ||
| 623d3167eb | |||
|
|
db8ad39420 | ||
| 8a46b5dd51 | |||
|
|
5f7762d0ca | ||
|
|
144a905460 | ||
| 4e0b574627 | |||
| 9496e73df1 |
@@ -49,7 +49,7 @@ TextureImporter:
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 15, z: 0, w: 15}
|
||||
spriteBorder: {x: 16, y: 16, z: 16, w: 16}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
|
||||
@@ -27,6 +27,40 @@ MonoBehaviour:
|
||||
m_Key: Scale Gizmo
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2904508764098560
|
||||
m_Key: Reset Gizmo
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917846080393216
|
||||
m_Key: Copy Object
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917920218910720
|
||||
m_Key: New Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918019179319296
|
||||
m_Key: Open Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918166198063104
|
||||
m_Key: 'Copy Object
|
||||
|
||||
'
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925542997331968
|
||||
m_Key: Remove Object
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925648920285184
|
||||
m_Key: Save Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2928491886645248
|
||||
m_Key: Exit Program
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
m_KeyGenerator:
|
||||
|
||||
@@ -30,6 +30,38 @@ MonoBehaviour:
|
||||
m_Localized: Scale Gizmo
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2904508764098560
|
||||
m_Localized: Reset Gizmo
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917846080393216
|
||||
m_Localized: Copy Object
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917920218910720
|
||||
m_Localized: New Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918019179319296
|
||||
m_Localized: Open Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918166198063104
|
||||
m_Localized: Copy Object
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925542997331968
|
||||
m_Localized: Remove Object
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925648920285184
|
||||
m_Localized: Save Project
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2928491886645248
|
||||
m_Localized: Exit Program
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds: []
|
||||
|
||||
@@ -30,6 +30,38 @@ MonoBehaviour:
|
||||
m_Localized: "\uC2A4\uCF00\uC77C \uAE30\uC9C0\uBAA8"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2904508764098560
|
||||
m_Localized: "\uB9AC\uC14B \uAE30\uC9C0\uBAA8"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917846080393216
|
||||
m_Localized: "\uAC1D\uCCB4 \uBCF5\uC0AC"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2917920218910720
|
||||
m_Localized: "\uC0C8 \uD504\uB85C\uC81D\uD2B8"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918019179319296
|
||||
m_Localized: "\uD504\uB85C\uC81D\uD2B8 \uC5F4\uAE30"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2918166198063104
|
||||
m_Localized: "\uAC1D\uCCB4 \uBCF5\uC0AC"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925542997331968
|
||||
m_Localized: "\uAC1D\uCCB4 \uC0AD\uC81C"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2925648920285184
|
||||
m_Localized: "\uD504\uB85C\uC81D\uD2B8 \uC800\uC7A5"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
- m_Id: 2928491886645248
|
||||
m_Localized: "\uD504\uB85C\uADF8\uB7A8 \uC885\uB8CC"
|
||||
m_Metadata:
|
||||
m_Items: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds: []
|
||||
|
||||
@@ -26,7 +26,7 @@ MonoBehaviour:
|
||||
m_Items: []
|
||||
m_ProjectLocaleIdentifier:
|
||||
m_Code: ko-KR
|
||||
m_PreloadBehavior: 1
|
||||
m_PreloadBehavior: 3
|
||||
m_InitializeSynchronously: 0
|
||||
references:
|
||||
version: 2
|
||||
|
||||
@@ -227,13 +227,12 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 7330605729473467856}
|
||||
- {fileID: 9010945254377347865}
|
||||
- {fileID: 4967853432408004068}
|
||||
m_Father: {fileID: 4536383871410992554}
|
||||
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: -15}
|
||||
m_SizeDelta: {x: 0, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: -17.5}
|
||||
m_SizeDelta: {x: 0, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6653012135198171495
|
||||
CanvasRenderer:
|
||||
@@ -289,10 +288,10 @@ RectTransform:
|
||||
- {fileID: 6402120625795957218}
|
||||
m_Father: {fileID: 6691755070911261169}
|
||||
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_SizeDelta: {x: 0, y: 25}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 286.5, y: -12.5}
|
||||
m_SizeDelta: {x: 573, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1131445508177178942
|
||||
CanvasRenderer:
|
||||
@@ -655,7 +654,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -663,7 +662,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &3905365314351557767
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -693,6 +692,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3538150327327642966}
|
||||
- {fileID: 4967853432408004068}
|
||||
- {fileID: 1003142542951200780}
|
||||
m_Father: {fileID: 6023788723247703297}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1385,6 +1385,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
header: {fileID: 0}
|
||||
Area: {fileID: 0}
|
||||
state: 0
|
||||
resizeDirection: 0
|
||||
@@ -1460,7 +1461,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -1468,7 +1469,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!114 &937857520092457360
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1638,7 +1639,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4908418670581876778}
|
||||
m_Father: {fileID: 3538150327327642966}
|
||||
m_Father: {fileID: 4536383871410992554}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@@ -1749,7 +1750,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
||||
@@ -34,8 +34,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: 0}
|
||||
m_SizeDelta: {x: 10, y: 10}
|
||||
m_AnchoredPosition: {x: 5, y: 0}
|
||||
m_SizeDelta: {x: 10, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8309550141671835622
|
||||
CanvasRenderer:
|
||||
@@ -65,7 +65,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -74,7 +74,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &702700444486434170
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -610,8 +610,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: 0}
|
||||
m_SizeDelta: {x: -10, y: -10}
|
||||
m_AnchoredPosition: {x: -5, y: 0}
|
||||
m_SizeDelta: {x: -10, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1403518221973745675
|
||||
GameObject:
|
||||
@@ -769,7 +769,7 @@ MonoBehaviour:
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 6259202582067685909}
|
||||
m_HorizontalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 1
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
m_VerticalScrollbarSpacing: -3
|
||||
m_OnValueChanged:
|
||||
@@ -1219,7 +1219,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6, y: -1}
|
||||
m_SizeDelta: {x: 15, y: -18}
|
||||
m_SizeDelta: {x: 10, y: -18}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &9160260616006377246
|
||||
CanvasRenderer:
|
||||
@@ -1249,7 +1249,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -1258,7 +1258,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!114 &8289467855309802760
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1556,7 +1556,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -12, y: 0}
|
||||
m_SizeDelta: {x: -12, y: -12}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2371798722619063628
|
||||
CanvasRenderer:
|
||||
@@ -1805,6 +1805,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
header: {fileID: 0}
|
||||
Area: {fileID: 0}
|
||||
state: 0
|
||||
resizeDirection: 0
|
||||
@@ -1984,8 +1985,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: 0}
|
||||
m_SizeDelta: {x: 10, y: 10}
|
||||
m_AnchoredPosition: {x: 5, y: 0}
|
||||
m_SizeDelta: {x: 10, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2110257543691917756
|
||||
CanvasRenderer:
|
||||
@@ -2015,7 +2016,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -2024,7 +2025,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &3708687645258132285
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2182,7 +2183,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -12, y: 0}
|
||||
m_SizeDelta: {x: -12, y: -12}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8339613067977679465
|
||||
CanvasRenderer:
|
||||
@@ -2512,7 +2513,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1098354475033513177
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3252,7 +3253,7 @@ MonoBehaviour:
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 8289467855309802760}
|
||||
m_HorizontalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 1
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
m_VerticalScrollbarSpacing: -3
|
||||
m_OnValueChanged:
|
||||
@@ -4104,8 +4105,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: 0}
|
||||
m_SizeDelta: {x: -10, y: -10}
|
||||
m_AnchoredPosition: {x: -5, y: 0}
|
||||
m_SizeDelta: {x: -10, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7893358657509629700
|
||||
GameObject:
|
||||
@@ -4357,7 +4358,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6, y: -1}
|
||||
m_SizeDelta: {x: 15, y: -18}
|
||||
m_SizeDelta: {x: 10, y: -18}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &2134743442907977708
|
||||
CanvasRenderer:
|
||||
@@ -4387,7 +4388,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -4396,7 +4397,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!114 &6259202582067685909
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -418,8 +418,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 208.94434, y: -154.58943}
|
||||
m_SizeDelta: {x: 379.8972, y: 309.1779}
|
||||
m_AnchoredPosition: {x: 208.94, y: -239.58}
|
||||
m_SizeDelta: {x: 379.8972, y: 309.17786}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3101259340876616321
|
||||
MonoBehaviour:
|
||||
@@ -495,7 +495,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: -0.00034048597, y: 0.00004343147}
|
||||
m_AnchoredPosition: {x: -0.00034048597, y: 0.00037136686}
|
||||
m_SizeDelta: {x: 282.99957, y: 2}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &8511847140840865857
|
||||
@@ -1365,8 +1365,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: -42.497}
|
||||
m_SizeDelta: {x: 0, y: -84.995}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00024414062}
|
||||
m_SizeDelta: {x: 0, y: -0.00048828}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5647078525317105949
|
||||
GameObject:
|
||||
@@ -1515,6 +1515,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
header: {fileID: 0}
|
||||
Area: {fileID: 0}
|
||||
state: 0
|
||||
resizeDirection: 0
|
||||
@@ -2402,7 +2403,7 @@ MonoBehaviour:
|
||||
m_HandleRect: {fileID: 1456553455777821898}
|
||||
m_Direction: 2
|
||||
m_Value: 0
|
||||
m_Size: 0.9999941
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
||||
@@ -196,7 +196,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@@ -577,6 +577,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
header: {fileID: 0}
|
||||
Area: {fileID: 0}
|
||||
state: 0
|
||||
resizeDirection: 0
|
||||
@@ -613,6 +614,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4848133918839780870}
|
||||
- {fileID: 7327674350019384346}
|
||||
- {fileID: 6332159985048176241}
|
||||
m_Father: {fileID: 5526574206638406261}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -655,10 +657,10 @@ RectTransform:
|
||||
- {fileID: 6015914731583279537}
|
||||
m_Father: {fileID: 6170707829871908408}
|
||||
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_SizeDelta: {x: 0, y: 25}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 286.5, y: -12.5}
|
||||
m_SizeDelta: {x: 573, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2662598266185177957
|
||||
CanvasRenderer:
|
||||
@@ -802,7 +804,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -810,7 +812,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!114 &1203360775691188198
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1283,13 +1285,12 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 2696512530260289514}
|
||||
- {fileID: 8873675426699895800}
|
||||
- {fileID: 7327674350019384346}
|
||||
m_Father: {fileID: 6065905194162777582}
|
||||
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: -15}
|
||||
m_SizeDelta: {x: 0, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: -17.5}
|
||||
m_SizeDelta: {x: 0, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4231886982462112987
|
||||
CanvasRenderer:
|
||||
@@ -1377,7 +1378,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -1385,7 +1386,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &8220806185953508040
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1416,7 +1417,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6269155309670994543}
|
||||
m_Father: {fileID: 4848133918839780870}
|
||||
m_Father: {fileID: 6065905194162777582}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
||||
@@ -1302,6 +1302,7 @@ MonoBehaviour:
|
||||
Button_Run: {fileID: 0}
|
||||
Button_Close: {fileID: 0}
|
||||
Button_LanguageSetting: {fileID: 0}
|
||||
Text_Language: {fileID: 0}
|
||||
--- !u!1 &1125765218071084743
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3041,8 +3042,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 15
|
||||
m_fontSizeBase: 15
|
||||
m_fontSize: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -3051,7 +3052,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: -3
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@@ -3551,6 +3552,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8580075652477381670}
|
||||
- {fileID: 6290649851210927995}
|
||||
m_Father: {fileID: 6105994354646297837}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
@@ -6762,8 +6764,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 15
|
||||
m_fontSizeBase: 15
|
||||
m_fontSize: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -6772,7 +6774,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: -3
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@@ -7451,8 +7453,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 15
|
||||
m_fontSizeBase: 15
|
||||
m_fontSize: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -7461,7 +7463,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: -3
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@@ -10733,6 +10735,157 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7669123702517555861
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6290649851210927995}
|
||||
- component: {fileID: 4658318050737482717}
|
||||
- component: {fileID: 2920137130514090499}
|
||||
- component: {fileID: 5344783717609916258}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Language
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6290649851210927995
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7669123702517555861}
|
||||
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: 5175156938614111087}
|
||||
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: 18.9, y: -9.5}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4658318050737482717
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7669123702517555861}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2920137130514090499
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7669123702517555861}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: EN
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 11
|
||||
m_fontSizeBase: 11
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &5344783717609916258
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7669123702517555861}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &7769666627040665028
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -10878,7 +11031,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Enter text...
|
||||
m_text: "\uAE30\uB2A5 \uAC80\uC0C9 .."
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
@@ -11854,8 +12007,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 15
|
||||
m_fontSizeBase: 15
|
||||
m_fontSize: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -11864,7 +12017,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: -3
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@@ -12005,8 +12158,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 15
|
||||
m_fontSizeBase: 15
|
||||
m_fontSize: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -12015,7 +12168,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: -3
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
|
||||
@@ -24,9 +24,8 @@ MonoBehaviour:
|
||||
probeSamplingDebugMesh: {fileID: 0}
|
||||
probeSamplingDebugTexture: {fileID: 0}
|
||||
probeVolumeBlendStatesCS: {fileID: 0}
|
||||
m_RendererFeatures:
|
||||
- {fileID: 203358797822649256}
|
||||
m_RendererFeatureMap: a8632bcabf79d202
|
||||
m_RendererFeatures: []
|
||||
m_RendererFeatureMap:
|
||||
m_UseNativeRenderPass: 0
|
||||
xrSystemData: {fileID: 0}
|
||||
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
||||
@@ -52,24 +51,3 @@ MonoBehaviour:
|
||||
m_DepthTextureFormat: 0
|
||||
m_AccurateGbufferNormals: 0
|
||||
m_IntermediateTextureMode: 1
|
||||
--- !u!114 &203358797822649256
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c96e8c42a07c7dd498c6973ddaa9dd1d, type: 3}
|
||||
m_Name: EdgeDetection
|
||||
m_EditorClassIdentifier:
|
||||
m_Active: 1
|
||||
settings:
|
||||
renderPassEvent: 500
|
||||
outlineThickness: 1
|
||||
outlineColor: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1}
|
||||
layerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1024
|
||||
edgeDetectionMaterial: {fileID: 2100000, guid: 1f064310b42f3774c93e76683fe11c3a, type: 2}
|
||||
|
||||
@@ -65,7 +65,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 092c4fc99ee91584d930b69a2926a277, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c5802470c3fb4754bba86eef138daa73, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -942,6 +942,7 @@ GameObject:
|
||||
- component: {fileID: 1294127454145776225}
|
||||
- component: {fileID: 451971561218025839}
|
||||
- component: {fileID: 4531525069399822389}
|
||||
- component: {fileID: 1290421278383867588}
|
||||
m_Layer: 0
|
||||
m_Name: InputField_Port
|
||||
m_TagString: Untagged
|
||||
@@ -1108,6 +1109,19 @@ MonoBehaviour:
|
||||
isAlert: 0
|
||||
m_InputValidator: {fileID: 0}
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &1290421278383867588
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2436487502178914535}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f95cd07bc2246945965157693796194, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inputField: {fileID: 0}
|
||||
--- !u!1 &3156314644122750241
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1233,12 +1247,10 @@ RectTransform:
|
||||
- {fileID: 7802291444583939836}
|
||||
- {fileID: 7140421003607322157}
|
||||
- {fileID: 5319280790680272187}
|
||||
- {fileID: 2409465826104916815}
|
||||
- {fileID: 379597478942034218}
|
||||
- {fileID: 5462667841529239013}
|
||||
- {fileID: 1693887338035721121}
|
||||
- {fileID: 8825133631318362178}
|
||||
- {fileID: 8526485094171269008}
|
||||
- {fileID: 8388329608737497676}
|
||||
- {fileID: 4620234391147991730}
|
||||
m_Father: {fileID: 0}
|
||||
@@ -1246,7 +1258,7 @@ RectTransform:
|
||||
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: 583, y: 220}
|
||||
m_SizeDelta: {x: 583, y: 180}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2575719433142104857
|
||||
CanvasRenderer:
|
||||
@@ -1344,142 +1356,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4003389390085169589}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &4617730869522186888
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7115248029429128929}
|
||||
- component: {fileID: 1863190725087911462}
|
||||
- component: {fileID: 6090726597310434102}
|
||||
m_Layer: 0
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7115248029429128929
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4617730869522186888}
|
||||
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: 8526485094171269008}
|
||||
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: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1863190725087911462
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4617730869522186888}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6090726597310434102
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4617730869522186888}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Test
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4285558896
|
||||
m_fontColor: {r: 0.4392157, g: 0.4392157, b: 0.4392157, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 16
|
||||
m_fontSizeBase: 16
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &5244346861865818874
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1809,142 +1685,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 40, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6013032041850567338
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1423389078985016357}
|
||||
- component: {fileID: 2990823342691973195}
|
||||
- component: {fileID: 8893341559389614051}
|
||||
m_Layer: 0
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1423389078985016357
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6013032041850567338}
|
||||
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: 2409465826104916815}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 85, y: 0}
|
||||
m_SizeDelta: {x: 120, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2990823342691973195
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6013032041850567338}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8893341559389614051
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6013032041850567338}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Connection Test
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
|
||||
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4285558896
|
||||
m_fontColor: {r: 0.4392157, g: 0.4392157, b: 0.4392157, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 16
|
||||
m_fontSizeBase: 16
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6872735410097360928
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2230,7 +1970,7 @@ GameObject:
|
||||
- component: {fileID: 8458748578651207766}
|
||||
- component: {fileID: 4713296498140157138}
|
||||
m_Layer: 0
|
||||
m_Name: Button_ViewResults
|
||||
m_Name: Button_TestAPI
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -2691,51 +2431,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8376188551342810451}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &8443765769311335949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2409465826104916815}
|
||||
- component: {fileID: 2307470290499782099}
|
||||
m_Layer: 0
|
||||
m_Name: Connection Test
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2409465826104916815
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8443765769311335949}
|
||||
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: 1423389078985016357}
|
||||
m_Father: {fileID: 6029866318953262369}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 125, y: 70}
|
||||
m_SizeDelta: {x: 250, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2307470290499782099
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8443765769311335949}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &8452262920164209762
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2872,127 +2567,6 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &8761055319915315992
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8526485094171269008}
|
||||
- component: {fileID: 4708186645858634878}
|
||||
- component: {fileID: 7345194138902725981}
|
||||
- component: {fileID: 7494914256502275596}
|
||||
m_Layer: 0
|
||||
m_Name: Button_TestAPI
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8526485094171269008
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8761055319915315992}
|
||||
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: 7115248029429128929}
|
||||
m_Father: {fileID: 6029866318953262369}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 83.5, y: 70}
|
||||
m_SizeDelta: {x: -333, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4708186645858634878
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8761055319915315992}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7345194138902725981
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8761055319915315992}
|
||||
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: 027d3b1aa1504584db7344ecf13dfc85, 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 &7494914256502275596
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8761055319915315992}
|
||||
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: 7345194138902725981}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &8829135613240903342
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3005,6 +2579,7 @@ GameObject:
|
||||
- component: {fileID: 6749344978886352018}
|
||||
- component: {fileID: 2032036743421240120}
|
||||
- component: {fileID: 7558723559091652677}
|
||||
- component: {fileID: 4643025905696753907}
|
||||
m_Layer: 0
|
||||
m_Name: InputField_Domain
|
||||
m_TagString: Untagged
|
||||
@@ -3171,3 +2746,16 @@ MonoBehaviour:
|
||||
isAlert: 0
|
||||
m_InputValidator: {fileID: 0}
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &4643025905696753907
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8829135613240903342}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 318ad98d4b818194da00221ee69745cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inputField: {fileID: 0}
|
||||
|
||||
@@ -251,6 +251,7 @@ GameObject:
|
||||
- component: {fileID: 6549079342170574329}
|
||||
- component: {fileID: 8772786093202997941}
|
||||
- component: {fileID: 8501740602063653259}
|
||||
- component: {fileID: 1292074844791121958}
|
||||
m_Layer: 0
|
||||
m_Name: InputField_Topic
|
||||
m_TagString: Untagged
|
||||
@@ -417,6 +418,19 @@ MonoBehaviour:
|
||||
isAlert: 0
|
||||
m_InputValidator: {fileID: 0}
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &1292074844791121958
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5041442594409627906}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5cfbc3180aa0867408d6521529e5cac4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inputField: {fileID: 0}
|
||||
--- !u!1 &5562854965458769467
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -942,6 +942,7 @@ GameObject:
|
||||
- component: {fileID: 1294127454145776225}
|
||||
- component: {fileID: 451971561218025839}
|
||||
- component: {fileID: 4531525069399822389}
|
||||
- component: {fileID: 3782032704331303633}
|
||||
m_Layer: 0
|
||||
m_Name: InputField_Port
|
||||
m_TagString: Untagged
|
||||
@@ -1108,6 +1109,19 @@ MonoBehaviour:
|
||||
isAlert: 0
|
||||
m_InputValidator: {fileID: 0}
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &3782032704331303633
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2436487502178914535}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f95cd07bc2246945965157693796194, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inputField: {fileID: 0}
|
||||
--- !u!1 &3156314644122750241
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2566,6 +2580,7 @@ GameObject:
|
||||
- component: {fileID: 6749344978886352018}
|
||||
- component: {fileID: 2032036743421240120}
|
||||
- component: {fileID: 7558723559091652677}
|
||||
- component: {fileID: 8720815484175462745}
|
||||
m_Layer: 0
|
||||
m_Name: InputField_Domain
|
||||
m_TagString: Untagged
|
||||
@@ -2732,3 +2747,16 @@ MonoBehaviour:
|
||||
isAlert: 0
|
||||
m_InputValidator: {fileID: 0}
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &8720815484175462745
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8829135613240903342}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 318ad98d4b818194da00221ee69745cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inputField: {fileID: 0}
|
||||
|
||||
@@ -1025,66 +1025,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1065617958303419244, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1065617958303419244, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1105169851982576340, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Panel_StudioTopbar
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1955157107292011281, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1101,34 +1045,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2516340938489095201, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1157,10 +1073,6 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2734107196935352845, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_text
|
||||
value: Data Update Setting
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3081720614352094850, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1241,26 +1153,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3518374408192557755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 34.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3518374408192557755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3612353324306706568, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PreserveAspect
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3887689113271058331, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1277,38 +1173,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4173484896289031105, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4173484896289031105, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1349,14 +1213,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4451917240437057383, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4451917240437057383, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@@ -1365,10 +1221,6 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4728269547262842792, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_text
|
||||
value: Data Repository
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4828121822976114357, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@@ -1425,14 +1277,6 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5358499166359212945, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5358499166359212945, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5557641235373680755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1553,70 +1397,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6210973074375535068, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6210973074375535068, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
- target: {fileID: 6290649851210927995, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 220
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
- target: {fileID: 6290649851210927995, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 149.3316
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -35
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6340558249613605857, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 240
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 89.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6467883027692677993, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@@ -1729,26 +1521,6 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1817,22 +1589,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9055937186152068310, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9055937186152068310, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_PixelsPerUnitMultiplier
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9089877903798422885, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 105.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9089877903798422885, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1854,8 +1610,7 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 7859639716907446574, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
@@ -3030,7 +2785,7 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 2277027821890051672, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 126.6001
|
||||
value: 126.60156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@@ -3056,6 +2811,10 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3159005925573434593, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -144.63281
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@@ -3184,6 +2943,10 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4585162413516526451, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 162.20312
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5132087015678815764, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@@ -3208,6 +2971,14 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -50.398438
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 20.800781
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -3679,8 +3450,6 @@ MonoBehaviour:
|
||||
_moveSettings:
|
||||
_canBeDisplayed: 1
|
||||
_isExpanded: 1
|
||||
_moveSpeed: 6
|
||||
_accelerationRate: 15
|
||||
_panSettings:
|
||||
_canBeDisplayed: 1
|
||||
_isExpanded: 1
|
||||
@@ -3717,6 +3486,8 @@ MonoBehaviour:
|
||||
_zoomMode: 0
|
||||
_orthoStandardZoomSensitivity: 10
|
||||
_perspStandardZoomSensitivity: 10
|
||||
_orthoFastZoomSensitivity: 30
|
||||
_perspFastZoomSensitivity: 30
|
||||
_orthoSmoothZoomSensitivity: 5
|
||||
_perspSmoothZoomSensitivity: 5
|
||||
_orthoZoomSmoothValue: 5
|
||||
@@ -4564,7 +4335,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224153425668364128, guid: 5814e191475da55449e996c6052e2ef7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -90
|
||||
value: -105
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224153425668364128, guid: 5814e191475da55449e996c6052e2ef7, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -9049,11 +8820,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1456553455777821898, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.9999937
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2345256951127197424, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_Size
|
||||
value: 0.9999854
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3027341500357890096, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
@@ -9149,11 +8920,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -648
|
||||
value: -738
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: 218
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -11893,6 +11664,22 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Panel_Toolbox
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3012754740992037236, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 258.89844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3964166921491454580, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 165.89844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5728574744260500265, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 227.89844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8914158643671488508, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 196.89844
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using RTG;
|
||||
using RTG;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Studio.Command;
|
||||
@@ -62,7 +62,7 @@ namespace Studio.RuntimeGizmo
|
||||
}
|
||||
public void SetWorkGizmoId(GizmoId gizmoId)
|
||||
{
|
||||
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
|
||||
if (ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Run)
|
||||
return;
|
||||
objectMoveGizmo.Gizmo.SetEnabled(false);
|
||||
objectRotationGizmo.Gizmo.SetEnabled(false);
|
||||
@@ -104,7 +104,7 @@ namespace Studio.RuntimeGizmo
|
||||
}
|
||||
public void SetGizmoTargetObjects(List<GameObject> objects)
|
||||
{
|
||||
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
|
||||
if (ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Run)
|
||||
return;
|
||||
selectedObjects.Clear();
|
||||
selectedObjects.AddRange(objects);
|
||||
|
||||
@@ -11,12 +11,12 @@ namespace RTG
|
||||
{
|
||||
private static readonly float _minMoveSpeed = 1e-1f;
|
||||
|
||||
[SerializeField]
|
||||
private float _moveSpeed = 6.0f;
|
||||
[SerializeField]
|
||||
private float _accelerationRate = 15.0f;
|
||||
private float _moveSpeed = 30.0f;
|
||||
private float _moveFastSpeed = 60.0f;
|
||||
private float _accelerationRate = 0f;
|
||||
|
||||
public float MoveSpeed { get { return _moveSpeed; } set { _moveSpeed = Mathf.Max(_minMoveSpeed, value); } }
|
||||
public float MoveFastSpeed { get { return _moveFastSpeed; } set { _moveFastSpeed = Mathf.Max(_minMoveSpeed, value); } }
|
||||
public float AccelerationRate { get { return _accelerationRate; } set { _accelerationRate = Mathf.Max(0.0f, value); } }
|
||||
|
||||
|
||||
|
||||
@@ -22,6 +22,10 @@ namespace RTG
|
||||
[SerializeField]
|
||||
private float _perspStandardZoomSensitivity = 10.0f;
|
||||
[SerializeField]
|
||||
private float _orthoFastZoomSensitivity = 30.0f;
|
||||
[SerializeField]
|
||||
private float _perspFastZoomSensitivity = 30.0f;
|
||||
[SerializeField]
|
||||
private float _orthoSmoothZoomSensitivity = 5.0f;
|
||||
[SerializeField]
|
||||
private float _perspSmoothZoomSensitivity = 5.0f;
|
||||
@@ -37,6 +41,8 @@ namespace RTG
|
||||
public CameraZoomMode ZoomMode { get { return _zoomMode; } set { _zoomMode = value; } }
|
||||
public float OrthoStandardZoomSensitivity { get { return _orthoStandardZoomSensitivity; } set { _orthoStandardZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float PerspStandardZoomSensitivity { get { return _perspStandardZoomSensitivity; } set { _perspStandardZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float OrthoFastZoomSensitivity { get { return _orthoFastZoomSensitivity; } set { _orthoFastZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float PerspFastZoomSensitivity { get { return _perspFastZoomSensitivity; } set { _perspFastZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float OrthoSmoothZoomSensitivity { get { return _orthoSmoothZoomSensitivity; } set { _orthoSmoothZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float PerspSmoothZoomSensitivity { get { return _perspSmoothZoomSensitivity; } set { _perspSmoothZoomSensitivity = Mathf.Max(value, 1e-3f); } }
|
||||
public float OrthoZoomSmoothValue { get { return _orthoZoomSmoothValue; } set { _orthoZoomSmoothValue = Mathf.Max(value, 1e-3f); } }
|
||||
@@ -49,16 +55,19 @@ namespace RTG
|
||||
return camera.orthographic ? OrthoZoomSmoothValue : PerspZoomSmoothValue;
|
||||
}
|
||||
|
||||
public float GetZoomSensitivity(Camera camera)
|
||||
public float GetZoomSensitivity(Camera camera, bool isFast)
|
||||
{
|
||||
if (_zoomMode == CameraZoomMode.Standard) return camera.orthographic ? OrthoStandardZoomSensitivity : PerspStandardZoomSensitivity;
|
||||
else
|
||||
if (_zoomMode == CameraZoomMode.Smooth) return camera.orthographic ? OrthoSmoothZoomSensitivity : PerspSmoothZoomSensitivity;
|
||||
|
||||
if (_zoomMode == CameraZoomMode.Standard)
|
||||
{
|
||||
if(camera.orthographic)
|
||||
return isFast ? OrthoFastZoomSensitivity : OrthoStandardZoomSensitivity;
|
||||
else
|
||||
return isFast ? PerspFastZoomSensitivity : PerspStandardZoomSensitivity;
|
||||
}
|
||||
//if (_zoomMode == CameraZoomMode.Smooth) return camera.orthographic ? OrthoSmoothZoomSensitivity : PerspSmoothZoomSensitivity;
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected override void RenderContent(UnityEngine.Object undoRecordObject)
|
||||
{
|
||||
|
||||
|
||||
@@ -349,8 +349,9 @@ namespace RTG
|
||||
|
||||
void GetInput()
|
||||
{
|
||||
float moveAmount = (_moveSettings.MoveSpeed + _currentAcceleration) * Time.deltaTime;
|
||||
|
||||
float moveSpeed = RTInput.GetKey(KeyCode.LeftShift) ? _moveSettings.MoveFastSpeed : _moveSettings.MoveSpeed;
|
||||
|
||||
float moveAmount = (moveSpeed + _currentAcceleration) * Time.deltaTime;
|
||||
Vector3 moveVector = Vector3.zero;
|
||||
_moveDirFlags[(int)MoveDirection.Forward] = Hotkeys.MoveForward.IsActive();
|
||||
_moveDirFlags[(int)MoveDirection.Backwards] = !_moveDirFlags[(int)MoveDirection.Forward] && Hotkeys.MoveBack.IsActive();
|
||||
@@ -465,19 +466,20 @@ namespace RTG
|
||||
return;
|
||||
|
||||
float mouseScroll = RTInput.MouseScroll();
|
||||
bool isFast = RTInput.GetKey(KeyCode.LeftShift);
|
||||
if (Mathf.Approximately(mouseScroll, 0.0f))
|
||||
return;
|
||||
|
||||
if (_zoomSettings.ZoomMode == CameraZoomMode.Standard)
|
||||
{
|
||||
Zoom(CalculateScrollZoomAmount(mouseScroll));
|
||||
Zoom(CalculateScrollZoomAmount(mouseScroll, isFast));
|
||||
//마우스 포인터위치로
|
||||
}
|
||||
else
|
||||
{
|
||||
StopCamTransform();
|
||||
StartCoroutine(_genricCamTransformCrtn = DoSmoothZoom(mouseScroll));
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// StopCamTransform();
|
||||
// StartCoroutine(_genricCamTransformCrtn = DoSmoothZoom(mouseScroll));
|
||||
//}
|
||||
}
|
||||
|
||||
public void SliderZoomInOut(int value)
|
||||
@@ -558,9 +560,9 @@ namespace RTG
|
||||
return _targetTransform.position + _targetTransform.forward * _focusPointOffset;
|
||||
}
|
||||
|
||||
private float CalculateScrollZoomAmount(float deviceScroll)
|
||||
private float CalculateScrollZoomAmount(float deviceScroll, bool isFast)
|
||||
{
|
||||
float zoomAmount = deviceScroll * _zoomSettings.GetZoomSensitivity(TargetCamera);
|
||||
float zoomAmount = deviceScroll * _zoomSettings.GetZoomSensitivity(TargetCamera, isFast);
|
||||
|
||||
if (_zoomSettings.InvertZoomAxis)
|
||||
zoomAmount *= -1.0f;
|
||||
@@ -722,18 +724,18 @@ namespace RTG
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerator DoSmoothZoom(float deviceScroll)
|
||||
{
|
||||
float zoomAmount = CalculateScrollZoomAmount(deviceScroll);
|
||||
//private IEnumerator DoSmoothZoom(float deviceScroll)
|
||||
//{
|
||||
// float zoomAmount = CalculateScrollZoomAmount(deviceScroll);
|
||||
|
||||
while(!Mathf.Approximately(zoomAmount, 0.0f))
|
||||
{
|
||||
Zoom(zoomAmount);
|
||||
zoomAmount = Mathf.Lerp(zoomAmount, 0.0f, _zoomSettings.GetZoomSmoothValue(TargetCamera) * Time.deltaTime);
|
||||
// while(!Mathf.Approximately(zoomAmount, 0.0f))
|
||||
// {
|
||||
// Zoom(zoomAmount);
|
||||
// zoomAmount = Mathf.Lerp(zoomAmount, 0.0f, _zoomSettings.GetZoomSmoothValue(TargetCamera) * Time.deltaTime);
|
||||
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
// yield return null;
|
||||
// }
|
||||
//}
|
||||
|
||||
private IEnumerator DoConstantRotationSwitch(Quaternion targetRotation)
|
||||
{
|
||||
|
||||
@@ -99,28 +99,28 @@ namespace RTG
|
||||
if (!_isEnabled)
|
||||
return;
|
||||
|
||||
if (!Application.isEditor)
|
||||
{
|
||||
if (RTInput.GetKeyDown(KeyCode.Z) && RTInput.GetKey(KeyCode.LeftControl))
|
||||
{
|
||||
Undo();
|
||||
}
|
||||
else if (RTInput.GetKeyDown(KeyCode.Y) && RTInput.GetKey(KeyCode.LeftControl))
|
||||
{
|
||||
Redo();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// Note: When running inside the editor, it seems that we need to add the LSHIFT key into
|
||||
// the mix. Otherwise, Undo/Redo does not work.
|
||||
if (GetEditorUndoHotkey())
|
||||
{
|
||||
Undo();
|
||||
}
|
||||
else if (GetEditorRedoHotkey())
|
||||
{
|
||||
Redo();
|
||||
}
|
||||
//if (!Application.isEditor)
|
||||
//{
|
||||
// if (RTInput.GetKeyDown(KeyCode.Z) && RTInput.GetKey(KeyCode.LeftControl))
|
||||
// {
|
||||
// Undo();
|
||||
// }
|
||||
// else if (RTInput.GetKeyDown(KeyCode.Y) && RTInput.GetKey(KeyCode.LeftControl))
|
||||
// {
|
||||
// Redo();
|
||||
// }
|
||||
// return;
|
||||
//}
|
||||
//// Note: When running inside the editor, it seems that we need to add the LSHIFT key into
|
||||
//// the mix. Otherwise, Undo/Redo does not work.
|
||||
//if (GetEditorUndoHotkey())
|
||||
//{
|
||||
// Undo();
|
||||
//}
|
||||
//else if (GetEditorRedoHotkey())
|
||||
//{
|
||||
// Redo();
|
||||
//}
|
||||
}
|
||||
|
||||
bool GetEditorUndoHotkey()
|
||||
|
||||
@@ -18,11 +18,17 @@ namespace Studio
|
||||
rectTransform = GetComponent<RectTransform>();
|
||||
}
|
||||
|
||||
private void Update()
|
||||
private void OnEnable()
|
||||
{
|
||||
if (rectTransform == null)
|
||||
return;
|
||||
{
|
||||
Debug.Log($"Not Found RectTransform in MouseObserver. {gameObject}");
|
||||
Destroy(this);
|
||||
}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
// 마우스가 자신의 UI(RectTransform) 영역 위에 있는지 판별
|
||||
bool isOver = RectTransformUtility.RectangleContainsScreenPoint(
|
||||
rectTransform,
|
||||
|
||||
@@ -150,7 +150,7 @@ namespace Studio.AssetTool
|
||||
//selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
|
||||
selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
|
||||
selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
|
||||
selectRenderObject.CreateRenderObject();
|
||||
selectRenderObject.CreateRenderObjectAndResizeBoundary();
|
||||
selectRenderObject.Select();
|
||||
selectedAssetData.AddTransformToRender(selectedItem.transform);
|
||||
CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform());
|
||||
@@ -183,7 +183,7 @@ namespace Studio.AssetTool
|
||||
//selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
|
||||
selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
|
||||
selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
|
||||
selectRenderObject.CreateRenderObject();
|
||||
selectRenderObject.CreateRenderObjectAndResizeBoundary();
|
||||
selectRenderObject.Select();
|
||||
selectedAssetData.AddTransformToRender(selectedItem.transform);
|
||||
CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform());
|
||||
@@ -293,7 +293,7 @@ namespace Studio.AssetTool
|
||||
if (selectedObjects.Count == 0)
|
||||
return;
|
||||
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
|
||||
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
|
||||
if (ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Run)
|
||||
{
|
||||
canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false);
|
||||
canvas_Popup.panel_objectdetails.SetTarget(selectedObjects);
|
||||
|
||||
@@ -7,6 +7,9 @@ using UnityEngine.EventSystems;
|
||||
using Studio.DataStructures;
|
||||
using Studio.UI;
|
||||
using Studio.Conifg;
|
||||
using Studio.Dynamic.TwinObject;
|
||||
using Studio.Dynamic.Manager;
|
||||
using Studio.Manage;
|
||||
|
||||
namespace Studio.AssetTool
|
||||
{
|
||||
@@ -215,6 +218,13 @@ namespace Studio.AssetTool
|
||||
Hide();
|
||||
}
|
||||
public void CreateRenderObject()
|
||||
{
|
||||
if (renderObject == null)
|
||||
{
|
||||
renderObject = instantiateObject?.Invoke(transform);
|
||||
}
|
||||
}
|
||||
public void CreateRenderObjectAndResizeBoundary()
|
||||
{
|
||||
if (renderObject == null)
|
||||
{
|
||||
@@ -278,10 +288,20 @@ namespace Studio.AssetTool
|
||||
return;
|
||||
|
||||
this.isAutoId = isAuto;
|
||||
if(functionObject !=null )
|
||||
if(functionObject.ObjectType.Equals(ObjectType.Dynamic))
|
||||
{
|
||||
functionObject.ChangeAutoID(isAuto);
|
||||
//switch(functionObject)
|
||||
//{
|
||||
// case AGV agv:
|
||||
// AGVManager.instance.SetCopyObject(isAutoId,agv.RenderObject);
|
||||
// break;
|
||||
//}
|
||||
}
|
||||
//if(functionObject !=null )
|
||||
//{
|
||||
// functionObject.ChangeAutoID(isAuto);
|
||||
//}
|
||||
}
|
||||
|
||||
private AbstractFunctionObject functionObject;
|
||||
|
||||
@@ -57,6 +57,7 @@ namespace Studio.AssetTool
|
||||
EventSystem.current.RaycastAll(pointerData, raycastResults);
|
||||
if (raycastResults.Any(x => x.gameObject.layer == uiLayer))
|
||||
{
|
||||
lockHandler = true;
|
||||
return;
|
||||
}
|
||||
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnBeginDrag(clickBeginPos);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Studio.AssetTool;
|
||||
using Studio.Manage;
|
||||
using Studio;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Studio.Command
|
||||
{
|
||||
@@ -41,6 +42,10 @@ namespace Studio.Command
|
||||
connectedAsset.renderObject.gameObject.SetActive(false);
|
||||
connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
|
||||
connector.sceneDataContainer.sceneObjects.Remove(connectedAsset.renderObject);
|
||||
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
renderObjectHandler.rtgController.SetGizmoTargetObjects(new List<GameObject>());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Studio.Command
|
||||
|
||||
}
|
||||
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Exit Program"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Studio.Command
|
||||
|
||||
}
|
||||
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Reset Gizmo"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace Studio.Command
|
||||
|
||||
}
|
||||
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Copy Object"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
@@ -56,7 +56,8 @@ namespace Studio.Command
|
||||
copyAsset.renderObject.getBounds = copySource.assetData.GetCombinedBoundary;
|
||||
copyAsset.renderObject.onTransformChanged = copySource.assetData.OnTransformDataChanged;
|
||||
copyAsset.renderObject.instantiateObject = copySource.assetData.InstantiateLoadedObject;
|
||||
copyAsset.renderObject.CreateRenderObject();
|
||||
copyAsset.renderObject.CreateRenderObjectAndResizeBoundary();
|
||||
copyAsset.hierarchyItem.linkedObject = copyObject;
|
||||
copyAsset.renderObject.transform.position = copySource.renderObject.transform.position;
|
||||
copyAsset.renderObject.transform.rotation = copySource.renderObject.transform.rotation;
|
||||
copyAsset.renderObject.transform.localScale = copySource.renderObject.transform.localScale;
|
||||
@@ -82,7 +83,8 @@ namespace Studio.Command
|
||||
childAsset.renderObject.getBounds = childAsset.assetData.GetCombinedBoundary;
|
||||
childAsset.renderObject.onTransformChanged = childAsset.assetData.OnTransformDataChanged;
|
||||
childAsset.renderObject.instantiateObject = childSource.assetData.InstantiateLoadedObject;
|
||||
childAsset.renderObject.CreateRenderObject();
|
||||
childAsset.renderObject.CreateRenderObjectAndResizeBoundary();
|
||||
childAsset.hierarchyItem.linkedObject = copyChildObject;
|
||||
childAsset.renderObject.transform.position = childSource.renderObject.transform.position;
|
||||
childAsset.renderObject.transform.rotation = childSource.renderObject.transform.rotation;
|
||||
childAsset.renderObject.transform.localScale = childSource.renderObject.transform.localScale;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Security.Permissions;
|
||||
using Studio.AssetTool;
|
||||
using Studio.HierarchyTree;
|
||||
using Studio.Manage;
|
||||
using Studio.Util;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Studio.Command
|
||||
{
|
||||
@@ -11,7 +13,7 @@ namespace Studio.Command
|
||||
private List<ConnectedAsset> removeList = new List<ConnectedAsset>();
|
||||
private List<int> siblingIndex = new List<int>();
|
||||
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Remove Object"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
@@ -21,8 +23,8 @@ namespace Studio.Command
|
||||
public void Execute()
|
||||
{
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
if (renderObjectHandler.selectedRenderObjects.Count == 0)
|
||||
return;
|
||||
//if (renderObjectHandler.selectedRenderObjects.Count == 0)
|
||||
// return;
|
||||
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
for (int i = 0; i < renderObjectHandler.selectedRenderObjects.Count; i++)
|
||||
@@ -48,10 +50,10 @@ namespace Studio.Command
|
||||
searchAsset.assetData.RemoveTransform(searchAsset.renderObject.transform);
|
||||
searchAsset.renderObject.gameObject.SetActive(false);
|
||||
objects.Add(searchAsset.renderObject);
|
||||
connector.connectedAssets.Remove(searchAsset);
|
||||
//connector.connectedAssets.Remove(searchAsset);
|
||||
}
|
||||
connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
|
||||
connector.connectedAssets.Remove(connectedAsset);
|
||||
//connector.connectedAssets.Remove(connectedAsset);
|
||||
}
|
||||
|
||||
foreach(var o in objects)
|
||||
@@ -83,9 +85,9 @@ namespace Studio.Command
|
||||
searchAsset.assetData.AddTransformToRender(searchAsset.renderObject.transform);
|
||||
searchAsset.renderObject.gameObject.SetActive(true);
|
||||
objects.Add(searchAsset.renderObject);
|
||||
connector.connectedAssets.Add(searchAsset);
|
||||
//connector.connectedAssets.Add(searchAsset);
|
||||
}
|
||||
connector.connectedAssets.Add(connectedAsset);
|
||||
//connector.connectedAssets.Add(connectedAsset);
|
||||
objects.Add(connectedAsset.renderObject);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace Studio.Command
|
||||
{
|
||||
public class NewProjectCommand : IIrreversibleCommand
|
||||
{
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "New Project"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace Studio.Command
|
||||
{
|
||||
public class OpenProjectCommand : IIrreversibleCommand
|
||||
{
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Open Project"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace Studio.Command
|
||||
{
|
||||
public class SaveAndNewProjectCommand : IIrreversibleCommand
|
||||
{
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Save And New Project"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace Studio.Command
|
||||
{
|
||||
public class SaveAndOpenProjectCommand : IIrreversibleCommand
|
||||
{
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Save And Open Project"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace Studio
|
||||
|
||||
}
|
||||
|
||||
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||
public string id { get => "Save Project"; set => throw new System.NotImplementedException(); }
|
||||
|
||||
public bool CanExecute()
|
||||
{
|
||||
|
||||
@@ -13,16 +13,16 @@ namespace Studio.Auth
|
||||
|
||||
public class AuthRepository
|
||||
{
|
||||
internal async Task<AuthEntity> Login(string email, string password)
|
||||
internal async Task<AuthEntity> Login(string url,string email, string password)
|
||||
{
|
||||
return await LoginRemote(email, password);
|
||||
return await LoginRemote(url,email, password);
|
||||
}
|
||||
|
||||
private async Task<AuthEntity> LoginRemote(string email, string password)
|
||||
private async Task<AuthEntity> LoginRemote(string url,string email, string password)
|
||||
{
|
||||
try
|
||||
{
|
||||
var response = await RestAPI.RequestPost<ResponseModel<AuthEntity>>("/api/auth/token",
|
||||
var response = await RestAPI.RequestPost<ResponseModel<AuthEntity>>(url,
|
||||
new Dictionary<string, object>
|
||||
{
|
||||
["email"] = email,
|
||||
|
||||
@@ -29,8 +29,7 @@ namespace Studio.Auth
|
||||
};
|
||||
_repository = repository;
|
||||
}
|
||||
|
||||
public async Task Login(string email, string password)
|
||||
public async Task Login(string url,string email, string password)
|
||||
{
|
||||
// Simulate login
|
||||
if (email.Length > 0 && password.Length > 0)
|
||||
@@ -40,7 +39,7 @@ namespace Studio.Auth
|
||||
State = AuthEntitiState.Loading,
|
||||
};
|
||||
//OnChanged?.Invoke(this, entiti.Copy());
|
||||
entiti = await _repository.Login(email, password);
|
||||
entiti = await _repository.Login(url,email, password);
|
||||
//OnChanged?.Invoke(this, entiti.Copy());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ namespace Studio.Conifg
|
||||
|
||||
request.DownloadSettings = new Best.HTTP.Request.Settings.DownloadSettings() { ContentStreamMaxBuffered = 1024 * 1024 * 200 };
|
||||
request.MethodType = method;
|
||||
headers.Clear();
|
||||
AddHeader(request, "Content-Type", "application/json; charset=utf-8");
|
||||
|
||||
if (useAuth) AddHeader(request,"access-token", AuthService.Instance.Entiti.accessToken);
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 08b6f925bff664748b4509de6c5f2e66
|
||||
@@ -12,7 +12,7 @@ using UnityEngine;
|
||||
|
||||
namespace Studio
|
||||
{
|
||||
public class StudioRepoistory
|
||||
public class StudioRepository
|
||||
{
|
||||
private MQTTClient client;
|
||||
|
||||
@@ -28,9 +28,8 @@ namespace Studio
|
||||
}
|
||||
}
|
||||
public Action<string, Dictionary<string, Dictionary<string, string>>> OnTopicList;
|
||||
public StudioRepoistory()
|
||||
public StudioRepository()
|
||||
{
|
||||
//MQTTCreateConnect();
|
||||
Application.quitting += OnDestroy;
|
||||
}
|
||||
private Dictionary<string, MQTTClient> clients =new();
|
||||
@@ -86,7 +85,7 @@ namespace Studio
|
||||
{
|
||||
return await Task.Run<StudioEntityWithState<object>>(async () =>
|
||||
{
|
||||
ResponseModel<object> response = await RestAPI.RequestGet<ResponseModel<object>>(url);
|
||||
ResponseModel<object> response = await RestAPI.RequestPost<ResponseModel<object>>(url);
|
||||
Debug.Log(response);
|
||||
if (response.code == "SUCCESS")
|
||||
return new StudioEntityWithState<object>(APIState.Loaded, response.data,response.requestsize);
|
||||
2
Assets/Scripts/Studio/Connect/StudioRepository.cs.meta
Normal file
2
Assets/Scripts/Studio/Connect/StudioRepository.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 32c472b9a2b033044a620d25492099d2
|
||||
@@ -12,6 +12,7 @@ using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
using static UnityEngine.Analytics.IAnalytic;
|
||||
|
||||
namespace Studio
|
||||
{
|
||||
@@ -44,7 +45,7 @@ namespace Studio
|
||||
private Dictionary<string, Dictionary<string, EventHandler<StudioServiceIdEventArgs>>> listenerIdMap =new();
|
||||
private Dictionary<string, EventHandler<StudioServiceTypeEventArgs>> listenerTypeMap = new();
|
||||
|
||||
private StudioRepoistory repository;
|
||||
private StudioRepository repository;
|
||||
private Dictionary<string, float> updateTime = new();
|
||||
public bool isConnected
|
||||
{
|
||||
@@ -77,19 +78,21 @@ namespace Studio
|
||||
private Dictionary<string, List<Topic>> topicTable = new();
|
||||
public Dictionary<string, List<Topic>> TopciTable { get { return topicTable; } }
|
||||
|
||||
public void Init()
|
||||
{
|
||||
this.repository = new StudioRepoistory();
|
||||
repository.OnTopicList += OnTopicList;
|
||||
}
|
||||
public void ConnectMQTT(string domain, string port, List<Util.Topic> topics)
|
||||
private void Start()
|
||||
{
|
||||
if (repository == null)
|
||||
{
|
||||
Init();
|
||||
ManagerHub.instance.Get<RunManager>().onStop += DisConnectMQTT;
|
||||
}
|
||||
|
||||
}
|
||||
public void Init()
|
||||
{
|
||||
this.repository = new StudioRepository();
|
||||
repository.OnTopicList += OnTopicList;
|
||||
}
|
||||
public void ConnectMQTT(string domain, string port, List<Util.Topic> topics)
|
||||
{
|
||||
var conntedInfo = $"MQTT Domain : {domain} , MQTTPORT :{port}";
|
||||
if (!topicTable.ContainsKey(conntedInfo))
|
||||
topicTable.Add(conntedInfo, new());
|
||||
@@ -172,6 +175,11 @@ namespace Studio
|
||||
|
||||
public void AddTypeIdListener(string type, string id = null, EventHandler<StudioServiceIdEventArgs> listener = null)
|
||||
{
|
||||
if(type == null)
|
||||
{
|
||||
Debug.Log("Type null");
|
||||
return;
|
||||
}
|
||||
if (!listenerIdMap.ContainsKey(type))
|
||||
{
|
||||
listenerIdMap.Add(type, new());
|
||||
@@ -239,6 +247,7 @@ namespace Studio
|
||||
else if (data.State == APIState.Error)
|
||||
{
|
||||
//TODO 에러메세지
|
||||
apiData.Clear();
|
||||
Debug.Log($"APIState : Error , Message :{data.Message}");
|
||||
}
|
||||
|
||||
@@ -295,28 +304,49 @@ namespace Studio
|
||||
Debug.Log($"kEY : {key}, Value:{value}");
|
||||
}
|
||||
|
||||
var datas = json["rows"].ToString();
|
||||
//TODO :리팩토링 필요함.
|
||||
var datas = json["data"].ToString();
|
||||
JObject test = JObject.Parse(datas);
|
||||
var list = new List<Dictionary<string, string>>();
|
||||
JArray jarray = JArray.Parse(datas);
|
||||
foreach (JObject obj in jarray.Children())
|
||||
foreach (JProperty te1 in test.Children())
|
||||
{
|
||||
Dictionary<string, string> keyvalue = new();
|
||||
string id = string.Empty;
|
||||
foreach (JProperty prop in obj.Children())
|
||||
string key1 = te1.Name.ToString();
|
||||
string value = te1.Value.ToString();
|
||||
var split = value.ToString().Split('[');
|
||||
var t = string.Empty;
|
||||
|
||||
if(split.Length >1)
|
||||
t = $"[{split[split.Length - 1]}";
|
||||
else if(!split[split.Length - 1].Contains("{"))
|
||||
{
|
||||
string key = prop.Name.ToString();
|
||||
string value = prop.Value.ToString();
|
||||
keyvalue.Add(key, value);
|
||||
Dictionary<string, string> item = new();
|
||||
item.Add(key1, value);
|
||||
list.Add(item);
|
||||
continue;
|
||||
}
|
||||
list.Add(keyvalue);
|
||||
}
|
||||
else
|
||||
t= $"[{split[split.Length - 1]}]";
|
||||
|
||||
JArray jarray = JArray.Parse(t);
|
||||
foreach (JObject obj in jarray.Children())
|
||||
{
|
||||
Dictionary<string, string> keyvalue = new();
|
||||
string id = string.Empty;
|
||||
foreach (JProperty prop in obj.Children())
|
||||
{
|
||||
string key = prop.Name.ToString();
|
||||
string value2 = prop.Value.ToString();
|
||||
keyvalue.Add(key, value2);
|
||||
}
|
||||
list.Add(keyvalue);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private void DispatchMachineEvent(string type, string id, Dictionary<string, string> entity)
|
||||
{
|
||||
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Stop)
|
||||
if (ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Stop)
|
||||
{
|
||||
Debug.Log("Stop");
|
||||
return;
|
||||
|
||||
129
Assets/Scripts/Studio/Connect/TemporaryAPIClient.cs
Normal file
129
Assets/Scripts/Studio/Connect/TemporaryAPIClient.cs
Normal file
@@ -0,0 +1,129 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Studio.Setting.Connect;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
using static UnityEngine.Analytics.IAnalytic;
|
||||
|
||||
namespace Studio
|
||||
{
|
||||
public class TemporaryAPIClient
|
||||
{
|
||||
private StudioRepository repository;
|
||||
public Dictionary<string, StudioEntityWithState<List<Dictionary<string, string>>>> apiData = new();
|
||||
|
||||
public TemporaryAPIClient()
|
||||
{
|
||||
repository = new StudioRepository();
|
||||
}
|
||||
|
||||
public async Task LoadBaseData(string url)
|
||||
{
|
||||
DateTime startTime = DateTime.Now;
|
||||
System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
|
||||
sw.Start();
|
||||
StudioEntityWithState<object> data = await repository.BaseInfo(url);
|
||||
sw.Stop();
|
||||
DateTime endTime = DateTime.Now;
|
||||
|
||||
var t = sw.ElapsedMilliseconds;
|
||||
|
||||
if (data.State.Equals(APIState.Loaded))
|
||||
{
|
||||
if (!apiData.ContainsKey(url))
|
||||
apiData.Add(url, new());
|
||||
|
||||
data.lastRequestTime = startTime;
|
||||
data.lastResponseTime = endTime;
|
||||
data.elapsedTime = sw.Elapsed;
|
||||
CheckAPIBoarder(data.Entity.ToString(), data.ReqSize, url, t);
|
||||
var entity = UpdateEntity(url, data.Entity.ToString());
|
||||
StudioEntityWithState<List<Dictionary<string, string>>> convertData = new(data.State, entity, data.ReqSize, data.Message);
|
||||
apiData[url] = convertData;
|
||||
}
|
||||
else if (data.State == APIState.Error)
|
||||
{
|
||||
//TODO 에러메세지
|
||||
Debug.Log($"APIState : Error , Message :{data.Message}");
|
||||
}
|
||||
|
||||
// onAPIDataLoaded?.Invoke(url, data); // 나중에 클래스 밖으로 이동 필요
|
||||
}
|
||||
|
||||
private void CheckAPIBoarder(string data, int reqSize, string url, long time)
|
||||
{
|
||||
var byteSize = System.Text.Encoding.Default.GetBytes(data).Length;
|
||||
//if (maxElapsedTime < time)
|
||||
//{
|
||||
// maxElapsedTime = time;
|
||||
// maxResponseTimeApi = url;
|
||||
//}
|
||||
|
||||
//if (maxReponesSize < byteSize)
|
||||
//{
|
||||
// maxReponesSize = byteSize;
|
||||
// maxResponseApi = url;
|
||||
//}
|
||||
//if (maxReuqestSize < reqSize)
|
||||
//{
|
||||
// maxReuqestSize = reqSize;
|
||||
// maxReuqestApi = url;
|
||||
//}
|
||||
//totalRequestPacket += reqSize;
|
||||
//totalResponsePacket += byteSize;
|
||||
//totalElapsedTime += time;
|
||||
}
|
||||
|
||||
public List<Dictionary<string, string>> UpdateEntity(string type, string data)
|
||||
{
|
||||
//Dcitionary 형으로 바꿈
|
||||
JObject json = JObject.Parse(data);
|
||||
foreach (JProperty prop in json.Children())
|
||||
{
|
||||
string key = prop.Name.ToString();
|
||||
string value = prop.Value.ToString();
|
||||
Debug.Log($"kEY : {key}, Value:{value}");
|
||||
}
|
||||
|
||||
//TODO :리팩토링 필요함.
|
||||
var datas = json["data"].ToString();
|
||||
JObject test = JObject.Parse(datas);
|
||||
var list = new List<Dictionary<string, string>>();
|
||||
foreach (JProperty te1 in test.Children())
|
||||
{
|
||||
string key1 = te1.Name.ToString();
|
||||
string value = te1.Value.ToString();
|
||||
var split = value.ToString().Split('[');
|
||||
var t = string.Empty;
|
||||
|
||||
if (split.Length > 1)
|
||||
t = $"[{split[split.Length - 1]}";
|
||||
else if (!split[split.Length - 1].Contains("{"))
|
||||
{
|
||||
Dictionary<string, string> item = new();
|
||||
item.Add(key1, value);
|
||||
list.Add(item);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
t = $"[{split[split.Length - 1]}]";
|
||||
|
||||
JArray jarray = JArray.Parse(t);
|
||||
foreach (JObject obj in jarray.Children())
|
||||
{
|
||||
Dictionary<string, string> keyvalue = new();
|
||||
string id = string.Empty;
|
||||
foreach (JProperty prop in obj.Children())
|
||||
{
|
||||
string key = prop.Name.ToString();
|
||||
string value2 = prop.Value.ToString();
|
||||
keyvalue.Add(key, value2);
|
||||
}
|
||||
list.Add(keyvalue);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/Studio/Connect/TemporaryAPIClient.cs.meta
Normal file
2
Assets/Scripts/Studio/Connect/TemporaryAPIClient.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8f6f9019b8bf5104ca51baa44c824081
|
||||
@@ -7,12 +7,13 @@ using Studio.Manage;
|
||||
|
||||
namespace Studio.Command
|
||||
{
|
||||
public class CommandInvoker: IInputHandler
|
||||
public class CommandInvoker : IInputHandler
|
||||
{
|
||||
public static CommandInvoker instance => SystemMain.instance.commandInvoker;
|
||||
|
||||
Stack<ICommand> commandStack = new();
|
||||
Stack<IReversibleCommand> undoableStack = new ();
|
||||
Stack<IReversibleCommand> undoableStack = new();
|
||||
Stack<IReversibleCommand> redoableStack = new();
|
||||
public void Invoke(ICommand command)
|
||||
{
|
||||
switch (command)
|
||||
@@ -33,9 +34,10 @@ namespace Studio.Command
|
||||
command.Execute();
|
||||
commandStack.Push(command);
|
||||
undoableStack.Push(command);
|
||||
redoableStack.Clear();
|
||||
}
|
||||
|
||||
public void Invoke(IIrreversibleCommand command)
|
||||
public void Invoke(IIrreversibleCommand command)
|
||||
{
|
||||
Debug.Log($"Invoke Irreversible Command={command}");
|
||||
command.Execute();
|
||||
@@ -50,12 +52,21 @@ namespace Studio.Command
|
||||
}
|
||||
var command = undoableStack.Pop();
|
||||
command.Undo();
|
||||
redoableStack.Push(command);
|
||||
}
|
||||
|
||||
public void Redo()
|
||||
{
|
||||
if (redoableStack.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var command = redoableStack.Pop();
|
||||
command.Execute();
|
||||
undoableStack.Push(command);
|
||||
}
|
||||
|
||||
public InputHandler GetInputHandler()
|
||||
{
|
||||
var shortcutTable = new Dictionary<KeyCode, Dictionary<KeyCode, Action>>();
|
||||
@@ -65,5 +76,11 @@ namespace Studio.Command
|
||||
var handler = new InputHandler(null, null, null, shortcutTable);
|
||||
return handler;
|
||||
}
|
||||
public void ResetCommandStack()
|
||||
{
|
||||
redoableStack.Clear();
|
||||
undoableStack.Clear();
|
||||
commandStack.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,8 @@ namespace Studio.Manage
|
||||
public class AssetManager : Manager
|
||||
{
|
||||
public List<string> localAssetPaths = new List<string>();
|
||||
private List<AssetData> loadAsset = new List<AssetData>();
|
||||
private List<HierarchyItem> loadHierarchy = new List<HierarchyItem>();
|
||||
|
||||
private List<string> folderPathList = new List<string>();
|
||||
private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
|
||||
@@ -67,9 +69,12 @@ namespace Studio.Manage
|
||||
{
|
||||
localAssetPaths.Clear();
|
||||
folderPathList.Clear();
|
||||
loadAsset.Clear();
|
||||
loadHierarchy.Clear();
|
||||
}
|
||||
public void LoadAssetSettingFBXDirectorys(int index, string folderPath)
|
||||
{
|
||||
Debug.Log("에셋 폴더 로드");
|
||||
if (!assetSettingPaths.ContainsKey(index))
|
||||
{
|
||||
assetSettingPaths.Add(index, folderPath);
|
||||
@@ -116,6 +121,7 @@ namespace Studio.Manage
|
||||
|
||||
public void LoadLocalFBXDirectorys()
|
||||
{
|
||||
Debug.Log("로컬 fbx 폴더 로드");
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
fbxFileManager.LoadLocalFBXDirectorys(folderPathList);
|
||||
var assetManagerData = new AssetManagerData();
|
||||
@@ -126,9 +132,14 @@ namespace Studio.Manage
|
||||
onSetAssetSetting?.Invoke(data);
|
||||
}
|
||||
|
||||
private void OnSetAssetHierarchyData()
|
||||
{
|
||||
|
||||
}
|
||||
private void OnLoadCustomAsset()
|
||||
{
|
||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
onSetAssetHierarchy?.Invoke(fbxFileManager.fileDatas);
|
||||
|
||||
@@ -137,13 +148,14 @@ namespace Studio.Manage
|
||||
|
||||
List<AssetData> assets = projectManager.curProjectData.assetDatas;
|
||||
|
||||
CommandInvoker.instance.Invoke(new RemoveAllObjectCommand());
|
||||
//CommandInvoker.instance.Invoke(new RemoveAllObjectCommand());
|
||||
|
||||
Debug.Log(assets.Count);
|
||||
foreach (AssetData asset in assets)
|
||||
{
|
||||
LoadAsset(asset);
|
||||
}
|
||||
|
||||
Debug.Log(connector.connectedAssets.Count);
|
||||
foreach (AssetData asset in assets)
|
||||
{
|
||||
RestoreHierarchy(asset);
|
||||
@@ -151,24 +163,33 @@ namespace Studio.Manage
|
||||
}
|
||||
private void LoadAsset(AssetData asset)
|
||||
{
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.OnLoadAsset(asset);
|
||||
if (!loadAsset.Contains(asset))
|
||||
{
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.OnLoadAsset(asset);
|
||||
|
||||
itemDict.TryAdd(asset.id, connector.connectedAssets.Last().hierarchyItem);
|
||||
loadAsset.Add(asset);
|
||||
}
|
||||
}
|
||||
|
||||
private void RestoreHierarchy(AssetData asset)
|
||||
{
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
itemDict.TryAdd(asset.id, connector.connectedAssets.Last().hierarchyItem);
|
||||
|
||||
foreach (int id in asset.children)
|
||||
if (!loadHierarchy.Contains(itemDict[asset.id]))
|
||||
{
|
||||
HierarchyItem parent = itemDict[asset.id];
|
||||
HierarchyItem child = itemDict[id];
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
|
||||
if (parent == null || child == null)
|
||||
continue;
|
||||
foreach (int id in asset.children)
|
||||
{
|
||||
HierarchyItem parent = itemDict[asset.id];
|
||||
HierarchyItem child = itemDict[id];
|
||||
|
||||
connector.OnRestoreHierarchy(parent, child);
|
||||
if (parent == null || child == null)
|
||||
continue;
|
||||
|
||||
connector.OnRestoreHierarchy(parent, child);
|
||||
loadHierarchy.Add(parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
public void SetAssetInfo(string name)
|
||||
|
||||
@@ -14,8 +14,10 @@ namespace Studio.Manage
|
||||
viewAngle = new Vector3(45, 145, 0);
|
||||
}
|
||||
|
||||
public void MoveToTwinObjectPos(TwinObject target)
|
||||
public void MoveToTwinObjectPos(GameObject target)
|
||||
{
|
||||
if (target == null)
|
||||
return;
|
||||
var command = new MoveToTargetCommand(target.transform, viewAngle, cameraDistance);
|
||||
CommandInvoker.instance.Invoke(command);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System.Drawing.Printing;
|
||||
using UnityEngine;
|
||||
using Studio.UI;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Studio.Manage
|
||||
{
|
||||
@@ -15,7 +16,9 @@ namespace Studio.Manage
|
||||
Texture2D cursor_DownLeft;
|
||||
Texture2D cursor_DownRight;
|
||||
|
||||
public List<Texture2D> cursors = new List<Texture2D>();
|
||||
public UI_GUIWindow currentUseGUIWindow;
|
||||
public Texture2D currentCursor;
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
@@ -27,6 +30,15 @@ namespace Studio.Manage
|
||||
cursor_UpRight = Resources.Load<Texture2D>("Images/cursor_diag_b");
|
||||
cursor_DownLeft = Resources.Load<Texture2D>("Images/cursor_diag_b");
|
||||
cursor_DownRight = Resources.Load<Texture2D>("Images/cursor_diag_a");
|
||||
|
||||
cursors.Add(cursor_Up);
|
||||
cursors.Add(cursor_Down);
|
||||
cursors.Add(cursor_Left);
|
||||
cursors.Add(cursor_Right);
|
||||
cursors.Add(cursor_UpLeft);
|
||||
cursors.Add(cursor_UpRight);
|
||||
cursors.Add(cursor_DownLeft);
|
||||
cursors.Add(cursor_DownRight);
|
||||
}
|
||||
|
||||
public void ChangeMouseCursor(ResizeDirection dir)
|
||||
@@ -65,6 +77,8 @@ namespace Studio.Manage
|
||||
|
||||
void ChangeCursor(Texture2D cursorTexture)
|
||||
{
|
||||
currentCursor = cursorTexture;
|
||||
|
||||
Vector2 hotspot = new Vector2(16, 16);
|
||||
|
||||
if (cursorTexture == null)
|
||||
@@ -74,5 +88,16 @@ namespace Studio.Manage
|
||||
|
||||
Cursor.SetCursor(cursorTexture, hotspot, CursorMode.Auto);
|
||||
}
|
||||
public bool IsResizeCursor()
|
||||
{
|
||||
foreach (var cursor in cursors)
|
||||
{
|
||||
if (currentCursor == cursor)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,6 +89,7 @@ namespace Studio.AssetTool
|
||||
assetData.thumbnail = thumbnail;
|
||||
OnLoadComplete(assetData);
|
||||
}
|
||||
|
||||
OnDirectoryLoadComplete();
|
||||
}
|
||||
public void LoadLocalFBXDirectorys(List<string> folderPaths)
|
||||
|
||||
@@ -35,6 +35,7 @@ namespace Studio.Manage
|
||||
|
||||
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;
|
||||
|
||||
canvas_popup.panel_assetsetting.onClose += canvas_popup.panel_assetinfo.Close;
|
||||
canvas_popup.panel_assetsetting.onClickServerAssets += canvas_popup.panel_serverassets.Active;
|
||||
canvas_popup.panel_assetsetting.onClickLocalAssets += canvas_popup.panel_localassets.Active;
|
||||
canvas_popup.panel_assetsetting.onClickAssetHierarchy += canvas_popup.panel_assethierarchy.Active;
|
||||
|
||||
@@ -40,7 +40,6 @@ namespace Studio.Manage
|
||||
{
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
var assetManager = ManagerHub.instance.Get<AssetManager>();
|
||||
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingManager>();
|
||||
|
||||
var sceneStartSetting = new SceneStartSetting();
|
||||
@@ -54,8 +53,8 @@ namespace Studio.Manage
|
||||
CommandInvoker.instance.Invoke(new RemoveAllObjectCommand());
|
||||
|
||||
fbxFileManager.ClearFilePaths();
|
||||
assetManager.ClearFolderPathList();
|
||||
assetManager.InitRessourceAsset();
|
||||
curProjectData = null;
|
||||
CommandInvoker.instance.ResetCommandStack();
|
||||
}
|
||||
public void TopMenuNewProjectSettingData()
|
||||
{
|
||||
@@ -90,8 +89,6 @@ namespace Studio.Manage
|
||||
.Select(asset => CreateAssetData(asset))
|
||||
.ToList();
|
||||
newProjectData = CreateProjectData(assetDatas);
|
||||
Debug.Log(curProjectData);
|
||||
Debug.Log(newProjectData);
|
||||
|
||||
if (CompareSaveState(curProjectData, newProjectData))
|
||||
{
|
||||
@@ -106,6 +103,10 @@ namespace Studio.Manage
|
||||
{
|
||||
ResetProjectSettingData();
|
||||
|
||||
var assetManager = ManagerHub.instance.Get<AssetManager>();
|
||||
assetManager.ClearFolderPathList();
|
||||
assetManager.InitRessourceAsset();
|
||||
|
||||
curProjectName = proejctName;
|
||||
curProjectPath = projectPath;
|
||||
curProjectTemplate = string.Empty;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using NUnit.Framework;
|
||||
using NUnit.Framework;
|
||||
using Studio.AssetTool;
|
||||
using Studio.Conifg;
|
||||
using Studio.Manage;
|
||||
@@ -20,8 +20,8 @@ namespace Studio.Manage
|
||||
Stop,
|
||||
Exit,
|
||||
}
|
||||
|
||||
public EState curState = EState.Stop;
|
||||
private EState curState = EState.Stop;
|
||||
public EState CurState { get { return curState; } }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
@@ -33,7 +33,7 @@ namespace Studio.Manage
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
|
||||
|
||||
curState = curState == EState.Stop ? EState.Run : EState.Stop;
|
||||
switch (curState)
|
||||
switch (CurState)
|
||||
{
|
||||
case EState.Run:
|
||||
Run();
|
||||
|
||||
@@ -22,20 +22,18 @@ namespace Studio.Manage
|
||||
AddCommand(new ActivateMoveGizmoCommand());
|
||||
AddCommand(new ActivateRotateGizmoCommand());
|
||||
AddCommand(new ActivateScaleGizmoCommand());
|
||||
//AddCommand(new ResetGizmoCommand());
|
||||
//AddCommand(new CopyObjectCommand());
|
||||
//AddCommand(new RemoveAllObjectCommand());
|
||||
//AddCommand(new RemoveSelectObjectCommand());
|
||||
//AddCommand(new NewProjectCommand());
|
||||
//AddCommand(new OpenProjectCommand());
|
||||
//AddCommand(new SaveAndNewProjectCommand());
|
||||
//AddCommand(new SaveAndOpenProjectCommand());
|
||||
//AddCommand(new SaveProjectCommand());
|
||||
//AddCommand(new CreateConnectedAssetCommand());
|
||||
//AddCommand(new ExitProgramCommand());
|
||||
AddCommand(new ResetGizmoCommand());
|
||||
AddCommand(new CopyObjectCommand());
|
||||
AddCommand(new RemoveSelectObjectCommand());
|
||||
AddCommand(new SaveProjectCommand());
|
||||
AddCommand(new ExitProgramCommand());
|
||||
|
||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
AddAction("New Project", projectManager.TopMenuNewProjectSettingData);
|
||||
AddAction("Open Project", projectManager.TopMenuOpenProjectSettingData);
|
||||
}
|
||||
|
||||
private async Task AddCommand(string id, Action action)
|
||||
public async Task Add(string id, Action action)
|
||||
{
|
||||
commands[id] = action;
|
||||
List<string> words = await ManagerHub.instance.Get<LanguageManager>().commandHelper.GetLocalizedAllLocales(id);
|
||||
@@ -48,7 +46,12 @@ namespace Studio.Manage
|
||||
|
||||
private async void AddCommand(ICommand command)
|
||||
{
|
||||
await AddCommand(command.id, () => CommandInvoker.instance.Invoke(command));
|
||||
await Add(command.id, () => CommandInvoker.instance.Invoke(command));
|
||||
}
|
||||
|
||||
public async void AddAction(string id, Action action)
|
||||
{
|
||||
await Add(id, action);
|
||||
}
|
||||
|
||||
public List<string> GetTrieContainingWords(string text)
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using XRLib;
|
||||
|
||||
namespace Studio.Manage
|
||||
@@ -106,6 +108,9 @@ namespace Studio.Manage
|
||||
}
|
||||
void Update()
|
||||
{
|
||||
if (IsEditInputField())
|
||||
return;
|
||||
|
||||
foreach (var key in downKeyActionTable.Keys)
|
||||
{
|
||||
if (Input.GetKeyDown(key))
|
||||
@@ -149,5 +154,15 @@ namespace Studio.Manage
|
||||
|
||||
updateLoop?.Invoke();
|
||||
}
|
||||
|
||||
bool IsEditInputField()
|
||||
{
|
||||
GameObject selectedObj = EventSystem.current.currentSelectedGameObject;
|
||||
|
||||
if (selectedObj == null)
|
||||
return false;
|
||||
|
||||
return selectedObj.GetComponent<TMP_InputField>() != null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
using Studio.AssetTool;
|
||||
using Studio.Dynamic.Manager;
|
||||
using Studio.Manage;
|
||||
using Studio.VirtualFactory.Info;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using static Studio.Manage.RunManager;
|
||||
|
||||
namespace Studio.Dynamic.TwinObject
|
||||
{
|
||||
@@ -29,6 +31,7 @@ namespace Studio.Dynamic.TwinObject
|
||||
|
||||
private bool isPlay = false;
|
||||
private CustomAssetRenderObject renderObject;
|
||||
public CustomAssetRenderObject RenderObject { get { return renderObject; } }
|
||||
public override Dictionary<string, string> Info
|
||||
{
|
||||
get
|
||||
@@ -58,6 +61,7 @@ namespace Studio.Dynamic.TwinObject
|
||||
public override void AfterAwake()
|
||||
{
|
||||
renderObject = GetComponent<CustomAssetRenderObject>();
|
||||
AGVManager.instance.AddAGV(this);
|
||||
if (!string.IsNullOrEmpty(renderObject.code))
|
||||
{
|
||||
moveSpeed = AGVManager.instance.AGVMoveSpeed;
|
||||
@@ -139,6 +143,8 @@ namespace Studio.Dynamic.TwinObject
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
if (ManagerHub.instance.Get<RunManager>().CurState != EState.Run)
|
||||
return;
|
||||
if (isPlay == false)
|
||||
return;
|
||||
PerforcedMovement();
|
||||
@@ -171,9 +177,11 @@ namespace Studio.Dynamic.TwinObject
|
||||
AGVManager.instance.SetCopyObject(isAuto, renderObject);
|
||||
}
|
||||
|
||||
protected override void OnDestroy()
|
||||
private void OnDisable()
|
||||
{
|
||||
base.OnDestroy();
|
||||
AGVManager.instance.RemoveAGV(this);
|
||||
if (renderObject.topic == null)
|
||||
return;
|
||||
StudioService.instance.RemoveTypeIdListener(renderObject.topic, renderObject.code);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,9 +17,14 @@ namespace Studio.Dynamic.Manager
|
||||
public float AGVMoveSpeed;
|
||||
public float AGVRotateSpeed;
|
||||
|
||||
|
||||
public void OnPlayStart()
|
||||
private void Start()
|
||||
{
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
}
|
||||
private void OnPlayStart()
|
||||
{
|
||||
if (agvRenderObj == null)
|
||||
return;
|
||||
agvRenderObj.gameObject.SetActive(false);
|
||||
var type = agvRenderObj.topic;
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
@@ -29,9 +34,20 @@ namespace Studio.Dynamic.Manager
|
||||
//todo::팝업메시지 나주엥 설정....
|
||||
return;
|
||||
}
|
||||
connector.componentScrollView.RemoveItem(asset.hierarchyItem);
|
||||
StudioService.instance.AddTypeListener(type, OnDataUpdate);
|
||||
StudioService.instance.AddTypeIdListener(type);
|
||||
}
|
||||
|
||||
public void AddAGV(AGV agv)
|
||||
{
|
||||
agvs.Add(agv);
|
||||
}
|
||||
|
||||
public void RemoveAGV(AGV agv)
|
||||
{
|
||||
agvs.Remove(agv);
|
||||
}
|
||||
/// <summary>
|
||||
/// MQTT
|
||||
/// </summary>
|
||||
@@ -101,21 +117,15 @@ namespace Studio.Dynamic.Manager
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void SetCopyObject(bool isAuto, CustomAssetRenderObject renderObject)
|
||||
{
|
||||
if (isAuto)
|
||||
{
|
||||
agvRenderObj = renderObject;
|
||||
//이벤트 걸어둔다..
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
}
|
||||
else
|
||||
{
|
||||
agvRenderObj = null;
|
||||
ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
|
||||
//이벤트해제
|
||||
//-= OnPlayStart
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,6 +31,13 @@ namespace Studio
|
||||
return CurrentEntity;
|
||||
}
|
||||
}
|
||||
public override ObjectType ObjectType
|
||||
{
|
||||
get
|
||||
{
|
||||
return ObjectType.Static;
|
||||
}
|
||||
}
|
||||
public override void AfterAwake()
|
||||
{
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
@@ -54,6 +61,10 @@ namespace Studio
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
RunManager runManager = ManagerHub.instance.Get<RunManager>();
|
||||
if (runManager == null)
|
||||
return;
|
||||
runManager.onRun -= OnPlayStart;
|
||||
if (curType == null)
|
||||
return;
|
||||
StudioService.instance.RemoveTypeIdListener(curType, transform.name);
|
||||
|
||||
@@ -31,6 +31,13 @@ namespace Studio
|
||||
return CurrentEntity;
|
||||
}
|
||||
}
|
||||
public override ObjectType ObjectType
|
||||
{
|
||||
get
|
||||
{
|
||||
return ObjectType.Static;
|
||||
}
|
||||
}
|
||||
public override void AfterAwake()
|
||||
{
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
@@ -54,8 +61,13 @@ namespace Studio
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
RunManager runManager = ManagerHub.instance.Get<RunManager>();
|
||||
if(runManager == null)
|
||||
return;
|
||||
runManager.onRun -= OnPlayStart;
|
||||
if (curType == null)
|
||||
return;
|
||||
if(StudioService.instance != null)
|
||||
StudioService.instance.RemoveTypeIdListener(curType, transform.name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,6 +31,13 @@ namespace Studio
|
||||
return CurrentEntity;
|
||||
}
|
||||
}
|
||||
public override ObjectType ObjectType
|
||||
{
|
||||
get
|
||||
{
|
||||
return ObjectType.Static;
|
||||
}
|
||||
}
|
||||
public override void AfterAwake()
|
||||
{
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
@@ -53,6 +60,10 @@ namespace Studio
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
RunManager runManager = ManagerHub.instance.Get<RunManager>();
|
||||
if (runManager == null)
|
||||
return;
|
||||
runManager.onRun -= OnPlayStart;
|
||||
if (curType == null)
|
||||
return;
|
||||
StudioService.instance.RemoveTypeIdListener(curType, transform.name);
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace Studio.Staic.STKC
|
||||
{
|
||||
get
|
||||
{
|
||||
return ObjectType.Dynamic;
|
||||
return ObjectType.Static;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace Studio.Staic.STKC
|
||||
public Vector3 bodyStart;
|
||||
public Vector3 bodyEnd;
|
||||
|
||||
private Action onMotionStart;
|
||||
private bool isAnimation = false;
|
||||
|
||||
private int[] values = new int[3];
|
||||
private string curType;
|
||||
@@ -63,7 +63,6 @@ namespace Studio.Staic.STKC
|
||||
{
|
||||
bodySpeed = 0.3f;
|
||||
liftSpeed = 0.3f;
|
||||
onMotionStart = StartAnim;
|
||||
ManagerHub.instance.Get<RunManager>().onRun += OnPlayStart;
|
||||
//이벤트 걸어둔다..
|
||||
//+= OnPlayStart
|
||||
@@ -113,29 +112,22 @@ namespace Studio.Staic.STKC
|
||||
liftStartY = lift.position.y;
|
||||
liftEndY = y;
|
||||
|
||||
onMotionStart?.Invoke();
|
||||
isAnimation = true;
|
||||
}
|
||||
public override void ChangeAutoID(bool isAuto)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
private void StartAnim()
|
||||
private void Update()
|
||||
{
|
||||
StopAllCoroutines();
|
||||
StartCoroutine(MotionStart());
|
||||
if (isAnimation == false || ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Stop)
|
||||
return;
|
||||
Sliding();
|
||||
Lifiting();
|
||||
if (bodyProcess >= 1f && liftProcess >= 1f)
|
||||
isAnimation = false;
|
||||
}
|
||||
|
||||
IEnumerator MotionStart()
|
||||
{
|
||||
while (liftProcess < 1f)
|
||||
{
|
||||
Sliding();
|
||||
Lifiting();
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
void Sliding()
|
||||
{
|
||||
bodyProcess += Time.deltaTime * bodySpeed;
|
||||
@@ -154,7 +146,6 @@ namespace Studio.Staic.STKC
|
||||
if (liftProcess >= 1f)
|
||||
{
|
||||
liftProcess = 1f;
|
||||
|
||||
}
|
||||
|
||||
var liftY = math.lerp(liftStartY, liftEndY, liftProcess);
|
||||
@@ -181,10 +172,14 @@ namespace Studio.Staic.STKC
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
isAnimation = false;
|
||||
RunManager runManager = ManagerHub.instance.Get<RunManager>();
|
||||
if (runManager == null)
|
||||
return;
|
||||
runManager.onRun -= OnPlayStart;
|
||||
if (curType == null)
|
||||
return;
|
||||
StudioService.instance.RemoveTypeIdListener(curType, transform.name);
|
||||
onMotionStart -= StartAnim;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ namespace Studio.UI
|
||||
panel_studiotopbar.onClickSaveProject += () => CommandInvoker.instance.Invoke(new SaveProjectCommand());
|
||||
|
||||
panel_studiotopbar.onClickLanguageSetting += ManagerHub.instance.Get<LanguageManager>().ChangeLanguage; // TODO: open panel
|
||||
panel_studiotopbar.onClickLanguageSetting += FindAnyObjectByType<UI_SearchCommand>().Search;
|
||||
|
||||
panel_studiotopbar.onClickClose += () => CommandInvoker.instance.Invoke(new ExitProgramCommand());
|
||||
}
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
using UnityEngine;
|
||||
using XRLib.UI;
|
||||
using TMPro;
|
||||
using UnityEngine.UI;
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using Studio.Util;
|
||||
using Studio.Auth;
|
||||
using Studio.Conifg;
|
||||
using Studio.Auth;
|
||||
using Studio.Setting.Connect;
|
||||
using Studio.Util;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using XRLib.UI;
|
||||
|
||||
namespace Studio.UI
|
||||
{
|
||||
@@ -19,6 +20,8 @@ namespace Studio.UI
|
||||
private Button Button_Remove;
|
||||
private RectTransform URLItemContent;
|
||||
private RectTransform AddURL;
|
||||
private Image Image_Check;
|
||||
private Sprite defaultSprite, connectedSprite, errorSprite;
|
||||
|
||||
private UI_InputURLItem prf_InputURLItem;
|
||||
private List<UI_InputURLItem> inputURLItems = new List<UI_InputURLItem>();
|
||||
@@ -31,11 +34,16 @@ namespace Studio.UI
|
||||
public override void AfterAwake()
|
||||
{
|
||||
prf_InputURLItem = Resources.Load<UI_InputURLItem>("Prefabs/UI/PRF_InputURLItem");
|
||||
|
||||
defaultSprite = Resources.Load<Sprite>("Images/IMG_DefalutIcon");
|
||||
connectedSprite = Resources.Load<Sprite>("Images/IMG_SuccessIcon");
|
||||
errorSprite = Resources.Load<Sprite>("Images/IMG_FailIcon");
|
||||
Button_AddURLItem.onClick.AddListener(OnClickAddURLItemButton);
|
||||
Button_TestAPI.onClick.AddListener(OnClickTestAPIButton);
|
||||
Button_Remove.onClick.AddListener(OnClickRemoveItemButton);
|
||||
|
||||
StudioService studioService = StudioService.instance;
|
||||
studioService.onAPIDataLoaded += SetCheckImageSprite;
|
||||
|
||||
inputURLItems.Clear();
|
||||
}
|
||||
private void OnClickAddURLItemButton()
|
||||
@@ -51,21 +59,33 @@ namespace Studio.UI
|
||||
onTestAPI?.Invoke();
|
||||
|
||||
// API 연결
|
||||
//ConfigConnected.APIDomain = InputField_Domain.text;
|
||||
// ConfigConnected.APIPort = int.Parse(InputField_Port.text);
|
||||
// ConfigConnected.APIDomain = InputField_Domain.text;
|
||||
// ConfigConnected.APIPort = int.Parse(InputField_Port.text);
|
||||
//StudioService.instance.ConnectMQTT();
|
||||
|
||||
await AuthService.Instance.Login("xr", "@dbqlTl1");
|
||||
|
||||
Image_Check.sprite = defaultSprite;
|
||||
string loginURL = $"http://{InputField_Domain.text}:{InputField_Port.text}/api/auth/token";
|
||||
await AuthService.Instance.Login(loginURL, "sdi", "@SdiDT1!");
|
||||
|
||||
foreach (UI_InputURLItem item in inputURLItems)
|
||||
{
|
||||
string url = "/api/" + item.InputField_URL.text;
|
||||
string url = $"http://{InputField_Domain.text}:{InputField_Port.text}/api/{item.InputField_URL.text}";
|
||||
await StudioService.instance.LoadBaseData(url);
|
||||
|
||||
//panel_DataRepository = FindAnyObjectByType<Panel_DataRepository>(FindObjectsInactive.Include);
|
||||
//panel_DataRepository.apiConnected = true;
|
||||
}
|
||||
}
|
||||
private void SetCheckImageSprite<T>(string name, StudioEntityWithState<T> value)
|
||||
{
|
||||
if(value.State.Equals(APIState.Loaded))
|
||||
{
|
||||
Image_Check.sprite = connectedSprite;
|
||||
}
|
||||
else if(value.State.Equals(APIState.Error))
|
||||
{
|
||||
Image_Check.sprite = errorSprite;
|
||||
}
|
||||
}
|
||||
private void OnClickRemoveItemButton()
|
||||
{
|
||||
onRemoveAPIConnectionItem?.Invoke(this);
|
||||
|
||||
@@ -60,13 +60,23 @@ namespace Studio.UI
|
||||
onMQTTTest?.Invoke();
|
||||
|
||||
var domain = InputField_Domain.text;
|
||||
var port = int.Parse(InputField_Port.text);
|
||||
if (string.IsNullOrWhiteSpace(domain))
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!int.TryParse(InputField_Port.text, out var port))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
List<string> topics = new();
|
||||
foreach (UI_InputTopicItem item in inputTopicItems)
|
||||
{
|
||||
var topic = item.InputField_Topic.text;
|
||||
topics.Add(topic);
|
||||
if (!string.IsNullOrWhiteSpace(topic))
|
||||
{
|
||||
topics.Add(topic);
|
||||
}
|
||||
}
|
||||
var tmpClient = new TemporaryMQTTClient(domain, port, topics, OnTopicTest, OnConnectedClient, OnErrorClient);
|
||||
panel_MQTTTestResult.Open(domain, port.ToString());
|
||||
|
||||
8
Assets/Scripts/Studio/UI/InputField.meta
Normal file
8
Assets/Scripts/Studio/UI/InputField.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 01921bb75417df441acf53da6992d294
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace Studio.UI
|
||||
{
|
||||
public class EnglishInputFieldValidator : InputFieldValidator
|
||||
{
|
||||
protected override char ValidateInput(string text, int charIndex, char addedChar)
|
||||
{
|
||||
if ((addedChar >= 'A' && addedChar <= 'Z') || (addedChar >= 'a' && addedChar <= 'z'))
|
||||
{
|
||||
return addedChar;
|
||||
}
|
||||
|
||||
return '\0';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5cfbc3180aa0867408d6521529e5cac4
|
||||
20
Assets/Scripts/Studio/UI/InputField/InputFieldValidator.cs
Normal file
20
Assets/Scripts/Studio/UI/InputField/InputFieldValidator.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using XRLib.UI;
|
||||
|
||||
namespace Studio.UI
|
||||
{
|
||||
[RequireComponent(typeof(TMP_InputField))]
|
||||
public abstract class InputFieldValidator : UIBase
|
||||
{
|
||||
public TMP_InputField inputField;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
inputField = GetComponent<TMP_InputField>();
|
||||
inputField.onValidateInput += ValidateInput;
|
||||
}
|
||||
|
||||
protected abstract char ValidateInput(string text, int charIndex, char addedChar);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03b149247b27102428968cb5df010774
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace Studio.UI
|
||||
{
|
||||
public class NumericDotInputFieldValidator : InputFieldValidator
|
||||
{
|
||||
protected override char ValidateInput(string text, int charIndex, char addedChar)
|
||||
{
|
||||
if (char.IsDigit(addedChar) || addedChar == '.')
|
||||
{
|
||||
return addedChar;
|
||||
}
|
||||
|
||||
return '\0';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 318ad98d4b818194da00221ee69745cd
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace Studio.UI
|
||||
{
|
||||
public class NumericInputFieldValidator : InputFieldValidator
|
||||
{
|
||||
protected override char ValidateInput(string text, int charIndex, char addedChar)
|
||||
{
|
||||
if (char.IsDigit(addedChar))
|
||||
{
|
||||
return addedChar;
|
||||
}
|
||||
|
||||
return '\0';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6f95cd07bc2246945965157693796194
|
||||
@@ -59,8 +59,8 @@ namespace Studio.UI
|
||||
var apiSetting = new APISetting();
|
||||
foreach (var item in apiConnectionItems)
|
||||
{
|
||||
var mqttConnection = item.GetAPIConnection();
|
||||
apiSetting.apiConnections.Add(mqttConnection);
|
||||
var apiConnection = item.GetAPIConnection();
|
||||
apiSetting.apiConnections.Add(apiConnection);
|
||||
}
|
||||
return apiSetting;
|
||||
}
|
||||
|
||||
@@ -142,13 +142,19 @@ namespace Studio.UI
|
||||
Texture2D texture = new Texture2D(2, 2);
|
||||
if (texture.LoadImage(imageData))
|
||||
{
|
||||
Image_Selected.enabled = true;
|
||||
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
|
||||
Image_Selected.sprite = sprite;
|
||||
var text = Button_ImageSelected.GetComponentInChildren<TMP_Text>();
|
||||
text.enabled = false;
|
||||
|
||||
ratio = texture.height / (float)texture.width;
|
||||
}
|
||||
else
|
||||
{
|
||||
Image_Selected.enabled = false;
|
||||
var text = Button_ImageSelected.GetComponentInChildren<TMP_Text>();
|
||||
text.enabled = true;
|
||||
Debug.LogError("이미지 로드 실패");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace Studio
|
||||
|
||||
rectTransform.localPosition = localPos;
|
||||
}
|
||||
private void Close()
|
||||
public void Close()
|
||||
{
|
||||
SetActive(false);
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@ namespace Studio.UI
|
||||
private RectTransform TabToggles;
|
||||
private Button Button_Close;
|
||||
|
||||
public Action onClose;
|
||||
|
||||
public Action<bool> onClickServerAssets;
|
||||
public Action<bool> onClickLocalAssets;
|
||||
public Action<bool> onClickAssetHierarchy;
|
||||
@@ -44,6 +46,7 @@ namespace Studio.UI
|
||||
public void Close()
|
||||
{
|
||||
SetActive(false);
|
||||
onClose?.Invoke();
|
||||
}
|
||||
private void OnServerAssetsValueChanged(bool isOn)
|
||||
{
|
||||
|
||||
@@ -174,6 +174,9 @@ namespace Studio.UI
|
||||
{
|
||||
ChangeTransformValue(gb.transform, type, value);
|
||||
}
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
renderObjectHandler.ResetGizmoTargetObjects();
|
||||
|
||||
onTransformChanged?.Invoke(selectedObjects);
|
||||
}
|
||||
public void OnTransformChanged(List<GameObject> objectTransforms)
|
||||
@@ -305,9 +308,11 @@ namespace Studio.UI
|
||||
{
|
||||
connectionModal.gameObject.SetActive(true);
|
||||
this.topic = searchAsset.renderObject.topic;
|
||||
this.isAuto = searchAsset.renderObject.isAutoId;
|
||||
connectionModal.Open();
|
||||
|
||||
if(searchAsset.renderObject.TryGetComponent<AbstractFunctionObject>(out var component))
|
||||
this.isAuto = component.ObjectType.Equals(ObjectType.Dynamic) ? true : false;
|
||||
connectionModal.SetAutoId(isAuto);
|
||||
connectionModal.Open();
|
||||
|
||||
if (!string.IsNullOrEmpty(topic))
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace Studio.UI
|
||||
public void CreateContentButton((TwinObject, TwinObject) pair)
|
||||
{
|
||||
var newButton = Object.Instantiate(buttonPrefab, content).GetComponent<UI_InterferedObjectButton>();
|
||||
newButton.OnClickButton += cameraManager.MoveToTwinObjectPos;
|
||||
//newButton.OnClickButton += cameraManager.MoveToTwinObjectPos;
|
||||
newButton.Initialize(pair.Item1, pair.Item2);
|
||||
createdButtons.Add(pair, newButton);
|
||||
}
|
||||
|
||||
@@ -99,8 +99,8 @@ namespace Studio
|
||||
for (int i = 0; i < assetManagerData.localAssetsPaths.Count; i++)
|
||||
{
|
||||
var item = Instantiate(prf_folderPathItem, Content_LocalAssets);
|
||||
item.onEndEditInputFieldURL += LoadAsstsPath;
|
||||
item.SetData(assetManagerData.localAssetsPaths[i]);
|
||||
item.onEndEditInputFieldURL += LoadAsstsPath;
|
||||
folderPathItems.Add(item);
|
||||
selectedURLs.Add(i, item.GetURL());
|
||||
|
||||
|
||||
@@ -37,6 +37,9 @@ namespace Studio.UI
|
||||
{
|
||||
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
|
||||
|
||||
if (paths == null)
|
||||
return;
|
||||
|
||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||
{
|
||||
var path = Path.GetDirectoryName(paths[0].Name);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
@@ -45,7 +45,7 @@ namespace Studio.UI
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (selectedObject == null || selectedObject.isCollided || ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
|
||||
if (selectedObject == null || selectedObject.isCollided || ManagerHub.instance.Get<RunManager>().CurState == RunManager.EState.Run)
|
||||
{
|
||||
DeactivateAll();
|
||||
return;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using Studio.Manage;
|
||||
using System;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using XRLib.UI;
|
||||
@@ -53,6 +54,7 @@ namespace Studio.UI
|
||||
|
||||
/*ControlBox*/
|
||||
public Button Button_LanguageSetting;
|
||||
public TextMeshProUGUI Text_Language;
|
||||
public event Action onClickLanguageSetting;
|
||||
|
||||
|
||||
@@ -114,6 +116,7 @@ namespace Studio.UI
|
||||
private void OnClickLanguageSetting()
|
||||
{
|
||||
Debug.Log("On Click anguage Setting");
|
||||
Text_Language.text = Text_Language.text == "KR" ? "EN" : "KR";
|
||||
onClickLanguageSetting?.Invoke();
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ namespace Studio.UI
|
||||
{
|
||||
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
|
||||
|
||||
if (paths == null)
|
||||
return;
|
||||
|
||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||
{
|
||||
var path = Path.GetDirectoryName(paths[0].Name);
|
||||
|
||||
@@ -17,6 +17,9 @@ namespace Studio.UI
|
||||
public ScrollRect scrollView_TopicResults;
|
||||
public UI_MQTTTestResultItem prf_MQTTTestResultItem;
|
||||
public Button button_Close;
|
||||
|
||||
private DateTime requestTime;
|
||||
|
||||
public struct MQTTTestResult
|
||||
{
|
||||
public string topic;
|
||||
@@ -48,6 +51,7 @@ namespace Studio.UI
|
||||
public void Open(string domain, string port)
|
||||
{
|
||||
Debug.Log($"Open MQTT Test Result Panel. Domain: {domain}, Port: {port}");
|
||||
requestTime = DateTime.Now;
|
||||
Item_Domain.SetValue(domain);
|
||||
Item_Port.SetValue(port);
|
||||
gameObject.SetActive(true);
|
||||
@@ -65,7 +69,7 @@ namespace Studio.UI
|
||||
}
|
||||
|
||||
var item = Instantiate(prf_MQTTTestResultItem, scrollView_TopicResults.content);
|
||||
item.SetResult(result.topic, result.message, result.payload);
|
||||
item.SetResult(result.topic, result.message, result.payload, requestTime, DateTime.Now);
|
||||
item.transform.SetParent(scrollView_TopicResults.content);
|
||||
items.Add(item);
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ namespace Studio.UI
|
||||
public class UI_GUIWindow : UIBase, IPointerDownHandler, IPointerUpHandler, IPointerEnterHandler, IPointerMoveHandler, IDragHandler
|
||||
{
|
||||
RectTransform rect;
|
||||
public UI_GUIWindowHeader header;
|
||||
public RectTransform Area;
|
||||
CursorManager cursorManager;
|
||||
|
||||
@@ -66,7 +67,7 @@ namespace Studio.UI
|
||||
raycastImg.raycastTarget = true;
|
||||
raycastImg.color = Color.clear;
|
||||
|
||||
var header = GetComponentInChildren<UI_GUIWindowHeader>();
|
||||
header = GetComponentInChildren<UI_GUIWindowHeader>();
|
||||
if (header == null)
|
||||
{
|
||||
Debug.LogError("GUIWindow¿¡ Header°¡ ¾øÀ½: " + gameObject.name);
|
||||
@@ -77,6 +78,7 @@ namespace Studio.UI
|
||||
onEnableEvent += (a)=>InitializeState();
|
||||
onDisableEvent += (a) => InitializeState();
|
||||
}
|
||||
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
SetPanelAsLastSibling();
|
||||
@@ -85,6 +87,8 @@ namespace Studio.UI
|
||||
|
||||
public void OnPointerUp(PointerEventData eventData)
|
||||
{
|
||||
var resizeDirection = GetHandleDirection();
|
||||
cursorManager.ChangeMouseCursor(resizeDirection);
|
||||
InitializeState();
|
||||
}
|
||||
|
||||
@@ -93,6 +97,8 @@ namespace Studio.UI
|
||||
if (!isCanResize)
|
||||
return;
|
||||
|
||||
SetHeaderSetting();
|
||||
|
||||
switch (state)
|
||||
{
|
||||
case GUIState.Resize:
|
||||
@@ -290,42 +296,41 @@ namespace Studio.UI
|
||||
{
|
||||
if (rect == null) return false;
|
||||
|
||||
// 기존 사이즈와 비교
|
||||
Vector2 currentSize = rect.rect.size;
|
||||
|
||||
bool isShrinking = newSize.x <= currentSize.x && newSize.y <= currentSize.y;
|
||||
|
||||
// 축소면 무조건 허용
|
||||
if (isShrinking)
|
||||
return true;
|
||||
|
||||
// 확장이라면 화면 안에 있을 때만 허용
|
||||
return IsRectTransformInsideCanvas(rect);
|
||||
return WouldBeInsideCanvas(rect, newSize);
|
||||
}
|
||||
|
||||
public bool IsRectTransformInsideCanvas(RectTransform targetRect)
|
||||
public bool WouldBeInsideCanvas(RectTransform targetRect, Vector2 newSize)
|
||||
{
|
||||
if (targetRect == null)
|
||||
return false;
|
||||
|
||||
Canvas rootCanvas = targetRect.GetComponentInParent<Canvas>();
|
||||
if (rootCanvas == null || !rootCanvas.pixelRect.Contains(Vector2.zero))
|
||||
if (rootCanvas == null)
|
||||
return false;
|
||||
|
||||
RectTransform canvasRect = rootCanvas.GetComponent<RectTransform>();
|
||||
Vector3 position = targetRect.position;
|
||||
Vector2 pivot = targetRect.pivot;
|
||||
Vector2 scaledSize = new Vector2(newSize.x * targetRect.lossyScale.x, newSize.y * targetRect.lossyScale.y);
|
||||
|
||||
Vector3[] worldCorners = new Vector3[4];
|
||||
targetRect.GetWorldCorners(worldCorners);
|
||||
Vector3 bottomLeft = position - new Vector3(pivot.x * scaledSize.x, pivot.y * scaledSize.y);
|
||||
Vector3 topRight = bottomLeft + new Vector3(scaledSize.x, scaledSize.y);
|
||||
|
||||
foreach (var corner in worldCorners)
|
||||
Vector3[] testCorners = new Vector3[] { bottomLeft, new Vector3(topRight.x, bottomLeft.y), new Vector3(bottomLeft.x, topRight.y), topRight };
|
||||
|
||||
foreach (var corner in testCorners)
|
||||
{
|
||||
Vector3 viewportPoint = RectTransformUtility.WorldToScreenPoint(null, corner);
|
||||
Vector3 screenPoint = RectTransformUtility.WorldToScreenPoint(null, corner);
|
||||
|
||||
// Canvas 크기 기준으로 판단
|
||||
if (viewportPoint.x < 0 || viewportPoint.y < 0 ||
|
||||
viewportPoint.x > Screen.width || viewportPoint.y > Screen.height)
|
||||
if (screenPoint.x < 0 || screenPoint.x > Screen.width || screenPoint.y < 0 || screenPoint.y > Screen.height)
|
||||
{
|
||||
return false; // 하나라도 화면 밖에 있음
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,11 +353,28 @@ namespace Studio.UI
|
||||
{
|
||||
state = GUIState.None;
|
||||
SetPanelPivot(initialPivot);
|
||||
|
||||
}
|
||||
|
||||
public void SetPanelAsLastSibling()
|
||||
{
|
||||
transform.SetAsLastSibling();
|
||||
}
|
||||
private void SetHeaderSetting()
|
||||
{
|
||||
RectTransformUtility.ScreenPointToLocalPointInRectangle(header.rectTransform, Input.mousePosition, null, out var localPoint);
|
||||
|
||||
if (header.rectTransform.rect.Contains(localPoint))
|
||||
{
|
||||
if (cursorManager.IsResizeCursor())
|
||||
{
|
||||
header.enabled = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
header.enabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Studio.Manage;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using XRLib.UI;
|
||||
@@ -6,15 +7,20 @@ namespace Studio.UI
|
||||
{
|
||||
public class UI_GUIWindowHeader : UIBase, IPointerDownHandler
|
||||
{
|
||||
CursorManager cursorManager;
|
||||
UI_GUIWindow parentGUIWindow;
|
||||
|
||||
public override void AfterAwake()
|
||||
{
|
||||
cursorManager = ManagerHub.instance.Get<CursorManager>();
|
||||
parentGUIWindow = GetParentGUIWindow();
|
||||
}
|
||||
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
if (cursorManager.IsResizeCursor())
|
||||
return;
|
||||
|
||||
parentGUIWindow.SetPanelAsLastSibling();
|
||||
parentGUIWindow.SetMoveState();
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ namespace Studio.AssetLibraryTree
|
||||
AssetLibraryItem node = GetNext(true);
|
||||
while (node != null && node.layerNum != layerNum)
|
||||
{
|
||||
if (node.name.Contains(name))
|
||||
if (node.name.ToLower().Contains(name.ToLower()))
|
||||
items.Add(node);
|
||||
node = node.GetNext(true);
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ namespace Studio.HierarchyTree
|
||||
HierarchyItem node = GetNext(true);
|
||||
while (node != null && node.layerNum != layerNum)
|
||||
{
|
||||
if (node.name.Contains(name))
|
||||
if (node.name.ToLower().Contains(name.ToLower()))
|
||||
items.Add(node);
|
||||
node = node.GetNext(true);
|
||||
}
|
||||
|
||||
@@ -258,15 +258,15 @@ namespace Studio.HierarchyTree
|
||||
}
|
||||
public void OnSelectSingle(HierarchyItem item)
|
||||
{
|
||||
if (selectedItems.Count == 1 && selectedItems[0] == item)
|
||||
{
|
||||
selectedItems.Clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
//if (selectedItems.Count == 1 && selectedItems[0] == item)
|
||||
//{
|
||||
// selectedItems.Clear();
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
selectedItems.Clear();
|
||||
selectedItems.Add(item);
|
||||
}
|
||||
//}
|
||||
foreach (var itemUI in activeItems)
|
||||
{
|
||||
itemUI.SetSelected(selectedItems);
|
||||
|
||||
@@ -6,6 +6,7 @@ using UnityEngine.Events;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
using Studio.UI;
|
||||
using Studio.Manage;
|
||||
|
||||
namespace Studio.HierarchyTree
|
||||
{
|
||||
@@ -24,6 +25,9 @@ namespace Studio.HierarchyTree
|
||||
private HierarchyScrollItemUI hoverItemUI;
|
||||
private Coroutine coroutinePendPopup;
|
||||
public UnityEvent<HierarchyItem> onExit;
|
||||
private float lastClickTime = 0f;
|
||||
private const float doubleClickInterval = 0.3f;
|
||||
|
||||
public override void OnBeginDrag(PointerEventData eventData)
|
||||
{
|
||||
if (eventData.button != PointerEventData.InputButton.Left)
|
||||
@@ -83,8 +87,6 @@ namespace Studio.HierarchyTree
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public override void OnEndDrag(PointerEventData eventData)
|
||||
{
|
||||
if (eventData.button == PointerEventData.InputButton.Left)
|
||||
@@ -142,19 +144,29 @@ namespace Studio.HierarchyTree
|
||||
base.OnEndDrag(eventData);
|
||||
}
|
||||
}
|
||||
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
if (eventData.button == PointerEventData.InputButton.Left)
|
||||
{
|
||||
HierarchyScrollItemUI itemUI = GetTargetItemUI(eventData);
|
||||
|
||||
if (itemUI != null)
|
||||
{
|
||||
sourceItem = itemUI.currentItem;
|
||||
|
||||
float timeSinceLastClick = Time.time - lastClickTime;
|
||||
|
||||
if (timeSinceLastClick <= doubleClickInterval)
|
||||
{
|
||||
ManagerHub.instance.Get<CameraManager>().MoveToTwinObjectPos(sourceItem.linkedObject);
|
||||
}
|
||||
}
|
||||
if (sourceItem != null)
|
||||
{
|
||||
coroutinePendPopup = StartCoroutine(CoroutinePendPopup());
|
||||
}
|
||||
lastClickTime = Time.time;
|
||||
}
|
||||
}
|
||||
public void OnPointerUp(PointerEventData eventData)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using TriLibCore.Extensions;
|
||||
using UnityEngine;
|
||||
@@ -13,6 +14,9 @@ namespace Studio.UI
|
||||
public Transform Item_Topic;
|
||||
public UVCKeyValueItem Item_TopicPayload;
|
||||
public UVCKeyValueItem Item_TopicPacketSize;
|
||||
public UVCKeyValueItem Item_LastRequestTime;
|
||||
public UVCKeyValueItem Item_LastResponseTime;
|
||||
public UVCKeyValueItem Item_LastSpandTime;
|
||||
public Button expand;
|
||||
public Button refresh;
|
||||
|
||||
@@ -21,7 +25,9 @@ namespace Studio.UI
|
||||
Item_Topic = transform.DeepFind<Transform>(nameof(Item_Topic));
|
||||
Item_TopicPayload = transform.DeepFind<UVCKeyValueItem>(nameof(Item_TopicPayload));
|
||||
Item_TopicPacketSize = transform.DeepFind<UVCKeyValueItem>(nameof(Item_TopicPacketSize));
|
||||
|
||||
Item_LastRequestTime = transform.DeepFind<UVCKeyValueItem>(nameof(Item_LastRequestTime));
|
||||
Item_LastResponseTime = transform.DeepFind<UVCKeyValueItem>(nameof(Item_LastResponseTime));
|
||||
Item_LastSpandTime = transform.DeepFind<UVCKeyValueItem>(nameof(Item_LastSpandTime));
|
||||
refresh = Item_Topic.GetComponentInChildren<Button>();
|
||||
expand = Item_TopicPayload.GetComponentInChildren<Button>();
|
||||
expand.onClick.AddListener(OnClickExpandPayloadView);
|
||||
@@ -32,17 +38,42 @@ namespace Studio.UI
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
internal void SetResult(string topic, string message, string payload)
|
||||
internal void SetResult(string topic, string message, string payload, DateTime requestTime, DateTime responseTime)
|
||||
{
|
||||
Debug.Log($"Set MQTT Test Result Item. Topic: {topic}, Message: {message}, Payload Length: {payload.Length}");
|
||||
if(Item_Topic == null || Item_TopicPayload == null || Item_TopicPacketSize == null)
|
||||
if (Item_Topic == null || Item_TopicPayload == null || Item_TopicPacketSize == null ||
|
||||
Item_LastRequestTime == null || Item_LastResponseTime == null || Item_LastSpandTime == null)
|
||||
{
|
||||
Debug.LogError("UI_MQTTTestResultItem: One or more UI elements are not assigned.");
|
||||
gameObject.SetActive(false);
|
||||
return;
|
||||
}
|
||||
Item_Topic.DeepFind<TextMeshProUGUI>("Text_Topic").SetText(topic);
|
||||
Item_TopicPayload.SetValue(payload);
|
||||
Item_TopicPacketSize.SetValue(payload.Length.ToString());
|
||||
|
||||
TimeSpan spandTime = responseTime - requestTime;
|
||||
string convertRequestTime = $"{requestTime.Day}일 {requestTime.Hour}시 {requestTime.Minute}분 {requestTime.Second}.{requestTime.Millisecond}초";
|
||||
string convertResponseTime = $"{responseTime.Day}일 {responseTime.Hour}시 {responseTime.Minute}분 {responseTime.Second}.{responseTime.Millisecond}초";
|
||||
string convertSpandTime = FormatTimeSpanIgnoreZero(spandTime);
|
||||
Item_LastRequestTime.SetValue(convertRequestTime);
|
||||
Item_LastResponseTime.SetValue(convertResponseTime);
|
||||
Item_LastSpandTime.SetValue(convertSpandTime);
|
||||
}
|
||||
|
||||
private string FormatTimeSpanIgnoreZero(TimeSpan spandTime)
|
||||
{
|
||||
List<string> parts = new();
|
||||
|
||||
if (spandTime.Days != 0)
|
||||
parts.Add($"{spandTime.Days}일");
|
||||
if (spandTime.Hours != 0)
|
||||
parts.Add($"{spandTime.Hours}시");
|
||||
if (spandTime.Minutes != 0)
|
||||
parts.Add($"{spandTime.Minutes}분");
|
||||
if (spandTime.Seconds != 0 || spandTime.Milliseconds != 0)
|
||||
parts.Add($"{spandTime.Seconds}.{spandTime.Milliseconds:D3}초");
|
||||
|
||||
return string.Join(" ", parts);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace XRLib.Collections
|
||||
|
||||
private void CollectWordsContainingSubstring(TrieNode node, string currentWord, string substring, List<string> result)
|
||||
{
|
||||
if (node.IsEndOfWord && currentWord.Contains(substring))
|
||||
if (node.IsEndOfWord && currentWord.ToLower().Contains(substring.ToLower()))
|
||||
{
|
||||
result.Add(currentWord);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_StringTable:
|
||||
m_TableReference:
|
||||
m_TableCollectionName:
|
||||
m_TableCollectionName: GUID:b7e3230909563f049a2b6af27abfd127
|
||||
m_AssetTable:
|
||||
m_TableReference:
|
||||
m_TableCollectionName:
|
||||
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
000e1e56b63491cd2948148ccce2b84c
|
||||
ad634d680da1f81c93bb728b20f31ee3
|
||||
Reference in New Issue
Block a user