diff --git a/Assets/DefaultLighting.lighting b/Assets/DefaultLighting.lighting index 6b2238c..f03ac47 100644 --- a/Assets/DefaultLighting.lighting +++ b/Assets/DefaultLighting.lighting @@ -18,7 +18,7 @@ LightingSettings: m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 1024 - m_BakeResolution: 140 + m_BakeResolution: 192 m_Padding: 2 m_LightmapCompression: 2 m_AO: 0 @@ -40,13 +40,13 @@ LightingSettings: m_FinalGatherFiltering: 1 m_PVRCulling: 1 m_PVRSampling: 1 - m_PVRDirectSampleCount: 64 - m_PVRSampleCount: 128 + m_PVRDirectSampleCount: 256 + m_PVRSampleCount: 512 m_PVREnvironmentSampleCount: 8 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 5 - m_PVRMinBounces: 1 + m_PVRBounces: 8 + m_PVRMinBounces: 2 m_PVREnvironmentMIS: 0 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 1 diff --git a/Assets/Materials/Floor.mat b/Assets/Materials/Floor.mat index aa52413..806f8c3 100644 --- a/Assets/Materials/Floor.mat +++ b/Assets/Materials/Floor.mat @@ -39,7 +39,7 @@ Material: m_TexEnvs: - _BaseMap: m_Texture: {fileID: 2800000, guid: 32fa26fa0c3961d4ea3c27cc6e8cde7e, type: 3} - m_Scale: {x: 5, y: 5} + m_Scale: {x: 10, y: 10} m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: 02dcd20f531722044bf4a3603dc3cc8e, type: 3} @@ -63,7 +63,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 32fa26fa0c3961d4ea3c27cc6e8cde7e, type: 3} - m_Scale: {x: 5, y: 5} + m_Scale: {x: 10, y: 10} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 8dd9f81..287f66f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -7061,6 +7061,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -9128090238604022076, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} - target: {fileID: -8980045776078546229, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_Enabled @@ -7226,6 +7231,11 @@ PrefabInstance: propertyPath: m_CastShadows value: 1 objectReference: {fileID: 0} + - target: {fileID: -7857521847107774905, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 1.25 + objectReference: {fileID: 0} - target: {fileID: -7857521847107774905, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StitchLightmapSeams @@ -7381,6 +7391,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5342259654076704066, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_Materials.Array.data[0] @@ -7581,11 +7601,21 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 1 objectReference: {fileID: 0} + - target: {fileID: -2859109400176981367, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: -2770825260674409808, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -2724932512259047546, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} - target: {fileID: -2686133645533411133, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags @@ -7686,6 +7716,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -1909195428182568538, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: -1827027357054264037, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags @@ -7771,6 +7806,26 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.07 objectReference: {fileID: 0} + - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.57286143 + objectReference: {fileID: 0} + - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.8196523 + objectReference: {fileID: 0} + - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -717511211058055674, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -110.1 + objectReference: {fileID: 0} - target: {fileID: -380595139111555720, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags @@ -7839,12 +7894,32 @@ PrefabInstance: - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_LocalPosition.y - value: 1.4265 + value: 1.4279 objectReference: {fileID: 0} - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_LocalPosition.z - value: 0.0696 + value: 0.0691 + objectReference: {fileID: 0} + - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.57286143 + objectReference: {fileID: 0} + - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.8196523 + objectReference: {fileID: 0} + - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 795547410136657018, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -110.1 objectReference: {fileID: 0} - target: {fileID: 850468428025529609, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} @@ -7919,7 +7994,7 @@ PrefabInstance: - target: {fileID: 1995990277796536632, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2009740602367058978, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} @@ -7951,6 +8026,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2438565304415241699, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2466260003292395435, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_Enabled @@ -8251,6 +8331,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 4484653850034527598, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4484653850034527598, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_CastShadows @@ -8656,6 +8741,11 @@ PrefabInstance: propertyPath: m_TagString value: DisplayP2 objectReference: {fileID: 0} + - target: {fileID: 8110296352969589220, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8123848027915441045, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_Name @@ -8671,6 +8761,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 8659595510093492236, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.25 + objectReference: {fileID: 0} - target: {fileID: 8722154295087679164, guid: 4cbf0dbca1ca1a5499c4b7806ab6aac5, type: 3} propertyPath: m_StaticEditorFlags @@ -15065,7 +15160,7 @@ PrefabInstance: - target: {fileID: -6635190872123795447, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: -3816740887767321414, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} @@ -15125,12 +15220,12 @@ PrefabInstance: - target: {fileID: -1596442841338162665, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: -1342902887879466839, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: -844778927340311124, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} @@ -15175,7 +15270,7 @@ PrefabInstance: - target: {fileID: 2511811754567536238, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 2550463727306718371, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} @@ -15250,12 +15345,12 @@ PrefabInstance: - target: {fileID: 8247994413960396516, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 8537421735129595006, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 0.25 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4557494e9d4b8ab47b2842d4bf045f25, type: 3} @@ -21382,6 +21477,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} @@ -21409,6 +21505,7 @@ MonoBehaviour: type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!114 &1793933670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21421,6 +21518,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_ClickSpeed: 0.3 m_MoveDeadzone: 0.6 m_RepeatDelay: 0.5 diff --git a/Assets/Scenes/MainScene/LightingData.asset b/Assets/Scenes/MainScene/LightingData.asset index f3df460..52fd963 100644 Binary files a/Assets/Scenes/MainScene/LightingData.asset and b/Assets/Scenes/MainScene/LightingData.asset differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png index 8f2757d..45fcb29 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png and b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr index fffc50d..f3386e2 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr and b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png b/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png new file mode 100644 index 0000000..4265183 Binary files /dev/null and b/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png differ diff --git a/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png.meta new file mode 100644 index 0000000..d6fbf98 --- /dev/null +++ b/Assets/Scenes/MainScene/Lightmap-1_comp_dir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: b603b8323e0d29749809819f918793ff +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr b/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr new file mode 100644 index 0000000..31872c2 Binary files /dev/null and b/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr.meta new file mode 100644 index 0000000..b6cbeff --- /dev/null +++ b/Assets/Scenes/MainScene/Lightmap-1_comp_light.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 266d0bd90d7c14142b2334b7c2c61d00 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..1c3fa0b --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cfe2a69ab768714189049973670160e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/UnityServicesProjectConfiguration.json b/Assets/StreamingAssets/UnityServicesProjectConfiguration.json new file mode 100644 index 0000000..c03aba6 --- /dev/null +++ b/Assets/StreamingAssets/UnityServicesProjectConfiguration.json @@ -0,0 +1 @@ +{"Keys":["com.unity.services.core.cloud-environment","com.unity.services.qos.version","com.unity.services.lobby.version","com.unity.services.core.version","com.unity.services.authentication.version","com.unity.services.relay.version"],"Values":[{"m_Value":"production","m_IsReadOnly":true},{"m_Value":"1.0.1","m_IsReadOnly":true},{"m_Value":"1.0.1","m_IsReadOnly":true},{"m_Value":"1.4.2","m_IsReadOnly":true},{"m_Value":"2.1.1","m_IsReadOnly":true},{"m_Value":"1.0.3","m_IsReadOnly":true}]} \ No newline at end of file diff --git a/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta b/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta new file mode 100644 index 0000000..9362bb3 --- /dev/null +++ b/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4732ca33743d3c94dba2dac439f9b344 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 318e855..8ff99ec 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,9 +9,9 @@ EditorBuildSettings: path: guid: 00000000000000000000000000000000 m_configObjects: - Unity.XR.Oculus.Settings: {fileID: 11400000, guid: d9e5f678b9f35594cbdc9ae712a0d312, + Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 882a733244498a8469ee2565acf52f50, type: 2} - com.unity.xr.management.loader_settings: {fileID: 11400000, guid: db89b17074095a945a48c1eb4a584b26, + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 3999ab811e936714280a476b3a032d86, type: 2} - com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 1fcde17febc3bc4449996af9d2510106, + com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 55d1ec7a4296de343b6d3bb6f9a19731, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 90528dc..bed888b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -185,7 +185,11 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} - - {fileID: 6536100391545742739, guid: 1fcde17febc3bc4449996af9d2510106, type: 2} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: -6018045015233401694, guid: 3999ab811e936714280a476b3a032d86, type: 2} + - {fileID: 6536100391545742739, guid: 55d1ec7a4296de343b6d3bb6f9a19731, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/README.md b/README.md index 6dfd4fd..2dbb323 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ Discord: Coming Soon [Chinese 中文 README](https://github.com/xiaopeng12138/MaiDXR/blob/main/README_zh.md) + ## About this project +--- - This project is an update of https://github.com/xiaopeng12138/MaiMai-VR. - Support DX version or above - The model is almost 1:1 to DX cabinet/framework @@ -17,37 +19,57 @@ Discord: Coming Soon - 3rd person camera and smooth camera - 3 customizable buttons + +## Preview +--- + + + ## Inspired by +--- - https://github.com/derole1/MaiMai-VR - https://github.com/HelloKS/MaiMai-VR + ## Used repository -- https://github.com/HelloKS/MaiMai-VR -- https://github.com/hecomi/uWindowCapture -- https://github.com/Sucareto/Mai2Touch -- https://github.com/xiaopeng12138/WACVR -- https://github.com/TonyViT/MrcXrtHelpers +--- +- [MaiMai-VR](https://github.com/HelloKS/MaiMai-VR) +- [Mai2Touch](https://github.com/Sucareto/Mai2Touch) +- [MrcXrtHelpers](https://github.com/TonyViT/MrcXrtHelpers) +- [uWindowCapture](https://github.com/hecomi/uWindowCapture) +- [uNvEncoder](https://github.com/hecomi/uNvEncoder) +- [uNvPipe](https://github.com/hecomi/uNvPipe) +- [uPacketDivision](https://github.com/hecomi/uPacketDivision) +- [WACVR](https://github.com/xiaopeng12138/WACVR) **Special thanks to [@V17AMax](https://github.com/V17AMax) for the beautiful logo and designs** ## Build requirements -- Current Unity version: 2021.3.2f1 +--- +- Current Unity version: 2021.3.8f1 + ## Supported platform -- All SteamVR device -- All Oculus device +--- +- All SteamVR device (Index，HTC，Oculus) +- All Oculus device (Oculus Desktop App) - Tested on Quest 2 through Oculus link (Native and via SteamVR) and ALVR (via SteamVR). The Hand Balls position is by default adjusted for the Quest 2 controller. ## Declaimer +--- - This project is non-profit and some resources came from Internet! - Although this is under the MIT license, do not use this in commercial/profitable scenarios! - Please support your local arcade if you can! + ## Changelog +--- Please see Changes.md + ## How to use +--- - Get game somehow and make sure it will run properly. (DO NOT ASK ANYTHING THAT IS DIRECTLY RELATED TO THE GAME IT SELF) - Download [latest version of MaiDXR](https://github.com/xiaopeng12138/MaiDXR/releases) - Download and install [com0com](https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/powersdr-iq/setup_com0com_W7_x64_signed.exe) @@ -59,7 +81,9 @@ Please see Changes.md - Start MaiDXR first then start the game. - If your touch is not working, try to enable somehow Test mod then exit Test mode. + ## Configuration +--- The green button on the bottom of the cabinet is lock button. Long press it will disable all unnecessary buttons, controller pointer, and the config panel. You can adjust all settings in the config panel or via config.json. The changes of config.json will only apply after the MaiDXR reboot. @@ -71,10 +95,8 @@ Some configs in config.json are only the index of the dropdown. You can use the pointer to point the third-person camera and grab it to the position where you want to be. -## Preview -![Image Capture](https://github.com/xiaopeng12138/MaiDXR/blob/main/PreviewImage/MaiDXR_PreviewImage.png?raw=true) - ## ToDo +--- - √ Add user-adjustable settings (controller position etc.) - √ Add non-VR window and camera smooth - √ Add button light @@ -87,6 +109,6 @@ You can use the pointer to point the third-person camera and grab it to the posi - Add Multiplay - Add visual touch and button feedback -Huge thanks to HelloKS, derole1, and every one in BSAH +Huge thanks to HelloKS, derole1, hecomi, V17AMax, and every one in BSAH -If you want to add any function pls commit PR, I will accept it as soon as possible and make a new build/release. +If you want to add any function pls commit PR, I will accept it as soon as possible and make a new build/release. \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index 5cc75fb..da11d9a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,11 +1,13 @@ -# ＃MaiDXR +# MaiDXR 一个开源的VR街机模拟器框体 交流QQ群：261946477 交流Discord：Coming Soon + ## 关于这个项目 +--- - 本项目是https://github.com/xiaopeng12138/MaiMai-VR 的重置更新 - 支持DX版本或以上 - 模型几乎与DX框体比例一致 @@ -15,11 +17,20 @@ - 支持第三人称和平滑相机 - 3个可自定义的按钮 + +## 预览 +--- + + + ## 灵感 +--- - https://github.com/derole1/MaiMai-VR - https://github.com/HelloKS/MaiMai-VR + ## 使用的仓库 +--- - https://github.com/HelloKS/MaiMai-VR - https://github.com/hecomi/uWindowCapture - https://github.com/Sucareto/Mai2Touch @@ -28,23 +39,33 @@ **特别感谢[@V17AMax](https://github.com/V17AMax)设计的Logo以及风格设计** + ## 编译要求 -- 当前Unity版本：2021.3.2f1 +--- +- 当前Unity版本：2021.3.8f1 + ## 支持的平台 -- 所有SteamVR设备 -- 所有的Oculus设备 +--- +- 所有SteamVR设备（Index，HTC，Oculus） +- 所有的Oculus设备（Oculus Desktop App) - 使用Oculus Link（原生和通过SteamVR）和ALVR（通过SteamVR）在Quest 2上测试过。手的位置是默认为Quest 2控制器调整的（其他控制器可能需要手动调整获得最佳体验） + ## 声明 +--- - 本项目为非营利性项目，部分资源来自互联网! - 虽然存储库是在MIT许可下的，但不要在商业/盈利的情况下使用它! - 如果可以的话，请支持你本地的机厅! + ## 更改日志 +--- 请参见 Changes.md + ## 如何使用 +--- - 确保游戏本体可以正常游玩。(不要询问任何与游戏本身直接相关的问题！) - 下载[MaiDXR的最新版本](https://github.com/xiaopeng12138/MaiDXR/releases) - 下载并安装[com0com](https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/powersdr-iq/setup_com0com_W7_x64_signed.exe) @@ -56,7 +77,9 @@ - 启动MaiDXR后启动游戏本体。 - 如果你的触摸不起作用，请尝试以某种方式启用维护模式，然后退出维护模式。 + ## 设置 +--- 框体底部的绿色按钮是锁定按钮。 长按它将禁用所有不必要的按钮、手柄指针和配置面板。 你可以在设置面板或通过 config.json 调整所有设置。 config.json 的更改只会在 MaiDXR 重启后生效。 @@ -67,10 +90,9 @@ config.json 中的一些配置的参数只是下拉列表选项的顺序。 你可以使用控制器指针指向第三人称相机，并用手柄的抓取键将其放到你想要的位置。 -## 预览 -![Image Capture](https://github.com/xiaopeng12138/MaiDXR/blob/main/PreviewImage/MaiDXR_PreviewImage.png?raw=true) ## ToDo +--- - √ 添加用户可调整的设置（控制器位置等） - √ 添加非VR窗口和摄像机的平滑度 - √ 添加按钮灯光 @@ -83,6 +105,6 @@ config.json 中的一些配置的参数只是下拉列表选项的顺序。 - 添加多人联机系统 - 添加可视化触摸反馈 -非常感谢HelloKS，derole1和所有在BSAH的小伙伴们 ！ +非常感谢HelloKS，derole1, hecomi, V17AMax和所有在BSAH的小伙伴们 ！ 如果你想添加任何功能，欢迎提交PR！我将尽快查看并光速打包新版本。