UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AGV 저장 기능 수정

Browse Source
This commit is contained in:
정영민
2025-05-28 13:54:19 +09:00
parent 5003ee2a11
commit c0159ef1ff
29 changed files with 3129 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1077
Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 72f142af384a5e341bf6099f889cca18
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1077
Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 192ba749438045e4bb32753ffff354b1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

338
Assets/Scenes/pre-0.24.0.unity
View File

@@ -169,6 +169,107 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &63933899
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_SizeDelta.x
value: 500
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_SizeDelta.y
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745165671321524316, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_Name
value: Panel_SaveAndOpenChecker
objectReference: {fileID: 0}
- target: {fileID: 6745165671321524316, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
--- !u!224 &110380560 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1112357447546033534, guid: 86fac645f610e6c43a57c53dec3f6e48, type: 3}
@@ -943,43 +1044,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -158
value: 0
objectReference: {fileID: 0}
- target: {fileID: 643449707283617506, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1079,23 +1180,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641865167890791995, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1115,23 +1216,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3407360332968577993, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1203,43 +1304,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -158
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -56
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1267,23 +1368,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
@@ -1459,23 +1560,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -124
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7049248817799997631, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
@@ -1551,43 +1652,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -124
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1599,23 +1700,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -56
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
@@ -1655,23 +1756,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 290
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 150
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: -56
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -2390,6 +2491,8 @@ RectTransform:
- {fileID: 1937464244}
- {fileID: 7474220137180433970}
- {fileID: 802579212}
- {fileID: 1970313509}
- {fileID: 1276837142}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2441,6 +2544,8 @@ MonoBehaviour:
panel_multilingualsettingmodal: {fileID: 0}
panel_loggingmodal: {fileID: 0}
panel_exitchecker: {fileID: 0}
panel_saveandnewchecker: {fileID: 0}
panel_saveandopenchecker: {fileID: 0}
panel_datarepository: {fileID: 0}
panel_agv: {fileID: 0}
panel_dataconnectmodal: {fileID: 0}
@@ -2552,7 +2657,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1af5890e725b4a74397a6abcbc5c8b43, type: 3}
m_Name:
m_EditorClassIdentifier:
AGVMoveSpeed: 0.15
AGVMoveSpeed: 0.3
AGVRotateSpeed: 0.15
--- !u!1 &574297194
GameObject:
@@ -8211,6 +8316,11 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 7257151592976347537, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
m_PrefabInstance: {fileID: 1265526093}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1276837142 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
m_PrefabInstance: {fileID: 63933899}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1287523440
GameObject:
m_ObjectHideFlags: 0
@@ -8759,6 +8869,107 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 9204995643987852086, guid: b7fb9c984bb17994ca59c9312245bd9e, type: 3}
m_PrefabInstance: {fileID: 1712022042}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1766393231
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_SizeDelta.x
value: 500
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_SizeDelta.y
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_Name
value: Panel_SaveAndNewChecker
objectReference: {fileID: 0}
- target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
--- !u!224 &1791222926 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
@@ -9046,6 +9257,11 @@ MonoBehaviour:
_canBeDisplayed: 1
_isExpanded: 1
_physicsMode: 1
--- !u!224 &1970313509 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
m_PrefabInstance: {fileID: 1766393231}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1976685923
PrefabInstance:
m_ObjectHideFlags: 0

1
Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs
View File

@@ -287,6 +287,7 @@ namespace Studio.AssetTool
private AbstractFunctionObject functionObject;
public void LoadCreate(string code,string topic, string component, bool isAuto)
{
transform.name = code;
this.code = code;
this.topic = topic;
this.componetKey = component;

24
Assets/Scripts/Studio/Command/ProjectCommand/SaveAndNewProjectCommand.cs Normal file
View File

@@ -0,0 +1,24 @@
using UnityEngine;
using Studio.Manage;
namespace Studio.Command
{
public class SaveAndNewProjectCommand : IIrreversibleCommand
{
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
public bool CanExecute()
{
throw new System.NotImplementedException();
}
public void Execute()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var projectManager = ManagerHub.instance.Get<ProjectManager>();
projectManager.SaveProjectSettingData();
canvas_Popup.panel_topmenunewprojectinfo.Open();
}
}
}

2
Assets/Scripts/Studio/Command/ProjectCommand/SaveAndNewProjectCommand.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9d865a25ef63f654b932b6a4d8459814

24
Assets/Scripts/Studio/Command/ProjectCommand/SaveAndOpenProjectCommand.cs Normal file
View File

@@ -0,0 +1,24 @@
using Studio.Manage;
using UnityEngine;
namespace Studio.Command
{
public class SaveAndOpenProjectCommand : IIrreversibleCommand
{
public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
public bool CanExecute()
{
throw new System.NotImplementedException();
}
public void Execute()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var projectManager = ManagerHub.instance.Get<ProjectManager>();
projectManager.SaveProjectSettingData();
canvas_Popup.panel_topmenuopenprojectinfo.Open();
}
}
}

2
Assets/Scripts/Studio/Command/ProjectCommand/SaveAndOpenProjectCommand.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 56edd3ee33cea2d4fa8a98e47e5da713

387
Assets/Scripts/Studio/Common/ProejctData.cs
View File

@@ -1,24 +1,69 @@
using System.Collections.Generic;
using System.Text;
using UnityEngine;
namespace Studio.Util
{
public class ProjectData
public class ProjectData : ISaveData
{
public SceneStartSetting sceneStartSetting;
public AssetManagerData assetManagerData;
public List<AssetData> assetDatas;
public List<AssetData> assetDatas = new();
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"sceneStartSetting: {sceneStartSetting.comparableData}");
sb.AppendLine($"assetManagerData: {assetManagerData.comparableData}");
sb.AppendLine("assetDatas: [");
for (int i = 0; i < assetDatas.Count; i++)
{
sb.Append(assetDatas[i].comparableData);
if (i < assetDatas.Count - 1) sb.AppendLine(",");
else sb.AppendLine();
}
sb.AppendLine(" ]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class SceneStartSetting
public class SceneStartSetting : ISaveData
{
public AppSetting appSetting;
public APISetting apiSetting;
public MQTTSetting mqttSetting;
public Dynamic3DModelSetting factorySetting;
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"appSetting: {appSetting.comparableData},");
sb.AppendLine($"apiSetting: {apiSetting.comparableData},");
sb.AppendLine($"mqttSetting: {mqttSetting.comparableData},");
sb.AppendLine($"factorySetting: {factorySetting.comparableData}");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class AppSetting
public class AppSetting : ISaveData
{
public string splashImageByte;
public float ratio;
@@ -27,68 +72,322 @@ namespace Studio.Util
public bool autoStart;
public string defaultLanauge;
public string languagePackPath;
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"splashImageByte: {splashImageByte},");
sb.AppendLine($"animationStyle: {animationStyle},");
sb.AppendLine($"progressBarStyle: {progressBarStyle},");
sb.AppendLine($"autoStart: {autoStart.ToString().ToLower()},");
sb.AppendLine($"defaultLanauge:{defaultLanauge},");
sb.AppendLine($"languagePackPath:{languagePackPath}");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class APISetting
public class APISetting : ISaveData
{
public List<APIConnection> apiConnections = new List<APIConnection>();
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.Append("apiConnections: [");
for (int i = 0; i < apiConnections.Count; i++)
{
sb.Append(apiConnections[i].comparableData);
if (i < apiConnections.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class APIConnection
public class APIConnection : ISaveData
{
public string domain;
public string port;
public List<URL> urls = new List<URL>();
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.Append("{");
sb.Append($"domain: {domain}, ");
sb.Append($"port: {port}, ");
sb.Append("urls: [");
for (int i = 0; i < urls.Count; i++)
{
sb.Append(urls[i].comparableData);
if (i < urls.Count - 1) sb.Append(", ");
}
sb.Append("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class URL
public class URL : ISaveData
{
public string url;
public string comparableData => GetComparableData();
public string GetComparableData()
{
return $"{{url: {url}}}";
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class MQTTSetting
public partial class MQTTSetting : ISaveData
{
public List<MQTTConnection> mqttConnections = new List<MQTTConnection>();
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.Append("mqttConnections: [");
for (int i = 0; i < mqttConnections.Count; i++)
{
sb.Append(mqttConnections[i].comparableData);
if (i < mqttConnections.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class MQTTConnection
public partial class MQTTConnection : ISaveData
{
public string domain;
public string port;
public List<Topic> topics = new List<Topic>();
}
public class Topic
{
public string topic;
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.Append("{");
sb.Append($"domain: {domain}, ");
sb.Append($"port: {port}, ");
sb.Append("topics: [");
for (int i = 0; i < topics.Count; i++)
{
sb.Append(topics[i].comparableData);
if (i < topics.Count - 1) sb.Append(", ");
}
sb.Append("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class Dynamic3DModelSetting
public partial class Topic : ISaveData
{
public string topic;
public string comparableData => GetComparableData();
public string GetComparableData()
{
return $"{{topic: {topic}}}";
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public partial class Dynamic3DModelSetting : ISaveData
{
public List<Dynamic3DModelConnection> modelDatas = new List<Dynamic3DModelConnection>();
public string comparableData => GetComparableData();
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.Append("modelDatas: [");
for (int i = 0; i < modelDatas.Count; i++)
{
sb.Append(modelDatas[i].comparableData);
if (i < modelDatas.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
}
public class Dynamic3DModelConnection
public partial class Dynamic3DModelConnection : ISaveData
{
public string dataName;
public string modelName;
public Dynamic3DModelUISetting modelUISettingData;
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"dataName: {dataName},");
sb.AppendLine($"modelName: {modelName},");
sb.AppendLine($"modelUISettingData: {modelUISettingData.comparableData}");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class Dynamic3DModelUISetting
public partial class Dynamic3DModelUISetting : ISaveData
{
public string name;
public string dashboardStyle;
public List<Dynamic3DModelUIData> dynamic3DModelUIData = new List<Dynamic3DModelUIData>();
public string comparableData => throw new System.NotImplementedException();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"name: {name},");
sb.AppendLine($"dashboardStyle: {dashboardStyle},");
sb.Append("dynamic3DModelUIData: [");
for (int i = 0; i < dynamic3DModelUIData.Count; i++)
{
sb.Append(dynamic3DModelUIData[i].comparableData);
if (i < dynamic3DModelUIData.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class Dynamic3DModelUIData
public partial class Dynamic3DModelUIData : ISaveData
{
public string dataName;
public string dataType;
public string dataValue;
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"dataName: {dataName},");
sb.AppendLine($"dataType: {dataType},");
sb.AppendLine($"dataValue: {dataValue}");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class AssetManagerData
public partial class AssetManagerData : ISaveData
{
public List<string> serverAssetsPaths = new List<string>();
public List<string> localAssetsPaths = new List<string>();
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.Append("serverAssetsPaths: [");
for (int i = 0; i < serverAssetsPaths.Count; i++)
{
sb.Append($"{serverAssetsPaths[i]}");
if (i < serverAssetsPaths.Count - 1) sb.Append(", ");
}
sb.AppendLine("],");
sb.Append("localAssetsPaths: [");
for (int i = 0; i < localAssetsPaths.Count; i++)
{
sb.Append($"{localAssetsPaths[i]}");
if (i < localAssetsPaths.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class AssetData
public class AssetData : ISaveData
{
public int id;
public string name;
@@ -127,9 +426,39 @@ namespace Studio.Util
this.scale = scale;
this.children = children;
}
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"name: {name},");
sb.AppendLine($"code: {code},");
sb.AppendLine($"component: {component},");
sb.AppendLine($"topic: {topic},");
sb.AppendLine($"isAutoCreate: {isAutoCreate},");
sb.AppendLine($"position: {position.comparableData},");
sb.AppendLine($"rotation: {rotation.comparableData},");
sb.AppendLine($"scale: {scale.comparableData},");
sb.Append("children: [");
for (int i = 0; i < children.Count; i++)
{
sb.Append(children[i]);
if (i < children.Count - 1) sb.Append(", ");
}
sb.AppendLine("]");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
public class SaveVector3
public class SaveVector3 : ISaveData
{
public float x;
public float y;
@@ -141,5 +470,23 @@ namespace Studio.Util
y = vector3.y;
z = vector3.z;
}
public string comparableData => GetComparableData();
public string GetComparableData()
{
var sb = new StringBuilder();
sb.AppendLine("{");
sb.AppendLine($"x: {x},");
sb.AppendLine($"y: {y},");
sb.Append($"z: {z}");
sb.Append("}");
return sb.ToString();
}
public bool IsEqual(ISaveData other)
{
throw new System.NotImplementedException();
}
}
}

13
Assets/Scripts/Studio/Interfaces/ISaveData.cs Normal file
View File

@@ -0,0 +1,13 @@
using UnityEngine;
namespace Studio
{
public interface ISaveData
{
string comparableData { get; }
string GetComparableData();
bool IsEqual(ISaveData other);
}
}

2
Assets/Scripts/Studio/Interfaces/ISaveData.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 37052d9b78896b94f9ed3e890370f3fe

10
Assets/Scripts/Studio/Managers/AssetManager.cs
View File

@@ -11,6 +11,8 @@ namespace Studio.Manage
{
public class AssetManager : Manager
{
public List<string> localAssetPaths = new List<string>();
private List<string> folderPathList = new List<string>();
private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
@@ -32,6 +34,11 @@ namespace Studio.Manage
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
}
public void ClearFolderPathList()
{
localAssetPaths.Clear();
folderPathList.Clear();
}
public void CombineAssetFolderPaths(List<string> folderPaths)
{
foreach(var folderPath in folderPaths)
@@ -41,6 +48,7 @@ namespace Studio.Manage
continue;
}
folderPathList.Add(folderPath);
localAssetPaths.Add(folderPath);
}
}
public void LoadLocalFBXDirectorys()
@@ -61,7 +69,7 @@ namespace Studio.Manage
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
if (projectManager.curProjectData == null)
if (projectManager.curProjectData.assetDatas.Count <= 0)
return;
List<AssetData> assets = projectManager.curProjectData.assetDatas;

10
Assets/Scripts/Studio/Managers/FBXFileManager.cs
View File

@@ -46,7 +46,10 @@ namespace Studio.AssetTool
{
}
public void ClearFilePaths()
{
filePaths.Clear();
}
public void LoadLocalFBXDirectorys(List<string> folderPaths)
{
@@ -89,8 +92,11 @@ namespace Studio.AssetTool
var folderName = Path.GetFileName(directoryPath);
if (dataRepo.TryGetDataFromName(assetName, out var p))
{
OnLoadComplete(p);
continue;
}
GameObject newObject = new GameObject(assetName);
newObject.transform.parent = fbxAnchor;
CustomAssetData assetData = newObject.AddComponent<CustomAssetData>();

1
Assets/Scripts/Studio/Managers/ManagerHub.cs
View File

@@ -24,6 +24,7 @@ namespace Studio.Manage
Join(new AssetManager());
Join(new SceneStartSettingManager());
Join(new RunManager());
Join(new ProjectDataComparerManager());
foreach(var m in managers)
{
m.Init();

41
Assets/Scripts/Studio/Managers/ProjectDataComparerManager.cs Normal file
View File

@@ -0,0 +1,41 @@
using Studio.Util;
using System.Collections.Generic;
using UnityEngine;
namespace Studio.Manage
{
public class ProjectDataComparerManager : Manager
{
public override void Init()
{
}
//public bool CompareProjectData(ProjectData preProjectData, ProjectData curProjectData)
//{
// if (preProjectData == null || curProjectData == null)
// return preProjectData == curProjectData;
// return preProjectData.sceneStartSetting.IsEqual(curProjectData.sceneStartSetting) &&
// preProjectData.assetManagerData.IsEqual(curProjectData.assetManagerData) &&
// CompareAssetDataList(preProjectData.assetDatas, curProjectData.assetDatas);
//}
//private static bool CompareAssetDataList(List<AssetData> preAssetDatas, List<AssetData> curAssetDatas)
//{
// if (preAssetDatas == null || curAssetDatas == null)
// return preAssetDatas == curAssetDatas;
// if (preAssetDatas.Count != curAssetDatas.Count)
// return false;
// for (int i = 0; i < preAssetDatas.Count; i++)
// {
// if (!preAssetDatas[i].IsEqual(curAssetDatas[i]))
// return false;
// }
// return true;
//}
}
}

2
Assets/Scripts/Studio/Managers/ProjectDataComparerManager.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1cf9fb0f0902d284eb806a927bd455f5

101
Assets/Scripts/Studio/Managers/ProjectManager.cs
View File

@@ -21,9 +21,20 @@ namespace Studio.Manage
public string curProjectTemplate;
public ProjectData curProjectData;
public ProjectData newProjectData;
public Action onOpenSaveAndOpenChecker;
public Action onOpenSaveAndNewChecker;
public Action onNewProjectModal;
public Action onOpenProjectModal;
public override void Init()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
onOpenSaveAndNewChecker += canvas_Popup.panel_saveandnewchecker.Open;
onOpenSaveAndOpenChecker += canvas_Popup.panel_saveandopenchecker.Open;
onNewProjectModal += canvas_Popup.panel_topmenunewprojectinfo.Open;
onOpenProjectModal += canvas_Popup.panel_topmenuopenprojectinfo.Open;
}
private void ResetProjectSettingData()
{
@@ -42,16 +53,64 @@ namespace Studio.Manage
}
CommandInvoker.instance.Invoke(new RemoveAllObjectCommand());
fbxFileManager.ClearFilePaths();
assetManager.ClearFolderPathList();
assetManager.onAssetManagerDatas?.Invoke(null);
}
public void TopMenuNewProjectSettingData()
{
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
var comparerManager = ManagerHub.instance.Get<ProjectDataComparerManager>();
List<AssetData> assetDatas = connector.connectedAssets
.Where(asset => asset.hierarchyItem.linkedObject.activeSelf)
.OrderBy(asset => asset.hierarchyItem.layerNum)
.ThenBy(asset => asset.hierarchyItem.GetSiblingIndex())
.Select(asset => CreateAssetData(asset))
.ToList();
newProjectData = CreateProjectData(assetDatas);
if (CompareSaveState(curProjectData, newProjectData))
{
onNewProjectModal?.Invoke();
}
else
{
onOpenSaveAndNewChecker?.Invoke();
}
}
public void TopMenuOpenProjectSettingData()
{
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
var comparerManager = ManagerHub.instance.Get<ProjectDataComparerManager>();
List<AssetData> assetDatas = connector.connectedAssets
.Where(asset => asset.hierarchyItem.linkedObject.activeSelf)
.OrderBy(asset => asset.hierarchyItem.layerNum)
.ThenBy(asset => asset.hierarchyItem.GetSiblingIndex())
.Select(asset => CreateAssetData(asset))
.ToList();
newProjectData = CreateProjectData(assetDatas);
Debug.Log(curProjectData);
Debug.Log(newProjectData);
if (CompareSaveState(curProjectData, newProjectData))
{
onOpenProjectModal?.Invoke();
}
else
{
onOpenSaveAndOpenChecker?.Invoke();
}
}
public void NewProjectSettingData(string proejctName, string projectPath)
{
ResetProjectSettingData();
curProjectName = proejctName;
curProjectPath = projectPath;
curProjectTemplate = string.Empty;
curProjectData = null;
ResetProjectSettingData();
List<AssetData> assetDatas = new List<AssetData>();
curProjectData = CreateProjectData(assetDatas);
}
public void OpenProejctSettingData(string filePath)
{
@@ -83,7 +142,6 @@ namespace Studio.Manage
}
public void OpenProjectSettingsDataAfterDataLoad()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingManager>();
if (curProjectData != null)
@@ -135,12 +193,12 @@ namespace Studio.Manage
private ProjectData CreateProjectData(List<AssetData> assetDatas)
{
return new ProjectData
{
sceneStartSetting = CreateSceneStartSettingData(),
assetManagerData = CreateAssetManagerData(),
assetDatas = assetDatas
};
var projectData = new ProjectData();
projectData.sceneStartSetting = CreateSceneStartSettingData();
projectData.assetManagerData = CreateAssetManagerData();
projectData.assetDatas = assetDatas;
return projectData;
}
private SceneStartSetting CreateSceneStartSettingData()
{
@@ -151,8 +209,9 @@ namespace Studio.Manage
}
private AssetManagerData CreateAssetManagerData()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var assetManagerData = canvas_Popup.panel_assetmanager.GetAssetManagerData();
var assetManager = ManagerHub.instance.Get<AssetManager>();
var assetManagerData = new AssetManagerData();
assetManagerData.localAssetsPaths.AddRange(assetManager.localAssetPaths);
return assetManagerData;
}
@@ -162,6 +221,24 @@ namespace Studio.Manage
var data = StandaloneFileBrowser.SaveFilePanel("SaveProject", "", curProjectName, ".ocs");
return data.Name;
}
public bool CompareSaveState(ISaveData origin, ISaveData modified)
{
if (origin.GetType() != modified.GetType())
{
return false;
}
var originHash = origin.comparableData;
var modifiedHash = modified.comparableData;
if (originHash.Equals(modifiedHash))
{
return true;
}
else
{
return false;
}
}
}
}

27
Assets/Scripts/Studio/Managers/SceneStartSettingManager.cs
View File

@@ -18,11 +18,6 @@ namespace Studio.Services
{
sceneStartSetting = new SceneStartSetting();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_appsetting.onClose += GetAppSettingData;
canvas_Popup.panel_apisetting.onClose += GetAPISettingData;
canvas_Popup.panel_mqttsetting.onClose += GetMQTTSettingData;
canvas_Popup.panel_3dfactorysetting.onClose += Get3DFactorySettingData;
onAppSetting += canvas_Popup.panel_appsetting.SetAppSetting;
onAPISetting += canvas_Popup.panel_apisetting.SetAPISetting;
onMQTTSetting += canvas_Popup.panel_mqttsetting.SetMQTTSetting;
@@ -30,29 +25,15 @@ namespace Studio.Services
}
public SceneStartSetting GetSceneStartSettingData()
{
return sceneStartSetting;
}
public void GetAppSettingData()
{
var sceneStartSetting = new SceneStartSetting();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.appSetting = canvas_Popup.panel_appsetting.GetAppSetting();
}
public void GetAPISettingData()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.apiSetting = canvas_Popup.panel_apisetting.GetAPISetting();
}
public void GetMQTTSettingData()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.mqttSetting = canvas_Popup.panel_mqttsetting.GetMQTTSetting();
canvas_Popup.panel_3dfactorysetting.SetDataDropdownData(sceneStartSetting.mqttSetting);
}
public void Get3DFactorySettingData()
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
sceneStartSetting.factorySetting = canvas_Popup.panel_3dfactorysetting.GetDynamic3DModelSetting();
return sceneStartSetting;
}
public void SetSceneStartSetting(SceneStartSetting sceneStartSetting)
{

3
Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs
View File

@@ -17,9 +17,6 @@ namespace Studio.Manage
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject;
GameObject repository = canvas_Popup.panel_datarepository.gameObject;
canvas_static.panel_studiotopbar.onClickNewProject += canvas_Popup.panel_topmenunewprojectinfo.Open;
canvas_static.panel_studiotopbar.onClickOpenProject += canvas_Popup.panel_topmenuopenprojectinfo.Open;
canvas_static.panel_studiotopbar.onClickAssetManager += canvas_Popup.panel_assetmanager.Open;
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));

6
Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs
View File

@@ -50,7 +50,7 @@ namespace Studio.Dynamic.Manager
continue;
}
var item = CreateAGV(e.Type, key, value);
SetRenderObject(item.GetComponent<CustomAssetRenderObject>());
SetRenderObject(key, item.GetComponent<CustomAssetRenderObject>());
agvs.Add(item);
}
}
@@ -73,9 +73,9 @@ namespace Studio.Dynamic.Manager
return agv;
}
private void SetRenderObject(CustomAssetRenderObject obj)
private void SetRenderObject(string key ,CustomAssetRenderObject obj)
{
obj.LoadCreate(asset.renderObject.code, asset.renderObject.topic, asset.renderObject.componetKey, asset.renderObject.isAutoId);
obj.LoadCreate(key, asset.renderObject.topic, asset.renderObject.componetKey, asset.renderObject.isAutoId);
}
/// <summary>

5
Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs
View File

@@ -45,6 +45,8 @@ namespace Studio
public Panel_MultilingualSettingModal panel_multilingualsettingmodal;
public Panel_LoggingModal panel_loggingmodal;
public Panel_ExitChecker panel_exitchecker;
public Panel_SaveAndNewChecker panel_saveandnewchecker;
public Panel_SaveAndOpenChecker panel_saveandopenchecker;
public Panel_DataRepository panel_datarepository;
public Panel_AGV panel_agv;
@@ -85,6 +87,9 @@ namespace Studio
panel_assetmanager.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand());
panel_assetsetting.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand());
panel_saveandnewchecker.onClickSaveAndNew += () => CommandInvoker.instance.Invoke(new SaveAndNewProjectCommand());
panel_saveandopenchecker.onClickSaveAndOpen += () => CommandInvoker.instance.Invoke(new SaveAndOpenProjectCommand());
panel_topmenunewprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new TopMenuNewProjectCommand());
panel_topmenuopenprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new TopMenuOpenProjectCommand());

3
Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs
View File

@@ -31,7 +31,8 @@ namespace Studio.UI
statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
//panel_studiotopbar.onClickAssetLibraryWindow += fbxFileManager.LoadLocalData;
panel_studiotopbar.onClickNewProject += () => CommandInvoker.instance.Invoke(new SaveProjectCommand());
panel_studiotopbar.onClickNewProject += projectManager.TopMenuNewProjectSettingData;
panel_studiotopbar.onClickOpenProject += projectManager.TopMenuOpenProjectSettingData;
panel_studiotopbar.onClickSaveProject += () => CommandInvoker.instance.Invoke(new SaveProjectCommand());
panel_studiotopbar.onClickPlay += runManager.ChangeState;

11
Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs
View File

@@ -198,13 +198,12 @@ namespace Studio.UI
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
Image_Selected.sprite = sprite;
}
Dropdown_AnimationStyle.value = Dropdown_AnimationStyle.options.FindIndex(option => option.text == appSetting.animationStyle);
Dropdown_ProgressBarStyle.value = Dropdown_ProgressBarStyle.options.FindIndex(option => option.text == appSetting.progressBarStyle);
Toggle_AutoStart.isOn = appSetting.autoStart;
Dropdown_DefaultLangauge.value = Dropdown_DefaultLangauge.options.FindIndex(option => option.text == appSetting.defaultLanauge);
InputField_LanguagePack.text = appSetting.languagePackPath;
}
Dropdown_AnimationStyle.value = Dropdown_AnimationStyle.options.FindIndex(option => option.text == appSetting.animationStyle);
Dropdown_ProgressBarStyle.value = Dropdown_ProgressBarStyle.options.FindIndex(option => option.text == appSetting.progressBarStyle);
Toggle_AutoStart.isOn = appSetting.autoStart;
Dropdown_DefaultLangauge.value = Dropdown_DefaultLangauge.options.FindIndex(option => option.text == appSetting.defaultLanauge);
InputField_LanguagePack.text = appSetting.languagePackPath;
}
}
}

