Merge branch 'mark-staging'
This commit is contained in:
commit
debb125d22
29 changed files with 7166 additions and 247 deletions
42
Game/Assets/Materials/Lit Variant.mat
Normal file
42
Game/Assets/Materials/Lit Variant.mat
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-3853035757935948902
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 7
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Lit Variant
|
||||||
|
m_Shader: {fileID: 4800000, guid: 69c1f799e772cb6438f56c23efccb782, type: 3}
|
||||||
|
m_Parent: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs: []
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats: []
|
||||||
|
m_Colors: []
|
||||||
|
m_BuildTextureStacks: []
|
8
Game/Assets/Materials/Lit Variant.mat.meta
Normal file
8
Game/Assets/Materials/Lit Variant.mat.meta
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9869168e8f2a4764ba7342964579c688
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
42
Game/Assets/Materials/PlaygroundKnowerMaterial.mat
Normal file
42
Game/Assets/Materials/PlaygroundKnowerMaterial.mat
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: PlaygroundKnowerMaterial
|
||||||
|
m_Shader: {fileID: 4800000, guid: e8b802ac01d87144b91f12f40c1f2659, type: 3}
|
||||||
|
m_Parent: {fileID: 2100000, guid: 9875a245ac49007498213638a307faa1, type: 2}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs: []
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats: []
|
||||||
|
m_Colors: []
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &1791783754322564823
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 7
|
8
Game/Assets/Materials/PlaygroundKnowerMaterial.mat.meta
Normal file
8
Game/Assets/Materials/PlaygroundKnowerMaterial.mat.meta
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1c0ceddebdcaaeb44a2b62ed7c081888
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
1918
Game/Assets/Prefabs/Chest and Drawer Interactable.prefab
Normal file
1918
Game/Assets/Prefabs/Chest and Drawer Interactable.prefab
Normal file
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2052c55ff54ac834f86e6bf8ec94d3c2
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
2073
Game/Assets/Prefabs/Drawer (Moving).prefab
Normal file
2073
Game/Assets/Prefabs/Drawer (Moving).prefab
Normal file
File diff suppressed because it is too large
Load diff
7
Game/Assets/Prefabs/Drawer (Moving).prefab.meta
Normal file
7
Game/Assets/Prefabs/Drawer (Moving).prefab.meta
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d6d1294f3d7f3b4438d5aa264b3eb4db
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,378 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &2241004988363710587
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 9062581398314777105}
|
||||||
|
- component: {fileID: 6622534912770032937}
|
||||||
|
- component: {fileID: 185535121731533047}
|
||||||
|
- component: {fileID: 4570066915066746684}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: Handle Surface
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &9062581398314777105
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2241004988363710587}
|
||||||
|
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: 7548123659046493114}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!54 &6622534912770032937
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2241004988363710587}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||||
|
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||||
|
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ImplicitCom: 1
|
||||||
|
m_ImplicitTensor: 1
|
||||||
|
m_UseGravity: 1
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!114 &185535121731533047
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2241004988363710587}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_InteractionManager: {fileID: 0}
|
||||||
|
m_Colliders: []
|
||||||
|
m_InteractionLayers:
|
||||||
|
m_Bits: 1
|
||||||
|
m_DistanceCalculationMode: 1
|
||||||
|
m_SelectMode: 0
|
||||||
|
m_FocusMode: 1
|
||||||
|
m_CustomReticle: {fileID: 0}
|
||||||
|
m_AllowGazeInteraction: 0
|
||||||
|
m_AllowGazeSelect: 0
|
||||||
|
m_OverrideGazeTimeToSelect: 0
|
||||||
|
m_GazeTimeToSelect: 0.5
|
||||||
|
m_OverrideTimeToAutoDeselectGaze: 0
|
||||||
|
m_TimeToAutoDeselectGaze: 3
|
||||||
|
m_AllowGazeAssistance: 0
|
||||||
|
m_FirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FirstSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FirstFocusEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastFocusExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FocusEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FocusExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Activated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Deactivated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_StartingHoverFilters: []
|
||||||
|
m_StartingSelectFilters: []
|
||||||
|
m_StartingInteractionStrengthFilters: []
|
||||||
|
m_AttachTransform: {fileID: 0}
|
||||||
|
m_SecondaryAttachTransform: {fileID: 0}
|
||||||
|
m_UseDynamicAttach: 0
|
||||||
|
m_MatchAttachPosition: 1
|
||||||
|
m_MatchAttachRotation: 1
|
||||||
|
m_SnapToColliderVolume: 1
|
||||||
|
m_ReinitializeDynamicAttachEverySingleGrab: 1
|
||||||
|
m_AttachEaseInTime: 0.15
|
||||||
|
m_MovementType: 0
|
||||||
|
m_VelocityDamping: 1
|
||||||
|
m_VelocityScale: 0.5
|
||||||
|
m_AngularVelocityDamping: 1
|
||||||
|
m_AngularVelocityScale: 1
|
||||||
|
m_TrackPosition: 1
|
||||||
|
m_SmoothPosition: 0
|
||||||
|
m_SmoothPositionAmount: 8
|
||||||
|
m_TightenPosition: 0.1
|
||||||
|
m_TrackRotation: 1
|
||||||
|
m_SmoothRotation: 0
|
||||||
|
m_SmoothRotationAmount: 8
|
||||||
|
m_TightenRotation: 0.1
|
||||||
|
m_TrackScale: 1
|
||||||
|
m_SmoothScale: 0
|
||||||
|
m_SmoothScaleAmount: 8
|
||||||
|
m_TightenScale: 0.1
|
||||||
|
m_ThrowOnDetach: 1
|
||||||
|
m_ThrowSmoothingDuration: 0.25
|
||||||
|
m_ThrowSmoothingCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
m_ThrowVelocityScale: 1.5
|
||||||
|
m_ThrowAngularVelocityScale: 1
|
||||||
|
m_ForceGravityOnDetach: 0
|
||||||
|
m_RetainTransformParent: 1
|
||||||
|
m_StartingSingleGrabTransformers: []
|
||||||
|
m_StartingMultipleGrabTransformers: []
|
||||||
|
m_AddDefaultGrabTransformers: 1
|
||||||
|
m_FarAttachMode: 0
|
||||||
|
--- !u!138 &4570066915066746684
|
||||||
|
FixedJoint:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2241004988363710587}
|
||||||
|
m_ConnectedBody: {fileID: 3082934515490353905}
|
||||||
|
m_ConnectedArticulationBody: {fileID: 0}
|
||||||
|
m_BreakForce: Infinity
|
||||||
|
m_BreakTorque: Infinity
|
||||||
|
m_EnableCollision: 0
|
||||||
|
m_EnablePreprocessing: 1
|
||||||
|
m_MassScale: 1
|
||||||
|
m_ConnectedMassScale: 1
|
||||||
|
--- !u!1 &2785014689676826087
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7548123659046493114}
|
||||||
|
- component: {fileID: 9107066153244540908}
|
||||||
|
- component: {fileID: 3082934515490353905}
|
||||||
|
- component: {fileID: 1033763107808798454}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: Drawer Interactable (Dynamic Component)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &7548123659046493114
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2785014689676826087}
|
||||||
|
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: 9062581398314777105}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &9107066153244540908
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2785014689676826087}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: da315c3f1e28be241badd4ee9c4b6e76, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
movementAxis: 1
|
||||||
|
maxMovementDistance: 0.5
|
||||||
|
--- !u!54 &3082934515490353905
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2785014689676826087}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||||
|
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||||
|
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ImplicitCom: 1
|
||||||
|
m_ImplicitTensor: 1
|
||||||
|
m_UseGravity: 0
|
||||||
|
m_IsKinematic: 1
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!153 &1033763107808798454
|
||||||
|
ConfigurableJoint:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2785014689676826087}
|
||||||
|
m_ConnectedBody: {fileID: 0}
|
||||||
|
m_ConnectedArticulationBody: {fileID: 0}
|
||||||
|
m_Anchor: {x: 0, y: -0.25, z: 0}
|
||||||
|
m_Axis: {x: 1, y: 0, z: 0}
|
||||||
|
m_AutoConfigureConnectedAnchor: 1
|
||||||
|
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||||
|
serializedVersion: 3
|
||||||
|
m_SecondaryAxis: {x: 0, y: 1, z: 0}
|
||||||
|
m_XMotion: 2
|
||||||
|
m_YMotion: 2
|
||||||
|
m_ZMotion: 2
|
||||||
|
m_AngularXMotion: 2
|
||||||
|
m_AngularYMotion: 2
|
||||||
|
m_AngularZMotion: 2
|
||||||
|
m_LinearLimitSpring:
|
||||||
|
spring: 0
|
||||||
|
damper: 0
|
||||||
|
m_LinearLimit:
|
||||||
|
limit: 0
|
||||||
|
bounciness: 0
|
||||||
|
contactDistance: 0
|
||||||
|
m_AngularXLimitSpring:
|
||||||
|
spring: 0
|
||||||
|
damper: 0
|
||||||
|
m_LowAngularXLimit:
|
||||||
|
limit: 0
|
||||||
|
bounciness: 0
|
||||||
|
contactDistance: 0
|
||||||
|
m_HighAngularXLimit:
|
||||||
|
limit: 0
|
||||||
|
bounciness: 0
|
||||||
|
contactDistance: 0
|
||||||
|
m_AngularYZLimitSpring:
|
||||||
|
spring: 0
|
||||||
|
damper: 0
|
||||||
|
m_AngularYLimit:
|
||||||
|
limit: 0
|
||||||
|
bounciness: 0
|
||||||
|
contactDistance: 0
|
||||||
|
m_AngularZLimit:
|
||||||
|
limit: 0
|
||||||
|
bounciness: 0
|
||||||
|
contactDistance: 0
|
||||||
|
m_TargetPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_TargetVelocity: {x: 0, y: 0, z: 0}
|
||||||
|
m_XDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_YDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_ZDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_TargetRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_TargetAngularVelocity: {x: 0, y: 0, z: 0}
|
||||||
|
m_RotationDriveMode: 0
|
||||||
|
m_AngularXDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_AngularYZDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_SlerpDrive:
|
||||||
|
serializedVersion: 4
|
||||||
|
positionSpring: 0
|
||||||
|
positionDamper: 0
|
||||||
|
maximumForce: 3.4028233e+38
|
||||||
|
useAcceleration: 0
|
||||||
|
m_ProjectionMode: 0
|
||||||
|
m_ProjectionDistance: 0.1
|
||||||
|
m_ProjectionAngle: 180
|
||||||
|
m_ConfiguredInWorldSpace: 0
|
||||||
|
m_SwapBodies: 0
|
||||||
|
m_BreakForce: Infinity
|
||||||
|
m_BreakTorque: Infinity
|
||||||
|
m_EnableCollision: 0
|
||||||
|
m_EnablePreprocessing: 1
|
||||||
|
m_MassScale: 1
|
||||||
|
m_ConnectedMassScale: 1
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b4c150a76357ddf4c8164a72e74104ec
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -101,7 +101,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 4
|
m_NumAlphaKeys: 4
|
||||||
m_CustomizeExpandLineDrawPercent: 1
|
m_CustomizeExpandLineDrawPercent: 1
|
||||||
|
@ -141,7 +140,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 3
|
m_NumColorKeys: 3
|
||||||
m_NumAlphaKeys: 4
|
m_NumAlphaKeys: 4
|
||||||
m_CustomizeExpandLineDrawPercent: 1
|
m_CustomizeExpandLineDrawPercent: 1
|
||||||
|
@ -181,7 +179,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 3
|
m_NumColorKeys: 3
|
||||||
m_NumAlphaKeys: 5
|
m_NumAlphaKeys: 5
|
||||||
m_CustomizeExpandLineDrawPercent: 1
|
m_CustomizeExpandLineDrawPercent: 1
|
||||||
|
@ -221,7 +218,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 3
|
m_NumColorKeys: 3
|
||||||
m_NumAlphaKeys: 5
|
m_NumAlphaKeys: 5
|
||||||
m_CustomizeExpandLineDrawPercent: 1
|
m_CustomizeExpandLineDrawPercent: 1
|
||||||
|
@ -261,7 +257,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 3
|
m_NumColorKeys: 3
|
||||||
m_NumAlphaKeys: 4
|
m_NumAlphaKeys: 4
|
||||||
m_CustomizeExpandLineDrawPercent: 1
|
m_CustomizeExpandLineDrawPercent: 1
|
||||||
|
@ -272,7 +267,6 @@ MonoBehaviour:
|
||||||
m_EmptyHitMaterial: {fileID: 0}
|
m_EmptyHitMaterial: {fileID: 0}
|
||||||
--- !u!120 &3053154067257784704
|
--- !u!120 &3053154067257784704
|
||||||
LineRenderer:
|
LineRenderer:
|
||||||
serializedVersion: 2
|
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
@ -358,20 +352,16 @@ LineRenderer:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
numCornerVertices: 8
|
numCornerVertices: 8
|
||||||
numCapVertices: 8
|
numCapVertices: 8
|
||||||
alignment: 0
|
alignment: 0
|
||||||
textureMode: 0
|
textureMode: 0
|
||||||
textureScale: {x: 1, y: 1}
|
|
||||||
shadowBias: 0.5
|
shadowBias: 0.5
|
||||||
generateLightingData: 0
|
generateLightingData: 0
|
||||||
m_MaskInteraction: 0
|
|
||||||
m_UseWorldSpace: 1
|
m_UseWorldSpace: 1
|
||||||
m_Loop: 0
|
m_Loop: 0
|
||||||
m_ApplyActiveColorSpace: 0
|
|
||||||
--- !u!210 &6278253758758756215
|
--- !u!210 &6278253758758756215
|
||||||
SortingGroup:
|
SortingGroup:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -383,7 +373,6 @@ SortingGroup:
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 30005
|
m_SortingOrder: 30005
|
||||||
m_SortAtRoot: 0
|
|
||||||
--- !u!1 &4804964734930210078
|
--- !u!1 &4804964734930210078
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -483,7 +472,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_ActivateInput:
|
m_ActivateInput:
|
||||||
|
@ -513,7 +501,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_SelectActionTrigger: 1
|
m_SelectActionTrigger: 1
|
||||||
|
@ -596,7 +583,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_UIScrollInput:
|
m_UIScrollInput:
|
||||||
|
|
|
@ -98,7 +98,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_ActivateInput:
|
m_ActivateInput:
|
||||||
|
@ -128,7 +127,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_SelectActionTrigger: 1
|
m_SelectActionTrigger: 1
|
||||||
|
@ -240,7 +238,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_UIScrollInput:
|
m_UIScrollInput:
|
||||||
|
@ -326,7 +323,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_ScaleOverTimeInput:
|
m_ScaleOverTimeInput:
|
||||||
|
@ -359,7 +355,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
--- !u!120 &7693184380767619946
|
--- !u!120 &7693184380767619946
|
||||||
LineRenderer:
|
LineRenderer:
|
||||||
serializedVersion: 2
|
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
@ -454,20 +449,16 @@ LineRenderer:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
numCornerVertices: 4
|
numCornerVertices: 4
|
||||||
numCapVertices: 4
|
numCapVertices: 4
|
||||||
alignment: 0
|
alignment: 0
|
||||||
textureMode: 0
|
textureMode: 0
|
||||||
textureScale: {x: 1, y: 1}
|
|
||||||
shadowBias: 0
|
shadowBias: 0
|
||||||
generateLightingData: 0
|
generateLightingData: 0
|
||||||
m_MaskInteraction: 0
|
|
||||||
m_UseWorldSpace: 1
|
m_UseWorldSpace: 1
|
||||||
m_Loop: 0
|
m_Loop: 0
|
||||||
m_ApplyActiveColorSpace: 0
|
|
||||||
--- !u!114 &4924506573850889901
|
--- !u!114 &4924506573850889901
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -540,7 +531,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_InvalidColorGradient:
|
m_InvalidColorGradient:
|
||||||
|
@ -570,7 +560,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_BlockedColorGradient:
|
m_BlockedColorGradient:
|
||||||
|
@ -600,7 +589,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_TreatSelectionAsValidState: 1
|
m_TreatSelectionAsValidState: 1
|
||||||
|
@ -627,7 +615,6 @@ SortingGroup:
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 30005
|
m_SortingOrder: 30005
|
||||||
m_SortAtRoot: 0
|
|
||||||
--- !u!114 &5800936643595229357
|
--- !u!114 &5800936643595229357
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -5,7 +5,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 2442306273320644280, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
- target: {fileID: 2442306273320644280, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||||
|
@ -89,7 +88,4 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||||
|
|
|
@ -98,7 +98,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_ActivateInput:
|
m_ActivateInput:
|
||||||
|
@ -128,7 +127,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_SelectActionTrigger: 0
|
m_SelectActionTrigger: 0
|
||||||
|
@ -240,7 +238,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_UIScrollInput:
|
m_UIScrollInput:
|
||||||
|
@ -326,7 +323,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_ScaleOverTimeInput:
|
m_ScaleOverTimeInput:
|
||||||
|
@ -359,7 +355,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
--- !u!120 &2761784063978902504
|
--- !u!120 &2761784063978902504
|
||||||
LineRenderer:
|
LineRenderer:
|
||||||
serializedVersion: 2
|
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
@ -454,20 +449,16 @@ LineRenderer:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
numCornerVertices: 0
|
numCornerVertices: 0
|
||||||
numCapVertices: 0
|
numCapVertices: 0
|
||||||
alignment: 0
|
alignment: 0
|
||||||
textureMode: 0
|
textureMode: 0
|
||||||
textureScale: {x: 1, y: 1}
|
|
||||||
shadowBias: 0.5
|
shadowBias: 0.5
|
||||||
generateLightingData: 0
|
generateLightingData: 0
|
||||||
m_MaskInteraction: 0
|
|
||||||
m_UseWorldSpace: 1
|
m_UseWorldSpace: 1
|
||||||
m_Loop: 0
|
m_Loop: 0
|
||||||
m_ApplyActiveColorSpace: 0
|
|
||||||
--- !u!114 &2761784063978902505
|
--- !u!114 &2761784063978902505
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -540,7 +531,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_InvalidColorGradient:
|
m_InvalidColorGradient:
|
||||||
|
@ -570,7 +560,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_BlockedColorGradient:
|
m_BlockedColorGradient:
|
||||||
|
@ -600,7 +589,6 @@ MonoBehaviour:
|
||||||
atime6: 0
|
atime6: 0
|
||||||
atime7: 0
|
atime7: 0
|
||||||
m_Mode: 0
|
m_Mode: 0
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
m_NumColorKeys: 2
|
||||||
m_NumAlphaKeys: 2
|
m_NumAlphaKeys: 2
|
||||||
m_TreatSelectionAsValidState: 0
|
m_TreatSelectionAsValidState: 0
|
||||||
|
@ -627,7 +615,6 @@ SortingGroup:
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 30005
|
m_SortingOrder: 30005
|
||||||
m_SortAtRoot: 0
|
|
||||||
--- !u!114 &3616344554909481683
|
--- !u!114 &3616344554909481683
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -416,7 +416,6 @@ GameObject:
|
||||||
- component: {fileID: 1767192439}
|
- component: {fileID: 1767192439}
|
||||||
- component: {fileID: 1767192437}
|
- component: {fileID: 1767192437}
|
||||||
- component: {fileID: 6232745470614056083}
|
- component: {fileID: 6232745470614056083}
|
||||||
- component: {fileID: 785240573026610109}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Main Camera
|
m_Name: Main Camera
|
||||||
m_TagString: MainCamera
|
m_TagString: MainCamera
|
||||||
|
@ -453,17 +452,9 @@ Camera:
|
||||||
m_projectionMatrixMode: 1
|
m_projectionMatrixMode: 1
|
||||||
m_GateFitMode: 2
|
m_GateFitMode: 2
|
||||||
m_FOVAxisMode: 0
|
m_FOVAxisMode: 0
|
||||||
m_Iso: 200
|
|
||||||
m_ShutterSpeed: 0.005
|
|
||||||
m_Aperture: 16
|
|
||||||
m_FocusDistance: 10
|
|
||||||
m_FocalLength: 50
|
|
||||||
m_BladeCount: 5
|
|
||||||
m_Curvature: {x: 2, y: 11}
|
|
||||||
m_BarrelClipping: 0.25
|
|
||||||
m_Anamorphism: 0
|
|
||||||
m_SensorSize: {x: 36, y: 24}
|
m_SensorSize: {x: 36, y: 24}
|
||||||
m_LensShift: {x: 0, y: 0}
|
m_LensShift: {x: 0, y: 0}
|
||||||
|
m_FocalLength: 50
|
||||||
m_NormalizedViewPortRect:
|
m_NormalizedViewPortRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
|
@ -599,50 +590,6 @@ MonoBehaviour:
|
||||||
m_Action: Rotation
|
m_Action: Rotation
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
--- !u!114 &785240573026610109
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1767192433}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_RenderShadows: 1
|
|
||||||
m_RequiresDepthTextureOption: 2
|
|
||||||
m_RequiresOpaqueTextureOption: 2
|
|
||||||
m_CameraType: 0
|
|
||||||
m_Cameras: []
|
|
||||||
m_RendererIndex: -1
|
|
||||||
m_VolumeLayerMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 1
|
|
||||||
m_VolumeTrigger: {fileID: 0}
|
|
||||||
m_VolumeFrameworkUpdateModeOption: 2
|
|
||||||
m_RenderPostProcessing: 0
|
|
||||||
m_Antialiasing: 0
|
|
||||||
m_AntialiasingQuality: 2
|
|
||||||
m_StopNaN: 0
|
|
||||||
m_Dithering: 0
|
|
||||||
m_ClearDepth: 1
|
|
||||||
m_AllowXRRendering: 1
|
|
||||||
m_AllowHDROutput: 1
|
|
||||||
m_UseScreenCoordOverride: 0
|
|
||||||
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_RequiresDepthTexture: 0
|
|
||||||
m_RequiresColorTexture: 0
|
|
||||||
m_Version: 2
|
|
||||||
m_TaaSettings:
|
|
||||||
quality: 3
|
|
||||||
frameInfluence: 0.1
|
|
||||||
jitterScale: 1
|
|
||||||
mipBias: 0
|
|
||||||
varianceClampScale: 0.9
|
|
||||||
contrastAdaptiveSharpening: 0
|
|
||||||
--- !u!1 &58445280694286476
|
--- !u!1 &58445280694286476
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -913,17 +860,9 @@ CharacterController:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1717954561962503725}
|
m_GameObject: {fileID: 1717954561962503725}
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_IncludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ExcludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_LayerOverridePriority: 0
|
|
||||||
m_IsTrigger: 0
|
m_IsTrigger: 0
|
||||||
m_ProvidesContacts: 0
|
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 3
|
serializedVersion: 2
|
||||||
m_Height: 1.36144
|
m_Height: 1.36144
|
||||||
m_Radius: 0.1
|
m_Radius: 0.1
|
||||||
m_SlopeLimit: 45
|
m_SlopeLimit: 45
|
||||||
|
@ -1266,7 +1205,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_GrabMoveAction:
|
m_GrabMoveAction:
|
||||||
|
@ -1330,7 +1268,6 @@ MonoBehaviour:
|
||||||
m_ManualValue: 0
|
m_ManualValue: 0
|
||||||
m_ManualQueuePerformed: 0
|
m_ManualQueuePerformed: 0
|
||||||
m_ManualQueueWasPerformedThisFrame: 0
|
m_ManualQueueWasPerformedThisFrame: 0
|
||||||
m_ManualQueueWasCompletedThisFrame: 0
|
|
||||||
m_ManualQueueValue: 0
|
m_ManualQueueValue: 0
|
||||||
m_ManualQueueTargetFrame: 0
|
m_ManualQueueTargetFrame: 0
|
||||||
m_GrabMoveAction:
|
m_GrabMoveAction:
|
||||||
|
@ -1699,7 +1636,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 202364688}
|
m_TransformParent: {fileID: 202364688}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 8270855663187062767, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
- target: {fileID: 8270855663187062767, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
||||||
|
@ -1751,9 +1687,6 @@ PrefabInstance:
|
||||||
value: Left Controller Visual
|
value: Left Controller Visual
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
||||||
--- !u!4 &8366379412631108205 stripped
|
--- !u!4 &8366379412631108205 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -1765,7 +1698,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1670256625}
|
m_TransformParent: {fileID: 1670256625}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||||
|
@ -1885,9 +1817,6 @@ PrefabInstance:
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 4238984354899526239}
|
objectReference: {fileID: 4238984354899526239}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||||
--- !u!114 &2449787133337329425 stripped
|
--- !u!114 &2449787133337329425 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -1910,7 +1839,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 202364688}
|
m_TransformParent: {fileID: 202364688}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||||
|
@ -1978,12 +1906,6 @@ PrefabInstance:
|
||||||
value: 10
|
value: 10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects:
|
|
||||||
- targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
|
||||||
insertIndex: -1
|
|
||||||
addedObject: {fileID: 2814764233898000032}
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||||
--- !u!4 &1666320186578454293 stripped
|
--- !u!4 &1666320186578454293 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -2016,7 +1938,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 202364688}
|
m_TransformParent: {fileID: 202364688}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||||
|
@ -2136,9 +2057,6 @@ PrefabInstance:
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 5967689310316253315}
|
objectReference: {fileID: 5967689310316253315}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||||
--- !u!4 &1319746309 stripped
|
--- !u!4 &1319746309 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -2161,7 +2079,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1670256625}
|
m_TransformParent: {fileID: 1670256625}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||||
|
@ -2225,12 +2142,6 @@ PrefabInstance:
|
||||||
value: -10
|
value: -10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects:
|
|
||||||
- targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
|
||||||
insertIndex: -1
|
|
||||||
addedObject: {fileID: 2052418245113747934}
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||||
--- !u!114 &2141651114331267770 stripped
|
--- !u!114 &2141651114331267770 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -2263,7 +2174,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1670256625}
|
m_TransformParent: {fileID: 1670256625}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 2447424620550846319, guid: b200f6587d118224eba8467281481800, type: 3}
|
- target: {fileID: 2447424620550846319, guid: b200f6587d118224eba8467281481800, type: 3}
|
||||||
|
@ -2315,9 +2225,6 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: b200f6587d118224eba8467281481800, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: b200f6587d118224eba8467281481800, type: 3}
|
||||||
--- !u!114 &1883230248363655243 stripped
|
--- !u!114 &1883230248363655243 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -2340,7 +2247,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 202364688}
|
m_TransformParent: {fileID: 202364688}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 4804964734930210078, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
- target: {fileID: 4804964734930210078, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||||
|
@ -2392,9 +2298,6 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||||
--- !u!4 &1543070802843469984 stripped
|
--- !u!4 &1543070802843469984 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -2417,7 +2320,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1666320186578454293}
|
m_TransformParent: {fileID: 1666320186578454293}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||||
|
@ -2485,21 +2387,12 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||||
--- !u!4 &2814764233898000032 stripped
|
|
||||||
Transform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 6764233457049000944}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1001 &7400760887118150798
|
--- !u!1001 &7400760887118150798
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 3954319948395782924}
|
m_TransformParent: {fileID: 3954319948395782924}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||||
|
@ -2567,21 +2460,12 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||||
--- !u!4 &2052418245113747934 stripped
|
|
||||||
Transform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 7400760887118150798}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1001 &7684238452101615925
|
--- !u!1001 &7684238452101615925
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1670256625}
|
m_TransformParent: {fileID: 1670256625}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 3475118261464492563, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
- target: {fileID: 3475118261464492563, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
||||||
|
@ -2633,9 +2517,6 @@ PrefabInstance:
|
||||||
value: Right Controller Visual
|
value: Right Controller Visual
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
||||||
--- !u!4 &6528530117482412838 stripped
|
--- !u!4 &6528530117482412838 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -2647,7 +2528,6 @@ PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 1680501587}
|
m_TransformParent: {fileID: 1680501587}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 3055433562365713971, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
- target: {fileID: 3055433562365713971, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
||||||
|
@ -2711,9 +2591,6 @@ PrefabInstance:
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
||||||
--- !u!4 &2196849375614954873 stripped
|
--- !u!4 &2196849375614954873 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
|
|
@ -609,6 +609,9 @@
|
||||||
"m_Id": ""
|
"m_Id": ""
|
||||||
},
|
},
|
||||||
"m_ActiveTargets": [
|
"m_ActiveTargets": [
|
||||||
|
{
|
||||||
|
"m_Id": "7f4faf20e056441da3400fcf5a01bd1d"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"m_Id": "4aa8a973dd78498e827b15fa6d213bc0"
|
"m_Id": "4aa8a973dd78498e827b15fa6d213bc0"
|
||||||
}
|
}
|
||||||
|
@ -774,7 +777,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -810,7 +812,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 2,
|
"m_PreviewMode": 2,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -844,7 +845,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -867,7 +867,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -960,7 +959,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -1001,7 +999,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1085,7 +1082,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1121,7 +1117,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1267,7 +1262,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -1318,7 +1312,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1360,7 +1353,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 2,
|
"m_PreviewMode": 2,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1433,7 +1425,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -1483,7 +1474,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1565,7 +1555,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1621,7 +1610,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1644,7 +1632,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -1672,7 +1659,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -1795,22 +1781,19 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
},
|
},
|
||||||
"m_TextureType": 1,
|
"m_TextureType": 1,
|
||||||
"m_NormalMapSpace": 0,
|
"m_NormalMapSpace": 0,
|
||||||
"m_EnableGlobalMipBias": true,
|
"m_EnableGlobalMipBias": true
|
||||||
"m_MipSamplingMode": 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
"m_SGVersion": 1,
|
"m_SGVersion": 1,
|
||||||
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
|
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
|
||||||
"m_ObjectId": "4aa8a973dd78498e827b15fa6d213bc0",
|
"m_ObjectId": "4aa8a973dd78498e827b15fa6d213bc0",
|
||||||
"m_Datas": [],
|
|
||||||
"m_ActiveSubTarget": {
|
"m_ActiveSubTarget": {
|
||||||
"m_Id": "8950326a11f44a81b3fc69ca5170c9c1"
|
"m_Id": "8950326a11f44a81b3fc69ca5170c9c1"
|
||||||
},
|
},
|
||||||
|
@ -1823,7 +1806,6 @@
|
||||||
"m_AlphaClip": false,
|
"m_AlphaClip": false,
|
||||||
"m_CastShadows": true,
|
"m_CastShadows": true,
|
||||||
"m_ReceiveShadows": true,
|
"m_ReceiveShadows": true,
|
||||||
"m_SupportsLODCrossFade": false,
|
|
||||||
"m_CustomEditorGUI": "",
|
"m_CustomEditorGUI": "",
|
||||||
"m_SupportVFX": false
|
"m_SupportVFX": false
|
||||||
}
|
}
|
||||||
|
@ -1854,7 +1836,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -1919,13 +1900,20 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
"m_SGVersion": 0,
|
||||||
|
"m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInLitSubTarget",
|
||||||
|
"m_ObjectId": "4f5ac9a480ac4addaabd14ae58f8f316",
|
||||||
|
"m_WorkflowMode": 1,
|
||||||
|
"m_NormalDropOffSpace": 0
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
"m_SGVersion": 0,
|
"m_SGVersion": 0,
|
||||||
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
|
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
|
||||||
|
@ -2099,7 +2087,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2209,7 +2196,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2336,6 +2322,23 @@
|
||||||
"m_Space": 0
|
"m_Space": 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
"m_SGVersion": 2,
|
||||||
|
"m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInTarget",
|
||||||
|
"m_ObjectId": "7f4faf20e056441da3400fcf5a01bd1d",
|
||||||
|
"m_ActiveSubTarget": {
|
||||||
|
"m_Id": "4f5ac9a480ac4addaabd14ae58f8f316"
|
||||||
|
},
|
||||||
|
"m_AllowMaterialOverride": true,
|
||||||
|
"m_SurfaceType": 0,
|
||||||
|
"m_ZWriteControl": 0,
|
||||||
|
"m_ZTestMode": 4,
|
||||||
|
"m_AlphaMode": 0,
|
||||||
|
"m_RenderFace": 2,
|
||||||
|
"m_AlphaClip": false,
|
||||||
|
"m_CustomEditorGUI": ""
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
"m_SGVersion": 0,
|
"m_SGVersion": 0,
|
||||||
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
|
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
|
||||||
|
@ -2391,13 +2394,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
"m_SGVersion": 2,
|
"m_SGVersion": 0,
|
||||||
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
|
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
|
||||||
"m_ObjectId": "8950326a11f44a81b3fc69ca5170c9c1",
|
"m_ObjectId": "8950326a11f44a81b3fc69ca5170c9c1",
|
||||||
"m_WorkflowMode": 1,
|
"m_WorkflowMode": 1,
|
||||||
"m_NormalDropOffSpace": 0,
|
"m_NormalDropOffSpace": 0,
|
||||||
"m_ClearCoat": false,
|
"m_ClearCoat": false
|
||||||
"m_BlendModePreserveSpecular": false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -2463,7 +2465,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -2502,7 +2503,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2553,7 +2553,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2639,7 +2638,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -2728,7 +2726,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2853,7 +2850,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -2916,7 +2912,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 2,
|
"m_PreviewMode": 2,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3000,7 +2995,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3102,15 +3096,13 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
},
|
},
|
||||||
"m_TextureType": 0,
|
"m_TextureType": 0,
|
||||||
"m_NormalMapSpace": 0,
|
"m_NormalMapSpace": 0,
|
||||||
"m_EnableGlobalMipBias": true,
|
"m_EnableGlobalMipBias": true
|
||||||
"m_MipSamplingMode": 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -3139,7 +3131,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3173,7 +3164,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3237,7 +3227,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3354,7 +3343,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3539,7 +3527,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3573,7 +3560,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3692,7 +3678,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -3754,7 +3739,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3837,7 +3821,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3898,7 +3881,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3942,7 +3924,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": false,
|
"m_PreviewExpanded": false,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -3983,7 +3964,6 @@
|
||||||
],
|
],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -4005,7 +3985,6 @@
|
||||||
"m_GeneratePropertyBlock": true,
|
"m_GeneratePropertyBlock": true,
|
||||||
"m_UseCustomSlotLabel": false,
|
"m_UseCustomSlotLabel": false,
|
||||||
"m_CustomSlotLabel": "",
|
"m_CustomSlotLabel": "",
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"overrideHLSLDeclaration": false,
|
"overrideHLSLDeclaration": false,
|
||||||
"hlslDeclarationOverride": 0,
|
"hlslDeclarationOverride": 0,
|
||||||
|
@ -4044,7 +4023,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
@ -4156,7 +4134,6 @@
|
||||||
"synonyms": [],
|
"synonyms": [],
|
||||||
"m_Precision": 0,
|
"m_Precision": 0,
|
||||||
"m_PreviewExpanded": true,
|
"m_PreviewExpanded": true,
|
||||||
"m_DismissedVersion": 0,
|
|
||||||
"m_PreviewMode": 0,
|
"m_PreviewMode": 0,
|
||||||
"m_CustomColors": {
|
"m_CustomColors": {
|
||||||
"m_SerializableColors": []
|
"m_SerializableColors": []
|
||||||
|
|
|
@ -129,4 +129,3 @@ SortingGroup:
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: 30010
|
m_SortingOrder: 30010
|
||||||
m_SortAtRoot: 0
|
|
||||||
|
|
2399
Game/Assets/Scenes/DrawerInteractionPlayground.unity
Normal file
2399
Game/Assets/Scenes/DrawerInteractionPlayground.unity
Normal file
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: beda9a1653d106a479bb5805e12d3d43
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
141
Game/Assets/Scripts/DrawerDynamicJointConfiguration.cs
Normal file
141
Game/Assets/Scripts/DrawerDynamicJointConfiguration.cs
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit.Interactables;
|
||||||
|
|
||||||
|
[RequireComponent(typeof(XRGrabInteractable))]
|
||||||
|
[RequireComponent(typeof(ConfigurableJoint))]
|
||||||
|
public class DrawerDynamicJointConfiguration : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Header("mark's all-in-one dynamic drawer component")]
|
||||||
|
[Space(10)]
|
||||||
|
[HelpBox("make sure every child inside both prefabs are under the" +
|
||||||
|
"'Interactable Environment' layer.\n\n" +
|
||||||
|
"whatever non-standard (a la ProBuilder) object geometry under the " +
|
||||||
|
"interactable prefab should have a convex mesh collider if the console nags about it!\n\n" +
|
||||||
|
"any Curve Interaction Casters (a la 'XR Origin (VR)' > 'Camera Offset' > '... Controller' " +
|
||||||
|
"> 'Near-Far Interactor' > 'Curve Interaction Caster') should be have the " +
|
||||||
|
"'Interactable Environment' layer included in its' Raycast Mask.",
|
||||||
|
HelpBoxMessageType.Error)]
|
||||||
|
[Space(10)]
|
||||||
|
[SerializeField]
|
||||||
|
private MovementAxis movementAxis = MovementAxis.Z;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// the maximum distance the drawer can be pulled out
|
||||||
|
/// </summary>
|
||||||
|
[Tooltip("the maximum distance the drawer can be pulled out")] [SerializeField]
|
||||||
|
private float maxMovementDistance = 0.5f;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// the velocity scale of the drawer, how fast it can move
|
||||||
|
/// </summary>
|
||||||
|
[Tooltip("the velocity scale of the drawer, how fast it can move")] [SerializeField]
|
||||||
|
private float velocityScale = 0.5f;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
// configure the configurable joint component
|
||||||
|
var cJoint = GetComponent<ConfigurableJoint>();
|
||||||
|
if (cJoint == null)
|
||||||
|
throw new Exception("Drawer (Dynamic): ConfigurableJoint component not found (unreachable?)");
|
||||||
|
|
||||||
|
// lock all motions (linear and angular) except for the desired (linear) axis
|
||||||
|
Debug.Log($"Drawer (Dynamic): locking movement to axis {movementAxis}");
|
||||||
|
cJoint.xMotion = movementAxis == MovementAxis.X
|
||||||
|
? ConfigurableJointMotion.Limited
|
||||||
|
: ConfigurableJointMotion.Locked;
|
||||||
|
cJoint.yMotion = movementAxis == MovementAxis.Y
|
||||||
|
? ConfigurableJointMotion.Limited
|
||||||
|
: ConfigurableJointMotion.Locked;
|
||||||
|
cJoint.zMotion = movementAxis == MovementAxis.Z
|
||||||
|
? ConfigurableJointMotion.Limited
|
||||||
|
: ConfigurableJointMotion.Locked;
|
||||||
|
cJoint.angularXMotion = ConfigurableJointMotion.Locked;
|
||||||
|
cJoint.angularYMotion = ConfigurableJointMotion.Locked;
|
||||||
|
cJoint.angularZMotion = ConfigurableJointMotion.Locked;
|
||||||
|
|
||||||
|
// set linear limit
|
||||||
|
cJoint.linearLimit = new SoftJointLimit
|
||||||
|
{
|
||||||
|
limit = maxMovementDistance,
|
||||||
|
bounciness = 0,
|
||||||
|
contactDistance = 0
|
||||||
|
};
|
||||||
|
|
||||||
|
// configure the rigidbody
|
||||||
|
var rb = GetComponent<Rigidbody>();
|
||||||
|
rb.isKinematic = false;
|
||||||
|
rb.useGravity = false;
|
||||||
|
rb.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic;
|
||||||
|
|
||||||
|
// configure the grab interactable
|
||||||
|
var grabInteractable = GetComponent<XRGrabInteractable>();
|
||||||
|
grabInteractable.movementType = XRBaseInteractable.MovementType.VelocityTracking;
|
||||||
|
grabInteractable.trackPosition = true;
|
||||||
|
grabInteractable.velocityScale = velocityScale;
|
||||||
|
|
||||||
|
// guess the handle collider, lol
|
||||||
|
Collider drawerDoorHandleCollider = GetComponentInChildren<BoxCollider>();
|
||||||
|
if (drawerDoorHandleCollider == null)
|
||||||
|
{
|
||||||
|
drawerDoorHandleCollider = GetComponentInChildren<SphereCollider>();
|
||||||
|
if (drawerDoorHandleCollider == null)
|
||||||
|
{
|
||||||
|
drawerDoorHandleCollider = GetComponentInChildren<CapsuleCollider>();
|
||||||
|
if (drawerDoorHandleCollider == null)
|
||||||
|
{
|
||||||
|
drawerDoorHandleCollider = GetComponentInChildren<MeshCollider>();
|
||||||
|
if (drawerDoorHandleCollider == null)
|
||||||
|
throw new Exception("Drawer (Dynamic): Drawer door handle collider not found");
|
||||||
|
|
||||||
|
Debug.Log("Drawer (Dynamic): MeshCollider collider found");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("Drawer (Dynamic): CapsuleCollider found");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("Drawer (Dynamic): SphereCollider found");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("Drawer (Dynamic): BoxCollider found");
|
||||||
|
}
|
||||||
|
|
||||||
|
// set the joint's anchor to the handle's world position
|
||||||
|
var handleWorldPosition =
|
||||||
|
drawerDoorHandleCollider.transform.TransformPoint(drawerDoorHandleCollider.bounds.center);
|
||||||
|
var jointAnchor = cJoint.transform.InverseTransformPoint(handleWorldPosition);
|
||||||
|
switch (movementAxis)
|
||||||
|
{
|
||||||
|
case MovementAxis.X:
|
||||||
|
jointAnchor.y = 0;
|
||||||
|
jointAnchor.z = 0;
|
||||||
|
break;
|
||||||
|
case MovementAxis.Y:
|
||||||
|
jointAnchor.x = 0;
|
||||||
|
jointAnchor.z = 0;
|
||||||
|
break;
|
||||||
|
case MovementAxis.Z:
|
||||||
|
jointAnchor.x = 0;
|
||||||
|
jointAnchor.y = 0;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
jointAnchor = Vector3.zero;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
cJoint.anchor = jointAnchor;
|
||||||
|
Debug.Log($"Drawer (Dynamic): set to {jointAnchor}");
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum MovementAxis
|
||||||
|
{
|
||||||
|
X,
|
||||||
|
Y,
|
||||||
|
Z
|
||||||
|
}
|
||||||
|
}
|
11
Game/Assets/Scripts/DrawerDynamicJointConfiguration.cs.meta
Normal file
11
Game/Assets/Scripts/DrawerDynamicJointConfiguration.cs.meta
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: da315c3f1e28be241badd4ee9c4b6e76
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
47
Game/Assets/Scripts/HelpBox.cs
Normal file
47
Game/Assets/Scripts/HelpBox.cs
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
// https://discussions.unity.com/t/helpattribute-allows-you-to-use-helpbox-in-the-unity-inspector-window/659414/22
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEditor;
|
||||||
|
|
||||||
|
public enum HelpBoxMessageType { None, Info, Warning, Error }
|
||||||
|
|
||||||
|
public class HelpBoxAttribute : PropertyAttribute {
|
||||||
|
|
||||||
|
public string Text;
|
||||||
|
public HelpBoxMessageType MessageType;
|
||||||
|
|
||||||
|
public HelpBoxAttribute(string text, HelpBoxMessageType messageType = HelpBoxMessageType.None) {
|
||||||
|
this.Text = text;
|
||||||
|
this.MessageType = messageType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[CustomPropertyDrawer(typeof(HelpBoxAttribute))]
|
||||||
|
public class HelpBoxAttributeDrawer : DecoratorDrawer {
|
||||||
|
|
||||||
|
public override float GetHeight() {
|
||||||
|
try {
|
||||||
|
var helpBoxAttribute = attribute as HelpBoxAttribute;
|
||||||
|
if (helpBoxAttribute == null) return base.GetHeight();
|
||||||
|
var helpBoxStyle = (GUI.skin != null) ? GUI.skin.GetStyle("helpbox") : null;
|
||||||
|
return helpBoxStyle == null ? base.GetHeight() : Mathf.Max(40f, helpBoxStyle.CalcHeight(new GUIContent(helpBoxAttribute.Text), EditorGUIUtility.currentViewWidth) + 4);
|
||||||
|
}
|
||||||
|
catch (System.ArgumentException) {
|
||||||
|
return 3 * EditorGUIUtility.singleLineHeight; // Handle Unity 2022.2 bug by returning default value.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnGUI(Rect position) {
|
||||||
|
if (attribute is not HelpBoxAttribute helpBoxAttribute) return;
|
||||||
|
EditorGUI.HelpBox(position, helpBoxAttribute.Text, GetMessageType(helpBoxAttribute.MessageType));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static MessageType GetMessageType(HelpBoxMessageType helpBoxMessageType) {
|
||||||
|
switch (helpBoxMessageType) {
|
||||||
|
default:
|
||||||
|
case HelpBoxMessageType.None: return MessageType.None;
|
||||||
|
case HelpBoxMessageType.Info: return MessageType.Info;
|
||||||
|
case HelpBoxMessageType.Warning: return MessageType.Warning;
|
||||||
|
case HelpBoxMessageType.Error: return MessageType.Error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
11
Game/Assets/Scripts/HelpBox.cs.meta
Normal file
11
Game/Assets/Scripts/HelpBox.cs.meta
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 08e77f16aecb3cf41b13291313e08860
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -121,7 +121,8 @@ MonoBehaviour:
|
||||||
m_RequiresSettingsUpdate: 0
|
m_RequiresSettingsUpdate: 0
|
||||||
m_AutomaticLoading: 0
|
m_AutomaticLoading: 0
|
||||||
m_AutomaticRunning: 0
|
m_AutomaticRunning: 0
|
||||||
m_Loaders: []
|
m_Loaders:
|
||||||
|
- {fileID: 11400000, guid: eb6d337c1678a97408eb0481002d9ae2, type: 2}
|
||||||
--- !u!114 &4897379186331661704
|
--- !u!114 &4897379186331661704
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.2d.tilemap": "1.0.0",
|
"com.unity.2d.tilemap": "1.0.0",
|
||||||
"com.unity.ads": "4.4.2",
|
"com.unity.ads": "4.12.0",
|
||||||
"com.unity.ai.navigation": "1.1.5",
|
"com.unity.ai.navigation": "1.1.5",
|
||||||
"com.unity.analytics": "3.8.1",
|
"com.unity.analytics": "3.8.1",
|
||||||
"com.unity.collab-proxy": "2.6.0",
|
"com.unity.collab-proxy": "2.6.0",
|
||||||
|
@ -14,16 +14,17 @@
|
||||||
"com.unity.inputsystem": "1.11.2",
|
"com.unity.inputsystem": "1.11.2",
|
||||||
"com.unity.learn.iet-framework": "3.1.3",
|
"com.unity.learn.iet-framework": "3.1.3",
|
||||||
"com.unity.probuilder": "5.2.3",
|
"com.unity.probuilder": "5.2.3",
|
||||||
"com.unity.purchasing": "4.11.0",
|
"com.unity.purchasing": "4.12.2",
|
||||||
"com.unity.render-pipelines.universal": "14.0.11",
|
"com.unity.render-pipelines.universal": "14.0.11",
|
||||||
"com.unity.test-framework": "1.1.33",
|
"com.unity.test-framework": "1.1.33",
|
||||||
"com.unity.textmeshpro": "3.0.7",
|
"com.unity.textmeshpro": "3.0.9",
|
||||||
"com.unity.timeline": "1.7.6",
|
"com.unity.timeline": "1.7.6",
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "1.0.0",
|
||||||
"com.unity.visualscripting": "1.9.4",
|
"com.unity.visualscripting": "1.9.5",
|
||||||
"com.unity.xr.interaction.toolkit": "3.0.3",
|
"com.unity.xr.interaction.toolkit": "3.0.3",
|
||||||
"com.unity.xr.legacyinputhelpers": "2.1.11",
|
"com.unity.xr.legacyinputhelpers": "2.1.12",
|
||||||
"com.unity.xr.management": "4.4.0",
|
"com.unity.xr.management": "4.5.0",
|
||||||
|
"com.unity.xr.oculus": "4.4.0",
|
||||||
"com.unity.xr.openxr": "1.14.0",
|
"com.unity.xr.openxr": "1.14.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.ads": {
|
"com.unity.ads": {
|
||||||
"version": "4.4.2",
|
"version": "4.12.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -174,12 +174,12 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.purchasing": {
|
"com.unity.purchasing": {
|
||||||
"version": "4.11.0",
|
"version": "4.12.2",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "1.0.0",
|
||||||
"com.unity.services.core": "1.8.2",
|
"com.unity.services.core": "1.12.5",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
"com.unity.modules.jsonserialize": "1.0.0",
|
"com.unity.modules.jsonserialize": "1.0.0",
|
||||||
"com.unity.modules.unitywebrequest": "1.0.0"
|
"com.unity.modules.unitywebrequest": "1.0.0"
|
||||||
|
@ -284,7 +284,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.textmeshpro": {
|
"com.unity.textmeshpro": {
|
||||||
"version": "3.0.7",
|
"version": "3.0.9",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -314,7 +314,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.visualscripting": {
|
"com.unity.visualscripting": {
|
||||||
"version": "1.9.4",
|
"version": "1.9.5",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -349,7 +349,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.xr.legacyinputhelpers": {
|
"com.unity.xr.legacyinputhelpers": {
|
||||||
"version": "2.1.11",
|
"version": "2.1.12",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -359,7 +359,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.xr.management": {
|
"com.unity.xr.management": {
|
||||||
"version": "4.4.0",
|
"version": "4.5.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -372,7 +372,7 @@
|
||||||
},
|
},
|
||||||
"com.unity.xr.oculus": {
|
"com.unity.xr.oculus": {
|
||||||
"version": "4.4.0",
|
"version": "4.4.0",
|
||||||
"depth": 1,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.xr.management": "4.4.0"
|
"com.unity.xr.management": "4.4.0"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
--- !u!55 &1
|
--- !u!55 &1
|
||||||
PhysicsManager:
|
PhysicsManager:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 13
|
serializedVersion: 14
|
||||||
m_Gravity: {x: 0, y: -9.81, z: 0}
|
m_Gravity: {x: 0, y: -9.81, z: 0}
|
||||||
m_DefaultMaterial: {fileID: 0}
|
m_DefaultMaterial: {fileID: 0}
|
||||||
m_BounceThreshold: 2
|
m_BounceThreshold: 2
|
||||||
|
@ -18,10 +18,11 @@ PhysicsManager:
|
||||||
m_ClothInterCollisionDistance: 0
|
m_ClothInterCollisionDistance: 0
|
||||||
m_ClothInterCollisionStiffness: 0
|
m_ClothInterCollisionStiffness: 0
|
||||||
m_ContactsGeneration: 1
|
m_ContactsGeneration: 1
|
||||||
m_LayerCollisionMatrix: ffffffffffffffffdffffffffffffffffffffffffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
m_LayerCollisionMatrix: fffbffffffffffffdffffffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
m_AutoSimulation: 1
|
m_SimulationMode: 0
|
||||||
m_AutoSyncTransforms: 1
|
m_AutoSyncTransforms: 1
|
||||||
m_ReuseCollisionCallbacks: 1
|
m_ReuseCollisionCallbacks: 1
|
||||||
|
m_InvokeCollisionCallbacks: 1
|
||||||
m_ClothInterCollisionSettingsToggle: 0
|
m_ClothInterCollisionSettingsToggle: 0
|
||||||
m_ClothGravity: {x: 0, y: -9.81, z: 0}
|
m_ClothGravity: {x: 0, y: -9.81, z: 0}
|
||||||
m_ContactPairsMode: 0
|
m_ContactPairsMode: 0
|
||||||
|
@ -36,3 +37,4 @@ PhysicsManager:
|
||||||
m_ImprovedPatchFriction: 0
|
m_ImprovedPatchFriction: 0
|
||||||
m_SolverType: 0
|
m_SolverType: 0
|
||||||
m_DefaultMaxAngularSpeed: 7
|
m_DefaultMaxAngularSpeed: 7
|
||||||
|
m_FastMotionThreshold: 3.4028235e+38
|
||||||
|
|
|
@ -831,7 +831,7 @@ PlayerSettings:
|
||||||
webGLMemoryGeometricGrowthCap: 96
|
webGLMemoryGeometricGrowthCap: 96
|
||||||
webGLPowerPreference: 2
|
webGLPowerPreference: 2
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
Android: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2
|
Android: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS
|
||||||
CloudRendering: UNITY_POST_PROCESSING_STACK_V2
|
CloudRendering: UNITY_POST_PROCESSING_STACK_V2
|
||||||
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
|
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
|
||||||
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
|
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
@ -840,9 +840,9 @@ PlayerSettings:
|
||||||
PS4: UNITY_POST_PROCESSING_STACK_V2
|
PS4: UNITY_POST_PROCESSING_STACK_V2
|
||||||
PS5: UNITY_POST_PROCESSING_STACK_V2
|
PS5: UNITY_POST_PROCESSING_STACK_V2
|
||||||
Stadia: UNITY_POST_PROCESSING_STACK_V2
|
Stadia: UNITY_POST_PROCESSING_STACK_V2
|
||||||
Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2
|
Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS
|
||||||
WebGL: UNITY_POST_PROCESSING_STACK_V2
|
WebGL: UNITY_POST_PROCESSING_STACK_V2
|
||||||
Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2
|
Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS
|
||||||
XboxOne: UNITY_POST_PROCESSING_STACK_V2
|
XboxOne: UNITY_POST_PROCESSING_STACK_V2
|
||||||
tvOS: UNITY_POST_PROCESSING_STACK_V2
|
tvOS: UNITY_POST_PROCESSING_STACK_V2
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments: {}
|
||||||
|
|
|
@ -23,7 +23,7 @@ TagManager:
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
- Interactable Environment
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
|
|
Loading…
Add table
Reference in a new issue