Upgrade to CM3, fix jitter
This commit is contained in:
Gregory Labute
Родитель
0935ae3c77
Коммит
9ad3e6617d
|
|
@ -1,84 +1,5 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1676734515771252290
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734515771252668}
|
||||
- component: {fileID: 1559510487834010612}
|
||||
m_Layer: 0
|
||||
m_Name: MiddleRig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734515771252668
|
||||
Transform:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734515771252290}
|
||||
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:
|
||||
- {fileID: 1676734516866984547}
|
||||
m_Father: {fileID: 1676734517288307197}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1559510487834010612
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734515771252290}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ExcludedPropertiesInInspector:
|
||||
- m_Script
|
||||
- Header
|
||||
- Extensions
|
||||
- m_Priority
|
||||
- m_Transitions
|
||||
- m_Follow
|
||||
- m_StandbyUpdate
|
||||
- m_Lens
|
||||
m_LockStageInInspector: 00000000
|
||||
m_StreamingVersion: 20170927
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
m_Follow: {fileID: 0}
|
||||
m_Lens:
|
||||
FieldOfView: 45
|
||||
OrthographicSize: 10
|
||||
NearClipPlane: 0.01
|
||||
FarClipPlane: 2000
|
||||
Dutch: 0
|
||||
ModeOverride: 0
|
||||
LensShift: {x: 0, y: 0}
|
||||
GateFit: 2
|
||||
FocusDistance: 10
|
||||
m_SensorSize: {x: 1, y: 1}
|
||||
m_Transitions:
|
||||
m_BlendHint: 0
|
||||
m_InheritPosition: 0
|
||||
m_OnCameraLive:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LegacyBlendHint: 0
|
||||
m_ComponentOwner: {fileID: 1676734516866984547}
|
||||
--- !u!1 &1676734516302391371
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -123,280 +44,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: e5eb80d8e62d9d145bb50fb783c0f731, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_PositionMode: 0
|
||||
m_RotationMode: 0
|
||||
m_UpdateMethod: 2
|
||||
m_Targets: []
|
||||
--- !u!1 &1676734516695783277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734516695783279}
|
||||
- component: {fileID: 2874321194989763460}
|
||||
m_Layer: 0
|
||||
m_Name: TopRig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734516695783279
|
||||
Transform:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516695783277}
|
||||
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:
|
||||
- {fileID: 1676734517587239784}
|
||||
m_Father: {fileID: 1676734517288307197}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2874321194989763460
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516695783277}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ExcludedPropertiesInInspector:
|
||||
- m_Script
|
||||
- Header
|
||||
- Extensions
|
||||
- m_Priority
|
||||
- m_Transitions
|
||||
- m_Follow
|
||||
- m_StandbyUpdate
|
||||
- m_Lens
|
||||
m_LockStageInInspector: 00000000
|
||||
m_StreamingVersion: 20170927
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
m_Follow: {fileID: 0}
|
||||
m_Lens:
|
||||
FieldOfView: 45
|
||||
OrthographicSize: 10
|
||||
NearClipPlane: 0.01
|
||||
FarClipPlane: 2000
|
||||
Dutch: 0
|
||||
ModeOverride: 0
|
||||
LensShift: {x: 0, y: 0}
|
||||
GateFit: 2
|
||||
FocusDistance: 10
|
||||
m_SensorSize: {x: 1, y: 1}
|
||||
m_Transitions:
|
||||
m_BlendHint: 0
|
||||
m_InheritPosition: 0
|
||||
m_OnCameraLive:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LegacyBlendHint: 0
|
||||
m_ComponentOwner: {fileID: 1676734517587239784}
|
||||
--- !u!1 &1676734516724634597
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734516724634599}
|
||||
- component: {fileID: 68858400247160939}
|
||||
m_Layer: 0
|
||||
m_Name: BottomRig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734516724634599
|
||||
Transform:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516724634597}
|
||||
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:
|
||||
- {fileID: 1676734517611811567}
|
||||
m_Father: {fileID: 1676734517288307197}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &68858400247160939
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516724634597}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ExcludedPropertiesInInspector:
|
||||
- m_Script
|
||||
- Header
|
||||
- Extensions
|
||||
- m_Priority
|
||||
- m_Transitions
|
||||
- m_Follow
|
||||
- m_StandbyUpdate
|
||||
- m_Lens
|
||||
m_LockStageInInspector: 00000000
|
||||
m_StreamingVersion: 20170927
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
m_Follow: {fileID: 0}
|
||||
m_Lens:
|
||||
FieldOfView: 45
|
||||
OrthographicSize: 10
|
||||
NearClipPlane: 0.01
|
||||
FarClipPlane: 2000
|
||||
Dutch: 0
|
||||
ModeOverride: 0
|
||||
LensShift: {x: 0, y: 0}
|
||||
GateFit: 2
|
||||
FocusDistance: 10
|
||||
m_SensorSize: {x: 1, y: 1}
|
||||
m_Transitions:
|
||||
m_BlendHint: 0
|
||||
m_InheritPosition: 0
|
||||
m_OnCameraLive:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LegacyBlendHint: 0
|
||||
m_ComponentOwner: {fileID: 1676734517611811567}
|
||||
--- !u!1 &1676734516866984546
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734516866984547}
|
||||
- component: {fileID: 1676734516866984542}
|
||||
- component: {fileID: 2042954464504670308}
|
||||
- component: {fileID: 6629134889958550407}
|
||||
m_Layer: 0
|
||||
m_Name: cm
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734516866984547
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516866984546}
|
||||
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: 1676734515771252668}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1676734516866984542
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516866984546}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &2042954464504670308
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516866984546}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_BindingMode: 5
|
||||
m_FollowOffset: {x: 0, y: 4, z: -9}
|
||||
m_XDamping: 1
|
||||
m_YDamping: 4
|
||||
m_ZDamping: 4
|
||||
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: 300
|
||||
m_AccelTime: 0.1
|
||||
m_DecelTime: 0.1
|
||||
m_InputAxisName:
|
||||
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: 1
|
||||
--- !u!114 &6629134889958550407
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734516866984546}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
PositionMode: 0
|
||||
RotationMode: 0
|
||||
UpdateMethod: 2
|
||||
Targets: []
|
||||
m_LegacyTargets: []
|
||||
--- !u!1 &1676734517288307075
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -406,7 +58,10 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734517288307197}
|
||||
- component: {fileID: 1676734517288307196}
|
||||
- component: {fileID: 3556993396688157473}
|
||||
- component: {fileID: 3344782713880715319}
|
||||
- component: {fileID: 6695765171019767151}
|
||||
- component: {fileID: 8120381116071039554}
|
||||
m_Layer: 0
|
||||
m_Name: CMFreeLook
|
||||
m_TagString: Untagged
|
||||
|
|
@ -426,13 +81,10 @@ Transform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1676734516695783279}
|
||||
- {fileID: 1676734515771252668}
|
||||
- {fileID: 1676734516724634599}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2966953081568086693}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1676734517288307196
|
||||
--- !u!114 &3556993396688157473
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -441,326 +93,139 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 1676734517288307075}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ExcludedPropertiesInInspector:
|
||||
- m_Script
|
||||
m_LockStageInInspector:
|
||||
m_StreamingVersion: 20170927
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
m_Follow: {fileID: 0}
|
||||
m_CommonLens: 1
|
||||
m_Lens:
|
||||
Priority:
|
||||
Enabled: 1
|
||||
m_Value: 10
|
||||
OutputChannel: 1
|
||||
StandbyUpdate: 2
|
||||
m_StreamingVersion: 20230301
|
||||
m_LegacyPriority: 0
|
||||
Target:
|
||||
TrackingTarget: {fileID: 0}
|
||||
LookAtTarget: {fileID: 0}
|
||||
CustomLookAtTarget: 0
|
||||
Lens:
|
||||
FieldOfView: 45
|
||||
OrthographicSize: 10
|
||||
NearClipPlane: 0.01
|
||||
FarClipPlane: 2000
|
||||
Dutch: 0
|
||||
ModeOverride: 0
|
||||
LensShift: {x: 0, y: 0}
|
||||
GateFit: 2
|
||||
FocusDistance: 10
|
||||
m_SensorSize: {x: 1, y: 1}
|
||||
m_Transitions:
|
||||
m_BlendHint: 0
|
||||
m_InheritPosition: 1
|
||||
m_OnCameraLive:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LegacyBlendHint: 0
|
||||
m_YAxis:
|
||||
PhysicalProperties:
|
||||
GateFit: 2
|
||||
SensorSize: {x: 1, y: 1}
|
||||
LensShift: {x: 0, y: 0}
|
||||
FocusDistance: 10
|
||||
Iso: 200
|
||||
ShutterSpeed: 0.005
|
||||
Aperture: 16
|
||||
BladeCount: 5
|
||||
Curvature: {x: 2, y: 11}
|
||||
BarrelClipping: 0.25
|
||||
Anamorphism: 0
|
||||
BlendHint: 0
|
||||
--- !u!114 &3344782713880715319
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517288307075}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
TargetOffset: {x: 0, y: 0, z: 0}
|
||||
TrackerSettings:
|
||||
BindingMode: 5
|
||||
PositionDamping: {x: 1, y: 4, z: 4}
|
||||
AngularDampingMode: 0
|
||||
RotationDamping: {x: 0, y: 0, z: 0}
|
||||
QuaternionDamping: 0
|
||||
OrbitStyle: 1
|
||||
Radius: 9
|
||||
Orbits:
|
||||
Top:
|
||||
Radius: 5
|
||||
Height: 10
|
||||
Center:
|
||||
Radius: 9
|
||||
Height: 4
|
||||
Bottom:
|
||||
Radius: 3
|
||||
Height: 1
|
||||
SplineCurvature: 1
|
||||
RecenteringTarget: 2
|
||||
HorizontalAxis:
|
||||
Value: 1
|
||||
Center: 0
|
||||
Range: {x: -180, y: 180}
|
||||
Wrap: 1
|
||||
Recentering:
|
||||
Enabled: 0
|
||||
Wait: 1
|
||||
Time: 2
|
||||
Restrictions: 0
|
||||
VerticalAxis:
|
||||
Value: 0.5
|
||||
m_SpeedMode: 0
|
||||
m_MaxSpeed: 30
|
||||
m_AccelTime: 0.5
|
||||
m_DecelTime: 0.1
|
||||
m_InputAxisName:
|
||||
m_InputAxisValue: 0
|
||||
m_InvertInput: 0
|
||||
m_MinValue: 0
|
||||
m_MaxValue: 1
|
||||
m_Wrap: 0
|
||||
m_Recentering:
|
||||
m_enabled: 0
|
||||
m_WaitTime: 1
|
||||
m_RecenteringTime: 2
|
||||
m_LegacyHeadingDefinition: -1
|
||||
m_LegacyVelocityFilterStrength: -1
|
||||
m_YAxisRecentering:
|
||||
m_enabled: 1
|
||||
m_WaitTime: 3
|
||||
m_RecenteringTime: 5
|
||||
m_LegacyHeadingDefinition: -1
|
||||
m_LegacyVelocityFilterStrength: -1
|
||||
m_XAxis:
|
||||
Value: 0
|
||||
m_SpeedMode: 0
|
||||
m_MaxSpeed: 5000
|
||||
m_AccelTime: 0.5
|
||||
m_DecelTime: 0.1
|
||||
m_InputAxisName:
|
||||
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_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_BindingMode: 5
|
||||
m_SplineCurvature: 1
|
||||
m_Orbits:
|
||||
- m_Height: 10
|
||||
m_Radius: 5
|
||||
- m_Height: 4
|
||||
m_Radius: 9
|
||||
- m_Height: 1
|
||||
m_Radius: 3
|
||||
m_LegacyHeadingBias: 3.4028235e+38
|
||||
m_Rigs:
|
||||
- {fileID: 2874321194989763460}
|
||||
- {fileID: 1559510487834010612}
|
||||
- {fileID: 68858400247160939}
|
||||
--- !u!1 &1676734517587239791
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734517587239784}
|
||||
- component: {fileID: 1676734517587239787}
|
||||
- component: {fileID: 1131617940854451013}
|
||||
- component: {fileID: 3481508363755925884}
|
||||
m_Layer: 0
|
||||
m_Name: cm
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734517587239784
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517587239791}
|
||||
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: 1676734516695783279}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1676734517587239787
|
||||
Center: 0.5
|
||||
Range: {x: 0, y: 1}
|
||||
Wrap: 0
|
||||
Recentering:
|
||||
Enabled: 1
|
||||
Wait: 3
|
||||
Time: 5
|
||||
Restrictions: 0
|
||||
RadialAxis:
|
||||
Value: 1
|
||||
Center: 1
|
||||
Range: {x: 1, y: 1}
|
||||
Wrap: 0
|
||||
Recentering:
|
||||
Enabled: 0
|
||||
Wait: 1
|
||||
Time: 2
|
||||
Restrictions: 0
|
||||
--- !u!114 &6695765171019767151
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517587239791}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1131617940854451013
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517587239791}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_BindingMode: 5
|
||||
m_FollowOffset: {x: 0, y: 4, z: -9}
|
||||
m_XDamping: 1
|
||||
m_YDamping: 3
|
||||
m_ZDamping: 3
|
||||
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: 300
|
||||
m_AccelTime: 0.1
|
||||
m_DecelTime: 0.1
|
||||
m_InputAxisName:
|
||||
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: 1
|
||||
--- !u!114 &3481508363755925884
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517587239791}
|
||||
m_GameObject: {fileID: 1676734517288307075}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1676734517611811566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1676734517611811567}
|
||||
- component: {fileID: 1676734517611811562}
|
||||
- component: {fileID: 472597200199413603}
|
||||
- component: {fileID: 7672280707994031227}
|
||||
m_Layer: 0
|
||||
m_Name: cm
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1676734517611811567
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517611811566}
|
||||
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: 1676734516724634599}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1676734517611811562
|
||||
LookAtOffset: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8120381116071039554
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517611811566}
|
||||
m_GameObject: {fileID: 1676734517288307075}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &472597200199413603
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517611811566}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_BindingMode: 5
|
||||
m_FollowOffset: {x: 0, y: 4, z: -9}
|
||||
m_XDamping: 1
|
||||
m_YDamping: 5
|
||||
m_ZDamping: 5
|
||||
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: 300
|
||||
m_AccelTime: 0.1
|
||||
m_DecelTime: 0.1
|
||||
m_InputAxisName:
|
||||
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: 1
|
||||
--- !u!114 &7672280707994031227
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1676734517611811566}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: a076c17fe76165e4f8ed21498b877bf9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Modifiers:
|
||||
- rid: 1518115041925136460
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 1518115041925136460
|
||||
type: {class: CinemachineFreeLookModifier/PositionDampingModifier, ns: Unity.Cinemachine, asm: Unity.Cinemachine}
|
||||
data:
|
||||
Damping:
|
||||
Top: {x: 1, y: 3, z: 3}
|
||||
Bottom: {x: 1, y: 5, z: 5}
|
||||
--- !u!1 &2167489802469618434
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -195,6 +195,10 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1676734517288307075, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CMFreeLook
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2167489802469618434, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CMCameraPrefab
|
||||
|
|
@ -239,20 +243,65 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
- target: {fileID: 8105522526621377643, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: m_ControllerManager.Controllers.Array.data[0].Owner
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8105522526621377643, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: m_ControllerManager.Controllers.Array.data[1].Owner
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8105522526621377643, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: m_ControllerManager.Controllers.Array.data[2].Owner
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: 'Modifiers.Array.data[0]'
|
||||
value: 1518115041925136459
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: 'managedReferences[1518115041925136459]'
|
||||
value: Unity.Cinemachine Unity.Cinemachine.CinemachineFreeLookModifier/PositionDampingModifier
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Top.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Top.y
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Top.z
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Bottom.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Bottom.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8120381116071039554, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
propertyPath: managedReferences[1518115041925136459].Damping.Bottom.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 1676734517288307196, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
--- !u!114 &51944850 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1676734517288307196, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
m_CorrespondingSourceObject: {fileID: 3556993396688157473, guid: 0193228de87741d40a42e561901c9083, type: 3}
|
||||
m_PrefabInstance: {fileID: 51944849}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &373304902
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
using System.Collections;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem;
|
||||
using Cinemachine;
|
||||
using Unity.Cinemachine;
|
||||
using Unity.Multiplayer.Samples.SocialHub.Player;
|
||||
using Unity.Netcode;
|
||||
|
||||
public class CameraControl : MonoBehaviour
|
||||
{
|
||||
public Camera mainCamera;
|
||||
public CinemachineFreeLook freeLookVCam;
|
||||
public CinemachineCamera freeLookVCam;
|
||||
|
||||
public float _speedMultiplier = 1.0f; // Speed multiplier for camera movement
|
||||
|
||||
private AvatarActions playerInputActions;
|
||||
private AvatarTransform avatarTransform; // This will be assigned at runtime
|
||||
private float distance;
|
||||
private bool _cameraMovementLock = false;
|
||||
private bool _isRMBPressed = false;
|
||||
|
||||
private CinemachineOrbitalFollow _orbitalFollow;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
playerInputActions = new AvatarActions();
|
||||
|
|
@ -26,10 +27,8 @@ public class CameraControl : MonoBehaviour
|
|||
playerInputActions.Player.Rotate.canceled += OnRotateCanceled;
|
||||
playerInputActions.Player.Look.performed += OnLookPerformed;
|
||||
|
||||
if (mainCamera == null)
|
||||
{
|
||||
mainCamera = Camera.main;
|
||||
}
|
||||
// Grab CM's orbital follow because we will be driving its axes directly
|
||||
_orbitalFollow = freeLookVCam.GetComponent<CinemachineOrbitalFollow>();
|
||||
|
||||
// Register the client connected callback
|
||||
if (NetworkManager.Singleton != null)
|
||||
|
|
@ -74,9 +73,6 @@ public class CameraControl : MonoBehaviour
|
|||
avatarTransform = avatar.GetComponent<AvatarTransform>();
|
||||
if (avatarTransform != null)
|
||||
{
|
||||
// Calculate the initial distance based on the avatar's position
|
||||
distance = Vector3.Distance(mainCamera.transform.position, avatarTransform.transform.position);
|
||||
UpdateCameraPosition(); // Update camera position to look at the new avatar
|
||||
SetupProtagonistVirtualCamera(); // Setup the virtual camera
|
||||
|
||||
// Unregister the avatar spawned callback to avoid redundancy
|
||||
|
|
@ -119,10 +115,6 @@ public class CameraControl : MonoBehaviour
|
|||
_isRMBPressed = false;
|
||||
Cursor.lockState = CursorLockMode.None;
|
||||
Cursor.visible = true;
|
||||
|
||||
// Clear input values
|
||||
freeLookVCam.m_XAxis.m_InputAxisValue = 0;
|
||||
freeLookVCam.m_YAxis.m_InputAxisValue = 0;
|
||||
}
|
||||
|
||||
private IEnumerator DisableMouseControlForFrame()
|
||||
|
|
@ -143,29 +135,17 @@ public class CameraControl : MonoBehaviour
|
|||
if (isDeviceMouse && !_isRMBPressed)
|
||||
return;
|
||||
|
||||
// Drive the camera's orbit position based on user input
|
||||
float deviceMultiplier = isDeviceMouse ? 0.02f : Time.deltaTime;
|
||||
|
||||
freeLookVCam.m_XAxis.m_InputAxisValue = cameraMovement.x * deviceMultiplier * _speedMultiplier;
|
||||
freeLookVCam.m_YAxis.m_InputAxisValue = cameraMovement.y * deviceMultiplier * _speedMultiplier;
|
||||
_orbitalFollow.HorizontalAxis.Value += cameraMovement.x * deviceMultiplier * _speedMultiplier;
|
||||
_orbitalFollow.VerticalAxis.Value += cameraMovement.y * deviceMultiplier * _speedMultiplier * 0.01f; // Y axis units are much smaller
|
||||
}
|
||||
|
||||
public void SetupProtagonistVirtualCamera()
|
||||
{
|
||||
Transform target = avatarTransform.transform;
|
||||
freeLookVCam.Follow = target;
|
||||
freeLookVCam.LookAt = target;
|
||||
freeLookVCam.OnTargetObjectWarped(target, target.position - freeLookVCam.transform.position);
|
||||
}
|
||||
|
||||
private void UpdateCameraPosition()
|
||||
{
|
||||
if (avatarTransform == null) return;
|
||||
|
||||
Vector3 direction = mainCamera.transform.position - avatarTransform.transform.position;
|
||||
direction.Normalize(); // Normalize the direction vector to ensure proper positioning
|
||||
|
||||
mainCamera.transform.position = avatarTransform.transform.position - direction * distance;
|
||||
mainCamera.transform.LookAt(avatarTransform.transform); // Ensure the camera looks at the avatar
|
||||
Transform target = avatarTransform.transform;
|
||||
freeLookVCam.Follow = target;
|
||||
CinemachineCore.ResetCameraState(); // snap to new position
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"dependencies": {
|
||||
"com.unity.ai.navigation": "2.0.0",
|
||||
"com.unity.animation.rigging": "1.3.0",
|
||||
"com.unity.cinemachine": "2.10.1",
|
||||
"com.unity.cinemachine": "3.1.1",
|
||||
"com.unity.collab-proxy": "2.4.4",
|
||||
"com.unity.ide.rider": "3.0.31",
|
||||
"com.unity.ide.visualstudio": "2.0.22",
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.cinemachine": {
|
||||
"version": "2.10.1",
|
||||
"version": "3.1.1",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.31"
|
||||
"com.unity.splines": "2.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -51,8 +51,8 @@
|
|||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.burst": "1.8.13",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.test-framework": "1.4.3",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.test-framework.performance": "3.0.3"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
@ -112,13 +112,13 @@
|
|||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.profiling.core": "1.0.0-pre.1",
|
||||
"com.unity.nuget.newtonsoft-json": "2.0.0",
|
||||
"com.unity.nuget.mono-cecil": "1.10.1",
|
||||
"com.unity.collections": "1.1.0",
|
||||
"com.unity.modules.uielements": "1.0.0",
|
||||
"com.unity.burst": "1.6.6",
|
||||
"com.unity.mathematics": "1.2.6"
|
||||
"com.unity.collections": "1.1.0",
|
||||
"com.unity.mathematics": "1.2.6",
|
||||
"com.unity.profiling.core": "1.0.0-pre.1",
|
||||
"com.unity.nuget.mono-cecil": "1.10.1",
|
||||
"com.unity.modules.uielements": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "2.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -127,8 +127,8 @@
|
|||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.transport": "2.3.0"
|
||||
"com.unity.transport": "2.3.0",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -208,10 +208,10 @@
|
|||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||
"com.unity.ugui": "1.0.0",
|
||||
"com.unity.services.core": "1.13.0",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.ugui": "1.0.0"
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -220,9 +220,9 @@
|
|||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.modules.androidjni": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||
"com.unity.modules.androidjni": "1.0.0"
|
||||
"com.unity.modules.unitywebrequest": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -231,8 +231,8 @@
|
|||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.services.deployment.api": "1.0.0",
|
||||
"com.unity.services.core": "1.12.0"
|
||||
"com.unity.services.core": "1.12.0",
|
||||
"com.unity.services.deployment.api": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -248,15 +248,15 @@
|
|||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||
"com.unity.services.authentication": "3.3.3",
|
||||
"com.unity.services.core": "1.13.0",
|
||||
"com.unity.services.qos": "1.3.0",
|
||||
"com.unity.services.wire": "1.2.6",
|
||||
"com.unity.transport": "2.2.1",
|
||||
"com.unity.collections": "2.2.1",
|
||||
"com.unity.services.deployment": "1.3.0"
|
||||
"com.unity.services.qos": "1.3.0",
|
||||
"com.unity.services.core": "1.13.0",
|
||||
"com.unity.services.wire": "1.2.6",
|
||||
"com.unity.services.deployment": "1.3.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.services.authentication": "3.3.3"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -265,11 +265,11 @@
|
|||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.collections": "1.2.4",
|
||||
"com.unity.services.core": "1.12.4",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.0.2",
|
||||
"com.unity.services.authentication": "2.0.0",
|
||||
"com.unity.collections": "1.2.4"
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.services.authentication": "2.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -278,10 +278,10 @@
|
|||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.settings-manager": "1.0.3",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.services.core": "1.12.5",
|
||||
"com.unity.nuget.newtonsoft-json": "3.0.2",
|
||||
"com.unity.modules.audio": "1.0.0"
|
||||
"com.unity.settings-manager": "1.0.3",
|
||||
"com.unity.nuget.newtonsoft-json": "3.0.2"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -312,6 +312,17 @@
|
|||
"com.unity.searcher": "4.9.2"
|
||||
}
|
||||
},
|
||||
"com.unity.splines": {
|
||||
"version": "2.6.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.ugui": "1.0.0",
|
||||
"com.unity.mathematics": "1.2.1",
|
||||
"com.unity.settings-manager": "1.0.3"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.test-framework": {
|
||||
"version": "1.4.4",
|
||||
"depth": 0,
|
||||
|
|
@ -338,9 +349,9 @@
|
|||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.director": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
@ -350,8 +361,8 @@
|
|||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.collections": "2.2.1",
|
||||
"com.unity.burst": "1.8.12",
|
||||
"com.unity.collections": "2.2.1",
|
||||
"com.unity.mathematics": "1.3.1"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче