diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 1237712..2213e57 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -1,14 +1,7 @@ - - - - - - - - + - { - "keyToString": { - "Discover.Launch.Via.Unity": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "vue.rearranger.settings.migration": "true" + +}]]> - diff --git a/FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting b/FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting deleted file mode 100644 index ac6b74f..0000000 --- a/FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting +++ /dev/null @@ -1,64 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Lighting Settings - serializedVersion: 4 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 2 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_LightmapCompression: 3 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 1 - m_PVREnvironmentMIS: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png new file mode 100644 index 0000000..9024e88 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png.meta new file mode 100644 index 0000000..258cec5 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 0840dce8b1228e542a245c781772c94c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf new file mode 100644 index 0000000..0a50e55 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf.meta b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf.meta new file mode 100644 index 0000000..0a29219 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/TitleScreen.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c6f6e7be95326674cb6c3bb6fef7a884 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/Cactus/CactusGreen.mat b/FlufflParty/Assets/Materials/Cactus/CactusGreen.mat index 74461db..0198747 100644 --- a/FlufflParty/Assets/Materials/Cactus/CactusGreen.mat +++ b/FlufflParty/Assets/Materials/Cactus/CactusGreen.mat @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.43937352, g: 0.9056604, b: 0.14951938, a: 1} + - _Color: {r: 0.35011005, g: 0.5849056, b: 0.20140618, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/ItemShop.mat b/FlufflParty/Assets/Materials/ItemShop.mat new file mode 100644 index 0000000..4e5364a --- /dev/null +++ b/FlufflParty/Assets/Materials/ItemShop.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ItemShop + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8679245, g: 0.39361095, b: 0.18422928, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting.meta b/FlufflParty/Assets/Materials/ItemShop.mat.meta similarity index 60% rename from FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting.meta rename to FlufflParty/Assets/Materials/ItemShop.mat.meta index 7eaf2d9..1be3332 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/New Lighting Settings.lighting.meta +++ b/FlufflParty/Assets/Materials/ItemShop.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 73100c072b51c9e4b876978bf39c7cb2 +guid: 275d56d4e2f2ad7479d682dbca365341 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 4890085278179872738 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat index c46d70d..26625d3 100644 --- a/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6850364, g: 0.6886792, b: 0.55549127, a: 1} + - _Color: {r: 0.54142123, g: 0.5471698, b: 0.42070132, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Scenes/New Lighting Settings.lighting b/FlufflParty/Assets/Scenes/New Lighting Settings.lighting index f0d4045..2c05f7d 100644 --- a/FlufflParty/Assets/Scenes/New Lighting Settings.lighting +++ b/FlufflParty/Assets/Scenes/New Lighting Settings.lighting @@ -14,7 +14,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 + m_IndirectOutputScale: 0.73 m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 512 diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index cf3a06b..b2c330e 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -20,11 +20,11 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0.41568628, g: 0.4862745, b: 0.627451, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 + m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_HaloStrength: 0.5 @@ -35,10 +35,10 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 + m_ReflectionIntensity: 0.8 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44741333, g: 0.49678463, b: 0.57287014, a: 1} + m_Sun: {fileID: 833951786} + m_IndirectSpecularColor: {r: 0.40280655, g: 0.44779444, b: 0.51712465, a: 0.8} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: c7a9b171cf6d47b469bfa450558aa8be, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 6860e72aff139d543acff54abd748b4b, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: 560fdca36749b9f47a392bdddbaceec2, type: 2} --- !u!196 &4 NavMeshSettings: @@ -241,8 +241,91 @@ Transform: - {fileID: 415149959} - {fileID: 1466295080} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &125656926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 125656927} + - component: {fileID: 125656929} + - component: {fileID: 125656928} + m_Layer: 0 + m_Name: SmallStones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &125656927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125656926} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -95.44659, y: -1.3947694, z: -122.99897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1121743278} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &125656928 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125656926} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5f3b45b056337774bad05165962195a5, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &125656929 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125656926} + m_Mesh: {fileID: 4300000, guid: 43c02035e33fc3040bba61b38130c5dc, type: 2} --- !u!1001 &146891670 PrefabInstance: m_ObjectHideFlags: 0 @@ -682,89 +765,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261030767} m_CullTransparentMesh: 1 ---- !u!1 &285632501 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 285632502} - - component: {fileID: 285632504} - - component: {fileID: 285632503} - m_Layer: 0 - m_Name: MiddleStones - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &285632502 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285632501} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -95.44659, y: -1.3547695, z: -122.99897} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1016814870} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &285632503 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285632501} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 7a6db9f94d211e64182be5d93ca6cd9e, 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &285632504 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285632501} - m_Mesh: {fileID: 4300000, guid: bba181da374c2c6468a0531e7bae10f9, type: 2} --- !u!1 &291851001 GameObject: m_ObjectHideFlags: 0 @@ -1175,7 +1175,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &357069698 GameObject: @@ -1224,7 +1224,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &358019285 GameObject: @@ -1378,7 +1378,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalPosition.x @@ -1422,6 +1422,89 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 616c4d7a7df3216439e209b540a24966, type: 3} +--- !u!1 &406610729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406610730} + - component: {fileID: 406610732} + - component: {fileID: 406610731} + m_Layer: 0 + m_Name: BigStones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &406610730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406610729} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -95.44659, y: -1.2247695, z: -122.99897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1121743278} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &406610731 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406610729} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e1f6f330ee5f749b3a6e73d41dc26b7e, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &406610732 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406610729} + m_Mesh: {fileID: 0} --- !u!1001 &415149958 PrefabInstance: m_ObjectHideFlags: 0 @@ -2805,6 +2888,89 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729803760} m_CullTransparentMesh: 1 +--- !u!1 &744686716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744686717} + - component: {fileID: 744686719} + - component: {fileID: 744686718} + m_Layer: 0 + m_Name: MiddleStones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &744686717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744686716} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -108.04, y: -1.3547695, z: -126.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1121743278} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &744686718 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744686716} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7a6db9f94d211e64182be5d93ca6cd9e, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &744686719 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744686716} + m_Mesh: {fileID: 4300000, guid: bba181da374c2c6468a0531e7bae10f9, type: 2} --- !u!1001 &775578245 PrefabInstance: m_ObjectHideFlags: 0 @@ -3394,235 +3560,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} m_PrefabInstance: {fileID: 869394930} m_PrefabAsset: {fileID: 0} ---- !u!1001 &884986416 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Name - value: Dice - objectReference: {fileID: 0} - - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 775467318149677044, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalPosition.x - value: 93.4767 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalPosition.y - value: 2.2014637 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalPosition.z - value: 122.63294 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071067 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 1966902952594303266, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 2645671130116350732, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 2868912489322427689, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 5723580827760669611, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.g - value: 0.8094107 - objectReference: {fileID: 0} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_fontColor32.rgba - value: 4278243071 - objectReference: {fileID: 0} - - target: {fileID: 8150423732821602548, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} --- !u!1001 &901983216 PrefabInstance: m_ObjectHideFlags: 0 @@ -3941,7 +3878,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 50.61, y: 151.873, z: 2.915} --- !u!1001 &975151665 PrefabInstance: @@ -4081,7 +4018,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1942185001724302219, guid: e98484d0aabc85c46a15d1bf861baa5b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1942185001724302219, guid: e98484d0aabc85c46a15d1bf861baa5b, type: 3} propertyPath: m_LocalPosition.x @@ -4407,40 +4344,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} m_PrefabInstance: {fileID: 1010051160} m_PrefabAsset: {fileID: 0} ---- !u!1 &1016814869 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1016814870} - m_Layer: 0 - m_Name: Stones - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1016814870 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1016814869} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 95.44659, y: 2.3647695, z: 122.99897} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1541540280} - - {fileID: 285632502} - - {fileID: 1806202865} - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1027886993 GameObject: m_ObjectHideFlags: 0 @@ -4649,7 +4552,7 @@ Transform: - {fileID: 1921648981} - {fileID: 683941144} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1031242795 GameObject: @@ -4732,7 +4635,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1035793950 GameObject: @@ -5161,6 +5064,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112206199} m_CullTransparentMesh: 1 +--- !u!1 &1121743277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1121743278} + m_Layer: 0 + m_Name: Stones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1121743278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121743277} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 95.44659, y: 2.3647695, z: 122.99897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 406610730} + - {fileID: 744686717} + - {fileID: 125656927} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1141516283 PrefabInstance: m_ObjectHideFlags: 0 @@ -7014,89 +6951,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} m_PrefabInstance: {fileID: 1515676470} m_PrefabAsset: {fileID: 0} ---- !u!1 &1541540279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1541540280} - - component: {fileID: 1541540282} - - component: {fileID: 1541540281} - m_Layer: 0 - m_Name: BigStones - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1541540280 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1541540279} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -95.44659, y: -1.2247695, z: -122.99897} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1016814870} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1541540281 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1541540279} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: e1f6f330ee5f749b3a6e73d41dc26b7e, 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1541540282 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1541540279} - m_Mesh: {fileID: 0} --- !u!1001 &1565914160 PrefabInstance: m_ObjectHideFlags: 0 @@ -7754,6 +7608,263 @@ Transform: m_CorrespondingSourceObject: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} m_PrefabInstance: {fileID: 1668607750} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1679225702 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Name + value: Dice + objectReference: {fileID: 0} + - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 315064472590105111, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 775467318149677044, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 831958016792397317, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalPosition.x + value: 93.4767 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2014637 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalPosition.z + value: 122.63294 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 1155666736973186963, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 1349340890652867529, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 1750218051325554436, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 1966902952594303266, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 2511516830439944807, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 2645671130116350732, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 2694733666151769419, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2868912489322427689, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 3077309903374013088, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 3171039057293478341, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4982061216380532107, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5723580827760669611, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.g + value: 0.8094107 + objectReference: {fileID: 0} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 6528083627130749425, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278243071 + objectReference: {fileID: 0} + - target: {fileID: 8150423732821602548, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2180264, guid: d06671affd8526948a76e0ac9aae126e, type: 2} + - target: {fileID: 8493526486081960991, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8866997394410611103, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} --- !u!1001 &1699740646 PrefabInstance: m_ObjectHideFlags: 0 @@ -8475,89 +8586,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805136054} m_CullTransparentMesh: 1 ---- !u!1 &1806202864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1806202865} - - component: {fileID: 1806202867} - - component: {fileID: 1806202866} - m_Layer: 0 - m_Name: SmallStones - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1806202865 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1806202864} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -95.44659, y: -1.3947694, z: -122.99897} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1016814870} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1806202866 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1806202864} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5f3b45b056337774bad05165962195a5, 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1806202867 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1806202864} - m_Mesh: {fileID: 4300000, guid: 43c02035e33fc3040bba61b38130c5dc, type: 2} --- !u!1 &1863703386 GameObject: m_ObjectHideFlags: 0 @@ -9831,7 +9859,7 @@ Transform: - {fileID: 1281103759} - {fileID: 996681007} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2091177499 PrefabInstance: diff --git a/FlufflParty/Assets/Scenes/Start/LightingData.asset b/FlufflParty/Assets/Scenes/Start/LightingData.asset index 25e6c41..0ac4f96 100644 Binary files a/FlufflParty/Assets/Scenes/Start/LightingData.asset and b/FlufflParty/Assets/Scenes/Start/LightingData.asset differ diff --git a/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_dir.png b/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_dir.png index a174251..9a03d91 100644 Binary files a/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_dir.png and b/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_dir.png differ diff --git a/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_light.exr b/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_light.exr index da8a88b..c943a3f 100644 Binary files a/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_light.exr and b/FlufflParty/Assets/Scenes/Start/Lightmap-0_comp_light.exr differ diff --git a/FlufflParty/Assets/Scenes/Start/ReflectionProbe-0.exr b/FlufflParty/Assets/Scenes/Start/ReflectionProbe-0.exr index 7f4b0ac..067ef91 100644 Binary files a/FlufflParty/Assets/Scenes/Start/ReflectionProbe-0.exr and b/FlufflParty/Assets/Scenes/Start/ReflectionProbe-0.exr differ diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index f2acaa7..0d331b3 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -20,12 +20,12 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.41442683, g: 0.48774004, b: 0.6320754, a: 1} + m_AmbientSkyColor: {r: 0.41568628, g: 0.4862745, b: 0.627451, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1.35 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_AmbientIntensity: 0.92 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.33361518, g: 0.3753652, b: 0.4811321, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 0.806 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.40423408, g: 0.44936222, b: 0.5189086, a: 0.806} + m_IndirectSpecularColor: {r: 0.40662986, g: 0.45238155, b: 0.52130955, a: 0.806} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6224,7 +6224,7 @@ Light: m_Type: 1 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 0.88 + m_Strength: 0.812 m_Bias: 0.05 m_NormalBias: 0.42 m_NearPlane: 0.2 @@ -18639,6 +18639,10 @@ PrefabInstance: propertyPath: LayoutItemShop value: objectReference: {fileID: 1235522788} + - target: {fileID: 3015192205350473725, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 275d56d4e2f2ad7479d682dbca365341, type: 2} - target: {fileID: 3663925849651850792, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_Name value: ItemShop @@ -18657,7 +18661,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalPosition.x - value: 81.31 + value: 81.143 objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalPosition.y @@ -18665,7 +18669,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalPosition.z - value: 101.41 + value: 101.651 objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalRotation.w diff --git a/FlufflParty/Assets/Scenes/WesternMap/LightingData.asset b/FlufflParty/Assets/Scenes/WesternMap/LightingData.asset index a7e3166..8dabd6f 100644 Binary files a/FlufflParty/Assets/Scenes/WesternMap/LightingData.asset and b/FlufflParty/Assets/Scenes/WesternMap/LightingData.asset differ diff --git a/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_dir.png b/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_dir.png index 7baec90..c2d7357 100644 Binary files a/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_dir.png and b/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_dir.png differ diff --git a/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_light.exr b/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_light.exr index 5f30db7..0ff9125 100644 Binary files a/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_light.exr and b/FlufflParty/Assets/Scenes/WesternMap/Lightmap-0_comp_light.exr differ diff --git a/FlufflParty/Assets/Scenes/WesternMap/ReflectionProbe-0.exr b/FlufflParty/Assets/Scenes/WesternMap/ReflectionProbe-0.exr index 7f4b0ac..067ef91 100644 Binary files a/FlufflParty/Assets/Scenes/WesternMap/ReflectionProbe-0.exr and b/FlufflParty/Assets/Scenes/WesternMap/ReflectionProbe-0.exr differ diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 8e426e0..1ee6a55 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -49,7 +49,7 @@ public class Client : MonoBehaviour private void Start() { - Application.targetFrameRate = 100; + Application.targetFrameRate = 60; thisClient = this; diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index 48f728e..0361ca1 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -48,7 +48,7 @@ public class PlayablePlayer : Player { return instance; } - + private void Update() { /* @@ -60,50 +60,59 @@ public class PlayablePlayer : Player */ if (activated && !name.Equals("")) { - //Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf if ((Input.GetMouseButtonUp(0) && !uiHandler.MapOpen) && wurfelZahl == 0 && !wurfelt) { if (!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward)) { - - wurfelt = true; - wurfelZahl = Random.Range(1, 7); - - switch (activeItem) - { - case Item.Type.Mushroom: wurfelZahl += 3; activeItem = Item.Type.None; break; - case Item.Type.DoubleDice: checkDoubleDice = true; activeItem = Item.Type.None; break; - } - - /* - if (activeItem == Item.Type.Mushroom) - { - wurfelZahl += 3; - activeItem = Item.Type.None; - }else if (activeItem == Item.Type.DoubleDice) - { - checkDoubleDice = true; - } - */ - - textLeftMoves.text = wurfelZahl + ""; - - client.SendWurfeln(wurfelZahl); - - //nächstes Feld anvisieren - TargetNextField(); - - //stop the dice - diceScript.StopRandom(wurfelZahl); - - //delay for walk start - timeSinceWurfeln = Time.time; + DiceRollRoutine(); } } } } + private void DiceRollRoutine() + { + wurfelt = true; + wurfelZahl = Random.Range(1, 7); + + switch (activeItem) + { + case Item.Type.Mushroom: + wurfelZahl += 3; + activeItem = Item.Type.None; + break; + case Item.Type.DoubleDice: + checkDoubleDice = true; + activeItem = Item.Type.None; + break; + } + + /* + if (activeItem == Item.Type.Mushroom) + { + wurfelZahl += 3; + activeItem = Item.Type.None; + }else if (activeItem == Item.Type.DoubleDice) + { + checkDoubleDice = true; + } + */ + + textLeftMoves.text = wurfelZahl + ""; + + client.SendWurfeln(wurfelZahl); + + //nächstes Feld anvisieren + TargetNextField(); + + //stop the dice + diceScript.StopRandom(wurfelZahl); + + //delay for walk start + timeSinceWurfeln = Time.time; + } + private void FixedUpdate() { if (activated && !name.Equals("")) @@ -247,6 +256,7 @@ public class PlayablePlayer : Player private Star currentStar = null; + private void OnTriggerEnter(Collider collider) { if (collider.name.Equals("ItemShopTrigger")) @@ -258,7 +268,7 @@ public class PlayablePlayer : Player { currentStar = collider.GetComponent(); - if(currentStar.IsActive) + if (currentStar.IsActive) { base.OnTriggerEnter(collider); uiHandler.ActivateLayoutBuyStar(this); @@ -269,7 +279,7 @@ public class PlayablePlayer : Player public void BuyStar(bool buy) { client.SendEventStopFinished(); - + if (buy) { currentStar.Buy(this); @@ -300,11 +310,11 @@ public class PlayablePlayer : Player transform.position + Vector3.up * 2, ref useLess, 0.2f); diceScript.StartRandom(); } - + public void ActivateItem(int index) { activeItem = items[index].type; items[index] = null; client.SendActiveItem((byte)index); } -} +} \ No newline at end of file diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json index 6f1d4dc..05277c1 100644 --- a/FlufflParty/Packages/packages-lock.json +++ b/FlufflParty/Packages/packages-lock.json @@ -54,8 +54,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.17", - "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.rider": "3.0.16", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", @@ -129,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.7.0", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index 36232de..a07662a 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -16,11 +16,11 @@ PlayerSettings: productName: FlufflParty defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} + m_SplashScreenBackgroundColor: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 1} m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 + m_SplashScreenAnimation: 0 m_SplashScreenLogoStyle: 1 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 @@ -40,8 +40,8 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: - - logo: {fileID: 0} - duration: 2 + - logo: {fileID: 21300000, guid: 0840dce8b1228e542a245c781772c94c, type: 3} + duration: 3.03 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 800 @@ -137,9 +137,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.12 - preloadedAssets: - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -160,7 +158,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.IOGameStudios.FlufflParty - Standalone: com.DefaultCompany.FlufflParty + Standalone: com.IO-Game-Studios.FlufflParty buildNumber: Standalone: 0 iPhone: 0 @@ -797,9 +795,9 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: 44d4ee26d5fd6614db3860bbcee0fe3c, type: 3} + splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 0 + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 @@ -842,7 +840,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 2 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 1156ebf..06dc05d 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -90,7 +90,7 @@ - +