Compare commits

...

24 Commits

Author SHA1 Message Date
geondo55
b636b4ca4d 2차 수정 및 asset완전삭제 기능 추가 2025-04-03 11:26:41 +09:00
geondo55
77ce046ff9 Merge branch 'main' into pgd/20250402 2025-04-02 17:08:38 +09:00
geondo55
3f40f681df 1차 코드 리팩토링(ProjectManager) 2025-04-02 17:07:24 +09:00
wsh
c207777bf6 안쓰는거 삭제 2025-04-02 11:56:59 +09:00
wsh
24057a4102 1. 폴더 및 네임스페이스 일부 정리
2. 미사용 클래스 제거
2025-04-02 10:21:48 +09:00
wsh
8d255ef06c 클래스 파일 분리 2025-04-01 16:16:56 +09:00
wsh
5a293f6c2c 1 2025-04-01 15:41:31 +09:00
wsh
c3c9b498c4 리팩토링 2025-04-01 15:32:26 +09:00
f94ef5b5b1 Merge pull request 'Gizmo 방향이 회전되지 않는 버그 수정' (#38) from sjm/250401 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/38
2025-04-01 11:53:45 +09:00
jmaniuvc
2772a3b928 Merge branch 'sjm/250331' into sjm/250401 2025-04-01 11:52:16 +09:00
jmaniuvc
32f1f3d956 Gizmo 방향이 회전되지 않는 버그 수정 2025-04-01 11:51:53 +09:00
db11ffc5eb Merge pull request 'TopBar 버튼을 다시 눌러서 메뉴들 닫았을때 색이 되돌아가지 않는 버그 수정' (#37) from sjm/250331 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/37
2025-03-31 16:02:00 +09:00
jmaniuvc
66dab5acfd TopBar 버튼을 다시 눌러서 메뉴들 닫았을때 색이 되돌아가지 않는 버그 수정 2025-03-31 15:29:10 +09:00
jmaniuvc
347c5853c5 디자인 적용 2025-03-31 10:53:28 +09:00
8edfe96073 Merge pull request '거리 측정 충돌 해결 / 윈도우 메뉴 드롭다운에 간섭되고 있는 객체 목록 UI 활성화 버튼 추가' (#36) from sjm/250331 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/36
2025-03-31 10:19:29 +09:00
jmaniuvc
9c3a0e02d7 충돌 해결 2025-03-31 10:16:44 +09:00
jmaniuvc
2e01bcf527 Merge branch 'sjm/250326' into sjm/250331
# Conflicts:
#	Assets/Scenes/0.22.7.unity
2025-03-31 10:09:25 +09:00
jmaniuvc
44724629d3 윈도우 메뉴 드롭다운에 간섭되고 있는 객체 목록 UI 활성화 버튼 추가 2025-03-31 10:08:13 +09:00
jmaniuvc
fd8b6052bf Scale 조절때 버그 수정 2025-03-26 18:32:24 +09:00
jmaniuvc
09b5001f3b Merge branch 'sjm/250325' into sjm/250326 2025-03-26 17:01:33 +09:00
jmaniuvc
110b2f87ed 거리 UI z값 버그 수정 2025-03-26 17:01:11 +09:00
jmaniuvc
eee79d1145 거리 Line 표시 2025-03-26 16:45:35 +09:00
jmaniuvc
bfc68b3d93 오브젝트 거리 측정 월드 좌표로 변경 2025-03-26 15:23:25 +09:00
jmaniuvc
65f0199ec6 거리 UI 2025-03-25 18:33:49 +09:00
141 changed files with 4326 additions and 2590 deletions

View File

@@ -195,7 +195,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -386,7 +386,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:

View File

@@ -825,7 +825,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -570,7 +570,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -608,10 +608,10 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_HighlightedColor: {r: 0.2980328, g: 0.27319673, b: 0.303, a: 1}
m_PressedColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_SelectedColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
@@ -672,6 +672,9 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
openTime: 0.1
closeColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
openColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
isButtonImageToggle: 1
--- !u!1 &1063646199281932845
GameObject:
m_ObjectHideFlags: 0
@@ -1121,7 +1124,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1241,17 +1244,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eeb29fdb1a9fc134aa57e1efd67b4848, type: 3}
m_Name:
m_EditorClassIdentifier:
Button_NewProject: {fileID: 0}
Button_SaveProject: {fileID: 0}
Button_LoadProject: {fileID: 0}
Button_DownloadLayout: {fileID: 0}
Button_ExportAGVPath: {fileID: 0}
Button_ImportAGVPath: {fileID: 0}
Button_LoadAssets: {fileID: 0}
Button_AssetWindow: {fileID: 0}
Button_ComponentWindow: {fileID: 0}
Button_Tools: {fileID: 0}
button_Icon: {fileID: 0}
Button_NewProject: {fileID: 8845531612634989544}
Button_SaveProject: {fileID: 7896083598485264292}
Button_LoadProject: {fileID: 198223961060221410}
Button_DownloadLayout: {fileID: 6398619867125381537}
Button_ExportAGVPath: {fileID: 5335094302430846695}
Button_ImportAGVPath: {fileID: 4147750155540767454}
Button_LoadAssets: {fileID: 1572705195072342980}
Button_AssetWindow: {fileID: 9118390163350013474}
Button_HierarchyWindow: {fileID: 0}
Button_Tools: {fileID: 6255786153821147911}
Button_ConflictedListWindow: {fileID: 0}
button_Icon: {fileID: 3577280054402309687}
--- !u!1 &3034319458232227286
GameObject:
m_ObjectHideFlags: 0
@@ -1465,7 +1469,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1503,10 +1507,10 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_HighlightedColor: {r: 0.2980328, g: 0.27319673, b: 0.303, a: 1}
m_PressedColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_SelectedColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
@@ -1567,6 +1571,9 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
openTime: 0.1
closeColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
openColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
isButtonImageToggle: 1
--- !u!1 &3183454003344235609
GameObject:
m_ObjectHideFlags: 0
@@ -1737,7 +1744,7 @@ RectTransform:
m_GameObject: {fileID: 3375801220601729173}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8294441913557132553}
@@ -1748,7 +1755,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 108, y: -32}
m_SizeDelta: {x: 307, y: 154}
m_SizeDelta: {x: 307, y: 203}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &139751343822457032
CanvasRenderer:
@@ -1772,7 +1779,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.16862746, g: 0.1764706, b: 0.24705882, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2231,7 +2238,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2269,10 +2276,10 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_HighlightedColor: {r: 0.2980328, g: 0.27319673, b: 0.303, a: 1}
m_PressedColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
m_SelectedColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
@@ -2333,6 +2340,9 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
openTime: 0.1
closeColor: {r: 0.23529412, g: 0.21568628, b: 0.23921569, a: 1}
openColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
isButtonImageToggle: 1
--- !u!1 &4302929749455078697
GameObject:
m_ObjectHideFlags: 0
@@ -4308,6 +4318,7 @@ RectTransform:
m_Children:
- {fileID: 8688116085078439031}
- {fileID: 4147382167238274784}
- {fileID: 5512206668012317612}
- {fileID: 5821008458756972882}
m_Father: {fileID: 8294441913557132553}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4398,7 +4409,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -4406,11 +4417,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -4446,11 +4457,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4528,7 +4539,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -4536,11 +4547,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -4576,11 +4587,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -121
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4616,6 +4627,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 547219611680456040}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6255786153821147911 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 547219611680456040}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &686077476744845262
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4694,7 +4716,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -4702,11 +4724,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -4742,11 +4764,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -168
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4809,11 +4831,144 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!114 &6398619867125381537 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 686077476744845262}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6833388731803765748 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 686077476744845262}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1958845721738098582
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6851815559567896889}
m_Modifications:
- target: {fileID: 1009026706481275526, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_Name
value: Button_ConflictedListWindow
objectReference: {fileID: 0}
- target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
value: 46
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8232947906609958833, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_text
value: Conflicted List
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!224 &5512206668012317612 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 1958845721738098582}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1964423804417470600
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4892,7 +5047,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -4900,11 +5055,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -4940,11 +5095,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -215
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5007,6 +5162,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!114 &5335094302430846695 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 1964423804417470600}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &5481852742840888498 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
@@ -5024,6 +5190,22 @@ PrefabInstance:
propertyPath: m_Name
value: Button_NewProject
objectReference: {fileID: 0}
- target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -5038,7 +5220,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5046,11 +5228,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5086,11 +5268,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5109,6 +5291,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!114 &8845531612634989544 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 3136965122067459463}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &8996151517581488573 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
@@ -5168,7 +5361,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5176,11 +5369,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5216,11 +5409,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5256,6 +5449,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 3441346602397263949}
m_PrefabAsset: {fileID: 0}
--- !u!114 &9118390163350013474 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 3441346602397263949}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4385836676027955659
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5334,7 +5538,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5342,11 +5546,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5382,11 +5586,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5454,6 +5658,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 4385836676027955659}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7896083598485264292 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 4385836676027955659}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4943340508714165675
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5532,7 +5747,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5540,11 +5755,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5580,11 +5795,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -309
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5652,6 +5867,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 4943340508714165675}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1572705195072342980 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 4943340508714165675}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6019380511333486477
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5730,7 +5956,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5738,11 +5964,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5778,11 +6004,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -121
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5845,6 +6071,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!114 &198223961060221410 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 6019380511333486477}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &349415598094472119 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
@@ -5928,7 +6165,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -5936,11 +6173,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -5976,11 +6213,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -262
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6043,6 +6280,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
--- !u!114 &4147750155540767454 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
m_PrefabInstance: {fileID: 7549965645376523441}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4582026471169970315 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
@@ -6090,7 +6338,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -6098,11 +6346,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -6138,11 +6386,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6220,7 +6468,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.x
@@ -6228,11 +6476,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_SizeDelta.y
@@ -6268,11 +6516,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

View File

@@ -0,0 +1,88 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5879261464688472025
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5472984000651998200}
- component: {fileID: 9157913964040327910}
- component: {fileID: 1305656563587261426}
m_Layer: 0
m_Name: PRF_ObjectDistanceLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5472984000651998200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &9157913964040327910
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1305656563587261426
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5879261464688472025}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 4f1ef37ae953c484bbc5d5e4049147e5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

View File

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

View File

