ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

- Implemented a much nicer looking door for entering round 1.

Browse Source 
- Improved door interactable so that the door closes itself after a short time.
- Improved position of some cameras in preparation for transitions later.
- Changed position of ACME Crimenet Computer so it doesn't bump the host.
This commit is contained in:
ActualHorse
2025-10-02 04:02:54 -04:00
parent dcef77b371
commit ebe8fad717
39 changed files with 1196 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/ACME Crimenet Computer/Swooce Right Back Out Again.anim
+13 -13
View File
@@ -19,13 +19,13 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -30, z: 0}
value: {x: 0, y: 2.985, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 0, z: 0}
@@ -33,8 +33,8 @@ AnimationClip:
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -45,7 +45,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 3.901, y: 0, z: 4.394}
value: {x: 3.537, y: 0, z: 4.792}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -160,7 +160,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 3.901
value: 3.537
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -220,7 +220,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 4.394
value: 4.792
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -255,8 +255,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -271,7 +271,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -30
value: 2.985
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -306,8 +306,8 @@ AnimationClip:
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Assets/Animations/ACME Crimenet Computer/Swooce Right In.anim
+5 -5
View File
@@ -28,7 +28,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: -30, z: 0}
value: {x: 0, y: 2.985, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -54,7 +54,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 3.901, y: 0, z: 4.394}
value: {x: 3.537, y: 0, z: 4.792}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -160,7 +160,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 3.901
value: 3.537
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -220,7 +220,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 4.394
value: 4.792
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -280,7 +280,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -30
value: 2.985
inSlope: 0
outSlope: 0
tangentMode: 136
Assets/Animations/Door.meta → Assets/Animations/Round 1 Door.meta
View File
Assets/Animations/Door/Close.anim → Assets/Animations/Round 1 Door/Close.anim
+138 -72
View File
@@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -90, y: 0, z: 195}
value: {x: -180, y: 0, z: -150}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -28,17 +28,17 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.6666667
value: {x: -90, y: 0, z: 90}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
value: {x: -180, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 649.9599}
outSlope: {x: 0, y: 0, z: 649.9599}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.052268386}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
path: Door
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
@@ -68,7 +68,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path:
path: Door
classID: 65
script: {fileID: 0}
flags: 0
@@ -81,7 +81,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
path: 718797587
attribute: 4
script: {fileID: 0}
typeID: 4
@@ -90,7 +90,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
path: 718797587
attribute: 3305885265
script: {fileID: 0}
typeID: 65
@@ -120,66 +120,6 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 195
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 90
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
@@ -206,11 +146,137 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path:
path: Door
classID: 65
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -180
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -180
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: Door
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: Door
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -150
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0
inSlope: 649.9599
outSlope: 649.9599
tangentMode: 0
weightedMode: 0
inWeight: 0.052268386
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: Door
classID: 4
script: {fileID: 0}
flags: 16
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Door
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Door
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Door
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Animations/Door/Close.anim.meta → Assets/Animations/Round 1 Door/Close.anim.meta
View File
Assets/Animations/Door/Open.anim → Assets/Animations/Round 1 Door/Open.anim
+98 -23
View File
@@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -90, y: 0, z: 90}
value: {x: -180, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -28,17 +28,17 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.6666667
value: {x: -90, y: 0, z: 195}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
value: {x: -180, y: 0, z: -150}
inSlope: {x: 0, y: 0, z: -541.8361}
outSlope: {x: 0, y: 0, z: -541.8361}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.045365006}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
path: Door
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
@@ -68,7 +68,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path:
path: Door
classID: 65
script: {fileID: 0}
flags: 0
@@ -81,7 +81,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
path: 718797587
attribute: 4
script: {fileID: 0}
typeID: 4
@@ -90,7 +90,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
path: 718797587
attribute: 3305885265
script: {fileID: 0}
typeID: 65
@@ -126,7 +126,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 90
value: -180
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -135,7 +135,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 195
value: -180
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -145,32 +145,71 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
attribute: localEulerAnglesRaw.x
path: Door
classID: 4
script: {fileID: 0}
flags: 0
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -90
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
attribute: localEulerAnglesRaw.y
path: Door
classID: 4
script: {fileID: 0}
flags: 8
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -150
inSlope: -541.8361
outSlope: -541.8361
tangentMode: 0
weightedMode: 0
inWeight: 0.045365006
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: Door
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
@@ -197,11 +236,47 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path:
path: Door
classID: 65
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Door
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Door
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Door
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Animations/Door/Open.anim.meta → Assets/Animations/Round 1 Door/Open.anim.meta
View File
Assets/Animations/Door/Door.controller → Assets/Animations/Round 1 Door/Round 1 Door.controller
+1 -1
View File
@@ -111,7 +111,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Door
m_Name: Round 1 Door
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Open
Assets/Animations/Door/Door.controller.meta → Assets/Animations/Round 1 Door/Round 1 Door.controller.meta
View File