38
Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs Normal file
View File

@@ -0,0 +1,38 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio
{
public class Panel_SaveAndNewChecker : PanelBase
{
private Button Button_SaveAndNew;
private Button Button_Cancel;
public Action onClickSaveAndNew;
public override void AfterAwake()
{
Button_SaveAndNew.onClick.AddListener(OnClickSaveAndNewButton);
Button_Cancel.onClick.AddListener(OnClickCancelButton);
}
public void Open()
{
SetActive(true);
}
public void Close()
{
SetActive(false);
}
private void OnClickSaveAndNewButton()
{
onClickSaveAndNew?.Invoke();
Close();
}
private void OnClickCancelButton()
{
Close();
}
}
}

2
Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e45202dbee11b9247b320232105a9209

38
Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs Normal file
View File

@@ -0,0 +1,38 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio
{
public class Panel_SaveAndOpenChecker : PanelBase
{
private Button Button_SaveAndOpen;
private Button Button_Cancel;
public Action onClickSaveAndOpen;
public override void AfterAwake()
{
Button_SaveAndOpen.onClick.AddListener(OnClickSaveAndOpenButton);
Button_Cancel.onClick.AddListener(OnClickCancelButton);
}
public void Open()
{
SetActive(true);
}
public void Close()
{
SetActive(false);
}
private void OnClickSaveAndOpenButton()
{
onClickSaveAndOpen?.Invoke();
Close();
}
private void OnClickCancelButton()
{
Close();
}
}
}

2
Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: c2210d7c485f6904d952f5df8ee52d0e