mirror of
https://udrimavric.com/MAVRIC/Stratasys-Fortus-450mc.git
synced 2025-01-22 07:09:08 -05:00
Merge branch 'development' into feature/MAVRIC-1961_UI-Fixes
This commit is contained in:
commit
e423c87409
@ -145,25 +145,41 @@ MonoBehaviour:
|
||||
m_PositionInput:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Position Input
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 9d857d62-5af5-4471-824a-f6ba04f4bdc1
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
m_SingletonActionBindings:
|
||||
- m_Name:
|
||||
m_Id: a90916f7-9340-4d5e-8208-d16db5c2e185
|
||||
m_Path: <HandheldARInputDevice>/devicePosition
|
||||
m_Interactions:
|
||||
m_Processors:
|
||||
m_Groups:
|
||||
m_Action: Position Input
|
||||
m_Flags: 0
|
||||
m_Flags: 0
|
||||
m_Reference: {fileID: 0}
|
||||
m_RotationInput:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Rotation Input
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 02a43bed-bcef-471d-b519-2587b1a16682
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
m_SingletonActionBindings:
|
||||
- m_Name:
|
||||
m_Id: f9cabcd3-2373-4881-be3a-5031aaa1b34e
|
||||
m_Path: <HandheldARInputDevice>/deviceRotation
|
||||
m_Interactions:
|
||||
m_Processors:
|
||||
m_Groups:
|
||||
m_Action: Rotation Input
|
||||
m_Flags: 0
|
||||
m_Flags: 0
|
||||
m_Reference: {fileID: 0}
|
||||
m_TrackingStateInput:
|
||||
@ -172,12 +188,12 @@ MonoBehaviour:
|
||||
m_Name: Tracking State
|
||||
m_Type: 0
|
||||
m_ExpectedControlType: Integer
|
||||
m_Id:
|
||||
m_Id: 732c113d-5b70-468b-913a-8455b474aecb
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings:
|
||||
- m_Name:
|
||||
m_Id:
|
||||
m_Id: ae29a0b3-7c31-4c3f-906a-54abb978dd9b
|
||||
m_Path: <XRHMD>/trackingState
|
||||
m_Interactions:
|
||||
m_Processors:
|
||||
@ -311,10 +327,10 @@ MonoBehaviour:
|
||||
m_PositionAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Position
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 6415d01b-2be8-4a07-83ce-5213a763b341
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -323,10 +339,10 @@ MonoBehaviour:
|
||||
m_RotationAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Rotation
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: b4748ed7-1edc-4e40-8fca-ad0008d4d0dd
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -335,10 +351,10 @@ MonoBehaviour:
|
||||
m_TrackingStateAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Tracking State
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 41a91f97-3e24-42e1-989e-176bfd9e6050
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -347,10 +363,10 @@ MonoBehaviour:
|
||||
m_SelectAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Select
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 97d64705-1eaa-41ad-8a3a-9cfd6ee30308
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -359,10 +375,10 @@ MonoBehaviour:
|
||||
m_SelectActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Select Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 17859812-c949-4e1c-8666-685fa7940c05
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -371,10 +387,10 @@ MonoBehaviour:
|
||||
m_ActivateAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Activate
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 12bf16aa-a284-4a51-82f4-f20a6d414352
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -383,10 +399,10 @@ MonoBehaviour:
|
||||
m_ActivateActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Activate Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 180ac3ba-aee8-41cc-a4ae-4c7662786c05
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -395,10 +411,10 @@ MonoBehaviour:
|
||||
m_UIPressAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: UI Press
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 4843995f-b2df-43c6-a4e9-ef6d8644e7b3
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -407,10 +423,10 @@ MonoBehaviour:
|
||||
m_UIPressActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: UI Press Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 92d0dbe8-0b81-4553-975e-de689f5f454c
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -419,10 +435,10 @@ MonoBehaviour:
|
||||
m_HapticDeviceAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Haptic Device
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 3c8f29cf-6694-4b7f-84ef-fdbb07e66f9c
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -431,10 +447,10 @@ MonoBehaviour:
|
||||
m_RotateAnchorAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Rotate Anchor
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: d3251074-11ce-4a01-b652-af93da9d903c
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -443,10 +459,10 @@ MonoBehaviour:
|
||||
m_DirectionalAnchorRotationAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Directional Anchor Rotation
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 4356db5f-ba53-4da4-a682-11990ccfc5d9
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -455,10 +471,10 @@ MonoBehaviour:
|
||||
m_TranslateAnchorAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Translate Anchor
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: b3d108c9-1e5f-41c2-9b8a-a56c54ddf284
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -694,7 +710,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1346038968849851932}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3}
|
||||
m_Name:
|
||||
@ -883,7 +899,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
worldOrigin: {fileID: 6647276524559071731}
|
||||
xrOrigin: {fileID: 8356354807591736184}
|
||||
positionOffset: {x: 0, y: -0.5, z: 0}
|
||||
positionOffset: {x: 0, y: 0, z: 0}
|
||||
rotationOffset: {x: 0, y: 0, z: 0}
|
||||
arTrackedImageManager: {fileID: 7078610990952912540}
|
||||
--- !u!1 &4908401803032465587
|
||||
@ -1000,8 +1016,9 @@ Transform:
|
||||
- {fileID: 6647276524559071731}
|
||||
- {fileID: 4979778874725930329}
|
||||
- {fileID: 1286257645179894439}
|
||||
- {fileID: 8341203594378053561}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7467876242708846740
|
||||
GameObject:
|
||||
@ -1097,10 +1114,10 @@ MonoBehaviour:
|
||||
m_PositionAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Position
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: cb78d6cc-68eb-43fc-975c-6334304c7167
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1109,10 +1126,10 @@ MonoBehaviour:
|
||||
m_RotationAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Rotation
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: a2e8ec20-0f92-49ee-bbf1-f50d857471f3
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1121,10 +1138,10 @@ MonoBehaviour:
|
||||
m_TrackingStateAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Tracking State
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: e8bf9d17-f384-4d21-a5f0-17b609e7393f
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1133,10 +1150,10 @@ MonoBehaviour:
|
||||
m_SelectAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Select
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 250f82ed-4a47-44c0-b4be-8756f0bc4da2
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1145,10 +1162,10 @@ MonoBehaviour:
|
||||
m_SelectActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Select Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: c4c3d348-6570-4934-88c6-d54defd54ba0
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1157,10 +1174,10 @@ MonoBehaviour:
|
||||
m_ActivateAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Activate
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: d578f99c-cef2-4c7f-8274-c951803431da
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1169,10 +1186,10 @@ MonoBehaviour:
|
||||
m_ActivateActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Activate Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: a632cb1c-1d03-445e-8d48-3b28da94b5a9
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1181,10 +1198,10 @@ MonoBehaviour:
|
||||
m_UIPressAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: UI Press
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 11040248-0b9f-4920-8d0f-11ae5979800f
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1193,10 +1210,10 @@ MonoBehaviour:
|
||||
m_UIPressActionValue:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: UI Press Action Value
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 40a07c80-2cc6-470e-b9fd-e7accb0db608
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1205,10 +1222,10 @@ MonoBehaviour:
|
||||
m_HapticDeviceAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Haptic Device
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 3848955e-03b2-4581-bdf7-574ad7dd49f9
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1217,10 +1234,10 @@ MonoBehaviour:
|
||||
m_RotateAnchorAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Rotate Anchor
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 40ab86e6-e488-4ed3-9682-d718bf0a6002
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1229,10 +1246,10 @@ MonoBehaviour:
|
||||
m_DirectionalAnchorRotationAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Directional Anchor Rotation
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 45cb0bd3-ddbe-4ef5-a76b-33468575bc5e
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1241,10 +1258,10 @@ MonoBehaviour:
|
||||
m_TranslateAnchorAction:
|
||||
m_UseReference: 0
|
||||
m_Action:
|
||||
m_Name:
|
||||
m_Name: Translate Anchor
|
||||
m_Type: 0
|
||||
m_ExpectedControlType:
|
||||
m_Id:
|
||||
m_Id: 5d1d98e3-5625-4ea1-9930-3169df092f7d
|
||||
m_Processors:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
@ -1480,7 +1497,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8166414642848557020}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3}
|
||||
m_Name:
|
||||
@ -1757,6 +1774,104 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
|
||||
m_PrefabInstance: {fileID: 267219771497156019}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3938762051458252784
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2995049788487289996}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1269322098343870099, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1870626934748538968, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
|
||||
- target: {fileID: 3848796925145863350, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254675097513070378, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4505335131898626314, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.50856435
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.49128637
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.50856435
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.49128637
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -88.02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5024481001895468269, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5059303799277590478, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5149811130857127022, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5906622177446004882, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Cartridge_Guide_Model
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
--- !u!4 &8341203594378053561 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
|
||||
m_PrefabInstance: {fileID: 3938762051458252784}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8715878347926190244
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1775,19 +1890,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 799.99994
|
||||
value: 800
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 311.99997
|
||||
value: 247.5665
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 399.99997
|
||||
value: 400
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -204.99998
|
||||
value: -164.72906
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1799,19 +1914,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 799.99994
|
||||
value: 800
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 89
|
||||
value: 80.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 399.99997
|
||||
value: 400
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -405.49997
|
||||
value: -328.9852
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -1907,19 +2022,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 135.99998
|
||||
value: 136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
value: 40.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 243.99997
|
||||
value: 244
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44.5
|
||||
value: -40.472908
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1931,19 +2046,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 135.99998
|
||||
value: 136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
value: 40.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 555.99994
|
||||
value: 556
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44.5
|
||||
value: -40.472908
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1955,19 +2070,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 135.99998
|
||||
value: 136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
value: 40.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 87.99999
|
||||
value: 88
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44.5
|
||||
value: -40.472908
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6130414054276300538, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1983,19 +2098,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 135.99998
|
||||
value: 136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
value: 40.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 399.99997
|
||||
value: 400
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44.5
|
||||
value: -40.472908
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -2007,19 +2122,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 135.99998
|
||||
value: 136
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
value: 40.945816
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 711.99994
|
||||
value: 712
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44.5
|
||||
value: -40.472908
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -2031,19 +2146,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 799.99994
|
||||
value: 800
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 48.999996
|
||||
value: 40.945812
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 399.99997
|
||||
value: 400
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -24.499998
|
||||
value: -20.472906
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
@ -15,7 +15,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &8760413228547238992
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -30,8 +30,9 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 6023609763215936869}
|
||||
- {fileID: 3248355253502752146}
|
||||
- {fileID: 1867450165178397065}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2618339340862356079
|
||||
GameObject:
|
||||
@ -836,14 +837,14 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7309634879579752424}
|
||||
m_LocalRotation: {x: -0.021451214, y: 0.97791797, z: -0.16367747, w: -0.12816393}
|
||||
m_LocalPosition: {x: 0.19, y: 0.25, z: 0.75}
|
||||
m_LocalRotation: {x: 0.19938692, y: 0.13293882, z: -0.027312605, w: 0.9704773}
|
||||
m_LocalPosition: {x: -0.1051, y: 0.2827, z: -0.6013}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8760413228547238992}
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 19.003, y: 194.933, z: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 23.22, y: 15.6, z: 0}
|
||||
--- !u!20 &8905626693440847948
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1037,3 +1038,69 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1001 &2610928759383726613
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8760413228547238992}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.50856435
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.49128637
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.50856435
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.49128637
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -88.02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5906286381360451428, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Cartridge_Full_Model
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
--- !u!4 &1867450165178397065 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
|
||||
m_PrefabInstance: {fileID: 2610928759383726613}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
Loading…
Reference in New Issue
Block a user