diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index e90c1b0..fca8ddc 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -919,22 +919,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -398.40652, y: -20.228851, z: -264.44186} - - {x: -150.03946, y: -20.228851, z: -264.44186} - - {x: -150.03946, y: -20.228851, z: -85.16855} - - {x: -398.40652, y: -20.228851, z: -85.16855} - - {x: -398.40652, y: -20.228851, z: -264.44186} - - {x: -398.40652, y: 400.47815, z: -264.44186} - - {x: -150.03946, y: 400.47815, z: -264.44186} - - {x: -150.03946, y: -20.228851, z: -264.44186} - - {x: -150.03946, y: 400.47815, z: -264.44186} - - {x: -150.03946, y: 400.47815, z: -85.16855} - - {x: -150.03946, y: -20.228851, z: -85.16855} - - {x: -150.03946, y: 400.47815, z: -85.16855} - - {x: -398.40652, y: 400.47815, z: -85.16855} - - {x: -398.40652, y: -20.228851, z: -85.16855} - - {x: -398.40652, y: 400.47815, z: -85.16855} - - {x: -398.40652, y: 400.47815, z: -264.44186} + - {x: -382.7949, y: -21.87201, z: -277.89185} + - {x: -136.05814, y: -21.87201, z: -277.89185} + - {x: -136.05814, y: -21.87201, z: -62.782074} + - {x: -382.7949, y: -21.87201, z: -62.782074} + - {x: -382.7949, y: -21.87201, z: -277.89185} + - {x: -382.7949, y: 500.21198, z: -277.89185} + - {x: -136.05814, y: 500.21198, z: -277.89185} + - {x: -136.05814, y: -21.87201, z: -277.89185} + - {x: -136.05814, y: 500.21198, z: -277.89185} + - {x: -136.05814, y: 500.21198, z: -62.782074} + - {x: -136.05814, y: -21.87201, z: -62.782074} + - {x: -136.05814, y: 500.21198, z: -62.782074} + - {x: -382.7949, y: 500.21198, z: -62.782074} + - {x: -382.7949, y: -21.87201, z: -62.782074} + - {x: -382.7949, y: 500.21198, z: -62.782074} + - {x: -382.7949, y: 500.21198, z: -277.89185} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -1268,7 +1268,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62178361} serializedVersion: 2 - m_LocalRotation: {x: 0.12400306, y: -0.09265334, z: 0.011630276, w: 0.9878782} + m_LocalRotation: {x: 0.12400305, y: -0.09265332, z: 0.011630273, w: 0.9878782} m_LocalPosition: {x: 24.371735, y: 51, z: -83.27547} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1912,7 +1912,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -1922,17 +1922,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99701 + value: 225.10922 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 302.769 + value: 196.54968 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.367 + value: -440.2693 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -1947,12 +1947,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -2053,7 +2053,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000010763138, y: 0.9982297, z: 0.059476644, w: -0.000077583616} + m_LocalRotation: {x: -0.000010763137, y: 0.9982297, z: 0.059476644, w: -0.00007758362} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5095,6 +5095,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1519374996} m_PrefabAsset: {fileID: 0} +--- !u!4 &403381423 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1102867470} + m_PrefabAsset: {fileID: 0} --- !u!1 &405810717 GameObject: m_ObjectHideFlags: 0 @@ -6680,7 +6686,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -6690,17 +6696,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99501 + value: 225.10724 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 300 + value: 193.78067 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.1 + value: -440.0023 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -6715,12 +6721,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -6903,6 +6909,18 @@ Transform: m_Children: [] m_Father: {fileID: 299259240} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &507695468 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1771925926} + m_PrefabAsset: {fileID: 0} +--- !u!4 &529613858 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1626698624} + m_PrefabAsset: {fileID: 0} --- !u!1001 &530571714 PrefabInstance: m_ObjectHideFlags: 0 @@ -7864,8 +7882,9 @@ GameObject: - component: {fileID: 605393722} - component: {fileID: 605393724} - component: {fileID: 605393723} + - component: {fileID: 605393725} m_Layer: 3 - m_Name: Pose Camera (1) + m_Name: Pose Camera Face On m_TagString: vc_Compare m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7879,8 +7898,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605393721} serializedVersion: 2 - m_LocalRotation: {x: -0.00006630494, y: 0.99952006, z: 0.030905241, w: 0.0021443975} - m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423} + m_LocalRotation: {x: -0.03109301, y: 0.0021573673, z: 0.00006711165, w: 0.99951416} + m_LocalPosition: {x: 18.109629, y: 8.274419, z: -10.463577} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -7946,6 +7965,21 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 997290492} +--- !u!114 &605393725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605393721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a3f991da12316e4e846f3de3ebb62a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_VirtualCamera: {fileID: 605393724} + m_Rotation: 0 + m_RotationSpeed: 2.5 --- !u!1 &607314882 GameObject: m_ObjectHideFlags: 0 @@ -9793,6 +9827,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 756896382} m_PrefabAsset: {fileID: 0} +--- !u!4 &758864099 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1154209501} + m_PrefabAsset: {fileID: 0} --- !u!1001 &758933855 PrefabInstance: m_ObjectHideFlags: 0 @@ -12258,6 +12298,46 @@ Transform: - {fileID: 1634740999} m_Father: {fileID: 543450651852864845} m_LocalEulerAnglesHint: {x: 0, y: 159.937, z: 0} +--- !u!1 &964939831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 964939832} + m_Layer: 0 + m_Name: Actuation Bodies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &964939832 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964939831} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -101.11222, y: 106.21934, z: 106.90228} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1890802854} + - {fileID: 403381423} + - {fileID: 975661796} + - {fileID: 1220035125} + - {fileID: 1116056124} + - {fileID: 1917545003} + - {fileID: 758864099} + - {fileID: 507695468} + - {fileID: 529613858} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &966662574 PrefabInstance: m_ObjectHideFlags: 0 @@ -12566,6 +12646,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6c3ca455471618548b92063d175ead45, type: 3} +--- !u!4 &975661796 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1135490460} + m_PrefabAsset: {fileID: 0} --- !u!1001 &979795330 PrefabInstance: m_ObjectHideFlags: 0 @@ -12771,9 +12857,9 @@ GameObject: m_Component: - component: {fileID: 997290492} - component: {fileID: 997290495} - - component: {fileID: 997290494} - component: {fileID: 997290493} - component: {fileID: 997290496} + - component: {fileID: 997290497} m_Layer: 3 m_Name: cm m_TagString: Untagged @@ -12823,7 +12909,7 @@ MonoBehaviour: m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 ---- !u!114 &997290494 +--- !u!114 &997290495 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -12832,20 +12918,10 @@ MonoBehaviour: m_GameObject: {fileID: 997290491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: 10} - m_XDamping: 0 - m_YDamping: 0 - m_ZDamping: 0 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 ---- !u!114 &997290495 +--- !u!114 &997290496 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -12854,10 +12930,15 @@ MonoBehaviour: m_GameObject: {fileID: 997290491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &997290496 + m_NoiseProfile: {fileID: 11400000, guid: 8608ec81ee27a15488d33f9dad239e91, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 0.1 + m_FrequencyGain: 1 + mNoiseOffsets: {x: -287.4774, y: 821.74634, z: -635.13635} +--- !u!114 &997290497 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -12866,14 +12947,51 @@ MonoBehaviour: m_GameObject: {fileID: 997290491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} m_Name: m_EditorClassIdentifier: - m_NoiseProfile: {fileID: 11400000, guid: 8608ec81ee27a15488d33f9dad239e91, type: 2} - m_PivotOffset: {x: 0, y: 0, z: 0} - m_AmplitudeGain: 0.1 - m_FrequencyGain: 1 - mNoiseOffsets: {x: -287.4774, y: 821.74634, z: -635.13635} + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 0, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 0 --- !u!1001 &997844618 PrefabInstance: m_ObjectHideFlags: 0 @@ -14186,7 +14304,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14196,17 +14314,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99501 + value: 225.10724 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 300 + value: 193.78067 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.367 + value: -440.2693 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14221,12 +14339,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14394,6 +14512,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1111750668} m_PrefabAsset: {fileID: 0} +--- !u!4 &1116056124 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 135020142} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1118176468 PrefabInstance: m_ObjectHideFlags: 0 @@ -14751,7 +14875,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14761,17 +14885,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99501 + value: 225.10724 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 300 + value: 193.78067 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -332.792 + value: -439.69427 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14786,12 +14910,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14944,7 +15068,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14954,17 +15078,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 124.00201 + value: 225.11423 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 305.14 + value: 198.92068 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.108 + value: -440.01028 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14979,12 +15103,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -15727,13 +15851,19 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 2132802821} +--- !u!4 &1220035125 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1630570323} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1225477207 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -15743,17 +15873,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99701 + value: 225.10922 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 302.769 + value: 196.54968 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -332.792 + value: -439.69427 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -15768,12 +15898,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21166,7 +21296,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21176,17 +21306,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 124.00201 + value: 225.11423 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 305.14 + value: 198.92068 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -332.8 + value: -439.70227 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21201,12 +21331,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21245,7 +21375,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21255,17 +21385,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 123.99701 + value: 225.10922 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 302.769 + value: 196.54968 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.1 + value: -440.0023 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21280,12 +21410,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -22488,7 +22618,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 964939832} m_Modifications: - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -22498,17 +22628,17 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 124.00201 + value: 225.11423 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.y - value: 305.14 + value: 198.92068 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.z - value: -333.375 + value: -440.27728 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -22523,12 +22653,12 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -23719,22 +23849,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -93.16517, y: -17.507889, z: -261.49307} - - {x: 173.06015, y: -17.507889, z: -261.49307} - - {x: 173.06015, y: -17.507889, z: 45.800194} - - {x: -93.16517, y: -17.507889, z: 45.800194} - - {x: -93.16517, y: -17.507889, z: -261.49307} - - {x: -93.16517, y: 406.70538, z: -261.49307} - - {x: 173.06015, y: 406.70538, z: -261.49307} - - {x: 173.06015, y: -17.507889, z: -261.49307} - - {x: 173.06015, y: 406.70538, z: -261.49307} - - {x: 173.06015, y: 406.70538, z: 45.800194} - - {x: 173.06015, y: -17.507889, z: 45.800194} - - {x: 173.06015, y: 406.70538, z: 45.800194} - - {x: -93.16517, y: 406.70538, z: 45.800194} - - {x: -93.16517, y: -17.507889, z: 45.800194} - - {x: -93.16517, y: 406.70538, z: 45.800194} - - {x: -93.16517, y: 406.70538, z: -261.49307} + - {x: -95.991974, y: -20.100876, z: -255.39917} + - {x: 192.91946, y: -20.100876, z: -255.39917} + - {x: 192.91946, y: -20.100876, z: 13.223732} + - {x: -95.991974, y: -20.100876, z: 13.223732} + - {x: -95.991974, y: -20.100876, z: -255.39917} + - {x: -95.991974, y: 443.76874, z: -255.39917} + - {x: 192.91946, y: 443.76874, z: -255.39917} + - {x: 192.91946, y: -20.100876, z: -255.39917} + - {x: 192.91946, y: 443.76874, z: -255.39917} + - {x: 192.91946, y: 443.76874, z: 13.223732} + - {x: 192.91946, y: -20.100876, z: 13.223732} + - {x: 192.91946, y: 443.76874, z: 13.223732} + - {x: -95.991974, y: 443.76874, z: 13.223732} + - {x: -95.991974, y: -20.100876, z: 13.223732} + - {x: -95.991974, y: 443.76874, z: 13.223732} + - {x: -95.991974, y: 443.76874, z: -255.39917} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -23994,6 +24124,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c26b1036545e1e478afe84464ba5588, type: 3} +--- !u!4 &1890802854 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 489043705} + m_PrefabAsset: {fileID: 0} --- !u!4 &1896885760 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6c3ca455471618548b92063d175ead45, @@ -24213,6 +24349,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1906330838} m_PrefabAsset: {fileID: 0} +--- !u!4 &1917545003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + m_PrefabInstance: {fileID: 1225477207} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1921581404 PrefabInstance: m_ObjectHideFlags: 0 @@ -24656,7 +24798,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.70043856, y: -0.02613758, z: 0.025706843, w: 0.7127705} + m_LocalRotation: {x: 0.70043856, y: -0.026137646, z: 0.025706908, w: 0.7127705} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -25287,7 +25429,7 @@ MonoBehaviour: m_CameraBlendMax: 15 m_CameraSwapMin: 30 m_CameraSwapMax: 45 - m_CameraController: 1 + m_CameraController: 0 m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2} m_BackgroundColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0} m_PoseCanvas: {fileID: 607314882} @@ -39030,18 +39172,10 @@ SceneRoots: - {fileID: 1517085324} - {fileID: 1853480535} - {fileID: 434856761} + - {fileID: 964939832} - {fileID: 709210745} - {fileID: 607314886} - {fileID: 951379159} - {fileID: 1080375957} - - {fileID: 489043705} - - {fileID: 1102867470} - - {fileID: 1135490460} - - {fileID: 1630570323} - - {fileID: 135020142} - - {fileID: 1225477207} - - {fileID: 1154209501} - - {fileID: 1771925926} - - {fileID: 1626698624} - {fileID: 699558210} - {fileID: 299259240} diff --git a/Assets/8_Scripts/1_Managers/AudioManager.cs b/Assets/8_Scripts/1_Managers/AudioManager.cs index 66172d0..d7a864f 100644 --- a/Assets/8_Scripts/1_Managers/AudioManager.cs +++ b/Assets/8_Scripts/1_Managers/AudioManager.cs @@ -54,4 +54,9 @@ public class AudioManager : MonoBehaviour soundInst.release(); soundInst.clearHandle(); } + + public void PlaySoundOnCameraSwitch() + { + Debug.Log("Halo"); + } } \ No newline at end of file diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index 309226f..24d1692 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -149,7 +149,7 @@ public class CameraManager : MonoBehaviour m_BrainPose.SetActive(false); m_Camera.cullingMask = m_Compare; m_PoseCanvas.SetActive(false); - m_Rewards.SetActive(true); + m_Rewards.SetActive(false); break; } @@ -200,6 +200,8 @@ public class CameraManager : MonoBehaviour private void SetCamera(GameObject camera) { + AudioManager.instance.PlaySoundOnCameraSwitch(); + SetCameraBlend(camera); // Set all camera to active, and set all priorities to 0, bar the first camera diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 9ade9f5..e4c3a51 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":128.685376,"total":133.54889559999998,"children":{"InitializeActuators":{"count":1,"self":0.000998,"total":0.000998,"children":null},"InitializeSensors":{"count":1,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":7555,"self":0.0454517,"total":1.0627085,"children":{"CollectObservations":{"count":3778,"self":0.9992595,"total":0.9992595,"children":null},"WriteActionMask":{"count":3778,"self":0.0075305999999999993,"total":0.0075305999999999993,"children":null},"RequestDecision":{"count":3778,"self":0.010466699999999999,"total":0.010466699999999999,"children":null}}},"DecideAction":{"count":7555,"self":1.6012932,"total":1.6012932,"children":null},"AgentAct":{"count":7555,"self":2.1965206,"total":2.1965206,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716820524","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 4bf14d4b-7c60-4da5-a8cb-0bf3a524e7b4 -accessToken yEUCxkm6udBRi80_eZgDO3eFwEjAjoJ7-cRY-ZImu30005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716820658"}} \ No newline at end of file +{"count":1,"self":58.697632,"total":60.362369599999994,"children":{"InitializeActuators":{"count":1,"self":0.0015018,"total":0.0015018,"children":null},"InitializeSensors":{"count":1,"self":0.0015048,"total":0.0015048,"children":null},"AgentSendState":{"count":3249,"self":0.014961799999999999,"total":0.49633649999999996,"children":{"CollectObservations":{"count":1625,"self":0.47284499999999996,"total":0.47284499999999996,"children":null},"WriteActionMask":{"count":1625,"self":0.0015105,"total":0.0015105,"children":null},"RequestDecision":{"count":1625,"self":0.0070192,"total":0.0070192,"children":null}}},"DecideAction":{"count":3249,"self":0.6905863,"total":0.6905863,"children":null},"AgentAct":{"count":3249,"self":0.4748074,"total":0.4748074,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716823230","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 4bf14d4b-7c60-4da5-a8cb-0bf3a524e7b4 -accessToken yEUCxkm6udBRi80_eZgDO3eFwEjAjoJ7-cRY-ZImu30005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716823290"}} \ No newline at end of file diff --git a/Assets/RotateCamera.cs b/Assets/RotateCamera.cs new file mode 100644 index 0000000..3ff6e1c --- /dev/null +++ b/Assets/RotateCamera.cs @@ -0,0 +1,26 @@ +using Cinemachine; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RotateCamera : MonoBehaviour +{ + // Start is called before the first frame update + + public CinemachineVirtualCamera m_VirtualCamera; + [SerializeField] + private float m_Rotation; + + public float m_RotationSpeed; + + // Update is called once per frame + void Update() + { + m_Rotation += Time.fixedDeltaTime * m_RotationSpeed; + + if (m_VirtualCamera != null) + { + m_VirtualCamera.GetCinemachineComponent().m_XAxis.Value = m_Rotation; + } + } +} diff --git a/Assets/RotateCamera.cs.meta b/Assets/RotateCamera.cs.meta new file mode 100644 index 0000000..54be4d3 --- /dev/null +++ b/Assets/RotateCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3a3f991da12316e4e846f3de3ebb62a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: