diff --git a/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim b/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim index 473f4e8..3ebbc09 100644 --- a/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim +++ b/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim @@ -71,7 +71,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 0.4} + value: {x: 1, y: 1, z: 0.1} inSlope: {x: 0, y: 0, z: 0.83526653} outSlope: {x: 0, y: 0, z: 0.83526653} tangentMode: 0 @@ -335,7 +335,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.1 inSlope: 0.83526653 outSlope: 0.83526653 tangentMode: 0 diff --git a/Assets/Animations/Jail Call.meta b/Assets/Animations/Jail Call.meta new file mode 100644 index 0000000..efc71cd --- /dev/null +++ b/Assets/Animations/Jail Call.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bdafa6540624e84182d97d1a65046eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller b/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller new file mode 100644 index 0000000..11a34b0 --- /dev/null +++ b/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8016422354116739550 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lightning Bolt Blink + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: faf2496892eb4d34eaad93b516b58731, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4812096638601564539 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8016422354116739550} + m_Position: {x: 30, y: 180, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8016422354116739550} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jail Call Lightning Bolt Blinker + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4812096638601564539} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller.meta b/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller.meta new file mode 100644 index 0000000..bdf224f --- /dev/null +++ b/Assets/Animations/Jail Call/Jail Call Lightning Bolt Blinker.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e6b2559ef1e3c846b0b99d150380d2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Jail Call/Lightning Bolt Blink.anim b/Assets/Animations/Jail Call/Lightning Bolt Blink.anim new file mode 100644 index 0000000..6f9b559 --- /dev/null +++ b/Assets/Animations/Jail Call/Lightning Bolt Blink.anim @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lightning Bolt Blink + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + 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_Enabled + path: Lightning Bolt + classID: 23 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3269743464 + attribute: 3305885265 + script: {fileID: 0} + typeID: 23 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + 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_Enabled + path: Lightning Bolt + classID: 23 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Jail Call/Lightning Bolt Blink.anim.meta b/Assets/Animations/Jail Call/Lightning Bolt Blink.anim.meta new file mode 100644 index 0000000..81ac34b --- /dev/null +++ b/Assets/Animations/Jail Call/Lightning Bolt Blink.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: faf2496892eb4d34eaad93b516b58731 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Gradients/M_JailCall_Border.mat b/Assets/Materials/Gradients/M_JailCall_Border.mat new file mode 100644 index 0000000..61b8d15 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Border.mat @@ -0,0 +1,85 @@ +%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_JailCall_Border + m_Shader: {fileID: 4800000, guid: ae367da677f462b469824fb90f3e4192, 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: 0} + 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} + - _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: + - _BottomColour: {r: 0.5882353, g: 0.39215687, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TopColour: {r: 1, g: 0.78431374, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Gradients/M_JailCall_Border.mat.meta b/Assets/Materials/Gradients/M_JailCall_Border.mat.meta new file mode 100644 index 0000000..74077a0 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Border.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b23fb87b65cd2c4408ca7d02e2670e85 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat b/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat new file mode 100644 index 0000000..9d46135 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat @@ -0,0 +1,102 @@ +%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_JailCall_LightningBolt + m_Shader: {fileID: 4800000, guid: ae367da677f462b469824fb90f3e4192, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + 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} + - _DetailNormal: + 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} + - _DetailTex: + 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: 0} + 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} + - _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: + - _Bicubic: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BottomColour: {r: 0.78431374, g: 0.78431374, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 0, a: 1} + - _Colour: {r: 1, g: 1, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Skew: {r: 0, g: 0, b: 0, a: 0} + - _TopColour: {r: 0.78431374, g: 0.78431374, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat.meta b/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat.meta new file mode 100644 index 0000000..edbd8c6 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_LightningBolt.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e7652d0d7dcf884285ffae607c7c4aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Gradients/M_JailCall_Shadow.mat b/Assets/Materials/Gradients/M_JailCall_Shadow.mat new file mode 100644 index 0000000..dc93cb7 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Shadow.mat @@ -0,0 +1,31 @@ +%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_JailCall_Shadow + m_Shader: {fileID: 4800000, guid: ae367da677f462b469824fb90f3e4192, type: 3} + m_Parent: {fileID: 2100000, guid: 8e7652d0d7dcf884285ffae607c7c4aa, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _BottomColour: {r: 0, g: 0, b: 0, a: 1} + - _TopColour: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Gradients/M_JailCall_Shadow.mat.meta b/Assets/Materials/Gradients/M_JailCall_Shadow.mat.meta new file mode 100644 index 0000000..9947ef0 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Shadow.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 124d743ecfefd8744877866a040b6374 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/LocationBoard.fbx b/Assets/Models/LocationBoard.fbx deleted file mode 100644 index 05ea9df..0000000 Binary files a/Assets/Models/LocationBoard.fbx and /dev/null differ diff --git a/Assets/Models/SM_CrookCallOverlay.fbx b/Assets/Models/SM_CrookCallOverlay.fbx index b2231b4..37191da 100644 Binary files a/Assets/Models/SM_CrookCallOverlay.fbx and b/Assets/Models/SM_CrookCallOverlay.fbx differ diff --git a/Assets/Models/SM_LocationBoard.fbx b/Assets/Models/SM_LocationBoard.fbx new file mode 100644 index 0000000..440d876 Binary files /dev/null and b/Assets/Models/SM_LocationBoard.fbx differ diff --git a/Assets/Models/LocationBoard.fbx.meta b/Assets/Models/SM_LocationBoard.fbx.meta similarity index 100% rename from Assets/Models/LocationBoard.fbx.meta rename to Assets/Models/SM_LocationBoard.fbx.meta diff --git a/Assets/Models/SM_LocationBoardCabinet.fbx b/Assets/Models/SM_LocationBoardCabinet.fbx index 51d2995..fd82ee5 100644 Binary files a/Assets/Models/SM_LocationBoardCabinet.fbx and b/Assets/Models/SM_LocationBoardCabinet.fbx differ diff --git a/Assets/Models/SM_Round2Floor.fbx b/Assets/Models/SM_Round2Floor.fbx index 8bff6f6..2c670dd 100644 Binary files a/Assets/Models/SM_Round2Floor.fbx and b/Assets/Models/SM_Round2Floor.fbx differ diff --git a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab index 4a9bcec..d057ee0 100644 --- a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab +++ b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5469398094120495767 Transform: m_ObjectHideFlags: 0 @@ -186,6 +186,26 @@ PrefabInstance: propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + - target: {fileID: -7511558181221131132, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: b23fb87b65cd2c4408ca7d02e2670e85, type: 2} + - target: {fileID: -7511558181221131132, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 8e7652d0d7dcf884285ffae607c7c4aa, type: 2} + - target: {fileID: -1650961516638611751, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8e7652d0d7dcf884285ffae607c7c4aa, type: 2} + - target: {fileID: -1650961516638611751, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 124d743ecfefd8744877866a040b6374, type: 2} - target: {fileID: 919132149155446097, guid: f763c946e951c2540a7de2af1f8a5756, type: 3} propertyPath: m_Name @@ -196,10 +216,34 @@ PrefabInstance: propertyPath: m_Layer value: 23 objectReference: {fileID: 0} + - target: {fileID: 8786324576378969273, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 6924ed010b86e02488fa9173e5405519, type: 2} + - target: {fileID: 8786324576378969273, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + - target: {fileID: 8786324576378969273, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: b23fb87b65cd2c4408ca7d02e2670e85, type: 2} + - target: {fileID: 8786324576378969273, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 124d743ecfefd8744877866a040b6374, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8018443001109229312} m_SourcePrefab: {fileID: 100100000, guid: f763c946e951c2540a7de2af1f8a5756, type: 3} --- !u!4 &2752861152387369276 stripped Transform: @@ -207,3 +251,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2431550034009452247} m_PrefabAsset: {fileID: 0} +--- !u!1 &3278602999264826246 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + m_PrefabInstance: {fileID: 2431550034009452247} + m_PrefabAsset: {fileID: 0} +--- !u!95 &8018443001109229312 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3278602999264826246} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 2e6b2559ef1e3c846b0b99d150380d2e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Prefabs/Player Podium Round 2.prefab b/Assets/Prefabs/Player Podium Round 2.prefab index b9b9af3..850694b 100644 --- a/Assets/Prefabs/Player Podium Round 2.prefab +++ b/Assets/Prefabs/Player Podium Round 2.prefab @@ -320,12 +320,12 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -341,27 +341,27 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -2.383001 + value: -3.332757 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.5189995 + value: 1.5189991 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 2.0110023 + value: 2.8298295 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: -0.4165495 + value: -0.41654956 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: 3.2298184e-15 + value: -0.0000000021302602 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -371,7 +371,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: -0.00000011920929 + value: -0.00000012754629 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 20ffb97..5caad43 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -5133,7 +5133,7 @@ Transform: m_GameObject: {fileID: 106321076} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.67, y: 0, z: 1.46} + m_LocalPosition: {x: 0.78, y: 0, z: 2.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5208,8 +5208,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 8.241913, y: 5.9157925, z: 0.77569705} - m_Center: {x: -0.31782368, y: 2.4578972, z: 0.3432508} + m_Size: {x: 6.445602, y: 5.9157925, z: 1.0274103} + m_Center: {x: -0.3893631, y: 2.4578972, z: -0.43916473} --- !u!1 &106359467 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4510245985558128150, guid: d065e253d298f0f44bb1d1c926531103, @@ -16385,37 +16385,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2024292607} m_PrefabAsset: {fileID: 0} ---- !u!1 &277338530 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 277338531} - m_Layer: 0 - m_Name: Player 1 Pedestal Light Anchor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &277338531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277338530} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.8433924, z: -0, w: -0.5372982} - m_LocalPosition: {x: -1.26, y: 0.3, z: -1.984} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1230983058} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &278613014 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7321907671636687759, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -17180,15 +17149,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 295257086} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.2588185, z: -0, w: 0.965926} - m_LocalPosition: {x: -1.495, y: 0, z: 0.143} + m_LocalRotation: {x: -0, y: 0.10784609, z: -0, w: 0.99416757} + m_LocalPosition: {x: -1.459, y: 0, z: 0.337} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 666229123} - {fileID: 809107838} m_Father: {fileID: 1583513123} - m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 12.382, z: 0} --- !u!1 &295678827 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6300196051895744731, guid: 126991d511ca61841a0ef899b6c038a6, @@ -25245,7 +25214,7 @@ PrefabInstance: type: 3} propertyPath: m_ProbeAnchor value: - objectReference: {fileID: 1769237702} + objectReference: {fileID: 0} - target: {fileID: 755772544833906144, guid: 5066b3b269b691d458beae6cb7911193, type: 3} propertyPath: serializationData.Prefab @@ -25368,6 +25337,11 @@ PrefabInstance: value: objectReference: {fileID: 9174552830167456250, guid: 5066b3b269b691d458beae6cb7911193, type: 3} + - target: {fileID: 9180995732343910284, guid: 5066b3b269b691d458beae6cb7911193, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -30751,37 +30725,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &625363652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 625363653} - m_Layer: 0 - m_Name: Player Back Wall Adjusted Position 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &625363653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625363652} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.8842, y: 0, z: 5.1139} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1331320733} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &626260667 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5468226942934575294, guid: be33bc7f6c414e6409becfa348b9310d, @@ -35723,98 +35666,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 734635744} m_PrefabAsset: {fileID: 0} ---- !u!1 &734800643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 734800644} - - component: {fileID: 734800646} - - component: {fileID: 734800645} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &734800644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734800643} - 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: 1589182209} - m_LocalEulerAnglesHint: {x: 0, y: 6.144, z: 0} ---- !u!81 &734800645 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734800643} - m_Enabled: 1 ---- !u!20 &734800646 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734800643} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 2.3333333 - far clip plane: 6.5 - field of view: 20 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &735590427 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5957486306513083280, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -41294,6 +41145,7 @@ MonoBehaviour: _ArrivalDisplays: - {fileID: 2013644315} - {fileID: 1776587609} + _WinningPlayerPositionMarker: {fileID: 1528301667} _JailCallCameraOverlay: {fileID: 1155978249} _JailPlayer: {fileID: 115578771} --- !u!1001 &867006604 @@ -41480,37 +41332,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &884476055 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 884476056} - m_Layer: 0 - m_Name: Player Back Wall Original Position - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &884476056 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 884476055} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.380006, y: 0, z: 4.805703} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1331320733} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &886213379 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6458581458612866833, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -44396,6 +44217,95 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1001 &942141808 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 972709827} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.x + value: 0.84705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.y + value: 0.84705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.z + value: 0.84705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000059604602 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000004214689 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.z + value: -2.8421706e-14 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_Name + value: Spawn Marker + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_TagString + value: EditorOnly + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} +--- !u!4 &942141809 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + m_PrefabInstance: {fileID: 942141808} + m_PrefabAsset: {fileID: 0} --- !u!1 &942306428 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7206467881111069546, guid: 126991d511ca61841a0ef899b6c038a6, @@ -45970,6 +45880,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &972709826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 972709827} + m_Layer: 0 + m_Name: Winning Player Spawn Point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &972709827 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972709826} + serializedVersion: 2 + m_LocalRotation: {x: -0.31791952, y: 0.6316068, z: 0.6316068, w: 0.3179198} + m_LocalPosition: {x: -1.84, y: 0, z: 1.239} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1371950537} + - {fileID: 942141809} + m_Father: {fileID: 1583513123} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -233.437} --- !u!1 &975045127 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8717376369267340683, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -51700,6 +51643,89 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1045530108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1045530109} + - component: {fileID: 1045530111} + - component: {fileID: 1045530110} + m_Layer: 0 + m_Name: Sphere + m_TagString: EditorOnly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1045530109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045530108} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1561995252} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1045530110 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045530108} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1045530111 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045530108} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1047388942 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4294144169429098507, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -54771,22 +54797,22 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -0.52005315 + value: -0.5200531 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.388 + value: 1.419 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 3.9405842 + value: 3.9405875 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.48823154 + value: 0.5227187 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -54796,7 +54822,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.8727142 + value: -0.85250527 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -58187,8 +58213,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 785030038} - - {fileID: 277338531} - - {fileID: 1769237702} - {fileID: 253261076} - {fileID: 481893951} m_Father: {fileID: 124273106} @@ -60635,14 +60659,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311764230} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.51, y: 0, z: 1.41} + m_LocalRotation: {x: -0, y: 0.15739243, z: -0, w: 0.9875362} + m_LocalPosition: {x: -3.16, y: 0, z: 3.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 35514605} m_Father: {fileID: 1483356975} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 18.111, z: 0} --- !u!65 &1311764234 BoxCollider: m_ObjectHideFlags: 0 @@ -60662,8 +60686,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.5753372, y: 5.9157925, z: 6.3446593} - m_Center: {x: 0.057150777, y: 2.4578972, z: -0.19181636} + m_Size: {x: 4.756959, y: 5.9157925, z: 6.3446593} + m_Center: {x: 1.1479565, y: 2.4578972, z: -0.19181609} --- !u!114 &1311764235 MonoBehaviour: m_ObjectHideFlags: 2 @@ -61339,13 +61363,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1324583144} serializedVersion: 2 - m_LocalRotation: {x: 0.83928233, y: -0.07592024, z: 0.12148833, w: 0.5244826} + m_LocalRotation: {x: 0.8504205, y: -0.09260997, z: 0.15988442, w: 0.4925905} m_LocalPosition: {x: -1.7616603, y: 6, z: 0.61220455} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 115.996, y: -16.473022, z: 0} + m_LocalEulerAnglesHint: {x: 119.838, y: -21.294983, z: 0} --- !u!108 &1324583146 Light: m_ObjectHideFlags: 0 @@ -61359,8 +61383,8 @@ Light: m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 2 - m_Range: 12 - m_SpotAngle: 35 + m_Range: 8 + m_SpotAngle: 20 m_InnerSpotAngle: 2 m_CookieSize: 10 m_Shadows: @@ -61914,9 +61938,7 @@ Transform: - {fileID: 96005905} - {fileID: 139770783} - {fileID: 2119386630} - - {fileID: 884476056} - {fileID: 124273106} - - {fileID: 625363653} - {fileID: 267965642} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -64018,6 +64040,71 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1369540354} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1371950536 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 972709827} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Player Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &1371950537 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 1371950536} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1374373549 PrefabInstance: m_ObjectHideFlags: 0 @@ -65964,7 +66051,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 10 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66000,7 +66087,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.99939084 + value: 0.9992291 objectReference: {fileID: 0} - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66010,7 +66097,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: 0.03489949 + value: 0.03925978 objectReference: {fileID: 0} - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66020,7 +66107,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 4 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -68125,7 +68212,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: 0.19 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} @@ -68135,7 +68222,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.194 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} @@ -68450,7 +68537,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_Name - value: SM_LocationBoardPlaceholderShell + value: SM_LocationBoardCabinet objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} @@ -68618,7 +68705,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} insertIndex: -1 - addedObject: {fileID: 1470660573} + addedObject: {fileID: 1470660576} m_SourcePrefab: {fileID: 100100000, guid: 2508e31fad449364f8b5919392c5d343, type: 3} --- !u!4 &1470660571 stripped Transform: @@ -68632,7 +68719,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1470660570} m_PrefabAsset: {fileID: 0} ---- !u!65 &1470660573 +--- !u!65 &1470660576 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -68651,8 +68738,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.8288006, y: 1.9812, z: 1.0000004} - m_Center: {x: -0.000000834465, y: 0.9906, z: -0.49999982} + m_Size: {x: 2.3467855, y: 2.4051921, z: 1.3522255} + m_Center: {x: -0.0000012765782, y: 1.2025961, z: -0.5999996} --- !u!1 &1471187087 GameObject: m_ObjectHideFlags: 0 @@ -74485,6 +74572,24 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1528301665 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 1371950536} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1528301667 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 1371950536} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528301665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1528591628 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9009189034908819552, guid: e9914385266bca24db809c39e395f03c, @@ -79757,6 +79862,38 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1561995251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1561995252} + m_Layer: 0 + m_Name: Placement Guide + m_TagString: EditorOnly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1561995252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561995251} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: 0.00000014901158, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9.919001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1045530109} + m_Father: {fileID: 7240854401870329234} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1562217076 PrefabInstance: m_ObjectHideFlags: 0 @@ -80711,6 +80848,7 @@ Transform: - {fileID: 51189180} - {fileID: 7240854401870329234} - {fileID: 295257087} + - {fileID: 972709827} - {fileID: 1468229609714695595} - {fileID: 1737232024} - {fileID: 1470660571} @@ -81274,12 +81412,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 832323181} m_PrefabAsset: {fileID: 0} ---- !u!4 &1589182209 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 1922829037} - m_PrefabAsset: {fileID: 0} --- !u!1 &1589630266 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6693907286767766257, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -84452,12 +84584,12 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 13 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -84478,7 +84610,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -1.3110001 + value: -0.42800003 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -84488,12 +84620,12 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 0.8540001 + value: 1.4250008 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.93615425 + value: 0.91119146 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -84503,7 +84635,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.3515896 + value: -0.41198322 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -88494,37 +88626,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1768602428} m_PrefabAsset: {fileID: 0} ---- !u!1 &1769237701 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1769237702} - m_Layer: 0 - m_Name: Player 2 Pedestal Light Anchor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1769237702 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769237701} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.8433924, z: -0, w: -0.5372982} - m_LocalPosition: {x: -1.166, y: 0.3, z: -1.884} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1230983058} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1769559492 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2833676846741775144, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -93835,18 +93936,13 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 20 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane value: 6.5 objectReference: {fileID: 0} - - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: NearClippingPlane - value: 2.3333333 - objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: CameraSystemManager @@ -93866,22 +93962,22 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -4.0039587 + value: -1.3841182 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.277 + value: 1.556 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 5.777049 + value: 5.045327 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: -0.08501793 + value: 0.18299471 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -93891,7 +93987,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.99637944 + value: -0.9831139 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -93915,11 +94011,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 734800644} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1922829038 stripped @@ -94396,37 +94488,37 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -0.7229997 + value: 0.4042194 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.729 + value: 3.2212162 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 5.749001 + value: 6.27767 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.2985172 + value: 0.4427746 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: 0.01691024 + value: 0.08970884 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.9527271 + value: -0.87029344 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: 0.053969458 + value: 0.19619502 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -96073,13 +96165,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1965776733} serializedVersion: 2 - m_LocalRotation: {x: -0.053005088, y: 0.5129961, z: -0.70511776, w: -0.48665637} + m_LocalRotation: {x: -0.05943238, y: 0.47057053, z: -0.7046052, w: -0.5277904} m_LocalPosition: {x: 2.9321992, y: 6, z: -3.2687712} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 129.192, y: -222.20999, z: -90} + m_LocalEulerAnglesHint: {x: 133.459, y: -216.898, z: -90} --- !u!108 &1965776735 Light: m_ObjectHideFlags: 0 @@ -96093,8 +96185,8 @@ Light: m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 2 - m_Range: 12 - m_SpotAngle: 45 + m_Range: 11 + m_SpotAngle: 25 m_InnerSpotAngle: 1 m_CookieSize: 10 m_Shadows: @@ -113602,7 +113694,7 @@ PrefabInstance: type: 3} propertyPath: m_ProbeAnchor value: - objectReference: {fileID: 277338531} + objectReference: {fileID: 0} - target: {fileID: 755772544833906144, guid: 5066b3b269b691d458beae6cb7911193, type: 3} propertyPath: serializationData.Prefab @@ -113736,6 +113828,11 @@ PrefabInstance: value: objectReference: {fileID: 9174552830167456250, guid: 5066b3b269b691d458beae6cb7911193, type: 3} + - target: {fileID: 9180995732343910284, guid: 5066b3b269b691d458beae6cb7911193, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -119647,6 +119744,10 @@ MonoBehaviour: ID: 1372 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1528301665} + ID: 1373 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -119814,42 +119915,42 @@ PrefabInstance: - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalPosition.x - value: -1.5900161 + value: -1.173 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalPosition.y - value: 9.918991 + value: 9.919001 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalPosition.z - value: 0.399991 + value: 1.088 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalRotation.w - value: 0.6644638 + value: 0.66446304 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalRotation.x - value: -0.6644623 + value: -0.66446304 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalRotation.y - value: 0.24184522 + value: 0.24184473 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalRotation.z - value: 0.24184413 + value: 0.24184473 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} @@ -119859,7 +119960,7 @@ PrefabInstance: - target: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 5848948944498296662, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} @@ -119884,7 +119985,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4542884620256451187, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} + insertIndex: 0 + addedObject: {fileID: 1561995252} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} --- !u!4 &7240854401870329234 stripped diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index ce5225b..3b52a21 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png index 9924ff9..87d0e8f 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 48f9c63..0e9cef0 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 21e84a3..3ffd46a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index d10898f..b782f74 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-10.exr b/Assets/Scenes/witwics/ReflectionProbe-10.exr index ef75630..5c1639d 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-10.exr and b/Assets/Scenes/witwics/ReflectionProbe-10.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-11.exr b/Assets/Scenes/witwics/ReflectionProbe-11.exr index 8ba62ba..312710a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-11.exr and b/Assets/Scenes/witwics/ReflectionProbe-11.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-12.exr b/Assets/Scenes/witwics/ReflectionProbe-12.exr index 3dd134b..fdc6e67 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-12.exr and b/Assets/Scenes/witwics/ReflectionProbe-12.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-13.exr b/Assets/Scenes/witwics/ReflectionProbe-13.exr index 8a62300..f04f29d 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-13.exr and b/Assets/Scenes/witwics/ReflectionProbe-13.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-14.exr b/Assets/Scenes/witwics/ReflectionProbe-14.exr index 696cc57..335c909 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-14.exr and b/Assets/Scenes/witwics/ReflectionProbe-14.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index e278209..b6b1b94 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 7bc8aa7..15190c3 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index c9f207e..d9263d2 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index d79f612..17cb094 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr index 6ffe9a4..f5a9163 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-6.exr and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-7.exr b/Assets/Scenes/witwics/ReflectionProbe-7.exr index 254c27a..75c087c 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-7.exr and b/Assets/Scenes/witwics/ReflectionProbe-7.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-8.exr b/Assets/Scenes/witwics/ReflectionProbe-8.exr index 42fcc49..3ce4a4f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-8.exr and b/Assets/Scenes/witwics/ReflectionProbe-8.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-9.exr b/Assets/Scenes/witwics/ReflectionProbe-9.exr index afb791c..ecd594f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-9.exr and b/Assets/Scenes/witwics/ReflectionProbe-9.exr differ diff --git a/Assets/Shaders/UVGradient.shader b/Assets/Shaders/UVGradient.shader index 801d6c4..2ba6f9c 100644 --- a/Assets/Shaders/UVGradient.shader +++ b/Assets/Shaders/UVGradient.shader @@ -38,12 +38,14 @@ Shader "Carmen/UVGradient" { float4 vertex : POSITION; float2 uv : TEXCOORD0; + fixed4 colour : COLOR0; }; struct V2F { float2 uv : TEXCOORD0; float4 position : SV_POSITION; + fixed4 colour : COLOR0; }; @@ -52,6 +54,7 @@ Shader "Carmen/UVGradient" V2F o; o.uv = TRANSFORM_TEX(v.uv, _MainTex); o.position = UnityObjectToClipPos(v.vertex); + o.colour = v.colour; return o; } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 4d80fa2..d73bd23 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 32 + Data: 33 - Name: Entry: 7 Data: @@ -1148,16 +1148,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailCallCameraOverlay + Data: _WinningPlayerPositionMarker - Name: $v Entry: 7 Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _WinningPlayerPositionMarker + - Name: k__BackingField + Entry: 9 + Data: 27 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 77|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: _JailCallCameraOverlay + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailCallCameraOverlay - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 79|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraOverlay, Assembly-CSharp @@ -1181,13 +1235,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1211,13 +1265,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 80|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1241,13 +1295,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1271,13 +1325,13 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 84|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -1286,7 +1340,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 84 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,19 +1355,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1337,13 +1391,13 @@ MonoBehaviour: Data: _Landmarks - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Landmarks - Name: k__BackingField Entry: 7 - Data: 89|System.RuntimeType, mscorlib + Data: 92|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -1352,7 +1406,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 89 + Data: 92 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1367,13 +1421,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1397,13 +1451,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 93|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1412,61 +1466,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 93 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _CurrentPlayerCounter - - Name: $v - Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CurrentPlayerCounter - - Name: k__BackingField - Entry: 9 - Data: 93 - - Name: k__BackingField - Entry: 9 - Data: 93 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1508,19 +1508,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RoundIsOver + Data: _CurrentPlayerCounter - Name: $v Entry: 7 Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RoundIsOver + Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 42 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 42 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1563,16 +1563,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound2 + Data: _RoundIsOver - Name: $v Entry: 7 Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RoundIsOver + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 104|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _CameraControllerRound2 + - Name: $v + Entry: 7 + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 103|System.RuntimeType, mscorlib + Data: 106|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1596,7 +1651,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1621,7 +1676,7 @@ MonoBehaviour: Data: _PlayingJailCall - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayingJailCall @@ -1645,7 +1700,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1670,71 +1725,16 @@ MonoBehaviour: Data: _PanelToReveal_Cache - Name: $v Entry: 7 - Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PanelToReveal_Cache - Name: k__BackingField Entry: 9 - Data: 93 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 93 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 110|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 110 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1771,19 +1771,74 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_STANDARD + - Name: k__BackingField + Entry: 7 + Data: 113|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 113 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_RED + - Name: $v + Entry: 7 + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1798,7 +1853,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1823,16 +1878,16 @@ MonoBehaviour: Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1847,7 +1902,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1872,16 +1927,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 9 - Data: 110 + Data: 113 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1896,7 +1951,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 765105a..72a1aa5 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -32,6 +32,7 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private ArrivalDisplay[] _ArrivalDisplays; + [SerializeField] private PositionMarker _WinningPlayerPositionMarker; [SerializeField] private CameraOverlay _JailCallCameraOverlay; [SerializeField] private RandomVideoPlayer _JailPlayer; @@ -72,6 +73,7 @@ public class GameManagerRound2 : GameManagerBase InitialiseLocationBoard(); + _WinningPlayerPositionMarker.ClearPlayer(); _JailChain.Initialise(); _JailPhone.Initialise(); @@ -113,6 +115,7 @@ public class GameManagerRound2 : GameManagerBase _PlayingJailCall = false; _JailCallCameraOverlay.EnableOverlayElements(false); + _WinningPlayerPositionMarker.ClearPlayer(); _JailPhone.Activate(false); _JailChain.Show = false; @@ -367,6 +370,7 @@ public class GameManagerRound2 : GameManagerBase Winner[0] = _CaseManager.GetHostOwner().displayName; } _CaseManager.SetCurrentWinningPlayers(Winner); + _WinningPlayerPositionMarker.SetPlayer(Winner[0]); HostCardRecoverTheLootInterface Interface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);