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

- Added a corkboard behind the wanted posters.

Browse Source 
- Teleporter buttons change spawn for all but the host/admin/camera operators.
- Fixed wanted posters having improperly scaled normal maps.
This commit is contained in:
ActualHorse
2026-04-13 02:57:31 -04:00
parent 4b882fab17
commit 28ab8cbe45
27 changed files with 909 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Materials/Assorted/M_Cork.mat
+88
View File
@@ -0,0 +1,88 @@
%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: M_Cork
m_Shader: {fileID: 4800000, guid: 288f9fd8f4f97774eadbafa338f9617c, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: cb072d3765e9cf443b3c71b63f2c4b9c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalTex:
m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3}
m_Scale: {x: 0.1, y: 0.1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.5882353, g: 0.39215687, b: 0.19607843, a: 1}
- _Color2: {r: 0.47058815, g: 0.29411763, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
Assets/Materials/Assorted/M_Cork.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cc50b68eaabf3b84cad9a23b7eab8d9f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/Decorations/M_DecorativePoster_CarmenPBS.mat
+4 -1
View File
@@ -26,6 +26,10 @@ Material:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1.5, y: 1.5}
m_Offset: {x: 0, y: 0}
- _EmissionMap: - _EmissionMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@@ -37,7 +41,6 @@ Material:
m_Ints: [] m_Ints: []
m_Floats: m_Floats:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _UVSec: 1
m_Colors: m_Colors:
- _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
Assets/Materials/Decorations/Static Wanted Posters/M_StaticWantedPoster_Base.mat
+4 -1
View File
@@ -26,6 +26,10 @@ Material:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1.5, y: 1.5}
m_Offset: {x: 0, y: 0}
- _EmissionMap: - _EmissionMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@@ -37,7 +41,6 @@ Material:
m_Ints: [] m_Ints: []
m_Floats: m_Floats:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _UVSec: 1
m_Colors: m_Colors:
- _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
Assets/Models/SM_Corkboard.fbx
BIN
View File
Binary file not shown.
Assets/Models/SM_Corkboard.fbx.meta
+109
View File
@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 37851402a67c86942a7f9184ff7315c2
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: 3
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/Scenes/witwics.unity
+243 -110
View File
@@ -3284,6 +3284,37 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 76935233} m_PrefabInstance: {fileID: 76935233}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &77165457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 77165458}
m_Layer: 0
m_Name: Spawn Transform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &77165458
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 77165457}
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: 889528276}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &78316819 stripped --- !u!1 &78316819 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 6597076503830995857, guid: be33bc7f6c414e6409becfa348b9310d, m_CorrespondingSourceObject: {fileID: 6597076503830995857, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -6882,14 +6913,14 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129997576} m_GameObject: {fileID: 129997576}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0.00000023841852, z: -0, w: -1}
m_LocalPosition: {x: -4.6666665, y: 0.891, z: 0} m_LocalPosition: {x: -4.7540016, y: 2.0693, z: -0}
m_LocalScale: {x: 1.3333333, y: 1.3333334, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1673503613} - {fileID: 1673503613}
- {fileID: 925493521} - {fileID: 925493521}
m_Father: {fileID: 1788772012} m_Father: {fileID: 760334291}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &133767269 stripped --- !u!1 &133767269 stripped
GameObject: GameObject:
@@ -14862,7 +14893,7 @@ Transform:
m_GameObject: {fileID: 260140873} m_GameObject: {fileID: 260140873}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -0.679, y: -0.0036, z: -0.0001} m_LocalPosition: {x: -0.679, y: 0.002, z: -0.002}
m_LocalScale: {x: 0.295, y: 0.3011334, z: 0.3011334} m_LocalScale: {x: 0.295, y: 0.3011334, z: 0.3011334}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -16475,7 +16506,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 1b072b78d56b48a44b8ff47c708d8d30, - target: {fileID: 841027405675547917, guid: 1b072b78d56b48a44b8ff47c708d8d30,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 1b072b78d56b48a44b8ff47c708d8d30, - target: {fileID: 841027405675547917, guid: 1b072b78d56b48a44b8ff47c708d8d30,
type: 3} type: 3}
@@ -21736,7 +21767,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: f6465ff57588b4940a61b2768a7cbc44, - target: {fileID: 841027405675547917, guid: f6465ff57588b4940a61b2768a7cbc44,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: f6465ff57588b4940a61b2768a7cbc44, - target: {fileID: 841027405675547917, guid: f6465ff57588b4940a61b2768a7cbc44,
type: 3} type: 3}
@@ -22110,7 +22141,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 16950816bbf045142a784d0d7eb602f1, - target: {fileID: 841027405675547917, guid: 16950816bbf045142a784d0d7eb602f1,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 16950816bbf045142a784d0d7eb602f1, - target: {fileID: 841027405675547917, guid: 16950816bbf045142a784d0d7eb602f1,
type: 3} type: 3}
@@ -35650,7 +35681,11 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac, - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac,
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 1788772012} addedObject: {fileID: 129997577}
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac,
type: 3}
insertIndex: -1
addedObject: {fileID: 2033001483}
m_AddedComponents: m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4418ea84766ed04468a42f24f5d9fdac, - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4418ea84766ed04468a42f24f5d9fdac,
type: 3} type: 3}
@@ -38850,7 +38885,7 @@ Transform:
m_GameObject: {fileID: 841163052} m_GameObject: {fileID: 841163052}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: -1, y: 1.666, z: 5.56} m_LocalPosition: {x: -1, y: 1.487, z: 5.56}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -39995,7 +40030,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 889528276} - component: {fileID: 889528276}
m_Layer: 0 m_Layer: 0
m_Name: Spawn Point m_Name: Engineering Room Spawn Point
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -40014,6 +40049,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 77165458}
- {fileID: 1069902877} - {fileID: 1069902877}
- {fileID: 1842054368} - {fileID: 1842054368}
m_Father: {fileID: 1607542514} m_Father: {fileID: 1607542514}
@@ -40801,7 +40837,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.78431374, g: 0.78431374, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@@ -42280,7 +42316,7 @@ PrefabInstance:
- target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, - target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 2.66825 value: 2.659
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5, - target: {fileID: 2675039169023975669, guid: 49d5e8d26bb0f5b40a5fc74a9edc7ef5,
type: 3} type: 3}
@@ -44154,7 +44190,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 6994758b57569254993dce3b5f472585, - target: {fileID: 841027405675547917, guid: 6994758b57569254993dce3b5f472585,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 6994758b57569254993dce3b5f472585, - target: {fileID: 841027405675547917, guid: 6994758b57569254993dce3b5f472585,
type: 3} type: 3}
@@ -45061,7 +45097,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: cd62c837e9517934f8ab2df79df3e1b8, - target: {fileID: 841027405675547917, guid: cd62c837e9517934f8ab2df79df3e1b8,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: cd62c837e9517934f8ab2df79df3e1b8, - target: {fileID: 841027405675547917, guid: cd62c837e9517934f8ab2df79df3e1b8,
type: 3} type: 3}
@@ -55602,7 +55638,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 89ff53c45c9fbc9478489821b52cf942, - target: {fileID: 841027405675547917, guid: 89ff53c45c9fbc9478489821b52cf942,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 89ff53c45c9fbc9478489821b52cf942, - target: {fileID: 841027405675547917, guid: 89ff53c45c9fbc9478489821b52cf942,
type: 3} type: 3}
@@ -57303,7 +57339,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 5b64a0ffa6d49474a96848685e3116e9, - target: {fileID: 841027405675547917, guid: 5b64a0ffa6d49474a96848685e3116e9,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 5b64a0ffa6d49474a96848685e3116e9, - target: {fileID: 841027405675547917, guid: 5b64a0ffa6d49474a96848685e3116e9,
type: 3} type: 3}
@@ -58504,7 +58540,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 890a79f2a5bb23946a3c5ee859ca4ecb, - target: {fileID: 841027405675547917, guid: 890a79f2a5bb23946a3c5ee859ca4ecb,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 890a79f2a5bb23946a3c5ee859ca4ecb, - target: {fileID: 841027405675547917, guid: 890a79f2a5bb23946a3c5ee859ca4ecb,
type: 3} type: 3}
@@ -59354,7 +59390,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.78431374, g: 0.78431374, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@@ -73924,7 +73960,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 0d785f7bddc36804ba45774a72373dc3, - target: {fileID: -8679921383154817045, guid: 0d785f7bddc36804ba45774a72373dc3,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d785f7bddc36804ba45774a72373dc3, - target: {fileID: -8679921383154817045, guid: 0d785f7bddc36804ba45774a72373dc3,
type: 3} type: 3}
@@ -77535,8 +77571,8 @@ Transform:
m_Children: m_Children:
- {fileID: 1586593149} - {fileID: 1586593149}
- {fileID: 889528276} - {fileID: 889528276}
- {fileID: 824788960}
- {fileID: 224136350} - {fileID: 224136350}
- {fileID: 824788960}
- {fileID: 841163055} - {fileID: 841163055}
- {fileID: 272672680} - {fileID: 272672680}
- {fileID: 1596624719} - {fileID: 1596624719}
@@ -83829,12 +83865,11 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1788772011} m_GameObject: {fileID: 1788772011}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: 0.00000026822087, z: -0, w: -1}
m_LocalPosition: {x: -1.25, y: 1.4, z: -0} m_LocalPosition: {x: -0, y: 0, z: 0.0035}
m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_LocalScale: {x: 0.75, y: 0.75, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 129997577}
- {fileID: 1249864386} - {fileID: 1249864386}
- {fileID: 990092988} - {fileID: 990092988}
- {fileID: 414428782} - {fileID: 414428782}
@@ -83847,7 +83882,7 @@ Transform:
- {fileID: 1962599171} - {fileID: 1962599171}
- {fileID: 428989208} - {fileID: 428989208}
- {fileID: 1557255133} - {fileID: 1557255133}
m_Father: {fileID: 760334291} m_Father: {fileID: 2033001483}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1788930248 stripped --- !u!1 &1788930248 stripped
GameObject: GameObject:
@@ -88311,7 +88346,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 3491b093d1b5b944cbb0c8d8dab3dc29, - target: {fileID: 841027405675547917, guid: 3491b093d1b5b944cbb0c8d8dab3dc29,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 3491b093d1b5b944cbb0c8d8dab3dc29, - target: {fileID: 841027405675547917, guid: 3491b093d1b5b944cbb0c8d8dab3dc29,
type: 3} type: 3}
@@ -90383,7 +90418,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.78431374, g: 0.78431374, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@@ -90459,7 +90494,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: c6b0c197d34afdb41b251c07b384ac31, - target: {fileID: 841027405675547917, guid: c6b0c197d34afdb41b251c07b384ac31,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: c6b0c197d34afdb41b251c07b384ac31, - target: {fileID: 841027405675547917, guid: c6b0c197d34afdb41b251c07b384ac31,
type: 3} type: 3}
@@ -94070,6 +94105,79 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1941376487} m_PrefabInstance: {fileID: 1941376487}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &2033001482
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 760334291}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.254
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.385
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -45
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2}
- target: {fileID: -7511558181221131132, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
- target: {fileID: 919132149155446097, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_Name
value: SM_Corkboard
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
insertIndex: -1
addedObject: {fileID: 1788772012}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37851402a67c86942a7f9184ff7315c2, type: 3}
--- !u!4 &2033001483 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 37851402a67c86942a7f9184ff7315c2,
type: 3}
m_PrefabInstance: {fileID: 2033001482}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2033050944 --- !u!1 &2033050944
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -99299,6 +99407,11 @@ PrefabInstance:
propertyPath: _PermissionsPanel propertyPath: _PermissionsPanel
value: value:
objectReference: {fileID: 824788962} objectReference: {fileID: 824788962}
- target: {fileID: 5666304297780667151, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3}
propertyPath: _SpawnPointObject
value:
objectReference: {fileID: 77165458}
- target: {fileID: 5666304297780667151, guid: 4fa69f67b9e439b4191063d255ef01ce, - target: {fileID: 5666304297780667151, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3} type: 3}
propertyPath: _HostTeleportLocation propertyPath: _HostTeleportLocation
@@ -99350,6 +99463,11 @@ PrefabInstance:
propertyPath: _PlayerPodiums.Array.data[2] propertyPath: _PlayerPodiums.Array.data[2]
value: value:
objectReference: {fileID: 1589630268} objectReference: {fileID: 1589630268}
- target: {fileID: 5666304297780667151, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3}
propertyPath: _EngineeringRoomTeleportLocation
value:
objectReference: {fileID: 889528276}
- target: {fileID: 5952060711327772084, guid: 4fa69f67b9e439b4191063d255ef01ce, - target: {fileID: 5952060711327772084, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@@ -99488,7 +99606,7 @@ PrefabInstance:
- target: {fileID: 7639665329390398964, guid: 4fa69f67b9e439b4191063d255ef01ce, - target: {fileID: 7639665329390398964, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 1.099 value: 0.91999996
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7639665329390398964, guid: 4fa69f67b9e439b4191063d255ef01ce, - target: {fileID: 7639665329390398964, guid: 4fa69f67b9e439b4191063d255ef01ce,
type: 3} type: 3}
@@ -103677,7 +103795,7 @@ PrefabInstance:
- target: {fileID: 841027405675547917, guid: 3ea9e1433e50c5f4a86660d2480f84b3, - target: {fileID: 841027405675547917, guid: 3ea9e1433e50c5f4a86660d2480f84b3,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.000375 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 841027405675547917, guid: 3ea9e1433e50c5f4a86660d2480f84b3, - target: {fileID: 841027405675547917, guid: 3ea9e1433e50c5f4a86660d2480f84b3,
type: 3} type: 3}
@@ -106734,8 +106852,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
spawns: spawns:
- {fileID: 889528276} - {fileID: 77165458}
spawnRadius: 0.75 spawnRadius: 0
spawnOrder: 0 spawnOrder: 0
spawnOrientation: 0 spawnOrientation: 0
ReferenceCamera: {fileID: 1069902874} ReferenceCamera: {fileID: 1069902874}
@@ -106763,103 +106881,103 @@ MonoBehaviour:
DynamicPrefabs: [] DynamicPrefabs: []
DynamicMaterials: DynamicMaterials:
- {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
- {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
- {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
- {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2}
- {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2}
- {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2}
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2}
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
- {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
- {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2}
- {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2}
- {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
- {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2}
- {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
- {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2}
- {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2}
- {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2}
- {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2}
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2}
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
- {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
- {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
- {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2}
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2}
- {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
- {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
- {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2}
- {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2}
- {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2}
- {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2}
- {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2}
- {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2}
- {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2}
- {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2}
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2}
- {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2}
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
- {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2}
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2}
- {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2}
- {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
- {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2}
- {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2}
- {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2}
- {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2}
- {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2}
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
LightMapsNear: [] LightMapsNear: []
LightMapsFar: [] LightMapsFar: []
LightMode: 0 LightMode: 0
@@ -112804,6 +112922,11 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 1607542514} m_TransformParent: {fileID: 1607542514}
m_Modifications: m_Modifications:
- target: {fileID: 65509029067069963, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
propertyPath: m_Size.y
value: 1120
objectReference: {fileID: 0}
- target: {fileID: 1314222525771112530, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 1314222525771112530, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
propertyPath: m_Camera propertyPath: m_Camera
@@ -112872,7 +112995,7 @@ PrefabInstance:
- target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 900 value: 1120
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
@@ -112917,7 +113040,7 @@ PrefabInstance:
- target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 1.375 value: 1.303
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 2988918088228115097, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
@@ -113116,6 +113239,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8706698847685276708, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8792415026714437721, guid: d0081ba0c86469447b4742edcbf39017, - target: {fileID: 8792415026714437721, guid: d0081ba0c86469447b4742edcbf39017,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@@ -113126,6 +113254,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9010868799197145067, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00012207031
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
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: 619 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/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/Shaders/Bicolour Noise.shader
+6 -2
View File
@@ -9,6 +9,8 @@ Shader "Carmen/Bicolour Noise"
Properties Properties
{ {
_MainTex ("Noise Texture", 2D) = "white" {} _MainTex ("Noise Texture", 2D) = "white" {}
_NormalTex ("Normal", 2D) = "bump" {}
_Color("Colour 1", Color) = (0,0,0,1) _Color("Colour 1", Color) = (0,0,0,1)
_Color2("Colour 2", Color) = (1,1,1,1) _Color2("Colour 2", Color) = (1,1,1,1)
} }
@@ -40,6 +42,7 @@ Shader "Carmen/Bicolour Noise"
#pragma surface surf LambertVRC alphatest:_Cutoff exclude_path:prepass exclude_path:deferred noforwardadd #pragma surface surf LambertVRC alphatest:_Cutoff exclude_path:prepass exclude_path:deferred noforwardadd
UNITY_DECLARE_TEX2D(_MainTex); UNITY_DECLARE_TEX2D(_MainTex);
UNITY_DECLARE_TEX2D(_NormalTex);
struct SurfaceOutputVRC struct SurfaceOutputVRC
{ {
@@ -54,6 +57,7 @@ Shader "Carmen/Bicolour Noise"
struct Input struct Input
{ {
float2 uv_MainTex; float2 uv_MainTex;
float2 uv_NormalTex;
half4 colour : COLOR; half4 colour : COLOR;
half4 colour2 : COLOR; half4 colour2 : COLOR;
}; };
@@ -63,11 +67,11 @@ Shader "Carmen/Bicolour Noise"
void surf (Input IN, inout SurfaceOutputVRC o) void surf (Input IN, inout SurfaceOutputVRC o)
{ {
o.Albedo = lerp(_Color, _Color2, UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex).r); o.Albedo = lerp(_Color, _Color2, smoothstep(0.2, 0.8, UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex).r));
o.Alpha = 1.0; o.Alpha = 1.0;
o.Gloss = 0.0; o.Gloss = 0.0;
o.Normal = fixed3(0.0, 0.0, 1.0); o.Normal = UnpackNormal(UNITY_SAMPLE_TEX2D(_NormalTex, IN.uv_NormalTex));
} }
Assets/UdonSharp/PlayerTeleporter.asset
+398 -235
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 9 Data: 11
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@@ -116,13 +116,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _HostTeleportLocation Data: _SpawnPointObject
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _HostTeleportLocation Data: _SpawnPointObject
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 8|System.RuntimeType, mscorlib Data: 8|System.RuntimeType, mscorlib
@@ -152,10 +152,29 @@ MonoBehaviour:
Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 3
- Name: - Name:
Entry: 7 Entry: 7
Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 11|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
- Name: tooltip
Entry: 1
Data: The spawn point used for the world. This will be moved to new locations
when teleports are requested.
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 12|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@@ -176,13 +195,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _EntranceTeleportLocation Data: _EngineeringRoomTeleportLocation
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _EntranceTeleportLocation Data: _EngineeringRoomTeleportLocation
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 8
@@ -203,64 +222,19 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 15|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: - Name: height
Entry: 8 Entry: 4
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _Player1TeleportLocation
- Name: $v
Entry: 7
Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Player1TeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8 Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -284,13 +258,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _Player2TeleportLocation Data: _HostTeleportLocation
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _Player2TeleportLocation Data: _HostTeleportLocation
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 8
@@ -312,186 +286,189 @@ MonoBehaviour:
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _Player3TeleportLocation
- Name: $v
Entry: 7
Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Player3TeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _AudienceTeleportLocation
- Name: $v
Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _AudienceTeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _HostTeleportButtons
- Name: $v
Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _HostTeleportButtons
- Name: <UserType>k__BackingField
Entry: 7
Data: 27|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.GameObject, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 27
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 29|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 19|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data: 20|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _EntranceTeleportLocation
- Name: $v
Entry: 7
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _EntranceTeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _Player1TeleportLocation
- Name: $v
Entry: 7
Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Player1TeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _Player2TeleportLocation
- Name: $v
Entry: 7
Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Player2TeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -515,16 +492,202 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _PlayerPodiums Data: _Player3TeleportLocation
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Player3TeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _AudienceTeleportLocation
- Name: $v
Entry: 7
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _AudienceTeleportLocation
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 36|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _HostTeleportButtons
- Name: $v
Entry: 7
Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _HostTeleportButtons
- Name: <UserType>k__BackingField
Entry: 7
Data: 39|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.GameObject, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 39
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 41|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _PlayerPodiums
- Name: $v
Entry: 7
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _PlayerPodiums Data: _PlayerPodiums
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 32|System.RuntimeType, mscorlib Data: 44|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: PlayerPodium[], Assembly-CSharp Data: PlayerPodium[], Assembly-CSharp
@@ -533,7 +696,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 7 Entry: 7
Data: 33|System.RuntimeType, mscorlib Data: 45|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: UnityEngine.Component[], UnityEngine.CoreModule Data: UnityEngine.Component[], UnityEngine.CoreModule
@@ -554,13 +717,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 35|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 47|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
@@ -569,7 +732,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 36|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
Assets/UdonSharp/PlayerTeleporter.cs
+42 -14
View File
@@ -1,7 +1,6 @@
using UdonSharp; using UdonSharp;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using VRC.SDKBase; using VRC.SDKBase;
@@ -9,27 +8,36 @@ using VRC.SDKBase;
public class PlayerTeleporter : UdonSharpBehaviour public class PlayerTeleporter : UdonSharpBehaviour
{ {
[SerializeField] private PermissionsPanel _PermissionsPanel; [SerializeField] private PermissionsPanel _PermissionsPanel;
[Space]
[Tooltip("The spawn point used for the world. This will be moved to new locations when teleports are requested.")]
[SerializeField] private Transform _SpawnPointObject;
[Space]
[SerializeField] private Transform _EngineeringRoomTeleportLocation;
[Space]
[SerializeField] private Transform _HostTeleportLocation; [SerializeField] private Transform _HostTeleportLocation;
[SerializeField] private Transform _EntranceTeleportLocation; [SerializeField] private Transform _EntranceTeleportLocation;
[Space]
[SerializeField] private Transform _Player1TeleportLocation; [SerializeField] private Transform _Player1TeleportLocation;
[SerializeField] private Transform _Player2TeleportLocation; [SerializeField] private Transform _Player2TeleportLocation;
[SerializeField] private Transform _Player3TeleportLocation; [SerializeField] private Transform _Player3TeleportLocation;
[Space]
[SerializeField] private Transform _AudienceTeleportLocation; [SerializeField] private Transform _AudienceTeleportLocation;
[Space] [Space]
[SerializeField] private GameObject _HostTeleportButtons; [SerializeField] private GameObject _HostTeleportButtons;
[Space] [Space]
[SerializeField] private PlayerPodium[] _PlayerPodiums; [SerializeField] private PlayerPodium[] _PlayerPodiums;
public override void OnPlayerRespawn(VRCPlayerApi Player) public override void OnPlayerRespawn(VRCPlayerApi Player)
{ {
if (_PermissionsPanel.IsPlayerHost(Player) ||
_PermissionsPanel.IsPlayerAdmin(Player) ||
_PermissionsPanel.IsPlayerCameraOperator(Player))
{
_MoveSpawnPointTo(_EngineeringRoomTeleportLocation);
_TeleportToCurrentSpawnPoint();
}
if (_PermissionsPanel.IsPlayerHost(Player)) if (_PermissionsPanel.IsPlayerHost(Player))
{ {
_HostTeleportButtons.SetActive(true); _HostTeleportButtons.SetActive(true);
@@ -52,34 +60,54 @@ public class PlayerTeleporter : UdonSharpBehaviour
public void TeleportToHostPosition() public void TeleportToHostPosition()
{ {
Networking.LocalPlayer.TeleportTo(_HostTeleportLocation.position, _HostTeleportLocation.rotation); _MoveSpawnPointTo(_HostTeleportLocation);
_TeleportToCurrentSpawnPoint();
} }
public void TeleportToEntrancePosition() public void TeleportToEntrancePosition()
{ {
Networking.LocalPlayer.TeleportTo(_EntranceTeleportLocation.position, _EntranceTeleportLocation.rotation); _MoveSpawnPointTo(_EntranceTeleportLocation);
_TeleportToCurrentSpawnPoint();
} }
public void TeleportToPlayer1Position() public void TeleportToPlayer1Position()
{ {
_PlayerPodiums[0].SetPlayerName(); _PlayerPodiums[0].SetPlayerName();
Networking.LocalPlayer.TeleportTo(_Player1TeleportLocation.position, _Player1TeleportLocation.rotation); _MoveSpawnPointTo(_Player1TeleportLocation);
_TeleportToCurrentSpawnPoint();
} }
public void TeleportToPlayer2Position() public void TeleportToPlayer2Position()
{ {
_PlayerPodiums[1].SetPlayerName(); _PlayerPodiums[1].SetPlayerName();
Networking.LocalPlayer.TeleportTo(_Player2TeleportLocation.position, _Player2TeleportLocation.rotation); _MoveSpawnPointTo(_Player2TeleportLocation);
_TeleportToCurrentSpawnPoint();
} }
public void TeleportToPlayer3Position() public void TeleportToPlayer3Position()
{ {
_PlayerPodiums[2].SetPlayerName(); _PlayerPodiums[2].SetPlayerName();
Networking.LocalPlayer.TeleportTo(_Player3TeleportLocation.position, _Player3TeleportLocation.rotation); _MoveSpawnPointTo(_Player3TeleportLocation);
_TeleportToCurrentSpawnPoint();
} }
public void TeleportToAudience() public void TeleportToAudience()
{ {
Networking.LocalPlayer.TeleportTo(_AudienceTeleportLocation.position, _AudienceTeleportLocation.rotation); _MoveSpawnPointTo(_AudienceTeleportLocation);
_TeleportToCurrentSpawnPoint();
}
private void _MoveSpawnPointTo(Transform Parent)
{
_SpawnPointObject.SetParent(Parent);
_SpawnPointObject.localPosition = Vector3.zero;
_SpawnPointObject.localRotation = Quaternion.identity;
_SpawnPointObject.localScale = Vector3.one;
}
private void _TeleportToCurrentSpawnPoint()
{
Networking.LocalPlayer.TeleportTo(_SpawnPointObject.position, _SpawnPointObject.rotation);
} }
} }
Assets/UdonSharp/UtilityScripts/BoneFollower.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower m_Name: BoneFollower
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/InteractToggle.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle m_Name: InteractToggle
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter m_Name: PlayerModSetter
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject m_Name: GlobalToggleObject
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject m_Name: MasterToggleObject
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower m_Name: TrackingDataFollower
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:
Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings m_Name: WorldAudioSettings
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError: