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

- Modem Arrivals and Tourist Information signs enable and disable correctly.

Browse Source 
- Rearranged round 2 room to be closer to show-accurate.
- Adjusted compression and lightmapping for round 2's velvet ropes.
- Magazine rack is now a prefab.
This commit is contained in:
ActualHorse
2026-04-16 18:36:46 -04:00
parent 3a68516eaf
commit 47eb6aae77
23 changed files with 2308 additions and 1832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Models/SM_DrywallPanel5x6.5.fbx
BIN
View File
Binary file not shown.
Assets/Models/SM_DrywallPanel5x6.5.fbx.meta
+109
View File
@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: cc0d0565f1a237147946201b277a94b3
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Models/SM_ModemArrivalsSign.fbx
BIN
View File
Binary file not shown.
Assets/Models/SM_ModemArrivalsSign.fbx.meta
+109
View File
@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: f5031b4cd8b573f4c8a2d961b34e53d1
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 2
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Models/SM_TouristInformationSign.fbx
BIN
View File
Binary file not shown.
Assets/Models/SM_TouristInformationSign.fbx.meta
+109
View File
@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: ec701d6b92f2c124da82efe9599909bf
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 2
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Models/SM_VelvetRope.fbx.meta
+5 -5
View File
@@ -5,7 +5,7 @@ ModelImporter:
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
@@ -36,7 +36,7 @@ ModelImporter:
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
meshCompression: 2
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
@@ -48,7 +48,7 @@ ModelImporter:
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
@@ -78,7 +78,7 @@ ModelImporter:
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
@@ -97,7 +97,7 @@ ModelImporter:
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
Assets/Prefabs/Magazine Rack.prefab
+1284
View File
File diff suppressed because it is too large Load Diff
Assets/Prefabs/Magazine Rack.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c34dd1dedad4fc54aad663392deab16f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/witwics.unity
+444 -1602
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_dir.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 622 KiB

After

Width:  |  Height:  |  Size: 621 KiB

Assets/Scenes/witwics/Lightmap-0_comp_light.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/OcclusionCullingData.asset
+231 -225
View File
File diff suppressed because one or more lines are too long
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/Scenes/witwics/ReflectionProbe-6.exr
BIN
View File
Binary file not shown.
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
+10
View File
@@ -70,6 +70,11 @@ public class GameManagerRound2 : GameManagerBase
_JailChain.Initialise();
_JailPhone.Initialise();
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(true);
}
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true);
_CameraControllerRound2.InitialiseCameras();
@@ -91,6 +96,11 @@ public class GameManagerRound2 : GameManagerBase
_JailPhone.Activate = false;
_JailChain.Show = false;
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(false);
}
_CameraControllerRound2.DeinitialiseCameras();
_CameraControllerRound2.PlayModemZoom(false);
Raw Files/ModemArrivalsSigns.blend
BIN
View File
Binary file not shown.