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

- Moved cameras to logical locations in the round 1 room.

Browse Source 
- Adjusted Modem teleport effect to hopefully fix rendering issues.
- Adjusted lighting, and added some to the alleyway.
This commit is contained in:
ActualHorse
2025-09-10 19:19:56 -04:00
parent 15030302ab
commit ad5450fcbd
13 changed files with 979 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/Modem/No Teleport Effect.anim
+147 -22
View File
@@ -14,30 +14,41 @@ AnimationClip:
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
value: {x: 0, y: 0.024, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_StaticEffect
classID: 1
script: {fileID: 0}
flags: 0
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 0.005}
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}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: SM_StaticEffect
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -48,9 +59,18 @@ AnimationClip:
genericBindings:
- serializedVersion: 2
path: 1930323159
attribute: 2086281974
attribute: 1
script: {fileID: 0}
typeID: 1
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1930323159
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
@@ -84,18 +104,123 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
attribute: m_LocalPosition.x
path: SM_StaticEffect
classID: 1
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.024
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: SM_StaticEffect
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: SM_StaticEffect
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: SM_StaticEffect
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: SM_StaticEffect
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.005
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: SM_StaticEffect
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
Assets/Animations/Modem/Teleport Effect.anim
+134 -86
View File
@@ -18,6 +18,15 @@ AnimationClip:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.024, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 0, y: 2.5, z: 0}
@@ -38,7 +47,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5
value: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0.024, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -55,9 +64,9 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1.35, y: 1.35, z: 0}
value: {x: 1, y: 1, z: 0.005}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -80,50 +89,29 @@ AnimationClip:
weightedMode: 0
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
path: SM_StaticEffect
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
time: 2.6166666
value: {x: 1.35, y: 1.35, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
value: {x: 1, y: 1, z: 0.005}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
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
attribute: m_IsActive
path: SM_StaticEffect
classID: 1
script: {fileID: 0}
flags: 0
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -150,15 +138,6 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1930323159
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -185,6 +164,15 @@ AnimationClip:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.005
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
@@ -203,6 +191,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.6166666
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0.005
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -218,42 +224,12 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
inSlope: 0
outSlope: Infinity
tangentMode: 103
tangentMode: 97
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_StaticEffect
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
@@ -293,6 +269,15 @@ AnimationClip:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.024
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 2.5
@@ -313,7 +298,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0
value: 0.024
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -332,6 +317,15 @@ AnimationClip:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
@@ -373,13 +367,40 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1.35
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.6166666
value: 1.35
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -394,13 +415,40 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1.35
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.6166666
value: 1.35
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Assets/Prefabs/Betacam Handheld.prefab
+5 -5
View File
@@ -625,20 +625,20 @@ Camera:
width: 1
height: 1
near clip plane: 0.03
far clip plane: 1000
field of view: 60
far clip plane: 10
field of view: 30
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 2617311
m_RenderingPath: -1
m_RenderingPath: 1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
@@ -664,7 +664,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 0}
volumeTrigger: {fileID: 8055959652257360952}
volumeLayer:
serializedVersion: 2
m_Bits: 16
Assets/Scenes/witwics.unity
+692 -520
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/witwics/LightingData.asset
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/Lightmap-0_comp_light.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-0.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-1.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-2.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-3.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-4.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-5.exr
BIN
View File
Binary file not shown.
Assets/VRChatCameraSystem
+1 -1
Submodule Assets/VRChatCameraSystem updated: 96ab301075...5f6feb16f7