@@ -2447,6 +2447,7 @@ RectTransform:
- {fileID: 1085911555}
- {fileID: 1712022043}
- {fileID: 1229281891}
- {fileID: 1195713950}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2471,6 +2472,7 @@ MonoBehaviour:
panel_hierarchy: {fileID: 0}
panel_assetlibrary: {fileID: 0}
panel_interworkingdatalist: {fileID: 0}
panel_interferedobjectlist: {fileID: 0}
panel_assetproperties: {fileID: 0}
panel_predefinedtype: {fileID: 0}
panel_objectinfo: {fileID: 0}
@@ -2482,6 +2484,7 @@ MonoBehaviour:
panel_draghandler: {fileID: 0}
panel_assetedit: {fileID: 0}
panel_thumbnail: {fileID: 0}
panel_objectdistance: {fileID: 0}
--- !u!114 &545811783
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3109,6 +3112,32 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 827571245}
m_CullTransparentMesh: 1
--- !u!1 &833546890 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4357501051956785434, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
m_PrefabInstance: {fileID: 1319277344}
m_PrefabAsset: {fileID: 0}
--- !u!114 &833546892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 833546890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8d1f9c7add0ac3345ac4cc9e8c59084a, type: 3}
m_Name:
m_EditorClassIdentifier:
identifier:
password:
onLoadFbxFile:
m_PersistentCalls:
m_Calls: []
onRemoveFbxFile:
m_PersistentCalls:
m_Calls: []
isLoadTaskComplete: 1
--- !u!1 &837752632
GameObject:
m_ObjectHideFlags: 0
@@ -4823,6 +4852,112 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1168550161}
m_CullTransparentMesh: 0
--- !u!1001 &1195713949
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 1037199441371851518, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_Name
value: Panel_ObjectDistance
objectReference: {fileID: 0}
- target: {fileID: 1037199441371851518, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
--- !u!224 &1195713950 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
m_PrefabInstance: {fileID: 1195713949}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1206099642
GameObject:
m_ObjectHideFlags: 0
@@ -8545,10 +8680,14 @@ PrefabInstance:
propertyPath: m_Name
value: CustomAssetConnector
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 7645908678807808531, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4357501051956785434, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
insertIndex: -1
addedObject: {fileID: 833546892}
m_SourcePrefab: {fileID: 100100000, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
--- !u!1 &1321269470
GameObject:
@@ -11972,6 +12111,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
openTime: 0.1
isButtonImageToggle: 0
closeColor: {r: 1, g: 1, b: 1, a: 1}
openColor: {r: 1, g: 1, b: 1, a: 1}
BG: {fileID: 627801129964666679}
--- !u!1 &1618951800751397818
GameObject:
@@ -12198,25 +12340,33 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 307582692180422744, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 307582692180422744, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -121
value: 0
objectReference: {fileID: 0}
- target: {fileID: 494264644172990295, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
@@ -12236,23 +12386,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -309
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1568513447129454289, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
@@ -12320,23 +12470,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2573358733300104709, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
@@ -12382,6 +12532,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3618310649423829132, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3618310649423829132, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3628472594065940370, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -12400,23 +12558,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4147750155540767454, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -12440,23 +12598,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -262
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582151064078720181, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -12568,23 +12726,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -215
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5540225464422352963, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
@@ -12596,23 +12774,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -121
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5872060385755613930, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
@@ -12634,29 +12812,49 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5915446777810898359, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5915446777810898359, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5915446777810898359, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5915446777810898359, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5915446777810898359, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6255786153821147911, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6398619867125381537, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -12672,23 +12870,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -168
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6851815559567896889, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.y
@@ -12732,23 +12930,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7812692383561393628, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
@@ -12796,23 +12994,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8831777936729481367, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
@@ -12828,23 +13026,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_SizeDelta.x
value: 295
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.x
value: 153.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_AnchoredPosition.y
value: -27
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9118390163350013474, guid: 6b6204170622c2248aa45b7084250442, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -14537,6 +14735,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
openTime: 0.1
isButtonImageToggle: 0
closeColor: {r: 1, g: 1, b: 1, a: 1}
openColor: {r: 1, g: 1, b: 1, a: 1}
BG: {fileID: 4396171917364011593}
--- !u!224 &5012894770760959717 stripped
RectTransform:
@@ -15784,6 +15985,38 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_AssetProperties
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -15864,6 +16097,78 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -15907,15 +16212,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2405735081472298735, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2405735081472298735, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2405735081472298735, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_SizeDelta.x
value: -17
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118259174350499689, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMax.x
@@ -15927,11 +16232,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3471637947323309505, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3471637947323309505, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3471637947323309505, guid: 5b361cfd4f99f2b46b2bbe34e3c159ca, type: 3}
propertyPath: m_AnchorMin.y
@@ -16054,10 +16359,42 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1791423234}
m_Modifications:
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1365857456347898781, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_Type
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3939186822727609201, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_Name
value: Panel_Toolbar
@@ -16142,6 +16479,118 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -16410,6 +16859,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
openTime: 0.1
isButtonImageToggle: 0
closeColor: {r: 1, g: 1, b: 1, a: 1}
openColor: {r: 1, g: 1, b: 1, a: 1}
BG: {fileID: 725141755715026998}
--- !u!1 &7358537005159908647
GameObject:

View File

@@ -1,6 +1,7 @@
using UnityEngine;
using System;
using System.Collections.Generic;
using System.Linq;
namespace RTG
{
@@ -341,8 +342,19 @@ namespace RTG
if (_transformSpace == GizmoSpace.Global) gizmoTransform.Rotation3D = Quaternion.identity;
else
{
if (_targetPivotObject == null) gizmoTransform.Rotation3D = Quaternion.identity;
else gizmoTransform.Rotation3D = _targetPivotObject.transform.rotation;
if (_targetPivotObject != null)
{
gizmoTransform.Rotation3D = _targetPivotObject.transform.rotation;
}
else if (_targetObjects.Count() == 1)
{
GameObject pivotObject = _targetObjects.First();
gizmoTransform.Rotation3D = pivotObject.transform.rotation;
}
else
{
gizmoTransform.Rotation3D = Quaternion.identity;
}
}
}
public void RefreshPositionAndRotation()

View File

@@ -10,17 +10,17 @@ public class CustomMessagePackResolver : IFormatterResolver
private static readonly Dictionary<Type, object> formatters = new Dictionary<Type, object>
{
{ typeof(XED.Asset.MaterialPropertyData), new MessagePack.Formatters.XED.Asset.MaterialPropertyDataFormatter() },
{ typeof(XED.Asset.ModelData), new MessagePack.Formatters.XED.Asset.ModelDataFormatter() },
{ typeof(XED.Asset.SaveData), new MessagePack.Formatters.XED.Asset.SaveDataFormatter() },
{ typeof(XED.Asset.SavedModelData), new MessagePack.Formatters.XED.Asset.SavedModelDataFormatter() },
{ typeof(XED.Asset.SerializableMesh), new MessagePack.Formatters.XED.Asset.SerializableMeshFormatter() },
{ typeof(XED.Asset.SerializableQuaternion), new MessagePack.Formatters.XED.Asset.SerializableQuaternionFormatter() },
{ typeof(XED.Asset.SerializableVector2), new MessagePack.Formatters.XED.Asset.SerializableVector2Formatter() },
{ typeof(XED.Asset.SerializableVector3), new MessagePack.Formatters.XED.Asset.SerializableVector3Formatter() },
{ typeof(XED.Asset.SubmeshData), new MessagePack.Formatters.XED.Asset.SubmeshDataFormatter() },
{ typeof(XED.Asset.TextureData), new MessagePack.Formatters.XED.Asset.TextureDataFormatter() },
{ typeof(XED.Asset.TransformData), new MessagePack.Formatters.XED.Asset.TransformDataFormatter() },
{ typeof(XED.Manage.MaterialPropertyData), new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter() },
{ typeof(XED.Manage.ModelData), new MessagePack.Formatters.XED.Manage.ModelDataFormatter() },
{ typeof(XED.Manage.SaveData), new MessagePack.Formatters.XED.Manage.SaveDataFormatter() },
{ typeof(XED.Manage.SavedModelData), new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter() },
{ typeof(XED.Manage.SerializableMesh), new MessagePack.Formatters.XED.Manage.SerializableMeshFormatter() },
{ typeof(XED.Manage.SerializableQuaternion), new MessagePack.Formatters.XED.Manage.SerializableQuaternionFormatter() },
{ typeof(XED.Manage.SerializableVector2), new MessagePack.Formatters.XED.Manage.SerializableVector2Formatter() },
{ typeof(XED.Manage.SerializableVector3), new MessagePack.Formatters.XED.Manage.SerializableVector3Formatter() },
{ typeof(XED.Manage.SubmeshData), new MessagePack.Formatters.XED.Manage.SubmeshDataFormatter() },
{ typeof(XED.Manage.TextureData), new MessagePack.Formatters.XED.Manage.TextureDataFormatter() },
{ typeof(XED.Manage.TransformData), new MessagePack.Formatters.XED.Manage.TransformDataFormatter() },
};
public IMessagePackFormatter<T> GetFormatter<T>()

View File

@@ -49,29 +49,29 @@ namespace MessagePack.Resolvers
{
lookup = new global::System.Collections.Generic.Dictionary<global::System.Type, int>(23)
{
{ typeof(global::XED.Asset.MaterialPropertyData[]), 0 },
{ typeof(global::XED.Asset.ModelData[]), 1 },
{ typeof(global::XED.Asset.SavedModelData[]), 2 },
{ typeof(global::XED.Asset.SerializableVector2[]), 3 },
{ typeof(global::XED.Asset.SerializableVector3[]), 4 },
{ typeof(global::XED.Asset.SerializableVector4[]), 5 },
{ typeof(global::XED.Asset.SubmeshData[]), 6 },
{ typeof(global::XED.Asset.TextureData[]), 7 },
{ typeof(global::XED.Asset.ThumbnailData[]), 8 },
{ typeof(global::XED.Manage.MaterialPropertyData[]), 0 },
{ typeof(global::XED.Manage.ModelData[]), 1 },
{ typeof(global::XED.Manage.SavedModelData[]), 2 },
{ typeof(global::XED.Manage.SerializableVector2[]), 3 },
{ typeof(global::XED.Manage.SerializableVector3[]), 4 },
{ typeof(global::XED.Manage.SerializableVector4[]), 5 },
{ typeof(global::XED.Manage.SubmeshData[]), 6 },
{ typeof(global::XED.Manage.TextureData[]), 7 },
{ typeof(global::XED.Manage.ThumbnailData[]), 8 },
{ typeof(string[][]), 9 },
{ typeof(global::XED.Asset.MaterialPropertyData), 10 },
{ typeof(global::XED.Asset.ModelData), 11 },
{ typeof(global::XED.Asset.SaveData), 12 },
{ typeof(global::XED.Asset.SavedModelData), 13 },
{ typeof(global::XED.Asset.SerializableMesh), 14 },
{ typeof(global::XED.Asset.SerializableQuaternion), 15 },
{ typeof(global::XED.Asset.SerializableVector2), 16 },
{ typeof(global::XED.Asset.SerializableVector3), 17 },
{ typeof(global::XED.Asset.SerializableVector4), 18 },
{ typeof(global::XED.Asset.SubmeshData), 19 },
{ typeof(global::XED.Asset.TextureData), 20 },
{ typeof(global::XED.Asset.ThumbnailData), 21 },
{ typeof(global::XED.Asset.TransformData), 22 },
{ typeof(global::XED.Manage.MaterialPropertyData), 10 },
{ typeof(global::XED.Manage.ModelData), 11 },
{ typeof(global::XED.Manage.SaveData), 12 },
{ typeof(global::XED.Manage.SavedModelData), 13 },
{ typeof(global::XED.Manage.SerializableMesh), 14 },
{ typeof(global::XED.Manage.SerializableQuaternion), 15 },
{ typeof(global::XED.Manage.SerializableVector2), 16 },
{ typeof(global::XED.Manage.SerializableVector3), 17 },
{ typeof(global::XED.Manage.SerializableVector4), 18 },
{ typeof(global::XED.Manage.SubmeshData), 19 },
{ typeof(global::XED.Manage.TextureData), 20 },
{ typeof(global::XED.Manage.ThumbnailData), 21 },
{ typeof(global::XED.Manage.TransformData), 22 },
};
}
@@ -85,29 +85,29 @@ namespace MessagePack.Resolvers
switch (key)
{
case 0: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.MaterialPropertyData>();
case 1: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.ModelData>();
case 2: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.SavedModelData>();
case 3: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.SerializableVector2>();
case 4: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.SerializableVector3>();
case 5: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.SerializableVector4>();
case 6: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.SubmeshData>();
case 7: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.TextureData>();
case 8: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Asset.ThumbnailData>();
case 0: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.MaterialPropertyData>();
case 1: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.ModelData>();
case 2: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.SavedModelData>();
case 3: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.SerializableVector2>();
case 4: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.SerializableVector3>();
case 5: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.SerializableVector4>();
case 6: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.SubmeshData>();
case 7: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.TextureData>();
case 8: return new global::MessagePack.Formatters.ArrayFormatter<global::XED.Manage.ThumbnailData>();
case 9: return new global::MessagePack.Formatters.ArrayFormatter<string[]>();
case 10: return new MessagePack.Formatters.XED.Asset.MaterialPropertyDataFormatter();
case 11: return new MessagePack.Formatters.XED.Asset.ModelDataFormatter();
case 12: return new MessagePack.Formatters.XED.Asset.SaveDataFormatter();
case 13: return new MessagePack.Formatters.XED.Asset.SavedModelDataFormatter();
case 14: return new MessagePack.Formatters.XED.Asset.SerializableMeshFormatter();
case 15: return new MessagePack.Formatters.XED.Asset.SerializableQuaternionFormatter();
case 16: return new MessagePack.Formatters.XED.Asset.SerializableVector2Formatter();
case 17: return new MessagePack.Formatters.XED.Asset.SerializableVector3Formatter();
case 18: return new MessagePack.Formatters.XED.Asset.SerializableVector4Formatter();
case 19: return new MessagePack.Formatters.XED.Asset.SubmeshDataFormatter();
case 20: return new MessagePack.Formatters.XED.Asset.TextureDataFormatter();
case 21: return new MessagePack.Formatters.XED.Asset.ThumbnailDataFormatter();
case 22: return new MessagePack.Formatters.XED.Asset.TransformDataFormatter();
case 10: return new MessagePack.Formatters.XED.Manage.MaterialPropertyDataFormatter();
case 11: return new MessagePack.Formatters.XED.Manage.ModelDataFormatter();
case 12: return new MessagePack.Formatters.XED.Manage.SaveDataFormatter();
case 13: return new MessagePack.Formatters.XED.Manage.SavedModelDataFormatter();
case 14: return new MessagePack.Formatters.XED.Manage.SerializableMeshFormatter();
case 15: return new MessagePack.Formatters.XED.Manage.SerializableQuaternionFormatter();
case 16: return new MessagePack.Formatters.XED.Manage.SerializableVector2Formatter();
case 17: return new MessagePack.Formatters.XED.Manage.SerializableVector3Formatter();
case 18: return new MessagePack.Formatters.XED.Manage.SerializableVector4Formatter();
case 19: return new MessagePack.Formatters.XED.Manage.SubmeshDataFormatter();
case 20: return new MessagePack.Formatters.XED.Manage.TextureDataFormatter();
case 21: return new MessagePack.Formatters.XED.Manage.ThumbnailDataFormatter();
case 22: return new MessagePack.Formatters.XED.Manage.TransformDataFormatter();
default: return null;
}
}
@@ -141,12 +141,12 @@ namespace MessagePack.Resolvers
#pragma warning disable SA1403 // File may only contain a single namespace
#pragma warning disable SA1649 // File name should match first type name
namespace MessagePack.Formatters.XED.Asset
namespace MessagePack.Formatters.XED.Manage
{
public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.MaterialPropertyData>
public sealed class MaterialPropertyDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.MaterialPropertyData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.MaterialPropertyData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -169,7 +169,7 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<string[]>(formatterResolver).Serialize(ref writer, value.texUIDs, options);
}
public global::XED.Asset.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.MaterialPropertyData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -179,7 +179,7 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.MaterialPropertyData();
var ____result = new global::XED.Manage.MaterialPropertyData();
for (int i = 0; i < length; i++)
{
@@ -229,10 +229,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.ModelData>
public sealed class ModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.ModelData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.ModelData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.ModelData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -245,12 +245,12 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.id);
writer.Write(value.parentId);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<string>(formatterResolver).Serialize(ref writer, value.modelComponentName, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.TransformData>(formatterResolver).Serialize(ref writer, value.transformData, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableMesh>(formatterResolver).Serialize(ref writer, value.mesh, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.MaterialPropertyData[]>(formatterResolver).Serialize(ref writer, value.materialProperties, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.TransformData>(formatterResolver).Serialize(ref writer, value.transformData, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableMesh>(formatterResolver).Serialize(ref writer, value.mesh, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.MaterialPropertyData[]>(formatterResolver).Serialize(ref writer, value.materialProperties, options);
}
public global::XED.Asset.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.ModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -260,7 +260,7 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.ModelData();
var ____result = new global::XED.Manage.ModelData();
for (int i = 0; i < length; i++)
{
@@ -276,13 +276,13 @@ namespace MessagePack.Formatters.XED.Asset
____result.modelComponentName = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<string>(formatterResolver).Deserialize(ref reader, options);
break;
case 3:
____result.transformData = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.TransformData>(formatterResolver).Deserialize(ref reader, options);
____result.transformData = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.TransformData>(formatterResolver).Deserialize(ref reader, options);
break;
case 4:
____result.mesh = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableMesh>(formatterResolver).Deserialize(ref reader, options);
____result.mesh = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableMesh>(formatterResolver).Deserialize(ref reader, options);
break;
case 5:
____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.MaterialPropertyData[]>(formatterResolver).Deserialize(ref reader, options);
____result.materialProperties = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.MaterialPropertyData[]>(formatterResolver).Deserialize(ref reader, options);
break;
default:
reader.Skip();
@@ -295,10 +295,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SaveData>
public sealed class SaveDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SaveData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SaveData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SaveData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -308,12 +308,12 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
writer.WriteArrayHeader(3);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SavedModelData[]>(formatterResolver).Serialize(ref writer, value.modelDatas, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.TextureData[]>(formatterResolver).Serialize(ref writer, value.textureDatas, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.ThumbnailData[]>(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SavedModelData[]>(formatterResolver).Serialize(ref writer, value.modelDatas, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.TextureData[]>(formatterResolver).Serialize(ref writer, value.textureDatas, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.ThumbnailData[]>(formatterResolver).Serialize(ref writer, value.thumbnailDatas, options);
}
public global::XED.Asset.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SaveData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -323,20 +323,20 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.SaveData();
var ____result = new global::XED.Manage.SaveData();
for (int i = 0; i < length; i++)
{
switch (i)
{
case 0:
____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SavedModelData[]>(formatterResolver).Deserialize(ref reader, options);
____result.modelDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SavedModelData[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 1:
____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.TextureData[]>(formatterResolver).Deserialize(ref reader, options);
____result.textureDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.TextureData[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 2:
____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.ThumbnailData[]>(formatterResolver).Deserialize(ref reader, options);
____result.thumbnailDatas = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.ThumbnailData[]>(formatterResolver).Deserialize(ref reader, options);
break;
default:
reader.Skip();
@@ -349,10 +349,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SavedModelData>
public sealed class SavedModelDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SavedModelData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SavedModelData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -363,10 +363,10 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
writer.WriteArrayHeader(2);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<string[][]>(formatterResolver).Serialize(ref writer, value.attributes, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.ModelData[]>(formatterResolver).Serialize(ref writer, value.models, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.ModelData[]>(formatterResolver).Serialize(ref writer, value.models, options);
}
public global::XED.Asset.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SavedModelData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -376,7 +376,7 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.SavedModelData();
var ____result = new global::XED.Manage.SavedModelData();
for (int i = 0; i < length; i++)
{
@@ -386,7 +386,7 @@ namespace MessagePack.Formatters.XED.Asset
____result.attributes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<string[][]>(formatterResolver).Deserialize(ref reader, options);
break;
case 1:
____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.ModelData[]>(formatterResolver).Deserialize(ref reader, options);
____result.models = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.ModelData[]>(formatterResolver).Deserialize(ref reader, options);
break;
default:
reader.Skip();
@@ -399,10 +399,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class SerializableMeshFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SerializableMesh>
public sealed class SerializableMeshFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SerializableMesh>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SerializableMesh value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableMesh value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -412,14 +412,14 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
writer.WriteArrayHeader(5);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3[]>(formatterResolver).Serialize(ref writer, value.vertices, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3[]>(formatterResolver).Serialize(ref writer, value.normals, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector4[]>(formatterResolver).Serialize(ref writer, value.tangents, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector2[]>(formatterResolver).Serialize(ref writer, value.uv, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SubmeshData[]>(formatterResolver).Serialize(ref writer, value.submeshes, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3[]>(formatterResolver).Serialize(ref writer, value.vertices, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3[]>(formatterResolver).Serialize(ref writer, value.normals, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector4[]>(formatterResolver).Serialize(ref writer, value.tangents, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector2[]>(formatterResolver).Serialize(ref writer, value.uv, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SubmeshData[]>(formatterResolver).Serialize(ref writer, value.submeshes, options);
}
public global::XED.Asset.SerializableMesh Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SerializableMesh Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -429,26 +429,26 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.SerializableMesh();
var ____result = new global::XED.Manage.SerializableMesh();
for (int i = 0; i < length; i++)
{
switch (i)
{
case 0:
____result.vertices = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3[]>(formatterResolver).Deserialize(ref reader, options);
____result.vertices = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 1:
____result.normals = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3[]>(formatterResolver).Deserialize(ref reader, options);
____result.normals = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 2:
____result.tangents = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector4[]>(formatterResolver).Deserialize(ref reader, options);
____result.tangents = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector4[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 3:
____result.uv = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector2[]>(formatterResolver).Deserialize(ref reader, options);
____result.uv = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector2[]>(formatterResolver).Deserialize(ref reader, options);
break;
case 4:
____result.submeshes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SubmeshData[]>(formatterResolver).Deserialize(ref reader, options);
____result.submeshes = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SubmeshData[]>(formatterResolver).Deserialize(ref reader, options);
break;
default:
reader.Skip();
@@ -461,10 +461,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class SerializableQuaternionFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SerializableQuaternion>
public sealed class SerializableQuaternionFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SerializableQuaternion>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SerializableQuaternion value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableQuaternion value, global::MessagePack.MessagePackSerializerOptions options)
{
writer.WriteArrayHeader(4);
writer.Write(value.x);
@@ -473,7 +473,7 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.w);
}
public global::XED.Asset.SerializableQuaternion Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SerializableQuaternion Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -482,7 +482,7 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.SerializableQuaternion();
var ____result = new global::XED.Manage.SerializableQuaternion();
for (int i = 0; i < length; i++)
{
@@ -511,17 +511,17 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class SerializableVector2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SerializableVector2>
public sealed class SerializableVector2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SerializableVector2>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SerializableVector2 value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector2 value, global::MessagePack.MessagePackSerializerOptions options)
{
writer.WriteArrayHeader(2);
writer.Write(value.x);
writer.Write(value.y);
}
public global::XED.Asset.SerializableVector2 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SerializableVector2 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -549,16 +549,16 @@ namespace MessagePack.Formatters.XED.Asset
}
}
var ____result = new global::XED.Asset.SerializableVector2(__x__, __y__);
var ____result = new global::XED.Manage.SerializableVector2(__x__, __y__);
reader.Depth--;
return ____result;
}
}
public sealed class SerializableVector3Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SerializableVector3>
public sealed class SerializableVector3Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SerializableVector3>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SerializableVector3 value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector3 value, global::MessagePack.MessagePackSerializerOptions options)
{
writer.WriteArrayHeader(3);
writer.Write(value.x);
@@ -566,7 +566,7 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.z);
}
public global::XED.Asset.SerializableVector3 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SerializableVector3 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -598,16 +598,16 @@ namespace MessagePack.Formatters.XED.Asset
}
}
var ____result = new global::XED.Asset.SerializableVector3(__x__, __y__, __z__);
var ____result = new global::XED.Manage.SerializableVector3(__x__, __y__, __z__);
reader.Depth--;
return ____result;
}
}
public sealed class SerializableVector4Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SerializableVector4>
public sealed class SerializableVector4Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SerializableVector4>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SerializableVector4 value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SerializableVector4 value, global::MessagePack.MessagePackSerializerOptions options)
{
writer.WriteArrayHeader(4);
writer.Write(value.x);
@@ -616,7 +616,7 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.w);
}
public global::XED.Asset.SerializableVector4 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SerializableVector4 Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -652,16 +652,16 @@ namespace MessagePack.Formatters.XED.Asset
}
}
var ____result = new global::XED.Asset.SerializableVector4(__x__, __y__, __z__, __w__);
var ____result = new global::XED.Manage.SerializableVector4(__x__, __y__, __z__, __w__);
reader.Depth--;
return ____result;
}
}
public sealed class SubmeshDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.SubmeshData>
public sealed class SubmeshDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.SubmeshData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.SubmeshData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.SubmeshData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -675,7 +675,7 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<int[]>(formatterResolver).Serialize(ref writer, value.triangles, options);
}
public global::XED.Asset.SubmeshData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.SubmeshData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -685,7 +685,7 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.SubmeshData();
var ____result = new global::XED.Manage.SubmeshData();
for (int i = 0; i < length; i++)
{
@@ -708,10 +708,10 @@ namespace MessagePack.Formatters.XED.Asset
}
}
public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.TextureData>
public sealed class TextureDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.TextureData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.TextureData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.TextureData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -726,7 +726,7 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.data);
}
public global::XED.Asset.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.TextureData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -759,16 +759,16 @@ namespace MessagePack.Formatters.XED.Asset
}
}
var ____result = new global::XED.Asset.TextureData(__name__, __uid__, __data__);
var ____result = new global::XED.Manage.TextureData(__name__, __uid__, __data__);
reader.Depth--;
return ____result;
}
}
public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.ThumbnailData>
public sealed class ThumbnailDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.ThumbnailData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.ThumbnailData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -780,7 +780,7 @@ namespace MessagePack.Formatters.XED.Asset
writer.Write(value.data);
}
public global::XED.Asset.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.ThumbnailData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -804,16 +804,16 @@ namespace MessagePack.Formatters.XED.Asset
}
}
var ____result = new global::XED.Asset.ThumbnailData(__data__);
var ____result = new global::XED.Manage.ThumbnailData(__data__);
reader.Depth--;
return ____result;
}
}
public sealed class TransformDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Asset.TransformData>
public sealed class TransformDataFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::XED.Manage.TransformData>
{
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Asset.TransformData value, global::MessagePack.MessagePackSerializerOptions options)
public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::XED.Manage.TransformData value, global::MessagePack.MessagePackSerializerOptions options)
{
if (value == null)
{
@@ -823,12 +823,12 @@ namespace MessagePack.Formatters.XED.Asset
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
writer.WriteArrayHeader(3);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3>(formatterResolver).Serialize(ref writer, value.position, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableQuaternion>(formatterResolver).Serialize(ref writer, value.rotation, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3>(formatterResolver).Serialize(ref writer, value.scale, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3>(formatterResolver).Serialize(ref writer, value.position, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableQuaternion>(formatterResolver).Serialize(ref writer, value.rotation, options);
global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3>(formatterResolver).Serialize(ref writer, value.scale, options);
}
public global::XED.Asset.TransformData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
public global::XED.Manage.TransformData Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
{
if (reader.TryReadNil())
{
@@ -838,20 +838,20 @@ namespace MessagePack.Formatters.XED.Asset
options.Security.DepthStep(ref reader);
global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
var length = reader.ReadArrayHeader();
var ____result = new global::XED.Asset.TransformData();
var ____result = new global::XED.Manage.TransformData();
for (int i = 0; i < length; i++)
{
switch (i)
{
case 0:
____result.position = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3>(formatterResolver).Deserialize(ref reader, options);
____result.position = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3>(formatterResolver).Deserialize(ref reader, options);
break;
case 1:
____result.rotation = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableQuaternion>(formatterResolver).Deserialize(ref reader, options);
____result.rotation = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableQuaternion>(formatterResolver).Deserialize(ref reader, options);
break;
case 2:
____result.scale = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Asset.SerializableVector3>(formatterResolver).Deserialize(ref reader, options);
____result.scale = global::MessagePack.FormatterResolverExtensions.GetFormatterWithVerify<global::XED.Manage.SerializableVector3>(formatterResolver).Deserialize(ref reader, options);
break;
default:
reader.Skip();

View File

@@ -1,7 +1,8 @@
using System.Collections.Generic;
using System.Drawing.Printing;
using UnityEngine;
using XED.Asset;
using XED.Hierarchy;
using XED.HierarchyTree;
using XED.Manage;
using XED.Util;
@@ -73,6 +74,23 @@ namespace XED
CommandManager.I.ExecuteCommand(command);
}
public void OnCompletelyRemoveObject(List<CustomAssetRenderObject> objects)
{
if (objects.Count == 0)
{
return;
}
List<ConnectedAsset> removeList = new List<ConnectedAsset>();
List<int> siblingIndex = new List<int>();
for (int i = 0; i < objects.Count; i++)
{
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.renderObject == objects[i]);
removeList.Add(searchAsset);
siblingIndex.Add(searchAsset.hierarchyItem.GetSiblingIndex());
}
ExecuteCompletelyRemoveObject(removeList);
}
private void ExecuteRemoveObject(List<ConnectedAsset> removeList)
{
for (int i = 0; i < removeList.Count; i++)
@@ -94,6 +112,19 @@ namespace XED
connector.componentScrollView.DeselectAll();
}
private void ExecuteCompletelyRemoveObject(List<ConnectedAsset> removeList)
{
for (int i = 0; i < removeList.Count; i++)
{
ConnectedAsset connectedAsset = removeList[i];
connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
connectedAsset.assetData.RemoveTransform(connectedAsset.renderObject.transform);
connectedAsset.renderObject.gameObject.SetActive(false);
}
connector.onCompletelyRemoveObjects?.Invoke(removeList);
connector.componentScrollView.DeselectAll();
}
private void UndoRemoveObject(List<ConnectedAsset> removeList, List<int> siblingIndex)
{
for (int i = 0; i < removeList.Count; i++)

View File

@@ -5,7 +5,7 @@ using XRLib;
using XED.Manage;
using XED.Command;
using XED.Util;
using XED.Hierarchy;
using XED.HierarchyTree;
using System.Linq;
using UnityEditor;
@@ -26,11 +26,12 @@ namespace XED.Asset
public GameObject selectedItem;
public CustomAssetRenderObject selectRenderObject;
public SaveLoadFBXData saveLoadFBXData;
public FBXFileManager saveLoadFBXData;
public RenderObjectHandler renderObjectHandler;
public System.Action<string, List<GameObject>> onSelectObjects;
public System.Action onDeselectObjects;
public System.Action onRemoveObjects;
public System.Action<List<ConnectedAsset>> onCompletelyRemoveObjects;
public System.Action onAssetDropped;
public CustomAssetDataHandler assetDataHandler;
@@ -40,7 +41,7 @@ namespace XED.Asset
ProjectManager projectManager;
void Awake()
{
saveLoadFBXData = FindFirstObjectByType<SaveLoadFBXData>();
saveLoadFBXData = FindFirstObjectByType<FBXFileManager>();
renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
assetDataHandler = new CustomAssetDataHandler(this);
assetEventHandler = new CustomAssetEventHandler(this);
@@ -71,16 +72,12 @@ namespace XED.Asset
renderObjectHandler.onOrderByHierachy.AddListener(OrderByHierarchy);
renderObjectHandler.onDeselectAll += OnDeselectAll;
projectManager.onRemoveAsset += assetCommandHandler.OnRemoveObject;
projectManager.onRemoveAsset += assetCommandHandler.OnCompletelyRemoveObject;
}
// Update is called once per frame
void Update()
{
//for (int i = 0; i < connectedAssets.Count; i++)
//{
// Debug.Log(connectedAssets[i].hierarchyItem.name + " "+ connectedAssets[i].hierarchyItem.GetSiblingIndex());
//}
if (selectedAssetData != null)
{
Vector3? pos = GetMousePointOnYPlane(objectShowDistance);
@@ -93,12 +90,6 @@ namespace XED.Asset
}
// <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>Ʈ <20><><EFBFBD><EFBFBD>
void OnLoadInterworkingData()
{
HierarchyItem item = InterworkingDataScrollView.AddItem("IdName", HierarchyItemType.data);
}
public void OnAssetSelected(HierarchyItem item)
{
if (item == null || item.linkedObject == null)

View File

@@ -1,5 +1,5 @@
using XED.Asset;
using XED.Hierarchy;
using XED.HierarchyTree;
using XED.Util;
namespace XED

View File

@@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using XED.Util;
namespace XED.Repositories
{
public class CustomAssetDataRepository
{
List<CustomAssetData> assetDatas = new List<CustomAssetData>();
public bool isEmpty => assetDatas.Count == 0;
public void Add(CustomAssetData data)
{
assetDatas.Add(data);
}
public bool TryGetDataFromPath(string path, out CustomAssetData data)
{
data = FindFromPath(path);
return data != null;
}
public CustomAssetData FindFromPath(string path)
{
if(path==null)
return null;
return assetDatas.Find(data => data.localFBXPath == path);
}
internal void Remove(CustomAssetData assetData)
{
assetDatas.Remove(assetData);
}
internal bool TryGetDataFromName(string name, out CustomAssetData p)
{
p = FindFromName(name);
return p != null;
}
private CustomAssetData FindFromName(string name)
{
return assetDatas.Find(data => data.assetName == name);
}
internal void AddRange(List<CustomAssetData> assetDatas)
{
this.assetDatas.AddRange(assetDatas);
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 5ccbf3d7b9e0ec8449cdc0c122d7a050

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using XED.Hierarchy;
using XED.HierarchyTree;
using XED.Util;
namespace XED.Asset

View File

@@ -1,15 +1,17 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using System.Linq;
using UnityEngine;
using UnityEngine.EventSystems;
using XED.DataStructures;
using XED.UI;
namespace XED.Util
{
public class CustomAssetRenderObject : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
private GameObject renderObject;
private MeshRenderer objectRenderer;
private MeshRenderer objectRenderer;
private List<Transform> snapPoints = new List<Transform>();
private BoxCollider boxCollider;
private Material matCubeShow;
@@ -17,26 +19,31 @@ namespace XED.Util
private Material matCubeCollided;
private HashSet<GameObject> objectsInTrigger = new HashSet<GameObject>();
public System.Action onTransformChanged;
public System.Action onTransformChanged;
public Func<Bounds> getBounds;
public Func<Transform, GameObject> instantiateObject;
public bool isSelected = false;
public bool isCollided = false;
private float zFightingOffset = 1.0001f;
LayerMask twinObjectMask;
private void Awake()
{
objectRenderer = GetComponentInChildren<MeshRenderer>();
objectRenderer = GetComponentInChildren<MeshRenderer>();
snapPoints = GetComponentsInChildren<ObjectSnap>().Select(x => x.transform).ToList();
boxCollider = GetComponent<BoxCollider>();
matCubeShow = Resources.Load<Material>("Materials/Mat_CubeShow");
matCubeSelected = Resources.Load<Material>("Materials/Mat_CubeSelected");
matCubeCollided = Resources.Load<Material>("Materials/Mat_CubeCollided");
boxCollider.gameObject.layer = LayerMask.NameToLayer("TwinObject");
twinObjectMask = LayerMask.GetMask("TwinObject");
}
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
ResetBoundary();
ResetBoundary();
}
private void OnEnable()
{
@@ -48,8 +55,8 @@ namespace XED.Util
ClearTriggerObjects();
}
private void OnTriggerEnter(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
isCollided = true;
@@ -59,14 +66,14 @@ namespace XED.Util
objectRenderer.material = matCubeCollided;
}
Show();
}
}
}
private void OnTriggerExit(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
objectsInTrigger.Remove(other.gameObject);
{
objectsInTrigger.Remove(other.gameObject);
}
if (objectsInTrigger.Count == 0)
{
@@ -75,7 +82,7 @@ namespace XED.Util
{
Hide();
}
}
}
}
public void OnPointerEnter(PointerEventData eventData)
{
@@ -97,14 +104,14 @@ namespace XED.Util
}
void ResetBoundary()
{
Bounds meshBounds = objectRenderer.bounds;
Bounds meshBounds = objectRenderer.bounds;
Vector3 localCenter = transform.InverseTransformPoint(meshBounds.center);
Vector3 localSize = transform.InverseTransformVector(meshBounds.size);
Vector3 localSize = transform.InverseTransformVector(meshBounds.size);
boxCollider.center = localCenter;
boxCollider.size = localSize;
}
void ClearTriggerObjects()
{
{
foreach (GameObject obj in new List<GameObject>(objectsInTrigger))
{
if (obj != null)
@@ -120,7 +127,7 @@ namespace XED.Util
if (boundary.HasValue)
{
ResizeBoundary(boundary.Value);
}
}
}
public void ResizeBoundary(Bounds meshBounds)
{
@@ -140,7 +147,7 @@ namespace XED.Util
snapPoints[5].localPosition = new Vector3(boundPointMin.x, boundPointMax.y, boundPointMax.z);
snapPoints[6].localPosition = new Vector3(boundPointMax.x, boundPointMin.y, boundPointMax.z);
snapPoints[7].localPosition = new Vector3(boundPointMax.x, boundPointMax.y, boundPointMin.z);
}
}
ResetBoundary();
}
public void Show()
@@ -174,7 +181,8 @@ namespace XED.Util
public void Select()
{
//ResizeBoundary();
isSelected = true;
FindSingle<Panel_ObjectDistance>().SelectObjectFromCreate(this);
isSelected = true;
objectRenderer.material = matCubeSelected;
Show();
}
@@ -191,7 +199,7 @@ namespace XED.Util
Hide();
}
public void CreateRenderObject()
{
{
if (renderObject == null)
{
renderObject = instantiateObject?.Invoke(transform);
@@ -199,7 +207,7 @@ namespace XED.Util
ResizeBoundary();
}
public void DestroyRenderObject()
{
{
if (renderObject)
{
Destroy(renderObject);
@@ -230,5 +238,14 @@ namespace XED.Util
if (renderObject == null) return null;
return new KDTree(renderObject);
}
public RaycastHit GetObjectHit(Vector3 direction)
{
RaycastHit hitInfo;
Vector3 changedScale = Vector3.Scale(boxCollider.size, transform.lossyScale);
Physics.BoxCast(boxCollider.bounds.center, changedScale / 2.0f, direction, out hitInfo, transform.rotation, Mathf.Infinity, twinObjectMask);
return hitInfo;
}
}
}
}

View File

@@ -0,0 +1,332 @@
using System.Collections.Generic;
using UnityEngine;
using System.IO;
using UnityEngine.Events;
using System.Collections;
using TriLibCore.SFB;
using XED.Util;
using System.Threading.Tasks;
using System;
using System.Linq;
using XED.Repositories;
namespace XED.Manage
{
public class FBXFileManager : MonoBehaviour
{
CustomAssetDataRepository dataRepo;
public string identifier;
public string password;
public UnityEvent<string, string, CustomAssetData> onLoadFbxFile;
public UnityEvent<string> onRemoveFbxFile;
public event System.Action onBeginLoadAsset;
private SaveData saveData;
private Queue<string> loadFilePath = new Queue<string>();
private SharedMaterial sharedMaterial;
private MessagePackFileManager<SaveData> messagePacker;
private bool isSaveTaskComplete = true;
public bool isLoadTaskComplete = true;
void Start()
{
dataRepo = new CustomAssetDataRepository();
saveData = new SaveData();
sharedMaterial = new SharedMaterial();
messagePacker = new MessagePackFileManager<SaveData>();
messagePacker.Initialize();
identifier = identifier.Length == 0 ? "defaultAssetData" : identifier;
StartCoroutine(CoroutineLoadLocalFiles());
string baseDataPath = Application.streamingAssetsPath + "/baseAssetData";
LoadLocalData(baseDataPath);
}
public void LoadLocalFBXDirectory()
{
TriLibCore.SFB.StandaloneFileBrowser.OpenFolderPanelAsync("Load Local (Directory)", "C:\\Users", false, OnLoadLocalFBXDirectory);
}
private void OnLoadLocalFBXDirectory(IList<ItemWithStream> list)
{
for (int i = 0; i < list.Count; i++)
{
if (!list[i].HasData)
continue;
var path = list[i].Name;
Debug.Log("path " + path);
var files = Directory.GetFiles(path, "*.fbx", SearchOption.AllDirectories);
if (dataRepo.TryGetDataFromPath(path, out var p))
return;
foreach (var file in files)
{
loadFilePath.Enqueue(file);
}
}
}
public void SaveToLocalData(List<CustomAssetData> assetDatas, string path = "")
{
if (isSaveTaskComplete == false)
{
return;
}
StartCoroutine(CoroutineSaveToLocalData(assetDatas, path));
}
public void LoadLocalData(string path = "")
{
if (isLoadTaskComplete == false)
{
return;
}
onBeginLoadAsset?.Invoke();
StartCoroutine(CoroutineLoadFromLocalData(path));
}
public CustomAssetData GetCustomAssetData(string name)
{
return dataRepo.FindFromPath(name);
//return listAssets.FirstOrDefault(x => x.name == name);
}
IEnumerator CoroutineLoadLocalFiles()
{
while (true)
{
yield return new WaitUntil(() => loadFilePath.Count > 0);
string path = loadFilePath.Dequeue();
string name = System.IO.Path.GetFileNameWithoutExtension(path);
//if (listAssets.Find(x => x.name == name) != null)
//{
// yield return null;
// continue;
//}
if (dataRepo.TryGetDataFromName(name, out var p))
{
yield return null;
continue;
}
string directoryPath = Path.GetDirectoryName(path);
string lastFolderName = Path.GetFileName(directoryPath);
string createDate = File.GetCreationTime(path).ToShortDateString();
string lastRevisionDate = File.GetLastAccessTime(path).ToShortDateString();
string uploadDate = DateTime.Now.ToShortDateString();
GameObject newObject = new GameObject(name);
newObject.transform.parent = transform;
CustomAssetData assetData = newObject.AddComponent<CustomAssetData>();
assetData.assetName = name;
assetData.folderName = lastFolderName;
assetData.createDate = createDate;
assetData.LastRevisionDate = lastRevisionDate;
assetData.UploadDate = uploadDate;
assetData.Creator = "xr@uvc.co.kr";
assetData.Manager = "xr@uvc.co.kr";
assetData.LoadLocalFBX(path);
dataRepo.Add(assetData);
onLoadFbxFile?.Invoke(name, lastFolderName, assetData);
yield return new WaitUntil(() => (assetData.isLoadComplete == true && assetData.progress == 1) || assetData.isLoadError == true);
if (assetData.isLoadError)
{
dataRepo.Remove(assetData);
onRemoveFbxFile?.Invoke(name);
}
yield return null;
}
}
IEnumerator CoroutineSaveToLocalData(List<CustomAssetData> assetDatas, string path)
{
//if (assetDatas == null || assetDatas.Count == 0)
//{
// assetDatas = listAssets;
//}
//if (assetDatas.Count == 0)
//{
// Debug.Log("No AssetDatas to Save");
// isSaveTaskComplete = true;
// yield break;
//}
if (dataRepo.isEmpty)
{
dataRepo.AddRange(assetDatas);
}
if (dataRepo.isEmpty)
{
Debug.Log("No AssetDatas to Save");
isSaveTaskComplete = true;
yield break;
}
isSaveTaskComplete = false;
List<SavedModelData> savedModels = new List<SavedModelData>();
List<ThumbnailData> thumbnails = new List<ThumbnailData>();
RuntimePreviewGenerator.BackgroundColor = Color.clear;
RuntimePreviewGenerator.OrthographicMode = true;
for (int i = 0; i < assetDatas.Count; i++)
{
var modelData = ConvertToSaveData(assetDatas[i]);
Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetDatas[i].loadedObject.transform, 320, 200);
thumbnail = thumbnail.MakeReadableTexture();
thumbnails.Add(new ThumbnailData(thumbnail.EncodeToPNG()));
savedModels.Add(modelData);
}
saveData.modelDatas = savedModels.ToArray();
saveData.textureDatas = sharedMaterial.textureDatas.ToArray();
saveData.thumbnailDatas = thumbnails.ToArray();
yield return null;
//Task task = SaveAsync(identifier, saveData);
string filePath = string.IsNullOrEmpty(path) ? Path.Combine(Application.persistentDataPath, identifier) : path;
Task task = Task.Run(() => messagePacker.SaveAsync(filePath, saveData));
yield return new WaitUntil(() => task.IsCompleted);
isSaveTaskComplete = true;
yield return null;
}
SavedModelData ConvertToSaveData(CustomAssetData assetData)
{
SavedModelData modelData = new SavedModelData();
modelData.SaveData(assetData.loadedObject, sharedMaterial);
//갯수 제한 없음 원하는 만큼 조절 가능. 테스트로 10개만 지정
modelData.attributes = new string[7][];
modelData.attributes[0] = new string[] { "assetName", assetData.assetName };
modelData.attributes[1] = new string[] { "folderName", assetData.folderName };
modelData.attributes[2] = new string[] { "createDate", assetData.createDate };
modelData.attributes[3] = new string[] { "LastRevisionDate", assetData.LastRevisionDate };
modelData.attributes[4] = new string[] { "UploadDate", assetData.UploadDate };
modelData.attributes[5] = new string[] { "Creator", assetData.createDate };
modelData.attributes[6] = new string[] { "Manager", assetData.Manager };
return modelData;
}
string GetLocalPath(string path)
{
if (string.IsNullOrEmpty(path))
{
return Path.Combine(Application.persistentDataPath, identifier);
}
else
{
return path;
}
}
bool CheckFilePathExists(string filePath)
{
if (!System.IO.File.Exists(filePath))
{
Debug.Log("No File Found At : " + filePath);
return false;
}
return true;
}
IEnumerator CoroutineLoadFromLocalData(string path)
{
isLoadTaskComplete = false;
float loadTime = 0;
//string filePath = string.IsNullOrEmpty(path) ? Path.Combine(Application.persistentDataPath, identifier) : path;
string filePath = GetLocalPath(path);
if (!CheckFilePathExists(filePath))
{
isLoadTaskComplete = true;
yield break;
}
//if (!System.IO.File.Exists(filePath))
//{
// Debug.Log("No File Found At : " + filePath);
// isLoadTaskComplete = true;
// yield break;
//}
Task<SaveData> task = Task<SaveData>.Run(() => messagePacker.LoadAsync(filePath));
yield return new WaitUntil(() => task.IsCompleted);
if (task.Result == null)
{
Debug.LogError("Error on loading local data.");
Debug.LogError("Error file location : " + filePath);
isLoadTaskComplete = true;
yield break;
}
saveData = task.Result;
for (int i = 0; i < saveData.textureDatas.Length; i++)
{
TextureData texData = saveData.textureDatas[i];
sharedMaterial.AddTextureData(texData);
loadTime += Time.deltaTime;
if (loadTime > 1.0f / 30.0f)
{
loadTime = 0;
yield return null;
}
}
for (int i = 0; i < saveData.modelDatas.Length; i++)
{
if (!LoadSaveData(saveData, i))
{
continue;
}
loadTime += Time.deltaTime;
if (loadTime > 1.0f / 30.0f)
{
loadTime = 0;
yield return null;
}
}
isLoadTaskComplete = true;
yield return null;
}
bool LoadSaveData(SaveData saveData, int index)
{
var modelData = saveData.modelDatas[index];
string assetName = modelData.attributes.FirstOrDefault(x => x[0].Equals("assetName"))?[1];
if (dataRepo.TryGetDataFromName(assetName, out var p))
return false;
string folderName = modelData.attributes.FirstOrDefault(x => x[0].Equals("folderName"))?[1];
string createDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("createDate"))?[1];
string lastRevisionDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("lastRevisionDate"))?[1];
string uploadDate = modelData.attributes.FirstOrDefault(x => x[0].Equals("uploadDate"))?[1];
string creator = modelData.attributes.FirstOrDefault(x => x[0].Equals("creator"))?[1];
string manager = modelData.attributes.FirstOrDefault(x => x[0].Equals("manager"))?[1];
Texture2D thumbnail = new Texture2D(1, 1);
thumbnail.LoadImage(saveData.thumbnailDatas[index].data);
GameObject newObject = new GameObject(assetName);
newObject.transform.parent = transform;
CustomAssetData assetData = newObject.AddComponent<CustomAssetData>();
assetData.assetName = assetName;
assetData.folderName = folderName;
assetData.createDate = createDate;
assetData.LastRevisionDate = lastRevisionDate;
assetData.UploadDate = uploadDate;
assetData.Creator = creator;
assetData.Manager = manager;
assetData.loadedObject = modelData.LoadModelData(sharedMaterial);
assetData.thumbnail = thumbnail;
assetData.OnLoadComplete();
dataRepo.Add(assetData);
//listAssets.Add(assetData);
onLoadFbxFile?.Invoke(assetData.assetName, assetData.folderName, assetData);
return true;
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 8d1f9c7add0ac3345ac4cc9e8c59084a

View File

@@ -0,0 +1,142 @@
using MessagePack;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public class MaterialPropertyData
{
[Key(0)]
public float[] baseColor;
[Key(1)]
public float metallic;
[Key(2)]
public float smoothness;
[Key(3)]
public float[] emissionColor;
[Key(4)]
public int renderMode;
[Key(5)]
public int surfaceType;
[Key(6)]
public int blendMode;
[Key(7)]
public float occlusionStrength;
[Key(8)]
public float normalScale;
[Key(9)]
public string[] texTypes;
[Key(10)]
public string[] texUIDs;
public void SetData(Material material)
{
Color bc = material.HasProperty("_BaseColor") ? material.GetColor("_BaseColor") :
material.HasProperty("_Color") ? material.GetColor("_Color") :
Color.white;
baseColor = new float[4] { bc.r, bc.g, bc.b, bc.a };
metallic = material.HasProperty("_Metallic") ? material.GetFloat("_Metallic") : 0;
smoothness = material.HasProperty("_Smoothness") ? material.GetFloat("_Smoothness") :
material.HasProperty("_Glossiness") ? material.GetFloat("_Glossiness") : 0;
Color ec = material.HasProperty("_EmissionColor") ? material.GetColor("_EmissionColor") : Color.white;
emissionColor = new float[4] { ec.r, ec.g, ec.b, ec.a };
renderMode = material.HasProperty("_Mode") ? (int)material.GetFloat("_Mode") : -1;
surfaceType = material.HasProperty("_Surface") ? (int)material.GetFloat("_Surface") : -1;
blendMode = material.HasProperty("_Blend") ? (int)material.GetFloat("_Blend") : -1;
occlusionStrength = material.HasProperty("_OcclusionStrength") ? material.GetFloat("_OcclusionStrength") : 0;
normalScale = material.HasProperty("_NormalScale") ? material.GetFloat("_NormalScale") :
material.HasProperty("_BumpScale") ? material.GetFloat("_BumpScale") : 0;
}
public void ApplyToMaterial(Material material)
{
bool isURP = material.shader.name.Contains("Universal Render Pipeline");
if (material.HasProperty("_BaseColor"))
{
material.SetColor("_BaseColor", new Color(baseColor[0], baseColor[1], baseColor[2], baseColor[3]));
}
else if (material.HasProperty("_Color"))
{
material.SetColor("_Color", new Color(baseColor[0], baseColor[1], baseColor[2], baseColor[3]));
}
if (material.HasProperty("_Metallic"))
{
material.SetFloat("_Metallic", metallic);
}
if (material.HasProperty("_Smoothness"))
{
material.SetFloat("_Smoothness", smoothness);
}
else if (material.HasProperty("_Glossiness"))
{
material.SetFloat("_Glossiness", smoothness);
}
if (material.HasProperty("_EmissionColor"))
{
material.SetColor("_EmissionColor", new Color(emissionColor[0], emissionColor[1], emissionColor[2], emissionColor[3]));
}
if (material.HasProperty("_Mode") && renderMode >= 0)
{
material.SetFloat("_Mode", renderMode);
}
if (material.HasProperty("_Surface") && surfaceType >= 0)
{
material.SetFloat("_Surface", surfaceType);
}
if (material.HasProperty("_Blend") && blendMode >= 0)
{
material.SetFloat("_Blend", blendMode);
}
if (isURP)
{
if (renderMode == 3)
{
material.SetFloat("_Surface", 1);
}
if (surfaceType == 1 || renderMode == 3)
{
material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Transparent;
material.SetFloat("_ZWrite", 0);
material.SetFloat("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
material.SetFloat("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
}
}
else
{
//Transparent
if (renderMode == 3 || surfaceType == 1)
{
material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Transparent;
material.SetFloat("_ZWrite", 0);
material.SetFloat("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
material.SetFloat("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
material.EnableKeyword("_ALPHABLEND_ON");
material.DisableKeyword("_ALPHATEST_ON");
material.DisableKeyword("_ALPHAPREMULTIPLY_ON");
}
//CutOut
else if (renderMode == 1)
{
material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest;
material.EnableKeyword("_ALPHATEST_ON");
material.DisableKeyword("_ALPHABLEND_ON");
material.DisableKeyword("_ALPHAPREMULTIPLY_ON");
}
//Opaque
else
{
material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Geometry;
material.SetFloat("_ZWrite", 1);
material.SetFloat("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
material.SetFloat("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
material.DisableKeyword("_ALPHATEST_ON");
material.DisableKeyword("_ALPHABLEND_ON");
material.DisableKeyword("_ALPHAPREMULTIPLY_ON");
}
}
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 445645d0b2652284a9db946e4d23b563

View File

@@ -0,0 +1,64 @@
using MessagePack.Resolvers;
using MessagePack;
using System.Threading.Tasks;
using System;
using System.IO;
using UnityEngine;
namespace XED.Manage
{
public class MessagePackFileManager<T>
{
public void Initialize()
{
StaticCompositeResolver.Instance.Register(
GeneratedResolver.Instance,
StandardResolver.Instance
);
MessagePackSerializer.DefaultOptions = MessagePackSerializerOptions.Standard.WithResolver(
StaticCompositeResolver.Instance
);
}
public async Task<T> LoadAsync(string filePath)
{
var lz4Option = MessagePackSerializerOptions.Standard.
WithCompression(MessagePackCompression.Lz4Block).
WithResolver(StaticCompositeResolver.Instance);
byte[] readByte = null;
T deserailze = default(T);
try
{
readByte = await File.ReadAllBytesAsync(filePath);
deserailze = MessagePackSerializer.Deserialize<T>(readByte, lz4Option);
}
catch (Exception ex)
{
Debug.LogError($"Task Error: {ex.Message}\n{ex.StackTrace}");
int byteLength = 0;
if (readByte != null)
{
byteLength = (int)readByte.Length;
}
Debug.LogError("Read Byte Size : " + byteLength.ToString());
}
return deserailze;
}
public async Task SaveAsync(string filePath, T data)
{
var lz4Option = MessagePackSerializerOptions.Standard.
WithCompression(MessagePackCompression.Lz4Block).
WithResolver(StaticCompositeResolver.Instance);
try
{
byte[] bytes = MessagePackSerializer.Serialize<T>(data, lz4Option);
await File.WriteAllBytesAsync(filePath, bytes);
}
catch (Exception ex)
{
Debug.LogError($"Task Error: {ex.Message}\n{ex.StackTrace}");
}
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 592137e8c153e864caf3162a9433b79f

View File

@@ -0,0 +1,22 @@
using MessagePack;
namespace XED.Manage
{
[MessagePackObject]
public class ModelData
{
[Key(0)]
public int id;
[Key(1)]
public int parentId;
[Key(2)]
public string modelComponentName;
[Key(3)]
public TransformData transformData;
[Key(4)]
public SerializableMesh mesh;
[Key(5)]
public MaterialPropertyData[] materialProperties;
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 30c9e0ef867870442b7eeea25b03452e

View File

@@ -5,6 +5,8 @@ using UnityEditor;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
using XED.Asset;
using XED.DataStructures;
using XED.Interfaces;
using XED.Manage;
using XED.RuntimeGizmo;
@@ -14,7 +16,6 @@ namespace XED.Util
public class RenderObjectHandler : MonoBehaviour, IModeController, IInputHandler
{
public ModePanel.ProgramMode mode => ModePanel.ProgramMode.ObjectLayout;
List<CustomAssetRenderObject> selectedRenderObjects = new List<CustomAssetRenderObject>();
List<CustomAssetRenderObject> copyRenderObjects = new List<CustomAssetRenderObject>();
List<GameObject> selectedGameObjects = new List<GameObject>();
@@ -48,7 +49,6 @@ namespace XED.Util
rtgController.onTransformChanged = OnTransformChangedFromRTG;
uiLayer = LayerMask.NameToLayer("UI");
//var inputManager = FindSingle<UserInputManager>();
selectIndex = 0;
}
@@ -160,6 +160,13 @@ namespace XED.Util
RemoveAllSelections();
onDeselectAll?.Invoke();
}
public void RemoveAll(List<ConnectedAsset> removeList)
{
CompletelyRemoveAllSelections(removeList);
onDeselectAll?.Invoke();
}
public void AddSelection(CustomAssetRenderObject item)
{
if (selectedRenderObjects.Any(x => x == item))
@@ -196,6 +203,16 @@ namespace XED.Util
selectedGameObjects.Clear();
rtgController.SetGizmoTargetObjects(selectedGameObjects);
}
public void CompletelyRemoveAllSelections(List<ConnectedAsset> removeList)
{
for (int i = 0; i < removeList.Count; i++)
{
Destroy(removeList[i].renderObject.gameObject);
}
selectedRenderObjects.Clear();
selectedGameObjects.Clear();
rtgController.SetGizmoTargetObjects(selectedGameObjects);
}
public void RemoveSelection(CustomAssetRenderObject item)
{
selectedRenderObjects.Remove(item);

View File

@@ -0,0 +1,16 @@
using MessagePack;
namespace XED.Manage
{
[MessagePackObject]
public class SaveData
{
[Key(0)]
public SavedModelData[] modelDatas;
[Key(1)]
public TextureData[] textureDatas;
[Key(2)]
public ThumbnailData[] thumbnailDatas;
}
}

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 427e19b97938787438145787dd188128
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,86 @@
using MessagePack;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public class SavedModelData
{
[Key(0)]
public string[][] attributes;
//public string assetName;
//[Key(1)]
//public string folderName;
//[Key(2)]
[Key(1)]
public ModelData[] models;
public void SaveData(GameObject modelObject, SharedMaterial sharedMaterial)
{
MeshRenderer[] meshRenderers = modelObject.transform.GetComponentsInChildren<MeshRenderer>(true);
models = new ModelData[meshRenderers.Length];
for (int i = 0; i < meshRenderers.Length; i++)
{
MeshFilter meshFilter = meshRenderers[i].GetComponent<MeshFilter>();
models[i] = new ModelData();
models[i].transformData = new TransformData();
models[i].modelComponentName = meshFilter.gameObject.name;
models[i].transformData.SetData(meshRenderers[i].transform);
models[i].mesh = new SerializableMesh();
models[i].mesh.SetData(meshFilter.mesh);
List<MaterialPropertyData> listMaterialPropertyDatas = new List<MaterialPropertyData>();
for (int j = 0; j < meshRenderers[i].materials.Length; j++)
{
MaterialPropertyData materialPropertyData = new MaterialPropertyData();
materialPropertyData.SetData(meshRenderers[i].materials[j]);
sharedMaterial.SaveTexture(meshRenderers[i].materials[j], materialPropertyData);
listMaterialPropertyDatas.Add(materialPropertyData);
}
models[i].materialProperties = listMaterialPropertyDatas.ToArray();
}
}
public GameObject LoadModelData(SharedMaterial sharedMaterial)
{
string assetName = attributes.FirstOrDefault(x => x[0].Equals("assetName"))?[1];
GameObject modelObject = null;
Dictionary<int, GameObject> partList = new Dictionary<int, GameObject>();
foreach (ModelData model in models)
{
GameObject part = new GameObject(model.modelComponentName);
model.transformData.ApplyToTransform(part.transform);
if (model.mesh != null)
{
MeshFilter meshFilter = part.AddComponent<MeshFilter>();
MeshRenderer meshRenderer = part.AddComponent<MeshRenderer>();
meshFilter.mesh = model.mesh.ToMesh();
Material[] materials = new Material[model.materialProperties.Length];
for (int j = 0; j < materials.Length; j++)
{
materials[j] = new Material(sharedMaterial.Get(model.materialProperties[j]));
model.materialProperties[j].ApplyToMaterial(materials[j]);
}
meshRenderer.materials = materials;
}
partList[model.id] = part;
if (modelObject == null)
{
modelObject = part;
}
}
foreach (ModelData model in models)
{
if (model.parentId != -1 && partList.ContainsKey(model.parentId))
{
partList[model.id].transform.SetParent(partList[model.parentId].transform, false);
}
}
return modelObject;
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 6a97b221d85863b4ea0aa15c48d4cfd4

View File

@@ -0,0 +1,297 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace XED.Manage
{
public class SharedMaterial
{
private enum RenderPipelineType
{
builtIn, URP, HDRP,
}
private Material sharedMaterial;
private Dictionary<MaterialPropertyData, Material> dicMaterials = new Dictionary<MaterialPropertyData, Material>();
private Dictionary<string, Texture2D> dicTextures = new Dictionary<string, Texture2D>();
private Dictionary<Texture2D, string> dicTextureIDs = new Dictionary<Texture2D, string>();
private RenderPipelineType renderPipelineType = RenderPipelineType.builtIn;
public List<TextureData> textureDatas = new List<TextureData>();
public SharedMaterial()
{
sharedMaterial = Resources.Load<Material>("Materials/Mat_TrilibBase");
if (UnityEngine.Rendering.GraphicsSettings.currentRenderPipeline == null)
{
renderPipelineType = RenderPipelineType.builtIn;
}
else if (UnityEngine.Rendering.GraphicsSettings.currentRenderPipeline.GetType().Name.Contains("UniversalRenderPipeline"))
{
renderPipelineType = RenderPipelineType.URP;
}
}
public Material Get(MaterialPropertyData mpd)
{
foreach (var kvp in dicMaterials)
{
if (AreMaterialSimilar(kvp.Key, mpd)) return kvp.Value;
}
Material mat = new Material(sharedMaterial);
mpd.ApplyToMaterial(mat);
ApplyTexture(mat, mpd);
dicMaterials.Add(mpd, mat);
return mat;
}
bool AreMaterialSimilar(MaterialPropertyData mpdA, MaterialPropertyData mpdB)
{
if (AreColorsSimilar(mpdA.baseColor, mpdB.baseColor) == false) return false;
if (AreColorsSimilar(mpdA.emissionColor, mpdB.emissionColor) == false) return false;
if (AreFloatsSimilar(mpdA.metallic, mpdB.metallic) == false) return false;
if (AreFloatsSimilar(mpdA.smoothness, mpdB.smoothness) == false) return false;
if (AreTexturesEqual(mpdA.texUIDs, mpdB.texUIDs) == false) return false;
return true;
}
bool AreFloatsSimilar(float a, float b, float tolerance = 0.001f)
{
return Mathf.Abs(a - b) < tolerance;
}
bool AreColorsSimilar(Color a, Color b, float tolerance = 0.01f)
{
return Mathf.Abs(a.r - b.r) < tolerance &&
Mathf.Abs(a.g - b.g) < tolerance &&
Mathf.Abs(a.b - b.b) < tolerance &&
Mathf.Abs(a.a - b.a) < tolerance;
}
bool AreColorsSimilar(float[] a, float[] b, float tolerance = 0.01f)
{
return Mathf.Abs(a[0] - b[0]) < tolerance &&
Mathf.Abs(a[1] - b[1]) < tolerance &&
Mathf.Abs(a[2] - b[2]) < tolerance &&
Mathf.Abs(a[3] - b[3]) < tolerance;
}
bool AreTexturesEqual(string[] savedData, string[] compareData)
{
if (savedData.Length != compareData.Length) return false;
for (int i = 0; i < compareData.Length; i++)
{
if (!savedData[i].Equals(compareData[i]))
{
return false;
}
}
return true;
}
public void SaveTexture(Material material, MaterialPropertyData mpd)
{
List<string> listTextureTypes = new List<string>();
List<string> listTextureUIDs = new List<string>();
Texture2D albedo = null;
if (renderPipelineType == RenderPipelineType.builtIn && material.HasProperty("_MainTex"))
{
albedo = material.GetTexture("_MainTex") as Texture2D;
}
if (renderPipelineType == RenderPipelineType.URP && material.HasProperty("_BaseMap"))
{
albedo = material.GetTexture("_BaseMap") as Texture2D;
}
if (albedo != null)
{
listTextureTypes.Add("Albedo");
listTextureUIDs.Add(GetTexUID(albedo));
}
Texture2D specular = null;
if (material.HasProperty("_SpecGlossMap"))
{
specular = material.GetTexture("_SpecGlossMap") as Texture2D;
}
if (specular != null)
{
listTextureTypes.Add("Specular");
listTextureUIDs.Add(GetTexUID(specular));
}
Texture2D metallicMap = null;
if (material.HasProperty("_MetallicGlossMap"))
{
metallicMap = material.GetTexture("_MetallicGlossMap") as Texture2D;
}
if (metallicMap != null)
{
listTextureTypes.Add("Metallic");
listTextureUIDs.Add(GetTexUID(metallicMap));
}
Texture2D normalMap = null;
if (renderPipelineType == RenderPipelineType.builtIn && material.HasProperty("_BumpMap"))
{
normalMap = material.GetTexture("_BumpMap") as Texture2D;
}
if (renderPipelineType == RenderPipelineType.URP && material.HasProperty("_NormalMap"))
{
normalMap = material.GetTexture("_NormalMap") as Texture2D;
}
if (normalMap != null)
{
listTextureTypes.Add("Normal");
listTextureUIDs.Add(GetTexUID(normalMap));
}
Texture2D occlusionMap = null;
if (material.HasProperty("_OcclusionMap"))
{
occlusionMap = material.GetTexture("_OcclusionMap") as Texture2D;
}
if (occlusionMap != null)
{
listTextureTypes.Add("Occlusion");
listTextureUIDs.Add(GetTexUID(occlusionMap));
}
Texture2D emissionMap = null;
if (material.HasProperty("_EmissionMap"))
{
emissionMap = material.GetTexture("_EmissionMap") as Texture2D;
}
if (emissionMap != null)
{
listTextureTypes.Add("Emission");
listTextureUIDs.Add(GetTexUID(emissionMap));
}
mpd.texTypes = listTextureTypes.ToArray();
mpd.texUIDs = listTextureUIDs.ToArray();
}
void ApplyTexture(Material material, MaterialPropertyData mpd)
{
bool hasSpecular = false;
for (int i = 0; i < mpd.texTypes.Length; i++)
{
string type = mpd.texTypes[i];
string uid = mpd.texUIDs[i];
Texture2D tex = dicTextures[uid];
switch (type)
{
case "Albedo":
{
if (material.HasProperty("_BaseMap") && tex != null)
{
material.SetTexture("_BaseMap", tex);
}
else if (material.HasProperty("_MainTex") && tex != null)
{
material.SetTexture("_MainTex", tex);
}
}
break;
case "Specular":
{
if (material.HasProperty("_SpecGlossMap") && tex != null)
{
material.SetTexture("_SpecGlossMap", tex);
hasSpecular = true;
}
}
break;
case "Metallic":
{
if (material.HasProperty("_MetallicGlossMap") && tex != null)
{
material.SetTexture("_MetallicGlossMap", tex);
}
}
break;
case "Normal":
{
if (material.HasProperty("_NormalMap") && tex != null)
{
material.SetTexture("_NormalMap", tex);
}
else if (material.HasProperty("_BumpMap") && tex != null)
{
material.SetTexture("_BumpMap", tex);
}
if (material.HasProperty("_NormalScale"))
{
material.SetFloat("_NormalScale", mpd.normalScale);
}
else if (material.HasProperty("_BumpScale"))
{
material.SetFloat("_BumpScale", mpd.normalScale);
}
}
break;
case "Occlusion":
{
if (material.HasProperty("_OcclusionMap") && tex != null)
{
material.SetTexture("_OcclusionMap", tex);
}
if (material.HasProperty("_OcclusionStrength"))
{
material.SetFloat("_OcclusionStrength", mpd.occlusionStrength);
}
}
break;
case "Emission":
{
if (material.HasProperty("_EmissionMap") && tex != null)
{
material.SetTexture("_EmissionMap", tex);
}
}
break;
}
}
if (material.HasProperty("_WorkflowMode"))
{
material.SetFloat("_WorkflowMode", hasSpecular ? 1f : 0f);
}
}
public Texture2D GetReadableTexture(Texture texture)
{
RenderTexture renderTex = new RenderTexture(texture.width, texture.height, 0);
Graphics.Blit(texture, renderTex);
Texture2D readableTexture = new Texture2D(texture.width, texture.height, TextureFormat.RGBA32, false);
RenderTexture.active = renderTex;
readableTexture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0);
readableTexture.Apply();
RenderTexture.active = null;
renderTex.Release();
return readableTexture;
}
public string GetTexUID(Texture2D tex)
{
string texUID = Guid.NewGuid().ToString();
if (dicTextureIDs.ContainsKey(tex))
{
texUID = dicTextureIDs[tex];
}
else
{
dicTextureIDs[tex] = texUID;
Texture2D readableTex = GetReadableTexture(tex);
//TextureData textureData = new TextureData()
//{
// name = tex.name,
// uid = texUID,
// data = readableTex.EncodeToPNG()
//};
//textureDatas.Add(textureData);
textureDatas.Add(new TextureData(tex.name, texUID, readableTex.EncodeToPNG()));
}
return texUID;
}
public void AddTextureData(TextureData texData)
{
if (dicTextures.ContainsKey(texData.uid))
{
//The odds are almost zero.
//It means save logic is wrong.
Debug.LogError("Duplicate Texture : " + texData.name + ", GUID : " + texData.uid);
}
else
{
Texture2D tex = new Texture2D(2, 2);
ImageConversion.LoadImage(tex, texData.data);
dicTextures[texData.uid] = tex;
}
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 991ddfb0a039da5498d4e3facf267ede

View File

@@ -1,99 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UIElements;
namespace XED
{
//ConvexHull이란 컨벡스 헐 알고리즘은 2차원 평면상에 여러개의 점이 있을 때
//그 점 중에서 일부를 이용하여 볼록 다각형을 만들되 볼록 다각형 내부에 모든 점을 포함시키는 것을 의미한다.
//https://www.crocus.co.kr/1288 설명 참고
//https://bloodstrawberry.tistory.com/1060 참고
public class ConvexHull
{
private LinePoint firstLinePoint;
private float CCWBy2D(Vector3 a, Vector3 b, Vector3 c)
{
var p = b - a;
var q = c - b;
return Vector3.Cross(p, q).y;
}
private int Compare(LinePoint a, LinePoint b)
{
var tmp = CCWBy2D(firstLinePoint.position, a.position, b.position);
if (tmp > 0) return -1;
else if(tmp == 0 && Vector3.Distance(firstLinePoint.position, a.position)<Vector3.Distance(firstLinePoint.position, b.position)) return -1;
return 1;
}
List<LinePoint> GetConvexHullVertices(List<LinePoint> point)
{
List<LinePoint> convexHull = new();
int index, sp;
LinePoint[] stack = new LinePoint[point.Count];
index = sp = 0;
stack[sp++] = point[index++];
stack[sp++] = point[index++];
while (sp < 3)
{
float tmp = CCWBy2D(stack[sp - 2].position, stack[sp - 1].position, point[index].position);
if (tmp > 0) stack[sp++] = point[index++];
else if (tmp == 0) // 직선인 경우는 점을 교체
{
sp--;
stack[sp++] = point[index++];
}
else index++;
}
while (index < point.Count)
{
float tmp = CCWBy2D(stack[sp - 2].position, stack[sp - 1].position, point[index].position);
if (tmp > 0) stack[sp++] = point[index++];
else sp--;
}
for (int i = 0; i < sp; i++) convexHull.Add(stack[i]);
return convexHull;
}
public void RoomLinePoint(Room room)
{
List<LinePoint> points = new();
points = room.points;
firstLinePoint = room.firstPoints;
points.Sort(Compare);
var sortPoint = GetConvexHullVertices(points);
room.points = points;
room.positions.Clear();
foreach (var pos in points)
{
room.positions.Add(pos.position);
}
// SetLineRenderer(lr, position, true);
}
void SetLineRenderer(LineRenderer lr, List<LinePoint> vertices, bool check)
{
lr.loop = check;
lr.positionCount = vertices.Count;
List<Vector3> position = new();
foreach (LinePoint p in vertices)
{
position.Add(p.position);
}
lr.SetPositions(position.ToArray());
}
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 67033d32a11ebd44e9706e0449ea9fa9

View File

@@ -1,61 +0,0 @@
using AmazingAssets.WireframeShader;
using System.Collections.Generic;
using UnityEngine;
namespace XED
{
[RequireComponent(typeof(MeshRenderer)), RequireComponent(typeof(MeshFilter))]
public class CreateWireFrame : MonoBehaviour
{
//MeshFilter meshFilter;
private bool tryQuad;
private Mesh wireframeMesh;
private Material mat;
private MeshFilter targetMeshFilter;
private MeshRenderer mr;
public override void AfterAwake()
{
var matrial = Resources.Load<Material>("Materials/Mat_Cutout");
mat = matrial;
targetMeshFilter = GetComponent<MeshFilter>();
mr = GetComponent<MeshRenderer>();
mr.material = mat;
}
public void CombineMeshes(List<MeshFilter> meshFilters)
{
if (meshFilters.Count == 0)
return;
var combine = new CombineInstance[meshFilters.Count];
for (var i = 0; i < meshFilters.Count; i++)
{
combine[i].mesh = meshFilters[i].sharedMesh;
combine[i].transform = meshFilters[i].transform.localToWorldMatrix;
}
var mesh = new Mesh();
mesh.CombineMeshes(combine);
targetMeshFilter.mesh = mesh;
WireFrameCreate(targetMeshFilter);
}
public void WireFrameCreate(MeshFilter meshFilter)
{
targetMeshFilter.mesh = meshFilter.mesh;
if (wireframeMesh != null)
UnityEngine.GameObject.DestroyImmediate(wireframeMesh);
wireframeMesh = targetMeshFilter.sharedMesh.GenerateWireframeMesh(false, tryQuad);
targetMeshFilter.sharedMesh = wireframeMesh;
}
public void Displayable(bool value)
{
if (mr == null)
return;
mr.enabled = value;
}
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 6ba8c050aa2df094996232819d8cd149
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,176 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using XRLib;
using XED.Manage;
using static UnityEngine.Rendering.DebugUI;
namespace XED
{
[Serializable]
public class FloorCreateManager:MonoBehaviour,ISingle
{
[SerializeField]
private List<Room> allRoomsCase = new();
[SerializeField]
private List<Room> rooms = new();
private ConvexHull convexHull = new();
public Action<Floor> onCreateFloor;
public List<Floor> floors = new();
private Dictionary<Floor, List<LinePoint>> floorTable = new();
private Dictionary<LinePoint, List<Floor>> floorsMap = new();
//Wall 생성될때
//Point 움직임, 제거 이벤트 발생 할때
//메쉬는 유지해야함.
//계산은
public override void AfterAwake()
{
}
public void FindCycles(HashSet<LinePoint> linePoints)
{
allRoomsCase.Clear();
foreach (var point in linePoints)
{
FindOnePointCycle(point);
}
FindSmallRoom();
//Floor 생성 해야함
}
public void FindOnePointCycle(LinePoint point)
{
if (point.connectPoints.Count < 2)
return;
//Add할 타이밍
//분할될 타이밍
var connectPoints = point.connectPoints;
foreach (var connectPoint in connectPoints)
{
var room = new Room();
room.AddLinePoint(point);
AddConnectPoint(connectPoint, room);
}
}
private void AddConnectPoint(LinePoint point, Room room)
{
if (point.visited)
return;
if (room.IsContains(point))
{
if (room.points.Count < 3)
return;
room.firstPoints = room.points.First();
allRoomsCase.Add(room);
return;
}
point.visited = true;
room.AddLinePoint(point);
var connectPoints = point.connectPoints;
foreach (var connectPoint in connectPoints)
{
var temp = new Room();
temp.points = room.points.ToList();
AddConnectPoint(connectPoint, temp);
}
point.visited = false; ;
}
private void FindSmallRoom()
{
var roomFistPoint = new HashSet<LinePoint>();
foreach (var room in allRoomsCase)
{
roomFistPoint.Add(room.firstPoints);
}
foreach (var tt in roomFistPoint)
{
var re = allRoomsCase.Where(f => f.firstPoints.Equals(tt))
.OrderBy(f => f.points.Count).ToList();
//최소 points의 개수
var minCount = re.Select(f => f.points.Count).First();
foreach (var aa in re)
{
if (aa.points.Count != minCount)
continue;
if (CheckDuplicationRoom(aa))
continue;
convexHull.RoomLinePoint(aa);
rooms.Add(aa);
// CreateFloor(aa);
}
}
}
void CreateFloor(Room room)
{
bool isequal = false;
foreach (var fl in floorTable)
{
isequal = Enumerable.SequenceEqual(room.points.OrderBy(x => x.name), fl.Value.OrderBy(z => z.name));
if (isequal)
break;
}
if(!isequal)
{
var poolManager = FindSingle<ObjectPoolManager>();
var floor = poolManager.Get<Floor>();
foreach (var value in room.points)
{
FloorTableAdd(floor, value);
FloorMap(value, floor);
}
floor.Set(room);
}
}
private void FloorTableAdd(Floor floor,LinePoint point)
{
if (!floorTable.ContainsKey(floor))
floorTable.Add(floor, new());
floorTable[floor].Add(point);
}
private void FloorMap(LinePoint point, Floor floor)
{
if (!floorsMap.ContainsKey(point))
floorsMap.Add(point, new());
floorsMap[point].Add(floor);
}
public void RemoveRoom(Room room)
{
}
private bool CheckDuplicationRoom(Room checkRoom)
{
foreach (var room in rooms)
{
if (checkRoom.points.Count != room.points.Count)
continue;
bool isequal = Enumerable.SequenceEqual(room.points.OrderBy(x => x.name), checkRoom.points.OrderBy(z => z.name));
if (isequal)
return true;
}
return false;
}
//Floor 지워지는 시점..
//재계산 하는 시점
//
}
}

View File

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

View File

@@ -1,40 +0,0 @@
using System;
using System.Runtime.InteropServices;
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
public class OpenFileName
{
public int structSize = 0;
public IntPtr dlgOwner = IntPtr.Zero;
public IntPtr instance = IntPtr.Zero;
public String filter = null;
public String customFilter = null;
public int maxCustFilter = 0;
public int filterIndex = 0;
public String file = null;
public int maxFile = 0;
public String fileTitle = null;
public int maxFileTitle = 0;
public String initialDir = null;
public String title = null;
public int flags = 0;
public short fileOffset = 0;
public short fileExtension = 0;
public String defExt = null;
public IntPtr custData = IntPtr.Zero;
public IntPtr hook = IntPtr.Zero;
public String templateName = null;
public IntPtr reservedPtr = IntPtr.Zero;
public int reservedInt = 0;
public int flagsEx = 0;
}
public class ofnDll
{
[DllImport("Comdlg32.dll", SetLastError = true, ThrowOnUnmappableChar = true, CharSet = CharSet.Auto)]
public static extern bool GetOpenFileName([In, Out] OpenFileName ofn);
public static bool OpenFileName([In, Out] OpenFileName ofn)
{
return GetOpenFileName(ofn);
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 3bbd69400cf49ce40b31141de01817d2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,46 @@
using System.Collections.Generic;
using UnityEngine;
namespace XED.Util
{
public class ProjectData
{
public string filePath;
public string updateDate;
public List<AssetData> assetDatas;
}
public class AssetData
{
public int id;
public string name;
public SaveVector3 position;
public SaveVector3 rotation;
public SaveVector3 scale;
public List<int> children;
public AssetData(int id, string name, SaveVector3 position, SaveVector3 rotation, SaveVector3 scale, List<int> children)
{
this.id = id;
this.name = name;
this.position = position;
this.rotation = rotation;
this.scale = scale;
this.children = children;
}
}
public class SaveVector3
{
public float x;
public float y;
public float z;
public SaveVector3(Vector3 vector3)
{
x = vector3.x;
y = vector3.y;
z = vector3.z;
}
}
}

View File

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

View File

@@ -1,21 +0,0 @@
using UnityEngine;
namespace XED.Util
{
public static class UtilityFunction
{
public static Transform FindDeepChild(Transform parent, string name)
{
foreach (Transform child in parent)
{
if (child.name == name)
return child;
Transform result = FindDeepChild(child, name);
if (result != null)
return result;
}
return null;
}
}
}

View File

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

View File

@@ -1,53 +0,0 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace XED.ComponentSystem
{
public abstract class ActionComponent
{
public enum EventType
{
Start,
Complete,
}
public bool isStarted;
public Action<ActionComponent> onStart;
public Action<ActionComponent> onComplete;
public Dictionary<EventType, List<ActionComponent>> subscribers = new();
public abstract void Start();
public abstract void Run();
public void Subscribe(EventType et, ActionComponent ac)
{
if (!subscribers.ContainsKey(et))
{
subscribers.Add(et, new List<ActionComponent>());
}
subscribers[et].Add(ac);
}
}
public class Timer : ActionComponent
{
public float timer;
public float duration;
public override void Run()
{
timer += Time.deltaTime;
}
public override void Start()
{
timer = 0f;
onStart?.Invoke(this);
}
}
}

View File

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

View File

@@ -1,25 +0,0 @@
using System.Collections.Generic;
using XRLib;
namespace XED.ComponentSystem
{
public class ActionComponentRunner : MonoBehaviour, ISingle
{
public List<ActionComponent> components =new();
public void Add(ActionComponent ac)
{
components.Add(ac);
}
void Update()
{
foreach (var c in components)
{
if (!c.isStarted)
c.Start();
c.Run();
}
}
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 33290f25a5450894d8bb61de724f0e8b

View File

@@ -1,10 +0,0 @@
using System;
namespace XED.ComponentSystem
{
[AttributeUsage(AttributeTargets.Field)]
public class ComponentAttribute : Attribute
{
}
}

View File

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

View File

@@ -1,9 +0,0 @@
using XRLib;
namespace XED.ComponentSystem
{
public class ComponentViewer : MonoBehaviour, ISingle
{
}
}

View File

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

View File

@@ -1,6 +0,0 @@
namespace XED.ComponentSystem
{
public class DropdownAttribute : ComponentAttribute
{
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 72d9ca4b84a83d44faa0782c8d091dcf

View File

@@ -1,10 +0,0 @@
using UnityEngine;
using UnityEngine.UIElements;
namespace XED.ComponentSystem
{
public class InputAttribute : ComponentAttribute
{
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 6bf39c253f9582444b29eca9a2735f8f

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a82b8cc88b7c5504baf7945c65a835d9
guid: cd45805b3801a77459d273f3878e8073
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace XED.Util
namespace XED.DataStructures
{
public class KDTree
{

View File

@@ -0,0 +1,61 @@
using MessagePack;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Rendering;
namespace XED.Manage
{
[MessagePackObject]
public class SerializableMesh
{
[Key(0)]
public SerializableVector3[] vertices;
[Key(1)]
public SerializableVector3[] normals;
[Key(2)]
public SerializableVector4[] tangents;
[Key(3)]
public SerializableVector2[] uv;
//[Key("Triangles")]
//public int[] triangles;
[Key(4)]
public SubmeshData[] submeshes;
public void SetData(Mesh mesh)
{
vertices = SerializableVector3.FromVector3Array(mesh.vertices);
normals = SerializableVector3.FromVector3Array(mesh.normals);
tangents = SerializableVector4.FromVector4Array(mesh.tangents);
uv = SerializableVector2.FromVector2Array(mesh.uv);
//triangles = mesh.triangles;
List<SubmeshData> submeshList = new List<SubmeshData>();
for (int i = 0; i < mesh.subMeshCount; i++)
{
SubmeshData submesh = new SubmeshData
{
materialIndex = i,
triangles = mesh.GetTriangles(i)
};
submeshList.Add(submesh);
}
submeshes = submeshList.ToArray();
}
public Mesh ToMesh()
{
Mesh newMesh = new Mesh();
newMesh.indexFormat = vertices.Length > 65535 ? IndexFormat.UInt32 : IndexFormat.UInt16;
newMesh.vertices = SerializableVector3.ToVector3Array(vertices);
newMesh.normals = SerializableVector3.ToVector3Array(normals);
newMesh.tangents = SerializableVector4.ToVector4Array(tangents);
newMesh.uv = SerializableVector2.ToVector2Array(uv);
//newMesh.triangles = triangles;
newMesh.subMeshCount = submeshes.Length;
for (int i = 0; i < submeshes.Length; i++)
{
newMesh.SetTriangles(submeshes[i].triangles, i);
}
newMesh.RecalculateBounds();
return newMesh;
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 999c0cb703525184cb36657eff785f40

View File

@@ -0,0 +1,22 @@
using MessagePack;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public struct SerializableQuaternion
{
[Key(0)]
public float x;
[Key(1)]
public float y;
[Key(2)]
public float z;
[Key(3)]
public float w;
public void FromQuaternion(Quaternion q) { x = q.x; y = q.y; z = q.z; w = q.w; }
public Quaternion ToQuaternion() => new Quaternion(x, y, z, w);
}
}

View File

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

View File

@@ -0,0 +1,35 @@
using MessagePack;
using System.Linq;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public struct SerializableVector2
{
[Key(0)]
public float x;
[Key(1)]
public float y;
[SerializationConstructor]
public SerializableVector2(float x, float y)
{
this.x = x;
this.y = y;
}
public void FromVector2(Vector2 v) { x = v.x; y = v.y; }
public Vector2 ToVector2() => new Vector2(x, y);
public static SerializableVector2[] FromVector2Array(Vector2[] array)
{
return array?.Select(v => new SerializableVector2(v.x, v.y)).ToArray();
}
public static Vector2[] ToVector2Array(SerializableVector2[] array)
{
return array?.Select(v => v.ToVector2()).ToArray();
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7f9188eec868d104d8dad44bf77fdab0

View File

@@ -0,0 +1,38 @@
using MessagePack;
using System.Linq;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public struct SerializableVector3
{
[Key(0)]
public float x;
[Key(1)]
public float y;
[Key(2)]
public float z;
[SerializationConstructor]
public SerializableVector3(float x, float y, float z)
{
this.x = x;
this.y = y;
this.z = z;
}
public void FromVector3(Vector3 v) { x = v.x; y = v.y; z = v.z; }
public Vector3 ToVector3() => new Vector3(x, y, z);
public static SerializableVector3[] FromVector3Array(Vector3[] array)
{
return array?.Select(v => new SerializableVector3(v.x, v.y, v.z)).ToArray();
}
public static Vector3[] ToVector3Array(SerializableVector3[] array)
{
return array?.Select(v => v.ToVector3()).ToArray();
}
}
}

View File

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

View File

@@ -0,0 +1,40 @@
using MessagePack;
using System.Linq;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public struct SerializableVector4
{
[Key(0)]
public float x;
[Key(1)]
public float y;
[Key(2)]
public float z;
[Key(3)]
public float w;
[SerializationConstructor]
public SerializableVector4(float x, float y, float z, float w)
{
this.x = x;
this.y = y;
this.z = z;
this.w = w;
}
public void FromVector4(Vector4 v) { x = v.x; y = v.y; z = v.z; w = v.w; }
public Vector4 ToVector4() => new Vector4(x, y, z, w);
public static SerializableVector4[] FromVector4Array(Vector4[] array)
{
return array?.Select(v => new SerializableVector4(v.x, v.y, v.z, v.w)).ToArray();
}
public static Vector4[] ToVector4Array(SerializableVector4[] array)
{
return array?.Select(v => v.ToVector4()).ToArray();
}
}
}

View File

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

View File

@@ -0,0 +1,14 @@
using MessagePack;
namespace XED.Manage
{
[MessagePackObject]
public class SubmeshData
{
[Key(0)]
public int materialIndex;
[Key(1)]
public int[] triangles;
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7ba29a7f5a6d3904fb7e7b38a3e65603

View File

@@ -0,0 +1,24 @@
using MessagePack;
namespace XED.Manage
{
[MessagePackObject]
public class TextureData
{
[Key(0)]
public string name;
[Key(1)]
public string uid;
[Key(2)]
public byte[] data;
[SerializationConstructor]
public TextureData(string name, string uid, byte[] data)
{
this.name = name;
this.uid = uid;
this.data = data;
}
}
}

View File

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

View File

@@ -0,0 +1,18 @@
using MessagePack;
namespace XED.Manage
{
[MessagePackObject]
public class ThumbnailData
{
[Key(0)]
public byte[] data;
[SerializationConstructor]
public ThumbnailData(byte[] data)
{
this.data = data;
}
}
}

View File

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

View File

@@ -0,0 +1,33 @@
using MessagePack;
using UnityEngine;
namespace XED.Manage
{
[MessagePackObject]
public class TransformData
{
[Key(0)]
public SerializableVector3 position;
[Key(1)]
public SerializableQuaternion rotation;
[Key(2)]
public SerializableVector3 scale;
public void SetData(Transform transform)
{
position = new SerializableVector3();
position.FromVector3(transform.position);
rotation = new SerializableQuaternion();
rotation.FromQuaternion(transform.rotation);
scale = new SerializableVector3();
scale.FromVector3(transform.lossyScale);
}
public void ApplyToTransform(Transform transform)
{
transform.position = position.ToVector3();
transform.rotation = rotation.ToQuaternion();
transform.localScale = scale.ToVector3();
}
}
}

View File

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

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c98df20933569634ab50df6409b85478
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -33,7 +33,7 @@ namespace XED
private TwoPointLine line;
public Color wallColor;
private CreateWireFrame wireFrame;
//private CreateWireFrame wireFrame;
public HashSet<LinePoint> includedPoints = new();
private Dictionary<VirtualPoint, bool> linePointTable = new Dictionary<VirtualPoint, bool>();
@@ -47,9 +47,9 @@ namespace XED
public override void AfterAwake()
{
var mat = Resources.Load<Material>("Materials/Mat_WallMat");
wireFrame = new GameObject("WireFrame").AddComponent<CreateWireFrame>();
wireFrame.transform.SetParent(transform);
wireFrame.Displayable(false);
//wireFrame = new GameObject("WireFrame").AddComponent<CreateWireFrame>();
//wireFrame.transform.SetParent(transform);
//wireFrame.Displayable(false);
meshfilter = GetComponent<MeshFilter>();
mr = GetComponent<MeshRenderer>();
mr.material = mat;
@@ -393,7 +393,7 @@ namespace XED
if (IsDisplayable)
{
line.SetActive(value);
wireFrame.Displayable(!value);
//wireFrame.Displayable(!value);
mr.enabled = !value;
var centrPoints = GetCenterPoints();
foreach (var point in centrPoints)
@@ -404,7 +404,7 @@ namespace XED
else
{
line.SetActive(false);
wireFrame.Displayable(false);
//wireFrame.Displayable(false);
mr.enabled = false;
var centrPoints = GetCenterPoints();
foreach (var point in centrPoints)

View File

@@ -60,7 +60,6 @@ namespace XED
public Wall prf_Wall;
public WallGroup prf_WallGroup;
private FloorCreateManager fm;
private int cc;
public Action<HashSet<Wall>> onCreateWallMesh;
@@ -82,20 +81,16 @@ namespace XED
wallLines.Add(wallLine);
}
}
private RTGController rtgController;
public override void AfterAwake()
{
renderParent = new GameObject("LineRenderParent");
lineMat = Resources.Load<Material>("Materials/Mat_LineRender");
fm = FindSingle<FloorCreateManager>();
prf_LinePoint = Resources.Load<LinePoint>("Prefabs/PRF_LinePoint");
prf_Wall = Resources.Load<Wall>("Prefabs/PRF_Wall");
prf_WallGroup = Resources.Load<WallGroup>("Prefabs/PRF_WallGroup");
meshCreator = FindSingle<MeshCreator>();
rtgController = new();
handler = GetInputHandler();
}

Some files were not shown because too many files have changed in this diff Show More