diff --git a/Game/CourierOld/Assets/Resources/Models/комната.fbx b/Game/CourierOld/Assets/Resources/Models/комната.fbx new file mode 100644 index 0000000..b6aaaa2 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/комната.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c930a0a0f8eafba5d3424aee881b5d74b0c5cd577974760e06a69a0da742c507 +size 481164 diff --git a/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta b/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta new file mode 100644 index 0000000..4830f6f --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 425e074725c3d964b86e9e7f0bc9b440 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab index 33e2d2d..efeb217 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab @@ -30,9 +30,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5388355903165944077} - {fileID: 4761058503291947116} - {fileID: 6017131008952297230} + - {fileID: 2778908582827482574} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-4180217759986572316 @@ -47,121 +47,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomTimer: 13 + roomType: 0 + roomTimer: 10 enterMarker: {fileID: 4761058503291947116} exitMarker: {fileID: 6017131008952297230} ---- !u!1 &4995932836210277906 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5388355903165944077} - - component: {fileID: 5070741574123288367} - - component: {fileID: 8183753309061526208} - - component: {fileID: 5026407498558906469} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5388355903165944077 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4995932836210277906} - 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: 688359521346588339} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5070741574123288367 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4995932836210277906} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8183753309061526208 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4995932836210277906} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &5026407498558906469 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4995932836210277906} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &7080809108028773528 GameObject: m_ObjectHideFlags: 0 @@ -187,7 +76,7 @@ Transform: m_GameObject: {fileID: 7080809108028773528} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.33942, y: 0, z: -4.7536097} + m_LocalPosition: {x: -10.21, y: 1.18, z: -1.22} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -218,9 +107,71 @@ Transform: m_GameObject: {fileID: 7527627021930292984} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.33942, y: 0, z: 4.72} + m_LocalPosition: {x: 9.9, y: 1.22, z: -1.26} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 688359521346588339} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2385240790407985701 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 688359521346588339} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalPosition.x + value: -0.13513851 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0499994 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalPosition.z + value: -0.2246666 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + propertyPath: m_Name + value: "\u043A\u043E\u043C\u043D\u0430\u0442\u0430" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} +--- !u!4 &2778908582827482574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} + m_PrefabInstance: {fileID: 2385240790407985701} + m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab index 249dfac..1f7e20c 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab @@ -271,7 +271,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomTimer: 19 + roomType: 0 + roomTimer: 10 enterMarker: {fileID: 8922805401416243237} exitMarker: {fileID: 6126628687386234644} --- !u!1 &7060958620083535568