diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend b/FlufflParty/Assets/BlenderFiles/Coin.blend new file mode 100644 index 0000000..9f4f79a Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Coin.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Coin.blend.meta b/FlufflParty/Assets/BlenderFiles/Coin.blend.meta new file mode 100644 index 0000000..59dddc7 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Coin.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 387e66df71e1e2f469913713334125c7 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend new file mode 100644 index 0000000..855bbb6 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta new file mode 100644 index 0000000..f82b491 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.blend.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: bbd5093a72be95c4893d4945fc77fb63 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: + - first: + 74: -623603649343465320 + second: Scene + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller new file mode 100644 index 0000000..29a1c55 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5454848988904016368 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scene + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -623603649343465320, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoinAnimated + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2595009610461881608} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2595009610461881608 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5454848988904016368} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5454848988904016368} diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller.meta b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller.meta new file mode 100644 index 0000000..6c99e7d --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95bf48ec95818a24f99ffbd7739ed7e6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/CoinSprite.png b/FlufflParty/Assets/BlenderFiles/CoinSprite.png new file mode 100644 index 0000000..2af99d8 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/CoinSprite.png differ diff --git a/FlufflParty/Assets/BlenderFiles/CoinSprite.png.meta b/FlufflParty/Assets/BlenderFiles/CoinSprite.png.meta new file mode 100644 index 0000000..8e640fa --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/CoinSprite.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 7dd49c33817e9e540be187ce6b1678c5 +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: 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: 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: 0 + 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/FlufflParty/Assets/BlenderFiles/Fence_3.blend b/FlufflParty/Assets/BlenderFiles/Fence_3.blend index 7124936..91659d9 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Fence_3.blend and b/FlufflParty/Assets/BlenderFiles/Fence_3.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend new file mode 100644 index 0000000..681b997 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend.meta b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend.meta new file mode 100644 index 0000000..609aa79 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: ea11a8eb5f9e1124bbc738805642937f +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/Fence_3.prefab b/FlufflParty/Assets/Prefabs/Fence_3.prefab index 3791e4b..763b206 100644 --- a/FlufflParty/Assets/Prefabs/Fence_3.prefab +++ b/FlufflParty/Assets/Prefabs/Fence_3.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4641865649285536773 +--- !u!1 &9017963377065697440 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,46 +8,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5413582502276155071} - - component: {fileID: 8975448722905221402} - - component: {fileID: 6587574688483851728} + - component: {fileID: 8533737750045391386} + - component: {fileID: 4738410026467915199} + - component: {fileID: 7360783506841272693} m_Layer: 0 m_Name: Fence_3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5413582502276155071 +--- !u!4 &8533737750045391386 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4641865649285536773} + m_GameObject: {fileID: 9017963377065697440} m_LocalRotation: {x: 0.8925904, y: -0.000000026873865, z: 0.000000053202537, w: -0.4508685} - m_LocalPosition: {x: -52.04776, y: 38.72916, z: -6.3431396} + m_LocalPosition: {x: -52.12397, y: 38.762848, z: -6.819824} m_LocalScale: {x: 0.576867, y: 0.57686704, z: 0.57686704} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8975448722905221402 +--- !u!33 &4738410026467915199 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4641865649285536773} - m_Mesh: {fileID: 6255687079079774844, guid: a7da72dadbe21ac4d90cbc57c50be4ec, type: 3} ---- !u!23 &6587574688483851728 + m_GameObject: {fileID: 9017963377065697440} + m_Mesh: {fileID: -7994650926060863905, guid: a7da72dadbe21ac4d90cbc57c50be4ec, type: 3} +--- !u!23 &7360783506841272693 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4641865649285536773} + m_GameObject: {fileID: 9017963377065697440} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 diff --git a/FlufflParty/Assets/Prefabs/PalmTree_2.prefab b/FlufflParty/Assets/Prefabs/PalmTree_2.prefab new file mode 100644 index 0000000..2a6b852 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PalmTree_2.prefab @@ -0,0 +1,201 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1540452545030607229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6972441210967823969} + - component: {fileID: 3661704316126736358} + - component: {fileID: 7971165752254347212} + m_Layer: 0 + m_Name: NurbsPath.002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6972441210967823969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540452545030607229} + m_LocalRotation: {x: 0.5630674, y: 0.61822075, z: -0.40545124, w: -0.36927974} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 0.47665912, y: 0.47665912, z: 0.47665912} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7635430510950912929} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3661704316126736358 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540452545030607229} + m_Mesh: {fileID: -2145793981142062404, guid: ea11a8eb5f9e1124bbc738805642937f, type: 3} +--- !u!23 &7971165752254347212 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540452545030607229} + 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: b6c4494d86ad85845a7c1957f96623c8, 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!1 &4266934368956926245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2865627656171415078} + - component: {fileID: 914434460215889382} + - component: {fileID: 5373444619896880292} + m_Layer: 0 + m_Name: NurbsPath.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2865627656171415078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266934368956926245} + m_LocalRotation: {x: -0.48293757, y: -0.41024014, z: 0.2738251, w: 0.7235289} + m_LocalPosition: {x: -0.27465042, y: 2.730696, z: 0.025967835} + m_LocalScale: {x: 0.49564624, y: 0.49564624, z: 0.49564624} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7635430510950912929} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &914434460215889382 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266934368956926245} + m_Mesh: {fileID: 3530945768078225325, guid: ea11a8eb5f9e1124bbc738805642937f, type: 3} +--- !u!23 &5373444619896880292 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266934368956926245} + 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: -6478536213147159724, guid: ea11a8eb5f9e1124bbc738805642937f, type: 3} + 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!1 &7115035628128487707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7635430510950912929} + m_Layer: 0 + m_Name: PalmTree_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7635430510950912929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7115035628128487707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 87.74621, y: -0.00000047683716, z: 94.295296} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2865627656171415078} + - {fileID: 6972441210967823969} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/FlufflParty/Assets/Prefabs/PalmTree_2.prefab.meta b/FlufflParty/Assets/Prefabs/PalmTree_2.prefab.meta new file mode 100644 index 0000000..01eca13 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PalmTree_2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff33ff758a2a9d745a29cb2d5fe7997d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 2b19feb..1f09b90 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -123,6 +123,129 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &144725373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalScale.y + value: 1.2839187 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalPosition.x + value: -46.159637 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalPosition.z + value: -2.372139 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7595968524697374341, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + propertyPath: m_Name + value: SandPlump + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fd4d2de2d235db54389206462a42c57f, type: 3} +--- !u!4 &144725374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} + m_PrefabInstance: {fileID: 144725373} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &388473845 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalPosition.x + value: 84.72632 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalPosition.y + value: 0.83 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalPosition.z + value: 98.16124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9227947 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000075252764 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalRotation.y + value: -0.38529217 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000014035092 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + propertyPath: m_Name + value: CoinAnimated + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} --- !u!1 &523664305 GameObject: m_ObjectHideFlags: 0 @@ -158,8 +281,11 @@ Transform: - {fileID: 543450653384893021} - {fileID: 543450651826473771} - {fileID: 543450653540455475} - - {fileID: 543450651978388392} - {fileID: 543450653468379848} + - {fileID: 1138138515521539025} + - {fileID: 144725374} + - {fileID: 543450651594602143} + - {fileID: 1645278604} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -255,9 +381,34 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288} ---- !u!1 &963194225 +--- !u!1 &963421750 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} + m_PrefabInstance: {fileID: 388473845} + m_PrefabAsset: {fileID: 0} +--- !u!95 &963421751 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963421750} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 95bf48ec95818a24f99ffbd7739ed7e6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1607968977 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -265,31 +416,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} + - component: {fileID: 1607968980} + - component: {fileID: 1607968979} + - component: {fileID: 1607968978} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: Camera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &963194226 +--- !u!81 &1607968978 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 1607968977} m_Enabled: 1 ---- !u!20 &963194227 +--- !u!20 &1607968979 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 1607968977} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -311,7 +462,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -326,21 +477,91 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &963194228 +--- !u!4 &1607968980 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_GameObject: {fileID: 1607968977} + m_LocalRotation: {x: 0.21244515, y: -0, z: -0, w: 0.97717303} + m_LocalPosition: {x: 84.7, y: 8.58, z: 82.76} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 24.531, y: 0, z: 0} +--- !u!1001 &1645278603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalScale.y + value: 0.16350786 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalScale.z + value: 0.02207658 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalPosition.x + value: -46.93466 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.1019592 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 387e66df71e1e2f469913713334125c7, type: 3} + propertyPath: m_Name + value: Coin + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 387e66df71e1e2f469913713334125c7, type: 3} +--- !u!4 &1645278604 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 387e66df71e1e2f469913713334125c7, type: 3} + m_PrefabInstance: {fileID: 1645278603} + m_PrefabAsset: {fileID: 0} --- !u!1 &2085245912 GameObject: m_ObjectHideFlags: 0 @@ -419,16 +640,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &543450651594602143 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + m_PrefabInstance: {fileID: 7961456930032493886} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450651826473771 stripped Transform: m_CorrespondingSourceObject: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} m_PrefabInstance: {fileID: 3625163125301297472} m_PrefabAsset: {fileID: 0} ---- !u!4 &543450651978388392 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - m_PrefabInstance: {fileID: 5524317947152078103} - m_PrefabAsset: {fileID: 0} --- !u!4 &543450652221036485 stripped Transform: m_CorrespondingSourceObject: {fileID: 6696708220561039824, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3} @@ -477,7 +698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_LocalPosition.x @@ -521,6 +742,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1138138515521539025 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + m_PrefabInstance: {fileID: 8765860533721231819} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3126132611923478660 PrefabInstance: m_ObjectHideFlags: 0 @@ -595,7 +821,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_LocalPosition.x - value: -42.537315 + value: -51.26 objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_LocalPosition.y @@ -603,7 +829,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_LocalPosition.z - value: 0.12741852 + value: -2.45 objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_LocalRotation.w @@ -648,7 +874,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_LocalPosition.x - value: -40.14998 + value: -42.35 objectReference: {fileID: 0} - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_LocalPosition.y @@ -656,7 +882,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_LocalPosition.z - value: -2.357376 + value: -0.7 objectReference: {fileID: 0} - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_LocalRotation.w @@ -749,63 +975,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} ---- !u!1001 &5524317947152078103 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 523664306} - m_Modifications: - - target: {fileID: 4641865649285536773, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_Name - value: Fence_3 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalPosition.x - value: -52.04776 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalPosition.y - value: 38.72916 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalPosition.z - value: -6.3431396 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalRotation.w - value: -0.4508685 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalRotation.x - value: 0.8925904 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalRotation.y - value: -0.000000026873865 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000053202537 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5413582502276155071, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} --- !u!1001 &6290137768048077059 PrefabInstance: m_ObjectHideFlags: 0 @@ -977,3 +1146,117 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} +--- !u!1001 &7961456930032493886 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 7115035628128487707, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_Name + value: PalmTree_2 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalPosition.x + value: -46.1 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalPosition.z + value: -2.26 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} +--- !u!1001 &8765860533721231819 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalPosition.x + value: -52.12397 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalPosition.y + value: 38.762848 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalPosition.z + value: -6.819824 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalRotation.w + value: -0.4508685 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8925904 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000026873865 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000053202537 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9017963377065697440, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} + propertyPath: m_Name + value: Fence_3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 9fd2170..6ae024e 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 8 - y: 51 - width: 1904 - height: 1093 + x: 0 + y: 43 + width: 1920 + height: 1109 m_ShowMode: 4 m_Title: Scene m_RootView: {fileID: 6} - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1904 - height: 1043 + width: 1920 + height: 1059 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 89 + controlID: 16 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,12 +64,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1454 + x: 1456 y: 0 - width: 450 - height: 1043 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 464 + height: 1059 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 360 - height: 618 + width: 376 + height: 592 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 618 - width: 1454 - height: 425 + y: 592 + width: 1456 + height: 467 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} @@ -148,8 +148,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 - height: 1093 + width: 1920 + height: 1109 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -173,7 +173,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -194,8 +194,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1073 - width: 1904 + y: 1089 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -218,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1454 - height: 1043 + width: 1456 + height: 1059 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 90 + controlID: 17 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1454 - height: 618 + width: 1456 + height: 592 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 91 + controlID: 18 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,15 +259,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 360 + x: 376 y: 0 - width: 1094 - height: 618 + width: 1080 + height: 592 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 699 - width: 1453 - height: 404 + x: 0 + y: 665 + width: 1455 + height: 446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -317,22 +317,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/BlenderFiles m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/BlenderFiles m_LastFoldersGridSize: -1 m_LastProjectPath: F:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e25b0000 - m_LastClickedID: 23522 - m_ExpandedIDs: 00000000e25b0000e45b000000ca9a3b + m_SelectedIDs: c25b0000 + m_LastClickedID: 23490 + m_ExpandedIDs: 00000000ba5b0000bc5b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e25b0000e45b0000 + m_ExpandedIDs: 00000000ba5b0000bc5b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -387,7 +387,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -404,7 +404,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -436,10 +436,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1462 - y: 81 - width: 449 - height: 1022 + x: 1456 + y: 73 + width: 463 + height: 1038 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -477,10 +477,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 81 - width: 359 - height: 597 + x: 0 + y: 73 + width: 375 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -490,7 +490,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 32fbffff + m_ExpandedIDs: 46ecffff32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -506,7 +506,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -534,10 +534,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 368 - y: 81 - width: 1092 - height: 597 + x: 376 + y: 73 + width: 1078 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -739,9 +739,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 135.21684, y: -23.159435, z: 119.330414} + m_Target: {x: 90.59447, y: -1.7509544, z: 90.56099} speed: 2 - m_Value: {x: 135.21684, y: -23.159435, z: 119.330414} + m_Value: {x: 90.59447, y: -1.7509544, z: 90.56099} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -788,20 +788,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.21297622, y: -0.444286, z: 0.10951643, w: -0.863397} + m_Target: {x: -0.046976782, y: -0.94740623, z: 0.16390747, w: -0.2716144} speed: 2 - m_Value: {x: -0.21279073, y: -0.44553667, z: 0.10982494, w: -0.86264455} + m_Value: {x: -0.047373757, y: -0.9469579, z: 0.16529334, w: -0.27148595} m_Size: - m_Target: 31.611065 + m_Target: 6.779281 speed: 2 - m_Value: 10 + m_Value: 6.4873505 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 + m_Speed: 1.0204899 + m_SpeedNormalized: 0.51 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -839,10 +839,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 376 + y: 73 + width: 1078 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -853,10 +853,10 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 1078, y: 550} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 @@ -868,10 +868,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_HBaseRangeMin: -539 + m_HBaseRangeMax: 539 + m_VBaseRangeMin: -275 + m_VBaseRangeMax: 275 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -889,23 +889,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1532 - height: 769 + width: 1078 + height: 550 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 539, y: 275} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -384.5 - width: 1532 - height: 769 + x: -539 + y: -275 + width: 1078 + height: 550 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1078, y: 571} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -931,10 +931,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 665 + width: 1455 + height: 446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default