diff --git a/Assets/Animations/Player Podium/PC Risk Card Turn Forward.anim b/Assets/Animations/Player Podium/PC Risk Card Turn Forward.anim index d97b155..f57acdc 100644 --- a/Assets/Animations/Player Podium/PC Risk Card Turn Forward.anim +++ b/Assets/Animations/Player Podium/PC Risk Card Turn Forward.anim @@ -27,7 +27,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 0.5833333 value: {x: 0, y: -180, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -53,8 +53,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 - value: {x: 0.304, y: 0.041, z: 0.2332} + time: 0.5833333 + value: {x: 0.304, y: 0.1914, z: 0.1565} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -99,7 +99,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.5833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -129,7 +129,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.5833333 value: 0 inSlope: 0 outSlope: 0 @@ -159,7 +159,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.5833333 value: -180 inSlope: 0 outSlope: 0 @@ -189,7 +189,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.5833333 value: 0 inSlope: 0 outSlope: 0 @@ -219,7 +219,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.5833333 value: 0.304 inSlope: 0 outSlope: 0 @@ -249,8 +249,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0.041 + time: 0.5833333 + value: 0.1914 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -279,8 +279,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0.2332 + time: 0.5833333 + value: 0.1565 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx b/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx index e073c41..eaf894e 100644 Binary files a/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx and b/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx differ diff --git a/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx.meta b/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx.meta index df480f9..f618815 100644 --- a/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx.meta +++ b/Assets/Models/Decorations/Flags/SM_TinyFlag.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx b/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx index b3f3351..a77cef8 100644 Binary files a/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx and b/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx differ diff --git a/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx.meta b/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx.meta index f592104..fcc9b85 100644 --- a/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx.meta +++ b/Assets/Models/Decorations/SM_RobinsonWorldMap.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_CeilingPlane.fbx b/Assets/Models/SM_CeilingPlane.fbx new file mode 100644 index 0000000..6a7934a Binary files /dev/null and b/Assets/Models/SM_CeilingPlane.fbx differ diff --git a/Assets/Models/SM_FloorPlane2.fbx.meta b/Assets/Models/SM_CeilingPlane.fbx.meta similarity index 98% rename from Assets/Models/SM_FloorPlane2.fbx.meta rename to Assets/Models/SM_CeilingPlane.fbx.meta index 13907d2..fad3237 100644 --- a/Assets/Models/SM_FloorPlane2.fbx.meta +++ b/Assets/Models/SM_CeilingPlane.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: df582371b6cfb5049a36b1d718037a95 +guid: c5353190a485a134481a9d9e089ecfc1 ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] diff --git a/Assets/Models/SM_FloorPlane.fbx b/Assets/Models/SM_FloorPlane.fbx index 6a7934a..64ece32 100644 Binary files a/Assets/Models/SM_FloorPlane.fbx and b/Assets/Models/SM_FloorPlane.fbx differ diff --git a/Assets/Models/SM_FloorPlane.fbx.meta b/Assets/Models/SM_FloorPlane.fbx.meta index fad3237..13907d2 100644 --- a/Assets/Models/SM_FloorPlane.fbx.meta +++ b/Assets/Models/SM_FloorPlane.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5353190a485a134481a9d9e089ecfc1 +guid: df582371b6cfb5049a36b1d718037a95 ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] diff --git a/Assets/Models/SM_FloorPlane2.fbx b/Assets/Models/SM_FloorPlane2.fbx deleted file mode 100644 index 30157cb..0000000 Binary files a/Assets/Models/SM_FloorPlane2.fbx and /dev/null differ diff --git a/Assets/Models/SM_PlayerPedestal.fbx b/Assets/Models/SM_PlayerPedestal.fbx index 83af6f1..c8eb756 100644 Binary files a/Assets/Models/SM_PlayerPedestal.fbx and b/Assets/Models/SM_PlayerPedestal.fbx differ diff --git a/Assets/Models/SM_Round1Door.fbx b/Assets/Models/SM_Round1Door.fbx index 9a99200..57c7228 100644 Binary files a/Assets/Models/SM_Round1Door.fbx and b/Assets/Models/SM_Round1Door.fbx differ diff --git a/Assets/Models/SM_Round1Door.fbx.meta b/Assets/Models/SM_Round1Door.fbx.meta index ea4ff55..a68c6f7 100644 --- a/Assets/Models/SM_Round1Door.fbx.meta +++ b/Assets/Models/SM_Round1Door.fbx.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 -guid: 899800e653b50104b9eaf32d2ec50019 +guid: 9748eb992b23eac4582c91e24d840bef ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] externalObjects: {} materials: - materialImportMode: 2 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -78,7 +78,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] @@ -97,7 +97,7 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 0 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Models/SM_Round1DoorNew.fbx b/Assets/Models/SM_Round1DoorNew.fbx deleted file mode 100644 index fce4091..0000000 Binary files a/Assets/Models/SM_Round1DoorNew.fbx and /dev/null differ diff --git a/Assets/Models/SM_Round1Floor.fbx b/Assets/Models/SM_Round1Floor.fbx index 1de14c4..de78fdc 100644 Binary files a/Assets/Models/SM_Round1Floor.fbx and b/Assets/Models/SM_Round1Floor.fbx differ diff --git a/Assets/Models/SM_Round1Podium.fbx b/Assets/Models/SM_Round1Podium.fbx index ffd68a8..a50d8f3 100644 Binary files a/Assets/Models/SM_Round1Podium.fbx and b/Assets/Models/SM_Round1Podium.fbx differ diff --git a/Assets/Models/SM_Round1PodiumNamePlacard.fbx b/Assets/Models/SM_Round1PodiumNamePlacard.fbx new file mode 100644 index 0000000..39b0ffc Binary files /dev/null and b/Assets/Models/SM_Round1PodiumNamePlacard.fbx differ diff --git a/Assets/Models/SM_Round1DoorNew.fbx.meta b/Assets/Models/SM_Round1PodiumNamePlacard.fbx.meta similarity index 98% rename from Assets/Models/SM_Round1DoorNew.fbx.meta rename to Assets/Models/SM_Round1PodiumNamePlacard.fbx.meta index a68c6f7..002abf7 100644 --- a/Assets/Models/SM_Round1DoorNew.fbx.meta +++ b/Assets/Models/SM_Round1PodiumNamePlacard.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9748eb992b23eac4582c91e24d840bef +guid: fef4b7f976be5be498f302b02c93adce ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index 84f6e4c..1da76e5 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -26,18 +26,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147622434047157077} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: -0.095} - m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_LocalRotation: {x: -0.00000005960463, y: 1, z: -0, w: 0.000000029802315} + m_LocalPosition: {x: 0, y: 0, z: 0.0026} + m_LocalScale: {x: 0.0009999999, y: 0.0009999999, z: 0.0009999999} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4151962916040414228} - m_Father: {fileID: 5984335492357139332} + m_Father: {fileID: 799912643020852426} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 1.092} - m_SizeDelta: {x: 700, y: 215} + m_AnchoredPosition: {x: 0, y: 0.002} + m_SizeDelta: {x: 630, y: 215} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3400579330922569370 Canvas: @@ -127,7 +127,7 @@ Transform: m_GameObject: {fileID: 578724368301165151} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: 0.20833333} + m_LocalPosition: {x: 0.0175, y: 0, z: 0.11} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -191,7 +191,7 @@ Transform: m_GameObject: {fileID: 1273041045561394985} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: 0.12500001} + m_LocalPosition: {x: 0.0175, y: 0, z: 0.055} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -800,37 +800,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3081469380416616671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5606189223142959981} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5606189223142959981 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3081469380416616671} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.357, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5984335492357139332} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3311726862824349027 GameObject: m_ObjectHideFlags: 1 @@ -941,7 +910,7 @@ Transform: m_GameObject: {fileID: 3902744920602546784} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.041, z: -0.23} + m_LocalPosition: {x: 0, y: 1.041, z: -0.305} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1041,7 +1010,7 @@ Transform: m_GameObject: {fileID: 4065564322009068976} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: 0.041666664} + m_LocalPosition: {x: 0.0175, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1074,7 +1043,7 @@ Transform: m_GameObject: {fileID: 4559844655557189913} serializedVersion: 2 m_LocalRotation: {x: 0.7071067, y: -0, z: -0, w: 0.7071069} - m_LocalPosition: {x: 0.608, y: -0.0237, z: -0.198} + m_LocalPosition: {x: 0.594, y: -0.0237, z: -0.156} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1290,7 +1259,7 @@ Transform: m_GameObject: {fileID: 5957486306513083280} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000002533197} - m_LocalPosition: {x: 0, y: 0.0278, z: 0.2231} + m_LocalPosition: {x: 0, y: 0.187, z: 0.1565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1315,8 +1284,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.48215008, y: 0.16358376, z: 0.2828468} - m_Center: {x: 0, y: 0.013086915, z: 0.1414234} + m_Size: {x: 0.33333334, y: 0.30797374, z: 0.14684395} + m_Center: {x: 0, y: -0.07450789, z: -0.017164871} --- !u!114 &6501792587173908481 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1376,7 +1345,7 @@ GameObject: - component: {fileID: 3938961789148287225} - component: {fileID: 2896373937264359406} - component: {fileID: 8474886526797794486} - m_Layer: 0 + m_Layer: 22 m_Name: Podium Highlight Effect m_TagString: Untagged m_Icon: {fileID: 0} @@ -1507,7 +1476,7 @@ Transform: m_GameObject: {fileID: 6494273791062881839} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.304, y: 1.026, z: -0.238} + m_LocalPosition: {x: -0.304, y: 1.026, z: -0.283} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1620,11 +1589,9 @@ Transform: - {fileID: 5617792120913924276} - {fileID: 2523767775587334635} - {fileID: 2108874904556183587} - - {fileID: 7780879094676330011} - {fileID: 7566631391838123814} - {fileID: 9043478063159764907} - {fileID: 4038521119021851374} - - {fileID: 5606189223142959981} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1226214083704227558 @@ -1904,7 +1871,7 @@ Transform: m_GameObject: {fileID: 7945424451921462804} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: -0.20833336} + m_LocalPosition: {x: 0.0175, y: 0, z: -0.165} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2176,7 +2143,7 @@ Transform: m_GameObject: {fileID: 8697447862879544987} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: -0.04166667} + m_LocalPosition: {x: 0.0175, y: 0, z: -0.055} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2208,7 +2175,7 @@ Transform: m_GameObject: {fileID: 8926171785367029373} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 0, z: -0.125} + m_LocalPosition: {x: 0.0175, y: 0, z: -0.11} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2505,6 +2472,94 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 13dcfdcf86a283d43b82280c52b3febd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &906179219550595873 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2108874904556183587} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.09 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - target: {fileID: 919132149155446097, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_Name + value: SM_Round1PodiumNamePlacard + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + propertyPath: m_StaticEditorFlags + value: 126 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7780879094676330011} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fef4b7f976be5be498f302b02c93adce, type: 3} +--- !u!4 &799912643020852426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fef4b7f976be5be498f302b02c93adce, + type: 3} + m_PrefabInstance: {fileID: 906179219550595873} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1768015018251908753 PrefabInstance: m_ObjectHideFlags: 0 @@ -2706,7 +2761,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - target: {fileID: 919132149155446097, guid: d52dd7da4dc174845b8ec221f8a0016c, type: 3} propertyPath: m_Name @@ -2724,6 +2779,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 3938961789148287225} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: d52dd7da4dc174845b8ec221f8a0016c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 799912643020852426} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d52dd7da4dc174845b8ec221f8a0016c, type: 3} @@ -3301,7 +3360,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - target: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3} propertyPath: m_Name @@ -3323,7 +3382,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3} insertIndex: -1 - addedObject: {fileID: 4505031650078111987} + addedObject: {fileID: 1232737882784910230} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3} insertIndex: -1 @@ -3345,7 +3404,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6167885581044250701} m_PrefabAsset: {fileID: 0} ---- !u!65 &4505031650078111987 +--- !u!65 &1232737882784910230 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3364,7 +3423,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.75, y: 0.70000035, z: 2.5} + m_Size: {x: 1.25, y: 1.0000004, z: 2.5000002} m_Center: {x: 0.375, y: 0.00000014901238, z: -1.25} --- !u!114 &2379192055874455715 MonoBehaviour: diff --git a/Assets/Scenes/witwics.lighting b/Assets/Scenes/witwics.lighting index 722445c..49cd2d3 100644 --- a/Assets/Scenes/witwics.lighting +++ b/Assets/Scenes/witwics.lighting @@ -19,7 +19,7 @@ LightingSettings: m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 16 - m_Padding: 16 + m_Padding: 8 m_LightmapCompression: 3 m_AO: 1 m_AOMaxDistance: 1 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 31e983c..ce9807a 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -20606,6 +20606,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: -7066721739990682315, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: -6398997995166298115, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_StaticEditorFlags @@ -20614,7 +20619,7 @@ PrefabInstance: - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: -5930041980729405407, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} @@ -20636,6 +20641,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -3802159405488812060, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - target: {fileID: -1650981249416628154, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_Materials.Array.data[0] @@ -20651,6 +20661,21 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - target: {fileID: -378214446103253992, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_ScaleInLightmap + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -378214446103253992, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: -378214446103253992, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - target: {fileID: -305091885687274788, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_CastShadows @@ -20676,6 +20701,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[2] value: objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - target: {fileID: -103088867777563083, guid: 9748eb992b23eac4582c91e24d840bef, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - target: {fileID: 919132149155446097, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_Name @@ -20689,7 +20719,7 @@ PrefabInstance: - target: {fileID: 3831827510232965585, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3831827510232965585, guid: 9748eb992b23eac4582c91e24d840bef, type: 3} @@ -46734,11 +46764,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: af769cc34b6f1184abdde3b566f86a51, - type: 3} - propertyPath: m_ScaleInLightmap - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: af769cc34b6f1184abdde3b566f86a51, type: 3} propertyPath: m_Materials.Array.data[0] @@ -81991,7 +82016,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 8634657762449747467, guid: df582371b6cfb5049a36b1d718037a95, type: 3} + m_Mesh: {fileID: 2432532794255309932, guid: df582371b6cfb5049a36b1d718037a95, type: 3} --- !u!1001 &1886661117134837012 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 8f114f8..29d45d4 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_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 1c5d34f..c130e88 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 ba1feee..a304733 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 ddc1587..ed3be0a 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-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 537b496..53b8aea 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 76c9615..012fdb4 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 99810e4..f0b324e 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 3bc2434..1a0ab8f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Raw Files/Round1Door.blend b/Raw Files/Round1Door.blend index 5c4bc3f..8a1e57e 100644 Binary files a/Raw Files/Round1Door.blend and b/Raw Files/Round1Door.blend differ diff --git a/Raw Files/Round1Floor.blend b/Raw Files/Round1Floor.blend new file mode 100644 index 0000000..f0eaba1 Binary files /dev/null and b/Raw Files/Round1Floor.blend differ diff --git a/Raw Files/Round1Podium.blend b/Raw Files/Round1Podium.blend index 39112f8..163c0f1 100644 Binary files a/Raw Files/Round1Podium.blend and b/Raw Files/Round1Podium.blend differ