diff --git a/.gitignore b/.gitignore index 58cbc82..42a5011 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* +*.zip diff --git a/Assets/Scenes/game.unity b/Assets/Scenes/game.unity index 08e2f54..a374339 100644 --- a/Assets/Scenes/game.unity +++ b/Assets/Scenes/game.unity @@ -4890,6 +4890,170 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4781277628412113339, guid: 288f6aaf1c74b0e4b874313edef77dfd, type: 3} +--- !u!43 &348910723 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh29004 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 216 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 106 + localAABB: + m_Center: {x: 2.5, y: 0.8313812, z: 2.5} + m_Extent: {x: 2.5, y: 0.8313812, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a0009000c000b000c000d000b000c000e000d000e000f000d000e0010000f00100011000f001200130014001300150014001600170018001700190018000a000b001a000b001b001a000b000d001b000d001c001b000d000f001c000f001d001c000f0011001d0011001e001d001f002000210020002200210020001a0022001a00230022001a002400250024002600250027002800290028002a0029001c001d002b001d002c002b001d001e002c001e002d002c00210022002e0022002f002e00220023002f00230030002f00310032003300320034003300350036003700380039003a003b003c003d003c003e003d003c003f003e003f0040003e002e002f0041002f00420041002f00430044004300450044004600470048004700490048004a004b004c004b004d004c004e004f0050004f0051005000520053005400530055005400410042005600420057005600580059005a0059005b005a005c005d005e005d005f005e004c004d0060004d0061006000620063006400630065006400660067006800670069006800 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 106 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 48 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 5936 + _typelessdata: 000000000000000000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000c7f6a33c0bd7a33c00000000000000005655553f1c8820bd0c367f3f1c8820bd6acd7f3f85e7203d562ea036000080bf000000005655553f6a13fb3dc6f6a33c5655553f00000000000000001c8820bd0c367f3f1c8820bd6acd7f3f85e7203d562ea036000080bf5655553f000000000bd7a33c7d0bfb3d5455553f209b863d5455553f1c88a0bd186c7e3f1c88a0bd1c357f3ff206a13d00000000000080bf5455553f5455553f7153fb3d595cfb3d00000000000000005655553ff006a1bd1d357f3f000000001c357f3fef06a13d00000000000080bf000000005655553f6a13fb3dc6f6a33c00000000000000005655d53ff00621bd1d357f3fee06213d1acd7f3fa466213d132ba136000080bf000000005655d53f43cb663e6012a53c5455553f209b863d5455553ff00621bd1d357f3fee06213d1acd7f3fa466213d132ba136000080bfeefe553f5455553f7153fb3d595cfb3d5655553f000000005655d53f000000001d357f3fee06a13d0000803f0000000000000000000080bf43ac543f5655d53f71da663ef4a9fb3d00000000000000005655d53f000000000000803f000000000000803f0000000000000000000080bf000000005655d53f43cb663e6012a53c000000000000000000002040000000000000803f000000000000803f0000000000000000000080bf000000000000204086fda73e64dea43c5655553f000000005655d53f000000000000803f000000000000803f0000000000000000000080bf5655553f5655d53f71da663ef4a9fb3d5655553f0000000000002040000000000000803f000000000000803f0000000000000000000080bf5655553f00002040afffa73e6494fb3d000000000000000055555540000000000000803f000000000000803f0000000000000000000080bf00000000555555408395dc3e68d7a43c5655553f0000000055555540000000000000803f000000000000803f0000000000000000000080bf5655553f555555408a95dc3e2994fb3d000000000000000055558540000000000000803f000000000000803f0000000000000000000080bf00000000555585408796083f08e0a43c5655553f0000000055558540000000000000803f000000000000803f0000000000000000000080bf5655553f555585403b96083f2b96fb3d00000000000000000000a040000000000000803f000000000000803f0000000000000000000080bf000000000000a04042e2223f52eba43c5655553f000000000000a040000000000000803f000000000000803f0000000000000000000080bf5655553f0000a040e5e1223fe498fb3d5655553f0000000000000000000000001d357f3ff006a1bd0000803f0000000000000000000080bf5655553f000000000bd7a33c7d0bfb3d5455553f209b863d5455553fee06213d1d357f3ff00621bd1acd7f3f85e620bdec5b4b3b000080bf5455553fedfe553f7153fb3d595cfb3d5655d53f0000000000000000ee06213d1d357f3ff00621bd1acd7f3f85e620bdec5b4b3b000080bf5655d53f00000000adb1a43c6ec6663e5655d53f000000005655553fee06a13d1d357f3f00000000db337f3f2306a1bdfd32cb3b000080bf5655d53f43ac543f738efb3d74de663e5455553f209b863d5455553f1688a03d186c7e3f1688a03d1c357f3fec06a1bd26a522af000080bf9459533f1e0c523f7153fb3d595cfb3d5655553f000000005655d53f1688203d0c367f3f1688203dcacc7f3f6e6621bd37bb4a3b000080bf43ac543f0205d43f71da663ef4a9fb3d5655d53f000000005655553f1688203d0c367f3f1688203dcacc7f3f6e6621bd37bb4a3b000080bf43acd43f200c523f738efb3d74de663e5655d53f000000005655d53f000000000000803f00000000c0fe7f3f000000002b92ca3b000080bf43acd43fb75cd33f0cdb663ec7e9663e5655d53f000000005655d53f000000000000803f000000000000803f0000000000000000000080bf5655d53f5655d53f0cdb663ec7e9663e5655d53f0000000000002040000000000000803f000000000000803f0000000000000000000080bf5655d53f00002040bffda73ef2ef663e5655d53f0000000055555540000000000000803f000000000000803f0000000000000000000080bf5655d53f55555540d693dc3eb9f7663e5655d53f0000000055558540000000000000803f000000000000803f0000000000000000000080bf5655d53f55558540c995083f3bf9663e5655d53f000000000000a040000000000000803f000000000000803f0000000000000000000080bf5655d53f0000a0407de1223fd1fa663e5655d53f0000000000000000000000000000803f000000000000803f0000000000000000000080bf5655d53f00000000adb1a43c6ec6663e5655d53f000000005655553f000000000000803f000000000000803f0000000000000000000080bf5655d53f5655553f738efb3d74de663e000020400000000000000000000000000000803f000000000000803f0000000000000000000080bf0000204000000000d63ba43cf4f9a73e00002040000000005655553f000000000000803f000000000000803f0000000000000000000080bf000020405655553f1565fb3d6500a83e00002040000000005655d53f000000000000803f000000000000803f0000000000000000000080bf000020405655d53fd5d3663e1604a83e5655d53f00000000000020403f2593bcafd57f3f3f2593bc6bf57f3f8337933c16066034000080bf5655d53f00002040bffda73ef2ef663e00002040000000005655d53f3f2593bcafd57f3f3f2593bc6bf57f3f8337933c16066034000080bf000020405655d53fd5d3663e1604a83e00002040408ff53c000020403f2513bd5eab7f3f3f2513bda5d57f3f943d133d00000000000080bf000020400000204056fea73e590ca83e5655d53f0000000000002040933d13bda5d57f3f00000000a5d57f3f933d133d00000000000080bf0a32d53f00002040bffda73ef2ef663e5655d53f0000000055555540933d93bca5d57f3f933d933c68f57f3fd94f933c5e626034000080bf0a32d53f55555540d693dc3eb9f7663e00002040408ff53c00002040933d93bca5d57f3f933d933c68f57f3fd94f933c5e626034000080bf2ff71f400000204056fea73e590ca83e00002040000000005555554000000000a5d57f3f933d133d0000803f0000000000000000000080bf87e51f40555555405493dc3ead13a83e000020400000000055555540000000000000803f000000000000803f0000000000000000000080bf00002040555555405493dc3ead13a83e000020400000000055558540000000000000803f000000000000803f0000000000000000000080bf00002040555585407595083f3414a83e00002040000000000000a040000000000000803f000000000000803f0000000000000000000080bf000020400000a0402ee1223fd314a83e555555400000000000000000000000000000803f000000000000803f0000000000000000000080bf555555400000000079f8a33c3590dc3e55555540000000005655553f000000000000803f000000000000803f0000000000000000000080bf555555405655553f0e53fb3d8a93dc3e55555540000000005655d53f000000000000803f000000000000803f0000000000000000000080bf555555405655d53f5cc8663ea597dc3e00002040000000005655d53f00000000a5d57f3f933d13bd0000803f0000000000000000000080bf000020400a32d53fd5d3663e1604a83e00002040408ff53c00002040933d933ca5d57f3f933d93bc68f57f3f763793bc0187293a000080bf000020402ff71f4056fea73e590ca83e55555540000000005655d53f933d933ca5d57f3f933d93bc68f57f3f763793bc0187293a000080bf555555400a32d53f5cc8663ea597dc3e555555400000000000002040933d133da5d57f3f0000000097d57f3f8b3d13bdf87fa93a000080bf5555554087e51f400dfea73e96a1dc3e00002040408ff53c000020403f25133d5eab7f3f3f25133da5d57f3f943d13bd00000000000080bfe0d31f40099f1f4056fea73e590ca83e000020400000000055555540ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf87e51f4030fd54405493dc3ead13a83e555555400000000000002040ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf09325540099f1f400dfea73e96a1dc3e000020400000000055555540ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf87e51f4030fd54402448b83e0205283f5555554066d5d43f55555540439f2abfd105ab3e439f2abf2fa1d73ee808683f8299073d000080bfbb5e514084195140711d933e56a75f3f555555400000000000002040ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf09325540099f1f4082e55b3e0205283f000020400000000055555540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555555c080608f3f2448b83e0205283f000020400000000055558540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555585c080608f3fc622ea3e8c58303f5555554066d5d43f55555540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555555c0d5b83e40711d933e56a75f3f5555554066d5d43f55558540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555585c0d5b83e4013f8c43ee1fa673f00002040000000000000a040a4dd64bf3567e53e000000000000000000000000000080bf000080bf0000a0c081608f3fb4fe0d3f17ac383f5555554066d5d43f0000a040a4dd64bf3567e53e000000000000000000000000000080bf000080bf0000a0c0d5b83e40b5d2f63e6b4e703f555585400000000000000000000000000000803f000000000000803f0000000000000000000080bf55558540000000000bd7a33c0493083f55558540000000005655553f000000000000803f000000000000803f0000000000000000000080bf555585405655553f884ffb3d9991083f55555540000000005655d53f53ba05bdfe737f3f52ba05bdf3dc7f3f59f1053df2bb1936000080bf555555405655d53f5cc8663ea597dc3e55558540000000005655553f53ba05bdfe737f3f52ba05bdf3dc7f3f59f1053df2bb1936000080bf555585405655553f884ffb3d9991083f555585400bd65f3d5655d53f53ba85bdfbe77e3f52ba85bd8a737f3f8a03863d53ba0530000080bf555585405655d53fb3da663eac98083f55555540000000005655d53f8b0386bd8b737f3f000000008a737f3f8a03863d00000000000080bf49e054405655d53f5cc8663ea597dc3e5555554000000000000020408b0306bd8b737f3f8b03063dcddc7f3fb03a063d2a661a36000080bf49e05440000020400dfea73e96a1dc3e555585400bd65f3d5655d53f8b0306bd8b737f3f8b03063dcddc7f3fb03a063d2a661a36000080bf792985405655d53fb3da663eac98083f555585400000000000002040000000008b737f3f8b03863d0000803f0000000000000000000080bf2d0c8540000020403f06a83e32a0083f555555400000000000002040000000003567e53ea5dd64bf0000803f0000000000000000000080bf5555554080608f3f82e55b3e0205283f5555554066d5d43f55555540000000003567e53ea5dd64bf0000803f0000000000000000000080bf55555540d5b83e40711d933e56a75f3f555585400000000000002040000000003567e53ea5dd64bf0000803f0000000000000000000080bf5555854080608f3f6460f03d8a58303f5555854066d5d43f55555540000000003567e53ea5dd64bf0000803f0000000000000000000080bf55558540d5b83e409485423edffa673f5555554066d5d43f55555540000000000000803f000000000000803f0000000000000000000080bf5555554055555540cbbe713f9c326e3d5555554066d5d43f55558540af04a93e88d42d3faf04a93e37365f3f8e54f4beab98e03d000080bf5555554055558540cbbe713febf02c3e5555854066d5d43f55555540af04a93e88d42d3faf04a93e37365f3f8e54f4beab98e03d000080bf5555854055555540bd65553f9c326e3d555585409e27013e55558540af04293f2152b73eaf04293fbd14f43ebd0961bfb004a9b2000080bf5555854055558540f86d413fe9cf7c3e5555554066d5d43f55558540bc09613fbe14f43e0000000000000000000000000000803f000080bf55558540bd7702becbbe713febf02c3e5555554066d5d43f0000a04090b0623fb07aec3ebd900a3d34d0f3bce83a84bc6dda7f3f000080bf0000a040bd7702be38837b3fe1f88b3e555585409e27013e5555854090b0623fb07aec3ebd900a3d34d0f3bce83a84bc6dda7f3f000080bf555585402e0ff0bff86d413fe9cf7c3e55558540000000000000a0406357643fa3e0e43ebd908a3d63bd73bdde2e04bdac697f3f000080bf0000a0404540febf8599423ff141b13e0000a0400000000000000000000000000000803f000000000000803f0000000000000000000080bf0000a0400000000023f8a33c19e0223f0000a040000000005655553f000000000000803f000000000000803f0000000000000000000080bf0000a0405655553f6363fb3ddade223f55558540000000005655553f000000008b737f3f8a0386bd0000803f0000000000000000000080bf5555854049e0543f884ffb3d9991083f555585400bd65f3d5655d53f8803063d8b737f3f8a0306bdcedc7f3ff2f005bd92af0c3b000080bf555585407655d53fb3da663eac98083f0000a040000000005655553f8803063d8b737f3f8a0306bdcedc7f3ff2f005bd92af0c3b000080bf0000a04049e0543f6363fb3ddade223f0000a040000000005655d53f8803863d8b737f3f00000000f0727f3f370386bd0f9c8c3b000080bf0000a04049e0d43fb6ef663e2fe5223f555585400bd65f3d5655d53f51ba853dfbe77e3f53ba853d8a737f3f870386bd53ba0530000080bfe2ee8440bc24d23fb3da663eac98083f55558540000000000000204051ba053dfe737f3f53ba053da7dc7f3f993a06bd77610c3b000080bf2d0c8540e6841e403f06a83e32a0083f0000a040000000005655d53f51ba053dfe737f3f53ba053da7dc7f3f993a06bd77610c3b000080bf36a89f40bc24d23fb6ef663e2fe5223f0000a0400000000000002040000000000000803f0000000066ff7f3f00000000ea4d8c3b000080bf36a89f40904a1e400904a83e49e6223f0000a0400000000000002040000000003567e53ea4dd64bf0000803f0000000000000000000080bf0000a04081608f3f0bd7a33c13ac383f0000a04066d5d43f55555540000000003567e53ea4dd64bf0000803f0000000000000000000080bf0000a040d5b83e4086a0bd3d674e703f5555854066d5d43f5555554000000000be14f43ebc09613f000080bf0000000000000000000080bf555585c0bd7702bebd65553f9c326e3d555585409e27013e55558540bb900a3db07aec3e90b0623f6dda7fbfe03a843c35d0f33c000080bf555585c02e0ff0bff86d413fe9cf7c3e0000a04066d5d43f55555540bb900a3db07aec3e90b0623f6dda7fbfe03a843c35d0f33c000080bf0000a0c0bd7702be88a53a3f0bd7a33c0000a0400000000055558540bb908a3da3e0e43e6357643fac697fbfd52e043d62bd733d000080bf0000a0c04540febffa00283fab21783e555585409e27013e55558540858d173e69547a3f858d173e041e7d3f8c3d19be868d1731000080bf573a83403e528040f86d413fe9cf7c3e55558540000000000000a040858d973d342a7d3f858d973d0c417f3f39869abde5f8373c000080bff7d48340ed489b408599423ff141b13e0000a0400000000055558540858d973d342a7d3f858d973d0c417f3f39869abde5f8373c000080bfc2329e403e528040fa00283fab21783e0000a040000000000000a040000000000000803f0000000093ef7f3f00000000dc69b73c000080bfc2329e40bab19a40fa00283ff141b13e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 2.5, y: 0.8313812, z: 2.5} + m_Extent: {x: 2.5, y: 0.8313812, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &349448038 PrefabInstance: m_ObjectHideFlags: 0 @@ -5892,7 +6056,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh27956 + m_Name: pb_Mesh27954 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15219,7 +15383,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh28422 + m_Name: pb_Mesh28418 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -17921,7 +18085,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh28736 + m_Name: pb_Mesh28740 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21774,7 +21938,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh27766 + m_Name: pb_Mesh27770 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -22708,7 +22872,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh28628 + m_Name: pb_Mesh28622 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34161,7 +34325,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh28940 + m_Name: pb_Mesh28946 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37051,7 +37215,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1921080736} + m_Mesh: {fileID: 348910723} --- !u!33 &1908967091 MeshFilter: m_ObjectHideFlags: 10 @@ -37059,7 +37223,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1908967089} - m_Mesh: {fileID: 1921080736} + m_Mesh: {fileID: 348910723} --- !u!23 &1908967092 MeshRenderer: m_ObjectHideFlags: 0 @@ -38224,8 +38388,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 1921080736} - m_VersionIndex: 220 + m_Mesh: {fileID: 348910723} + m_VersionIndex: 223 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -38360,170 +38524,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1910323084} m_PrefabAsset: {fileID: 0} ---- !u!43 &1921080736 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh28998 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 216 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 106 - localAABB: - m_Center: {x: 2.5, y: 0.8313812, z: 2.5} - m_Extent: {x: 2.5, y: 0.8313812, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a0009000c000b000c000d000b000c000e000d000e000f000d000e0010000f00100011000f001200130014001300150014001600170018001700190018000a000b001a000b001b001a000b000d001b000d001c001b000d000f001c000f001d001c000f0011001d0011001e001d001f002000210020002200210020001a0022001a00230022001a002400250024002600250027002800290028002a0029001c001d002b001d002c002b001d001e002c001e002d002c00210022002e0022002f002e00220023002f00230030002f00310032003300320034003300350036003700380039003a003b003c003d003c003e003d003c003f003e003f0040003e002e002f0041002f00420041002f00430044004300450044004600470048004700490048004a004b004c004b004d004c004e004f0050004f0051005000520053005400530055005400410042005600420057005600580059005a0059005b005a005c005d005e005d005f005e004c004d0060004d0061006000620063006400630065006400660067006800670069006800 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 106 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 48 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 5936 - _typelessdata: 000000000000000000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000c7f6a33c0bd7a33c00000000000000005655553f1c8820bd0c367f3f1c8820bd6acd7f3f85e7203d562ea036000080bf000000005655553f6a13fb3dc6f6a33c5655553f00000000000000001c8820bd0c367f3f1c8820bd6acd7f3f85e7203d562ea036000080bf5655553f000000000bd7a33c7d0bfb3d5455553f209b863d5455553f1c88a0bd186c7e3f1c88a0bd1c357f3ff206a13d00000000000080bf5455553f5455553f7153fb3d595cfb3d00000000000000005655553ff006a1bd1d357f3f000000001c357f3fef06a13d00000000000080bf000000005655553f6a13fb3dc6f6a33c00000000000000005655d53ff00621bd1d357f3fee06213d1acd7f3fa466213d132ba136000080bf000000005655d53f43cb663e6012a53c5455553f209b863d5455553ff00621bd1d357f3fee06213d1acd7f3fa466213d132ba136000080bfeefe553f5455553f7153fb3d595cfb3d5655553f000000005655d53f000000001d357f3fee06a13d0000803f0000000000000000000080bf43ac543f5655d53f71da663ef4a9fb3d00000000000000005655d53f000000000000803f000000000000803f0000000000000000000080bf000000005655d53f43cb663e6012a53c000000000000000000002040000000000000803f000000000000803f0000000000000000000080bf000000000000204086fda73e64dea43c5655553f000000005655d53f000000000000803f000000000000803f0000000000000000000080bf5655553f5655d53f71da663ef4a9fb3d5655553f0000000000002040000000000000803f000000000000803f0000000000000000000080bf5655553f00002040afffa73e6494fb3d000000000000000055555540000000000000803f000000000000803f0000000000000000000080bf00000000555555408395dc3e68d7a43c5655553f0000000055555540000000000000803f000000000000803f0000000000000000000080bf5655553f555555408a95dc3e2994fb3d000000000000000055558540000000000000803f000000000000803f0000000000000000000080bf00000000555585408796083f08e0a43c5655553f0000000055558540000000000000803f000000000000803f0000000000000000000080bf5655553f555585403b96083f2b96fb3d00000000000000000000a040000000000000803f000000000000803f0000000000000000000080bf000000000000a04042e2223f52eba43c5655553f000000000000a040000000000000803f000000000000803f0000000000000000000080bf5655553f0000a040e5e1223fe498fb3d5655553f0000000000000000000000001d357f3ff006a1bd0000803f0000000000000000000080bf5655553f000000000bd7a33c7d0bfb3d5455553f209b863d5455553fee06213d1d357f3ff00621bd1acd7f3f85e620bdec5b4b3b000080bf5455553fedfe553f7153fb3d595cfb3d5655d53f0000000000000000ee06213d1d357f3ff00621bd1acd7f3f85e620bdec5b4b3b000080bf5655d53f00000000adb1a43c6ec6663e5655d53f000000005655553fee06a13d1d357f3f00000000db337f3f2306a1bdfd32cb3b000080bf5655d53f43ac543f738efb3d74de663e5455553f209b863d5455553f1688a03d186c7e3f1688a03d1c357f3fec06a1bd26a522af000080bf9459533f1e0c523f7153fb3d595cfb3d5655553f000000005655d53f1688203d0c367f3f1688203dcacc7f3f6e6621bd37bb4a3b000080bf43ac543f0205d43f71da663ef4a9fb3d5655d53f000000005655553f1688203d0c367f3f1688203dcacc7f3f6e6621bd37bb4a3b000080bf43acd43f200c523f738efb3d74de663e5655d53f000000005655d53f000000000000803f00000000c0fe7f3f000000002b92ca3b000080bf43acd43fb75cd33f0cdb663ec7e9663e5655d53f000000005655d53f000000000000803f000000000000803f0000000000000000000080bf5655d53f5655d53f0cdb663ec7e9663e5655d53f0000000000002040000000000000803f000000000000803f0000000000000000000080bf5655d53f00002040bffda73ef2ef663e5655d53f0000000055555540000000000000803f000000000000803f0000000000000000000080bf5655d53f55555540d693dc3eb9f7663e5655d53f0000000055558540000000000000803f000000000000803f0000000000000000000080bf5655d53f55558540c995083f3bf9663e5655d53f000000000000a040000000000000803f000000000000803f0000000000000000000080bf5655d53f0000a0407de1223fd1fa663e5655d53f0000000000000000000000000000803f000000000000803f0000000000000000000080bf5655d53f00000000adb1a43c6ec6663e5655d53f000000005655553f000000000000803f000000000000803f0000000000000000000080bf5655d53f5655553f738efb3d74de663e000020400000000000000000000000000000803f000000000000803f0000000000000000000080bf0000204000000000d63ba43cf4f9a73e00002040000000005655553f000000000000803f000000000000803f0000000000000000000080bf000020405655553f1565fb3d6500a83e00002040000000005655d53f000000000000803f000000000000803f0000000000000000000080bf000020405655d53fd5d3663e1604a83e5655d53f00000000000020403f2593bcafd57f3f3f2593bc6bf57f3f8337933c16066034000080bf5655d53f00002040bffda73ef2ef663e00002040000000005655d53f3f2593bcafd57f3f3f2593bc6bf57f3f8337933c16066034000080bf000020405655d53fd5d3663e1604a83e00002040408ff53c000020403f2513bd5eab7f3f3f2513bda5d57f3f943d133d00000000000080bf000020400000204056fea73e590ca83e5655d53f0000000000002040933d13bda5d57f3f00000000a5d57f3f933d133d00000000000080bf0a32d53f00002040bffda73ef2ef663e5655d53f0000000055555540933d93bca5d57f3f933d933c68f57f3fd94f933c5e626034000080bf0a32d53f55555540d693dc3eb9f7663e00002040408ff53c00002040933d93bca5d57f3f933d933c68f57f3fd94f933c5e626034000080bf2ff71f400000204056fea73e590ca83e00002040000000005555554000000000a5d57f3f933d133d0000803f0000000000000000000080bf87e51f40555555405493dc3ead13a83e000020400000000055555540000000000000803f000000000000803f0000000000000000000080bf00002040555555405493dc3ead13a83e000020400000000055558540000000000000803f000000000000803f0000000000000000000080bf00002040555585407595083f3414a83e00002040000000000000a040000000000000803f000000000000803f0000000000000000000080bf000020400000a0402ee1223fd314a83e555555400000000000000000000000000000803f000000000000803f0000000000000000000080bf555555400000000079f8a33c3590dc3e55555540000000005655553f000000000000803f000000000000803f0000000000000000000080bf555555405655553f0e53fb3d8a93dc3e55555540000000005655d53f000000000000803f000000000000803f0000000000000000000080bf555555405655d53f5cc8663ea597dc3e00002040000000005655d53f00000000a5d57f3f933d13bd0000803f0000000000000000000080bf000020400a32d53fd5d3663e1604a83e00002040408ff53c00002040933d933ca5d57f3f933d93bc68f57f3f763793bc0187293a000080bf000020402ff71f4056fea73e590ca83e55555540000000005655d53f933d933ca5d57f3f933d93bc68f57f3f763793bc0187293a000080bf555555400a32d53f5cc8663ea597dc3e555555400000000000002040933d133da5d57f3f0000000097d57f3f8b3d13bdf87fa93a000080bf5555554087e51f400dfea73e96a1dc3e00002040408ff53c000020403f25133d5eab7f3f3f25133da5d57f3f943d13bd00000000000080bfe0d31f40099f1f4056fea73e590ca83e000020400000000055555540ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf87e51f4030fd54405493dc3ead13a83e555555400000000000002040ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf09325540099f1f400dfea73e96a1dc3e000020400000000055555540ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf87e51f4030fd54402448b83e0205283f5555554066d5d43f55555540439f2abfd105ab3e439f2abf2fa1d73ee808683f8299073d000080bfbb5e514084195140711d933e56a75f3f555555400000000000002040ef6ca1be23972a3fef6ca1be184c5b3f941af93e24cc2f3e000080bf09325540099f1f4082e55b3e0205283f000020400000000055555540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555555c080608f3f2448b83e0205283f000020400000000055558540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555585c080608f3fc622ea3e8c58303f5555554066d5d43f55555540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555555c0d5b83e40711d933e56a75f3f5555554066d5d43f55558540a5dd64bf3567e53e000000000000000000000000000080bf000080bf555585c0d5b83e4013f8c43ee1fa673f00002040000000000000a040a4dd64bf3567e53e000000000000000000000000000080bf000080bf0000a0c081608f3fb4fe0d3f17ac383f5555554066d5d43f0000a040a4dd64bf3567e53e000000000000000000000000000080bf000080bf0000a0c0d5b83e40b5d2f63e6b4e703f555585400000000000000000000000000000803f000000000000803f0000000000000000000080bf55558540000000000bd7a33c0493083f55558540000000005655553f000000000000803f000000000000803f0000000000000000000080bf555585405655553f884ffb3d9991083f55555540000000005655d53f53ba05bdfe737f3f52ba05bdf3dc7f3f59f1053df2bb1936000080bf555555405655d53f5cc8663ea597dc3e55558540000000005655553f53ba05bdfe737f3f52ba05bdf3dc7f3f59f1053df2bb1936000080bf555585405655553f884ffb3d9991083f555585400bd65f3d5655d53f53ba85bdfbe77e3f52ba85bd8a737f3f8a03863d53ba0530000080bf555585405655d53fb3da663eac98083f55555540000000005655d53f8b0386bd8b737f3f000000008a737f3f8a03863d00000000000080bf49e054405655d53f5cc8663ea597dc3e5555554000000000000020408b0306bd8b737f3f8b03063dcddc7f3fb03a063d2a661a36000080bf49e05440000020400dfea73e96a1dc3e555585400bd65f3d5655d53f8b0306bd8b737f3f8b03063dcddc7f3fb03a063d2a661a36000080bf792985405655d53fb3da663eac98083f555585400000000000002040000000008b737f3f8b03863d0000803f0000000000000000000080bf2d0c8540000020403f06a83e32a0083f555555400000000000002040000000003567e53ea5dd64bf0000803f0000000000000000000080bf5555554080608f3f82e55b3e0205283f5555554066d5d43f55555540000000003567e53ea5dd64bf0000803f0000000000000000000080bf55555540d5b83e40711d933e56a75f3f555585400000000000002040000000003567e53ea5dd64bf0000803f0000000000000000000080bf5555854080608f3f6460f03d8a58303f5555854066d5d43f55555540000000003567e53ea5dd64bf0000803f0000000000000000000080bf55558540d5b83e409485423edffa673f5555554066d5d43f55555540000000000000803f000000000000803f0000000000000000000080bf5555554055555540cbbe713f9c326e3d5555554066d5d43f55558540af04a93e88d42d3faf04a93e37365f3f8e54f4beab98e03d000080bf5555554055558540cbbe713febf02c3e5555854066d5d43f55555540af04a93e88d42d3faf04a93e37365f3f8e54f4beab98e03d000080bf5555854055555540bd65553f9c326e3d555585409e27013e55558540af04293f2152b73eaf04293fbd14f43ebd0961bfb004a9b2000080bf5555854055558540f86d413fe9cf7c3e5555554066d5d43f55558540bc09613fbe14f43e0000000000000000000000000000803f000080bf55558540bd7702becbbe713febf02c3e5555554066d5d43f0000a04090b0623fb07aec3ebd900a3d34d0f3bce83a84bc6dda7f3f000080bf0000a040bd7702be38837b3fe1f88b3e555585409e27013e5555854090b0623fb07aec3ebd900a3d34d0f3bce83a84bc6dda7f3f000080bf555585402e0ff0bff86d413fe9cf7c3e55558540000000000000a0406357643fa3e0e43ebd908a3d63bd73bdde2e04bdac697f3f000080bf0000a0404540febf8599423ff141b13e0000a0400000000000000000000000000000803f000000000000803f0000000000000000000080bf0000a0400000000023f8a33c19e0223f0000a040000000005655553f000000000000803f000000000000803f0000000000000000000080bf0000a0405655553f6363fb3ddade223f55558540000000005655553f000000008b737f3f8a0386bd0000803f0000000000000000000080bf5555854049e0543f884ffb3d9991083f555585400bd65f3d5655d53f8803063d8b737f3f8a0306bdcedc7f3ff2f005bd92af0c3b000080bf555585407655d53fb3da663eac98083f0000a040000000005655553f8803063d8b737f3f8a0306bdcedc7f3ff2f005bd92af0c3b000080bf0000a04049e0543f6363fb3ddade223f0000a040000000005655d53f8803863d8b737f3f00000000f0727f3f370386bd0f9c8c3b000080bf0000a04049e0d43fb6ef663e2fe5223f555585400bd65f3d5655d53f51ba853dfbe77e3f53ba853d8a737f3f870386bd53ba0530000080bfe2ee8440bc24d23fb3da663eac98083f55558540000000000000204051ba053dfe737f3f53ba053da7dc7f3f993a06bd77610c3b000080bf2d0c8540e6841e403f06a83e32a0083f0000a040000000005655d53f51ba053dfe737f3f53ba053da7dc7f3f993a06bd77610c3b000080bf36a89f40bc24d23fb6ef663e2fe5223f0000a0400000000000002040000000000000803f0000000066ff7f3f00000000ea4d8c3b000080bf36a89f40904a1e400904a83e49e6223f0000a0400000000000002040000000003567e53ea4dd64bf0000803f0000000000000000000080bf0000a04081608f3f0bd7a33c13ac383f0000a04066d5d43f55555540000000003567e53ea4dd64bf0000803f0000000000000000000080bf0000a040d5b83e4086a0bd3d674e703f5555854066d5d43f5555554000000000be14f43ebc09613f000080bf0000000000000000000080bf555585c0bd7702bebd65553f9c326e3d555585409e27013e55558540bb900a3db07aec3e90b0623f6dda7fbfe03a843c35d0f33c000080bf555585c02e0ff0bff86d413fe9cf7c3e0000a04066d5d43f55555540bb900a3db07aec3e90b0623f6dda7fbfe03a843c35d0f33c000080bf0000a0c0bd7702be88a53a3f0bd7a33c0000a0400000000055558540bb908a3da3e0e43e6357643fac697fbfd52e043d62bd733d000080bf0000a0c04540febffa00283fab21783e555585409e27013e55558540858d173e69547a3f858d173e041e7d3f8c3d19be868d1731000080bf573a83403e528040f86d413fe9cf7c3e55558540000000000000a040858d973d342a7d3f858d973d0c417f3f39869abde5f8373c000080bff7d48340ed489b408599423ff141b13e0000a0400000000055558540858d973d342a7d3f858d973d0c417f3f39869abde5f8373c000080bfc2329e403e528040fa00283fab21783e0000a040000000000000a040000000000000803f0000000093ef7f3f00000000dc69b73c000080bfc2329e40bab19a40fa00283ff141b13e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 2.5, y: 0.8313812, z: 2.5} - m_Extent: {x: 2.5, y: 0.8313812, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1924462257 PrefabInstance: m_ObjectHideFlags: 0 @@ -40170,7 +40170,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 20.41 field of view: 60 orthographic: 0 @@ -40689,6 +40689,7 @@ MonoBehaviour: Camera: {fileID: 2018884822} CameraHolder: {fileID: 1639070413} ToggleSpeed: 3 + IsRotating: 0 --- !u!114 &2041039498 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/URP-Balanced.asset b/Assets/Settings/URP-Balanced.asset index 71bb8dc..1e79d86 100644 --- a/Assets/Settings/URP-Balanced.asset +++ b/Assets/Settings/URP-Balanced.asset @@ -27,7 +27,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_MSAA: 1 m_RenderScale: 0.4 - m_UpscalingFilter: 0 + m_UpscalingFilter: 2 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 diff --git a/Assets/Settings/URP-Performant.asset b/Assets/Settings/URP-Performant.asset index 646d176..4babdfa 100644 --- a/Assets/Settings/URP-Performant.asset +++ b/Assets/Settings/URP-Performant.asset @@ -27,7 +27,7 @@ MonoBehaviour: m_SupportsHDR: 0 m_MSAA: 1 m_RenderScale: 0.4 - m_UpscalingFilter: 0 + m_UpscalingFilter: 2 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 diff --git a/Assets/scripts/general/player/CameraBob.cs b/Assets/scripts/general/player/CameraBob.cs index 649b4b7..71ee340 100644 --- a/Assets/scripts/general/player/CameraBob.cs +++ b/Assets/scripts/general/player/CameraBob.cs @@ -15,6 +15,9 @@ public class CameraBob : MonoBehaviour CharacterController controller; public bool IsRotating = false; + //public int XRotStop = 1000; + //public int YRotStop = 1000; + Vector3 StartPos; Quaternion StartRot; @@ -57,25 +60,26 @@ public class CameraBob : MonoBehaviour if (!IsRotating) PlayMotion(FootStepMotion()); else - PlayMotion(FootStepRotation()); + return; + //PlayMotion(FootStepRotation()); } Vector3 FootStepMotion() { Vector3 pos = Vector3.zero; - pos.y += Mathf.Sin(Time.time * Frequency) * Amplitude; - pos.x += Mathf.Cos(Time.time * Frequency / 2) * Amplitude *2; + pos.y += Mathf.Cos(Time.time * Frequency) * Amplitude; + pos.x += Mathf.Sin(Time.time * Frequency / 2) * Amplitude *2; return pos; } - + /* Quaternion FootStepRotation() { Quaternion pos = new Quaternion(0,0,0,0); - pos.y += Mathf.Sin(Time.time * Frequency) * Amplitude; - pos.x += Mathf.Cos(Time.time * Frequency / 2) * Amplitude * 2; + pos.y += Mathf.Sin(Time.time * Frequency) * (Amplitude / YRotStop); + pos.x += Mathf.Cos(Time.time * Frequency / 2) * (Amplitude / XRotStop); return pos; } - + */ void ResetPosition() { if (!IsRotating) @@ -86,6 +90,7 @@ public class CameraBob : MonoBehaviour else { if (Camera.localRotation == StartRot) return; + Camera.localRotation = Quaternion.Lerp(Camera.localRotation, StartRot, Time.deltaTime); } } diff --git a/Assets/scripts/general/player/CameraMovement.cs b/Assets/scripts/general/player/CameraMovement.cs index 3b5677e..a75e69e 100644 --- a/Assets/scripts/general/player/CameraMovement.cs +++ b/Assets/scripts/general/player/CameraMovement.cs @@ -50,16 +50,16 @@ public class CameraMovement : MonoBehaviour } } - IEnumerator PauseGame() + IEnumerable PauseGame() { SceneManager.LoadSceneAsync("pause", LoadSceneMode.Additive); Time.timeScale = 0; return null; } - IEnumerator UnPauseGame() + IEnumerable UnPauseGame() { - SceneManager.UnloadSceneAsync("pause" ); + SceneManager.UnloadSceneAsync("pause"); Time.timeScale = 1; return null; }