diff --git a/Assets/Animations/Enemy/Golem/Death.anim b/Assets/Animations/Enemy/Golem/Death.anim new file mode 100644 index 00000000..52792d1f --- /dev/null +++ b/Assets/Animations/Enemy/Golem/Death.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: -15, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemy/Golem/Death.anim.meta b/Assets/Animations/Enemy/Golem/Death.anim.meta new file mode 100644 index 00000000..7047f03c --- /dev/null +++ b/Assets/Animations/Enemy/Golem/Death.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d216f0d839c071347a983855e91ff4ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Golem/Golem.controller b/Assets/Animations/Enemy/Golem/Golem.controller index acc0801c..93b6ec88 100644 --- a/Assets/Animations/Enemy/Golem/Golem.controller +++ b/Assets/Animations/Enemy/Golem/Golem.controller @@ -25,6 +25,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8696838392488886793 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Dead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7160560893234037818} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-8572935404381392403 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -191,7 +216,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 5844729645613544628} - m_Position: {x: 260, y: -10, z: 0} + m_Position: {x: 260, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: -5548300821866393615} m_Position: {x: 530, y: 150, z: 0} @@ -207,12 +232,16 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1771573117966061423} m_Position: {x: 260, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7160560893234037818} + m_Position: {x: 260, y: -70, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -8696838392488886793} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 10, z: 0} + m_AnyStatePosition: {x: 40, y: -60, z: 0} m_EntryPosition: {x: 0, y: 160, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} @@ -278,31 +307,37 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: HeadButt m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: SlapLeft m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: SlapRight m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Shimmy m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Dead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -443,6 +478,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &7160560893234037818 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + 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: 7400000, guid: d216f0d839c071347a983855e91ff4ed, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &8102202995211043108 AnimatorState: serializedVersion: 5 diff --git a/Assets/InputSettings/PlayerControls.inputactions b/Assets/InputSettings/PlayerControls.inputactions index 2b72fdd5..b97f6807 100644 --- a/Assets/InputSettings/PlayerControls.inputactions +++ b/Assets/InputSettings/PlayerControls.inputactions @@ -108,6 +108,14 @@ "expectedControlType": "", "processors": "", "interactions": "" + }, + { + "name": "Build", + "type": "Button", + "id": "0f32dc60-99a7-4bfe-b879-e62dd5de833d", + "expectedControlType": "Button", + "processors": "", + "interactions": "" } ], "bindings": [ @@ -462,6 +470,28 @@ "action": "Join", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "36179d5c-e459-48a7-b483-65037e386747", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Controller", + "action": "Build", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1d81c03c-c3f5-49cf-b2a1-5dc6c38f9775", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard", + "action": "Build", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Materials/Base/BaseMat2.mat b/Assets/Materials/Base/BaseMat2.mat index 220f521c..2a405deb 100644 --- a/Assets/Materials/Base/BaseMat2.mat +++ b/Assets/Materials/Base/BaseMat2.mat @@ -21,7 +21,7 @@ Material: m_TexEnvs: [] m_Floats: - BaseColor: 1.52 - - Charge_Percent: 0.021052632 + - Charge_Percent: 0.060526315 m_Colors: - Color_Albedo: {r: 0, g: 0.40026736, b: 1, a: 0} - EmissionColor: {r: 0, g: 0.2518901, b: 2.091783, a: 0} diff --git a/Assets/Models/Enemies/GolemDead.fbx b/Assets/Models/Enemies/GolemDead.fbx new file mode 100644 index 00000000..26a13288 Binary files /dev/null and b/Assets/Models/Enemies/GolemDead.fbx differ diff --git a/Assets/Models/Enemies/GolemDead.fbx.meta b/Assets/Models/Enemies/GolemDead.fbx.meta new file mode 100644 index 00000000..9782babd --- /dev/null +++ b/Assets/Models/Enemies/GolemDead.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 0aac413f8784a0c4091f25ca57a14f84 +ModelImporter: + serializedVersion: 20101 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + 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 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + 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 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Movies.meta b/Assets/Movies.meta new file mode 100644 index 00000000..fa8a6f1d --- /dev/null +++ b/Assets/Movies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15f1f7eadf461f84286449f75eb25fc9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Movies/preview-movie.mp4 b/Assets/Movies/preview-movie.mp4 new file mode 100644 index 00000000..9c26247f Binary files /dev/null and b/Assets/Movies/preview-movie.mp4 differ diff --git a/Assets/Movies/preview-movie.mp4.meta b/Assets/Movies/preview-movie.mp4.meta new file mode 100644 index 00000000..80008d3b --- /dev/null +++ b/Assets/Movies/preview-movie.mp4.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: c3b7982099344544fa4aa6c0496dd919 +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Crystal Loot/Loot Crystal.prefab b/Assets/Prefabs/Crystal Loot/Loot Crystal.prefab index cb2d9bd5..bed31c37 100644 --- a/Assets/Prefabs/Crystal Loot/Loot Crystal.prefab +++ b/Assets/Prefabs/Crystal Loot/Loot Crystal.prefab @@ -282,6 +282,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4042051552127044901} m_Modifications: + - target: {fileID: 684046417497730669, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 684046417497730671, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_IsActive value: 0 @@ -336,15 +340,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 684046418129813649, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.68 + value: 7.81 objectReference: {fileID: 0} - target: {fileID: 684046418129813649, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_SizeDelta.x - value: 3 + value: 10 objectReference: {fileID: 0} - target: {fileID: 684046418129813649, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_SizeDelta.y - value: 3 + value: 10 objectReference: {fileID: 0} - target: {fileID: 684046418129813649, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_AnchorMin.x @@ -374,10 +378,158 @@ PrefabInstance: propertyPath: m_Name value: TutorialCanvas objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1382620340721622299, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000007450694 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5056124961537859825, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6118477816947665869, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8293482305323054863, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000119209176 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8367400184499646073, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125837497372373905, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d6650570dfaa50443b7deca297dfdcdf, type: 3} --- !u!224 &1975052258306774230 stripped diff --git a/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab b/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab new file mode 100644 index 00000000..d86eed25 --- /dev/null +++ b/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab @@ -0,0 +1,540 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1254178599862226205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6546599202194112955} + - component: {fileID: 1464653979115186163} + - component: {fileID: 2878167924984921465} + - component: {fileID: 6107554260886534353} + - component: {fileID: 8837923774420012111} + - component: {fileID: 5621826775005746012} + m_Layer: 0 + m_Name: HandR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6546599202194112955 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 6.815354, z: 0.262468} + m_LocalScale: {x: 75, y: 75, z: 75} + m_Children: [] + m_Father: {fileID: 5745518246449043427} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1464653979115186163 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + m_Mesh: {fileID: -7502423325010019466, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!23 &2878167924984921465 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 53ccc4bb81ad43940b1c27f182c11fe5, 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!64 &6107554260886534353 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -7502423325010019466, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!54 &8837923774420012111 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!75 &5621826775005746012 +ConstantForce: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254178599862226205} + m_Enabled: 1 + m_Force: {x: 0, y: 0, z: 0} + m_RelativeForce: {x: 0, y: 0, z: 0} + m_Torque: {x: 0, y: 0, z: 0} + m_RelativeTorque: {x: 0, y: 0, z: 0} +--- !u!1 &3770343743344624676 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2700988612633695584} + - component: {fileID: 6396342301339907172} + - component: {fileID: 1043452832205817939} + - component: {fileID: 2423785796053719842} + - component: {fileID: 7450002446033925956} + - component: {fileID: 7956994570643255623} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2700988612633695584 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 6.815354, z: 0.262468} + m_LocalScale: {x: 75, y: 75, z: 75} + m_Children: [] + m_Father: {fileID: 5745518246449043427} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6396342301339907172 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + m_Mesh: {fileID: -8839368762345780380, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!23 &1043452832205817939 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 53ccc4bb81ad43940b1c27f182c11fe5, 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!64 &2423785796053719842 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -8839368762345780380, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!54 &7450002446033925956 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!75 &7956994570643255623 +ConstantForce: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770343743344624676} + m_Enabled: 1 + m_Force: {x: 0, y: 0, z: 0} + m_RelativeForce: {x: 0, y: 0, z: 0} + m_Torque: {x: 0, y: 0, z: 0} + m_RelativeTorque: {x: 0, y: 0, z: 0} +--- !u!1 &4676843217774761056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8206597404032252466} + - component: {fileID: 1786314382244667370} + - component: {fileID: 7753600412293547822} + - component: {fileID: 7489884707195512450} + - component: {fileID: 2406182902263827966} + - component: {fileID: 5229281414467992300} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8206597404032252466 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 6.815354, z: 0.262468} + m_LocalScale: {x: 75, y: 75, z: 75} + m_Children: [] + m_Father: {fileID: 5745518246449043427} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1786314382244667370 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + m_Mesh: {fileID: 2959467708922500008, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!23 &7753600412293547822 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 53ccc4bb81ad43940b1c27f182c11fe5, 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!64 &7489884707195512450 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 2959467708922500008, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!54 &2406182902263827966 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!75 &5229281414467992300 +ConstantForce: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676843217774761056} + m_Enabled: 1 + m_Force: {x: 0, y: 0, z: 0} + m_RelativeForce: {x: 0, y: 0, z: 0} + m_Torque: {x: 0, y: 0, z: 0} + m_RelativeTorque: {x: 0, y: 0, z: 0} +--- !u!1 &4969720865562201433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5745518246449043427} + m_Layer: 0 + m_Name: GolemDead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5745518246449043427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4969720865562201433} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 29.893202, y: -1.72, z: 34.757664} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8206597404032252466} + - {fileID: 1107391168788425735} + - {fileID: 6546599202194112955} + - {fileID: 2700988612633695584} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7005881484836469966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1107391168788425735} + - component: {fileID: 659539063365834693} + - component: {fileID: 6973150773041945335} + - component: {fileID: 401478816335922075} + - component: {fileID: 464690000736584161} + - component: {fileID: 1436265097433643814} + m_Layer: 0 + m_Name: HandL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1107391168788425735 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 6.815354, z: 0.262468} + m_LocalScale: {x: 75, y: 75, z: 75} + m_Children: [] + m_Father: {fileID: 5745518246449043427} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &659539063365834693 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + m_Mesh: {fileID: 6637221642779607170, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!23 &6973150773041945335 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 53ccc4bb81ad43940b1c27f182c11fe5, 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!64 &401478816335922075 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 6637221642779607170, guid: 0aac413f8784a0c4091f25ca57a14f84, type: 3} +--- !u!54 &464690000736584161 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!75 &1436265097433643814 +ConstantForce: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7005881484836469966} + m_Enabled: 1 + m_Force: {x: 0, y: 0, z: 0} + m_RelativeForce: {x: 0, y: 0, z: 0} + m_Torque: {x: 0, y: 0, z: 0} + m_RelativeTorque: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab.meta b/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab.meta new file mode 100644 index 00000000..e6a6ecbe --- /dev/null +++ b/Assets/Prefabs/Enemy/Enemies/GolemDead.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82e8b4d583f0b114aa310d670f41a778 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemy/Enemies/GolemEnemy.prefab b/Assets/Prefabs/Enemy/Enemies/GolemEnemy.prefab index 6deb1ca0..6ac0aabd 100644 --- a/Assets/Prefabs/Enemy/Enemies/GolemEnemy.prefab +++ b/Assets/Prefabs/Enemy/Enemies/GolemEnemy.prefab @@ -1108,6 +1108,7 @@ MonoBehaviour: baseStopDistance: 2.5 slap: {fileID: -8063788094010961536} headbutt: {fileID: 4423465569533801917} + deadGolem: {fileID: 4969720865562201433, guid: 82e8b4d583f0b114aa310d670f41a778, type: 3} sync: {fileID: 4272603375916495953} --- !u!114 &2043701056 MonoBehaviour: diff --git a/Assets/Prefabs/Enemy/Enemies/Skeleton.prefab b/Assets/Prefabs/Enemy/Enemies/Skeleton.prefab index cf96a04f..70c4a545 100644 --- a/Assets/Prefabs/Enemy/Enemies/Skeleton.prefab +++ b/Assets/Prefabs/Enemy/Enemies/Skeleton.prefab @@ -662,7 +662,7 @@ SphereCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Radius: 3.5 + m_Radius: 3 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2127989831378458320 GameObject: @@ -1928,7 +1928,6 @@ GameObject: m_Component: - component: {fileID: 6262807936475223192} - component: {fileID: 6262807936475223191} - - component: {fileID: 6262807936475223195} - component: {fileID: 6262807936475223196} - component: {fileID: 5862766765972872273} - component: {fileID: 6262807936475223190} @@ -1977,27 +1976,15 @@ MonoBehaviour: attackDamage: 5 scoreValue: 10 durationBeforeDespawn: 2.5 + colliderToDisable: {fileID: 6262807936475223194} + colliderToEnable: {fileID: 1737569877594554043} + launchRotationSpeed: 25 walkSpeed: 1.3 chaseSpeed: 3 baseAttackDistance: 2 playerAttackDistance: 2.5 playerChaseStopDistance: 8 audioSource: {fileID: 5299323398470747327} ---- !u!114 &6262807936475223195 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262807936475223189} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 44aeb75c17c6bb242b9da7bec99c01aa, type: 3} - m_Name: - m_EditorClassIdentifier: - colliderToDisable: {fileID: 6262807936475223194} - colliderToEnable: {fileID: 1737569877594554043} - launchRotationSpeed: 25 --- !u!114 &6262807936475223196 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Enemy/Enemies/Unigolem.prefab b/Assets/Prefabs/Enemy/Enemies/Unigolem.prefab index 0ef35e3d..16300be6 100644 --- a/Assets/Prefabs/Enemy/Enemies/Unigolem.prefab +++ b/Assets/Prefabs/Enemy/Enemies/Unigolem.prefab @@ -413,7 +413,6 @@ GameObject: m_Component: - component: {fileID: 6094904989433470017} - component: {fileID: 8135351288033698040} - - component: {fileID: 7936769435568181584} - component: {fileID: 1188638836342214499} - component: {fileID: 5596777997928769972} - component: {fileID: 7415659850581668381} @@ -458,25 +457,13 @@ MonoBehaviour: attackDamage: 5 scoreValue: 10 durationBeforeDespawn: 2.5 + colliderToDisable: {fileID: 7415659850581668381} + colliderToEnable: {fileID: 7712605073058049184} + launchRotationSpeed: 0 model: {fileID: 7764703935131286064} tiltAngleSide: 10 tiltAngleFront: 15 detonationDistance: 2 ---- !u!114 &7936769435568181584 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6094904989433470016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 038f81e2cfae591409b8a2244bbe762f, type: 3} - m_Name: - m_EditorClassIdentifier: - colliderToDisable: {fileID: 7415659850581668381} - colliderToEnable: {fileID: 7712605073058049184} - launchRotationSpeed: 0 --- !u!114 &1188638836342214499 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/Characters/Player_Dahl.prefab b/Assets/Prefabs/Player/Characters/Player_Dahl.prefab index 7a4f1076..d6b940a4 100644 --- a/Assets/Prefabs/Player/Characters/Player_Dahl.prefab +++ b/Assets/Prefabs/Player/Characters/Player_Dahl.prefab @@ -1463,6 +1463,7 @@ MonoBehaviour: heldItemBone: {fileID: 7197418879628508991} enemyViewFocus: {fileID: 3115779887983679145} toggleMaterial: {fileID: 2327685517829295026} + deathCooldownOver: 0 --- !u!114 &4071846026879171961 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/HUD.prefab b/Assets/Prefabs/UI/HUD.prefab index b4394d58..45273f4a 100644 --- a/Assets/Prefabs/UI/HUD.prefab +++ b/Assets/Prefabs/UI/HUD.prefab @@ -1116,6 +1116,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f8991e59881edcb4bbaa22c6a3c44f2a, type: 3} m_Name: m_EditorClassIdentifier: + resourceStartAmount: 100 resourceText: {fileID: 3875453902857254870} scoreText: {fileID: 143523117} score: 0 diff --git a/Assets/Prefabs/UI/PauseMenu.prefab b/Assets/Prefabs/UI/PauseMenu.prefab index dada85a5..a4307c58 100644 --- a/Assets/Prefabs/UI/PauseMenu.prefab +++ b/Assets/Prefabs/UI/PauseMenu.prefab @@ -164,7 +164,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7578182136137157790} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -767,6 +767,7 @@ RectTransform: m_Children: - {fileID: 5820653049465747186} - {fileID: 8972834855378586841} + - {fileID: 8617435496792757602} - {fileID: 1025107726187060797} m_Father: {fileID: 1663500158680934234} m_RootOrder: 1 @@ -1007,6 +1008,140 @@ MonoBehaviour: m_EditorClassIdentifier: buttonUp: {fileID: 1270107825} buttonDown: {fileID: 1270107824} +--- !u!1 &2658137231285782986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7440366373048708404} + - component: {fileID: 1207562616890494406} + - component: {fileID: 4291664164171672153} + m_Layer: 5 + m_Name: Text (TMP) (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7440366373048708404 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2658137231285782986} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8972834855378586841} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 71, y: 109} + m_SizeDelta: {x: 118.64328, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1207562616890494406 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2658137231285782986} + m_CullTransparentMesh: 0 +--- !u!114 &4291664164171672153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2658137231285782986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Build + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2790399334053288318 GameObject: m_ObjectHideFlags: 0 @@ -1443,7 +1578,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 198, y: 204} + m_AnchoredPosition: {x: 197.6, y: 236.1} m_SizeDelta: {x: 118.64328, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6458990605570123512 @@ -1474,7 +1609,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Sell + m_text: 'Sell/ + + Cancel' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} @@ -1513,7 +1650,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -63.67 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -1570,7 +1707,7 @@ RectTransform: m_GameObject: {fileID: 6447248897094837798} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.57740825, y: 0.45, z: 1} m_Children: - {fileID: 6498509629497458895} - {fileID: 7044538584297769839} @@ -1578,6 +1715,7 @@ RectTransform: - {fileID: 4609986345755607815} - {fileID: 1607908488173965798} - {fileID: 7259141408481325334} + - {fileID: 7440366373048708404} m_Father: {fileID: 7578182136137157790} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1624,6 +1762,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7010104617340412742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8617435496792757602} + - component: {fileID: 8892932716803222408} + - component: {fileID: 2406296427758806801} + m_Layer: 5 + m_Name: Instructions (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8617435496792757602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7010104617340412742} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.57740825, y: 0.6624, z: 1} + m_Children: [] + m_Father: {fileID: 7578182136137157790} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8892932716803222408 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7010104617340412742} + m_CullTransparentMesh: 0 +--- !u!114 &2406296427758806801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7010104617340412742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7176471} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b3c096a45208aba4793e2919c3d7cbee, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7759117074323814611 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Endless_Mode.unity b/Assets/Scenes/Endless_Mode.unity index c2ce0f55..32a2a211 100644 --- a/Assets/Scenes/Endless_Mode.unity +++ b/Assets/Scenes/Endless_Mode.unity @@ -2478,6 +2478,87 @@ Transform: m_Father: {fileID: 1538812500} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 104.183, z: 0} +--- !u!1 &9727032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9727033} + - component: {fileID: 9727035} + - component: {fileID: 9727034} + m_Layer: 0 + m_Name: crown02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9727033 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9727032} + m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.12, z: 0} + m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} + m_Children: [] + m_Father: {fileID: 2123706901} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &9727034 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9727032} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 45e411453850b3143991c9bfa6104a7a, 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 &9727035 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9727032} + m_Mesh: {fileID: 413610570324566871, guid: 4551238487d38e3438e50ffee90dc504, type: 3} --- !u!1 &9891399 GameObject: m_ObjectHideFlags: 0 @@ -10732,6 +10813,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 353828665} + - {fileID: 2123706901} m_Father: {fileID: 547956745} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14951,7 +15033,7 @@ Camera: m_GameObject: {fileID: 68505623} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 + m_ClearFlags: 1 m_BackGroundColor: {r: 0.20392159, g: 0.9058824, b: 0.8941177, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -14968,8 +15050,8 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 50 - orthographic: 0 - orthographic size: 5 + orthographic: 1 + orthographic size: 12 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -14993,7 +15075,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 68505623} m_LocalRotation: {x: 0.4617481, y: -0.0013314242, z: 0.00069309556, w: 0.88700986} - m_LocalPosition: {x: 42.43524, y: 5, z: 35.5} + m_LocalPosition: {x: 42.43524, y: 20, z: 35.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -39621,6 +39703,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173994475} m_Mesh: {fileID: 5113453758752670646, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} +--- !u!224 &174316661 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4043387886964053726, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} + m_PrefabInstance: {fileID: 1989525685} + m_PrefabAsset: {fileID: 0} --- !u!1 &174564794 GameObject: m_ObjectHideFlags: 0 @@ -47501,7 +47588,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1374458342} - - {fileID: 1885832389} - {fileID: 268896955} m_Father: {fileID: 0} m_RootOrder: 0 @@ -48218,6 +48304,39 @@ MonoBehaviour: - {fileID: 493999182} - {fileID: 366797677} _occupyingObject: {fileID: 924615464} +--- !u!1 &213639703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 213639704} + m_Layer: 0 + m_Name: stonePile01(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &213639704 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213639703} + m_LocalRotation: {x: 0, y: 0.07959004, z: 0, w: 0.9968277} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 6.14633, y: 6.14633, z: 6.14633} + m_Children: + - {fileID: 1335772582} + - {fileID: 1606181667} + - {fileID: 1323966205} + m_Father: {fileID: 1928643167} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 9.13, z: 0} --- !u!1 &213762998 GameObject: m_ObjectHideFlags: 0 @@ -57489,6 +57608,142 @@ MonoBehaviour: - {fileID: 1928643166} - {fileID: 476504115} _occupyingObject: {fileID: 538179437} +--- !u!1 &256787377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 256787378} + - component: {fileID: 256787380} + - component: {fileID: 256787379} + m_Layer: 5 + m_Name: Text (TMP) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &256787378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256787377} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 202.7, y: 236.1} + m_SizeDelta: {x: 118.64328, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &256787379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256787377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Sell/ + + Cancel' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -63.67 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &256787380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256787377} + m_CullTransparentMesh: 0 --- !u!1 &256877391 GameObject: m_ObjectHideFlags: 0 @@ -60374,7 +60629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4658540579827121065, guid: 375bb6c67aa7996499aaeee68a943bb5, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4658540579827121065, guid: 375bb6c67aa7996499aaeee68a943bb5, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -71399,6 +71654,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320759503} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &321989823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321989824} + - component: {fileID: 321989826} + - component: {fileID: 321989825} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &321989824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321989823} + m_LocalRotation: {x: -0, y: -0, z: 0.23047619, w: 0.97307795} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.6653, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 26.65} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 344.96, y: 297} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &321989825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321989823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96aca83f19eb4fd45867cab8d1e4acce, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &321989826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321989823} + m_CullTransparentMesh: 0 --- !u!1 &322283156 GameObject: m_ObjectHideFlags: 0 @@ -73565,6 +73895,11 @@ MonoBehaviour: - {fileID: 1634578490} - {fileID: 837685438} _occupyingObject: {fileID: 0} +--- !u!4 &332110250 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + m_PrefabInstance: {fileID: 1356521109} + m_PrefabAsset: {fileID: 0} --- !u!1 &332216033 GameObject: m_ObjectHideFlags: 0 @@ -152371,6 +152706,140 @@ MonoBehaviour: - {fileID: 586017568} - {fileID: 1970759072} _occupyingObject: {fileID: 0} +--- !u!1 &659325889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 659325890} + - component: {fileID: 659325892} + - component: {fileID: 659325891} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &659325890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659325889} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 107.45, y: -93.3} + m_SizeDelta: {x: 247.86328, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &659325891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659325889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Rotate turret + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &659325892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659325889} + m_CullTransparentMesh: 0 --- !u!1 &659387140 GameObject: m_ObjectHideFlags: 0 @@ -157348,6 +157817,52 @@ Transform: m_Father: {fileID: 1501562820} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &684372961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684372962} + - component: {fileID: 684372963} + m_Layer: 0 + m_Name: controlTutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &684372962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684372961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1702063070} + - {fileID: 1814861541} + m_Father: {fileID: 174316661} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &684372963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684372961} + m_CullTransparentMesh: 0 --- !u!1 &684694158 GameObject: m_ObjectHideFlags: 0 @@ -161309,6 +161824,87 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698902299} m_Mesh: {fileID: 6697108462537596329, guid: c6948dcbcdc115d42bd0c51e8b32d727, type: 3} +--- !u!1 &699243551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 699243552} + - component: {fileID: 699243554} + - component: {fileID: 699243553} + m_Layer: 0 + m_Name: crown02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &699243552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 699243551} + m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.12, z: 0} + m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} + m_Children: [] + m_Father: {fileID: 2132860141} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &699243553 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 699243551} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 45e411453850b3143991c9bfa6104a7a, 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 &699243554 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 699243551} + m_Mesh: {fileID: 413610570324566871, guid: 4551238487d38e3438e50ffee90dc504, type: 3} --- !u!1 &699387049 GameObject: m_ObjectHideFlags: 0 @@ -168392,6 +168988,87 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 731752493} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &732581371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732581372} + - component: {fileID: 732581374} + - component: {fileID: 732581373} + m_Layer: 0 + m_Name: bottom02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &732581372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732581371} + m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.12, z: 0} + m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} + m_Children: [] + m_Father: {fileID: 2132860141} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &732581373 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732581371} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 3f5c14189cf45314785dcaf26bc13cb0, 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 &732581374 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732581371} + m_Mesh: {fileID: 7522118744798333110, guid: 4551238487d38e3438e50ffee90dc504, type: 3} --- !u!1 &733131478 GameObject: m_ObjectHideFlags: 0 @@ -186747,8 +187424,8 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -223229,6 +223906,140 @@ MonoBehaviour: - {fileID: 328920933} - {fileID: 1350901748} _occupyingObject: {fileID: 0} +--- !u!1 &964097208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 964097209} + - component: {fileID: 964097211} + - component: {fileID: 964097210} + m_Layer: 5 + m_Name: Text (TMP) (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &964097209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964097208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 306.1, y: 31.5} + m_SizeDelta: {x: 149.44186, y: 82.73633} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &964097210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964097208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Confirm/ \nRepair" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -63.67 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &964097211 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964097208} + m_CullTransparentMesh: 0 --- !u!1 &964300883 GameObject: m_ObjectHideFlags: 0 @@ -224286,6 +225097,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968963795} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &969558772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 969558773} + - component: {fileID: 969558775} + - component: {fileID: 969558774} + m_Layer: 5 + m_Name: Text (TMP) (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &969558773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969558772} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 71, y: 109} + m_SizeDelta: {x: 118.64328, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &969558774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969558772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Build + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &969558775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969558772} + m_CullTransparentMesh: 0 --- !u!1 &969772867 GameObject: m_ObjectHideFlags: 0 @@ -263608,6 +264553,75 @@ Transform: m_Father: {fileID: 937200653} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1127545010 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1926164584} + m_Modifications: + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05155809 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9016668 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.z + value: -0.112172656 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4144345 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.183 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 130.63 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.x + value: 14.052304 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.y + value: 14.052305 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.z + value: 14.052306 + objectReference: {fileID: 0} + - target: {fileID: 6453742252294820681, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_Name + value: tree01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} --- !u!1 &1128696366 GameObject: m_ObjectHideFlags: 0 @@ -266481,6 +267495,87 @@ MonoBehaviour: - {fileID: 335211237} - {fileID: 437448202} _occupyingObject: {fileID: 1271004490} +--- !u!1 &1140245491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1140245492} + - component: {fileID: 1140245494} + - component: {fileID: 1140245493} + m_Layer: 0 + m_Name: bottom02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1140245492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140245491} + m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.12, z: 0} + m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} + m_Children: [] + m_Father: {fileID: 2123706901} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1140245493 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140245491} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 3f5c14189cf45314785dcaf26bc13cb0, 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 &1140245494 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140245491} + m_Mesh: {fileID: 7522118744798333110, guid: 4551238487d38e3438e50ffee90dc504, type: 3} --- !u!1 &1140247207 GameObject: m_ObjectHideFlags: 0 @@ -266830,6 +267925,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1498222006} + - {fileID: 332110250} m_Father: {fileID: 330183321} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -273929,6 +275025,140 @@ MonoBehaviour: - {fileID: 606369407} - {fileID: 370638470} _occupyingObject: {fileID: 0} +--- !u!1 &1169741781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1169741782} + - component: {fileID: 1169741784} + - component: {fileID: 1169741783} + m_Layer: 5 + m_Name: Text (TMP) (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1169741782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169741781} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -204.6, y: 190.5} + m_SizeDelta: {x: 127.758575, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1169741783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169741781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Move + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1169741784 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169741781} + m_CullTransparentMesh: 0 --- !u!1 &1169774401 GameObject: m_ObjectHideFlags: 0 @@ -278295,6 +279525,140 @@ Transform: m_Father: {fileID: 1501562820} m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1187899389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187899390} + - component: {fileID: 1187899392} + - component: {fileID: 1187899391} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1187899390 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187899389} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 394.6, y: 246.1} + m_SizeDelta: {x: 290.6927, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1187899391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187899389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Build Turret + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1187899392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187899389} + m_CullTransparentMesh: 0 --- !u!1 &1188288524 GameObject: m_ObjectHideFlags: 0 @@ -301293,6 +302657,54 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: MainMenu objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 806385292296530049, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1016699934949060240, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1025107726187060797, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} propertyPath: m_AnchorMin.y value: 0 @@ -301513,6 +302925,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -204.6 objectReference: {fileID: 0} + - target: {fileID: 7440366373048708404, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7578182136137157790, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} propertyPath: m_AnchorMin.y value: 0 @@ -301561,6 +302977,30 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8617435496792757602, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8972834855378586841, guid: 115481d4343226c429fa4f98af7a6a9f, type: 3} propertyPath: m_AnchorMin.y value: 0 @@ -307331,6 +308771,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1170167376} + - {fileID: 2132860141} m_Father: {fileID: 1682701673} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -315206,65 +316647,7 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322930794} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} ---- !u!1 &1324194456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1324194457} - - component: {fileID: 1324194458} - m_Layer: 0 - m_Name: HexCell(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1324194457 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324194456} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 71.014084, y: 0, z: 79.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 748890693} - m_Father: {fileID: 1816476055} - m_RootOrder: 16 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1324194458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324194456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3d3de04c7eaa4677adc5cb5e120ecef, type: 3} - m_Name: - m_EditorClassIdentifier: - coordinates: - _x: 2 - _z: 28 - _cellType: - material: {fileID: 2100000, guid: 51855904a3cbc63439eee966c5c98a3c, type: 2} - elevation: 0 - neighbors: - - {fileID: 574142313} - - {fileID: 1124126153} - - {fileID: 291328623} - - {fileID: 148403534} - - {fileID: 844302680} - - {fileID: 73767974} - _occupyingObject: {fileID: 0} ---- !u!1 &1324526345 +--- !u!1 &1323966204 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315272,37 +316655,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1324526346} - - component: {fileID: 1324526348} - - component: {fileID: 1324526347} + - component: {fileID: 1323966205} + - component: {fileID: 1323966207} + - component: {fileID: 1323966206} m_Layer: 0 - m_Name: crown02 + m_Name: small m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1324526346 +--- !u!4 &1323966205 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324526345} - m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.12, z: 0} - m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} + m_GameObject: {fileID: 1323966204} + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.08, z: 0} + m_LocalScale: {x: 2.570373, y: 2.570373, z: 2.570373} m_Children: [] - m_Father: {fileID: 1921786420} - m_RootOrder: 1 + m_Father: {fileID: 213639704} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1324526347 +--- !u!23 &1323966206 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324526345} + m_GameObject: {fileID: 1323966204} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -315315,7 +316698,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 45e411453850b3143991c9bfa6104a7a, type: 2} + - {fileID: 2100000, guid: bfcfbf413f8f67c4c9243fd044f9da66, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -315337,15 +316720,15 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1324526348 +--- !u!33 &1323966207 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324526345} - m_Mesh: {fileID: 413610570324566871, guid: 4551238487d38e3438e50ffee90dc504, type: 3} ---- !u!1 &1325005289 + m_GameObject: {fileID: 1323966204} + m_Mesh: {fileID: -4846291162012944035, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} +--- !u!1 &1324194456 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315353,95 +316736,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1325005290} - - component: {fileID: 1325005293} - - component: {fileID: 1325005292} - - component: {fileID: 1325005291} + - component: {fileID: 1324194457} + - component: {fileID: 1324194458} m_Layer: 0 - m_Name: Mesh + m_Name: HexCell(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!4 &1325005290 +--- !u!4 &1324194457 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325005289} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1324194456} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 71.014084, y: 0, z: 79.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1280218975} - m_RootOrder: 0 + m_Children: + - {fileID: 748890693} + m_Father: {fileID: 1816476055} + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1325005291 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325005289} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} ---- !u!23 &1325005292 -MeshRenderer: +--- !u!114 &1324194458 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325005289} + m_GameObject: {fileID: 1324194456} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - 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: 9061c0a39302aae4495532f46b083b87, 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 &1325005293 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325005289} - m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} ---- !u!1 &1325941735 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3d3de04c7eaa4677adc5cb5e120ecef, type: 3} + m_Name: + m_EditorClassIdentifier: + coordinates: + _x: 2 + _z: 28 + _cellType: + material: {fileID: 2100000, guid: 51855904a3cbc63439eee966c5c98a3c, type: 2} + elevation: 0 + neighbors: + - {fileID: 574142313} + - {fileID: 1124126153} + - {fileID: 291328623} + - {fileID: 148403534} + - {fileID: 844302680} + - {fileID: 73767974} + _occupyingObject: {fileID: 0} +--- !u!1 &1324526345 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315449,54 +316794,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1325941736} - - component: {fileID: 1325941739} - - component: {fileID: 1325941738} - - component: {fileID: 1325941737} + - component: {fileID: 1324526346} + - component: {fileID: 1324526348} + - component: {fileID: 1324526347} m_Layer: 0 - m_Name: Mesh + m_Name: crown02 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1325941736 +--- !u!4 &1324526346 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325941735} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1324526345} + m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.12, z: 0} + m_LocalScale: {x: 4.2606754, y: 4.2606754, z: 4.2606754} m_Children: [] - m_Father: {fileID: 2081800678} - m_RootOrder: 0 + m_Father: {fileID: 1921786420} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1325941737 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325941735} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} ---- !u!23 &1325941738 +--- !u!23 &1324526347 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325941735} + m_GameObject: {fileID: 1324526345} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 @@ -315507,7 +316837,199 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5ec7c15465c2cc74886c0424eff4ab92, type: 2} + - {fileID: 2100000, guid: 45e411453850b3143991c9bfa6104a7a, 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 &1324526348 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324526345} + m_Mesh: {fileID: 413610570324566871, guid: 4551238487d38e3438e50ffee90dc504, type: 3} +--- !u!1 &1325005289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325005290} + - component: {fileID: 1325005293} + - component: {fileID: 1325005292} + - component: {fileID: 1325005291} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &1325005290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325005289} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1280218975} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1325005291 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325005289} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!23 &1325005292 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325005289} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 9061c0a39302aae4495532f46b083b87, 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 &1325005293 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325005289} + m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &1325941735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325941736} + - component: {fileID: 1325941739} + - component: {fileID: 1325941738} + - component: {fileID: 1325941737} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &1325941736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325941735} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2081800678} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1325941737 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325941735} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!23 &1325941738 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325941735} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 5ec7c15465c2cc74886c0424eff4ab92, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -317170,6 +318692,87 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1335198574} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &1335772581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1335772582} + - component: {fileID: 1335772584} + - component: {fileID: 1335772583} + m_Layer: 0 + m_Name: big + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1335772582 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335772581} + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.08, z: 0} + m_LocalScale: {x: 2.570373, y: 2.570373, z: 2.570373} + m_Children: [] + m_Father: {fileID: 213639704} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1335772583 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335772581} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: bfcfbf413f8f67c4c9243fd044f9da66, 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 &1335772584 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335772581} + m_Mesh: {fileID: -6428272361537545761, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} --- !u!1 &1335912949 GameObject: m_ObjectHideFlags: 0 @@ -322618,6 +324221,75 @@ MonoBehaviour: - {fileID: 244319686} - {fileID: 737687208} _occupyingObject: {fileID: 0} +--- !u!1001 &1356521109 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1141061103} + m_Modifications: + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.x + value: 0.12339159 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.031603284 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0039316346 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9918469 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.183 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 3.65 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.x + value: 14.052304 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.y + value: 14.052305 + objectReference: {fileID: 0} + - target: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_LocalScale.z + value: 14.052306 + objectReference: {fileID: 0} + - target: {fileID: 6453742252294820681, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + propertyPath: m_Name + value: tree01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} --- !u!1 &1356656178 GameObject: m_ObjectHideFlags: 0 @@ -393993,6 +395665,87 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606077426} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &1606181666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1606181667} + - component: {fileID: 1606181669} + - component: {fileID: 1606181668} + m_Layer: 0 + m_Name: medium + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1606181667 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606181666} + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.08, z: 0} + m_LocalScale: {x: 2.570373, y: 2.570373, z: 2.570373} + m_Children: [] + m_Father: {fileID: 213639704} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1606181668 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606181666} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: bfcfbf413f8f67c4c9243fd044f9da66, 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 &1606181669 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606181666} + m_Mesh: {fileID: 5113453758752670646, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} --- !u!1 &1608071993 GameObject: m_ObjectHideFlags: 0 @@ -401669,6 +403422,140 @@ Transform: m_Father: {fileID: 383320405} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1640912194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1640912195} + - component: {fileID: 1640912197} + - component: {fileID: 1640912196} + m_Layer: 5 + m_Name: Text (TMP) (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1640912195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640912194} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1814861541} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 344.96, y: 109.5} + m_SizeDelta: {x: 118.64328, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1640912196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640912194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Cancel + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1640912197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640912194} + m_CullTransparentMesh: 0 --- !u!1 &1640942049 GameObject: m_ObjectHideFlags: 0 @@ -402252,17 +404139,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1643936997} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} ---- !u!114 &1644120583 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 25241746811586454, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} - m_PrefabInstance: {fileID: 1989525685} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8991e59881edcb4bbaa22c6a3c44f2a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1644140226 GameObject: m_ObjectHideFlags: 0 @@ -415686,6 +417562,81 @@ Transform: m_Father: {fileID: 1251137518} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 104.183, z: 0} +--- !u!1 &1702063069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1702063070} + - component: {fileID: 1702063072} + - component: {fileID: 1702063071} + m_Layer: 5 + m_Name: Instructions (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1702063070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702063069} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.57741, y: 0.6624, z: 1} + m_Children: [] + m_Father: {fileID: 684372962} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 743, y: 0} + m_SizeDelta: {x: 1167.865, y: 513.07996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1702063071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702063069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b3c096a45208aba4793e2919c3d7cbee, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1702063072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702063069} + m_CullTransparentMesh: 0 --- !u!1 &1703157682 GameObject: m_ObjectHideFlags: 0 @@ -441655,6 +443606,89 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814760432} m_Mesh: {fileID: 6697108462537596329, guid: c6948dcbcdc115d42bd0c51e8b32d727, type: 3} +--- !u!1 &1814861540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1814861541} + - component: {fileID: 1814861543} + - component: {fileID: 1814861542} + m_Layer: 5 + m_Name: Instructions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1814861541 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814861540} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.57741, y: 0.57741, z: 1} + m_Children: + - {fileID: 1187899390} + - {fileID: 659325890} + - {fileID: 256787378} + - {fileID: 1640912195} + - {fileID: 964097209} + - {fileID: 1169741782} + - {fileID: 321989824} + - {fileID: 969558773} + m_Father: {fileID: 684372962} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -640.8, y: 0} + m_SizeDelta: {x: 1167.865, y: 513.88} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1814861542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814861540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f8d689f5122b61241b9ca64be2f77d29, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1814861543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814861540} + m_CullTransparentMesh: 0 --- !u!1 &1814914475 GameObject: m_ObjectHideFlags: 0 @@ -458000,11 +460034,6 @@ MonoBehaviour: - {fileID: 2091962003} - {fileID: 999435072} _occupyingObject: {fileID: 0} ---- !u!4 &1885832389 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 11748564391039281, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - m_PrefabInstance: {fileID: 2729021833892921654} - m_PrefabAsset: {fileID: 0} --- !u!1 &1885876491 GameObject: m_ObjectHideFlags: 0 @@ -461939,6 +463968,11 @@ MonoBehaviour: - {fileID: 1776026289} - {fileID: 0} _occupyingObject: {fileID: 1203648972} +--- !u!4 &1901761606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5970538139742505459, guid: 3f8b52c6be1c3af44b7be0ed2b1e604a, type: 3} + m_PrefabInstance: {fileID: 1127545010} + m_PrefabAsset: {fileID: 0} --- !u!1 &1901928743 GameObject: m_ObjectHideFlags: 0 @@ -466968,6 +469002,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 653543366} + - {fileID: 1901761606} m_Father: {fileID: 2078322531} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -467574,6 +469609,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1121966921} + - {fileID: 213639704} m_Father: {fileID: 2078322531} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -481474,6 +483510,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 102443052, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 102443052, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 102443052, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1047170856, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -481486,6 +483534,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 25241746811586454, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} + propertyPath: startTutorial + value: + objectReference: {fileID: 684372962} - target: {fileID: 2778704818627589043, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} propertyPath: m_Camera value: @@ -481580,7 +483632,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5102762895172474464, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6676795971338430111, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} propertyPath: m_AnchorMax.x @@ -481596,7 +483648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7185895281895621408, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} propertyPath: m_AnchoredPosition.x - value: -2.5 + value: -2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dcf7e165b56be7240ae3a1648ddec8da, type: 3} @@ -515026,6 +517078,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123618157} m_Mesh: {fileID: 8829373326209325920, guid: c7d73f1035ea33a4591f82b402e6cabc, type: 3} +--- !u!1 &2123706900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123706901} + m_Layer: 0 + m_Name: tree01(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2123706901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123706900} + m_LocalRotation: {x: 0, y: 0.32556805, z: 0, w: 0.9455186} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7.35184, y: 7.35184, z: 7.35184} + m_Children: + - {fileID: 1140245492} + - {fileID: 9727033} + m_Father: {fileID: 49585827} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 38, z: 0} --- !u!1 &2123842662 GameObject: m_ObjectHideFlags: 0 @@ -517080,6 +519164,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131819673} m_Mesh: {fileID: 5113453758752670646, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} +--- !u!1 &2132860140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132860141} + m_Layer: 0 + m_Name: tree01(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2132860141 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132860140} + m_LocalRotation: {x: 0, y: 0.9335804, z: 0, w: 0.35836807} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7.35184, y: 7.35184, z: 7.35184} + m_Children: + - {fileID: 732581372} + - {fileID: 699243552} + m_Father: {fileID: 1291225390} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 138, z: 0} --- !u!1 &2133264310 GameObject: m_ObjectHideFlags: 0 @@ -519998,36 +522114,3 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2147307416} m_Mesh: {fileID: 5113453758752670646, guid: 941971907b2fa71478f0f79d2e44a39c, type: 3} ---- !u!1001 &2729021833892921654 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 207661144} - m_Modifications: - - target: {fileID: 11748564391039281, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11748564391039281, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11748564391039281, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11748564391039281, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8032793438729518725, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: m_Name - value: InventoryManager - objectReference: {fileID: 0} - - target: {fileID: 8203989930854161992, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} - propertyPath: ui - value: - objectReference: {fileID: 1644120583} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 572b62e3b379a3742b36f60f31d00d91, type: 3} diff --git a/Assets/Scenes/Gallery.unity b/Assets/Scenes/Gallery.unity index de52c67c..1e4b58d9 100644 --- a/Assets/Scenes/Gallery.unity +++ b/Assets/Scenes/Gallery.unity @@ -150,7 +150,7 @@ RectTransform: m_GameObject: {fileID: 90288461} m_LocalRotation: {x: -0, y: -0, z: 0.1943087, w: 0.98094046} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 1, z: 1} + m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 1516157255} m_RootOrder: 0 @@ -180,9 +180,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 96922d4feadcf4d44ad839f762410ef4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c8c8388f2d6e014f9fc6ca9e3c1abd2, type: 3} m_Type: 3 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 1 m_FillAmount: 1 @@ -392,7 +392,7 @@ RectTransform: m_GameObject: {fileID: 1134773077} m_LocalRotation: {x: -0, y: -0, z: -0.20212571, w: 0.97935957} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 1, z: 1} + m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 1516157255} m_RootOrder: 2 @@ -422,9 +422,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 24f943e131cc93f47b8edcf66a040628, type: 3} + m_Sprite: {fileID: 21300000, guid: 186d4841f930f5842a603f312d1789ab, type: 3} m_Type: 3 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 1 m_FillAmount: 1 @@ -467,7 +467,7 @@ RectTransform: m_GameObject: {fileID: 1319050151} m_LocalRotation: {x: -0, y: -0, z: -0.15370873, w: 0.9881162} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 1, z: 1} + m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 1516157255} m_RootOrder: 1 @@ -497,9 +497,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 00a91cb4ec9fd4a45a5da14a151e04b3, type: 3} + m_Sprite: {fileID: 21300000, guid: 08560965d51841946b785a1d1f40b852, type: 3} m_Type: 3 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 1 m_FillAmount: 1 diff --git a/Assets/Scenes/Intro.unity b/Assets/Scenes/Intro.unity new file mode 100644 index 00000000..e492599e --- /dev/null +++ b/Assets/Scenes/Intro.unity @@ -0,0 +1,815 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, 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_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &517675867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 517675870} + - component: {fileID: 517675869} + - component: {fileID: 517675868} + - component: {fileID: 517675872} + - component: {fileID: 517675871} + - component: {fileID: 517675873} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &517675868 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_Enabled: 1 +--- !u!20 &517675869 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &517675870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!328 &517675871 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: c3b7982099344544fa4aa6c0496dd919, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 517675869} + m_TargetTexture: {fileID: 0} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: _MainTex + m_RenderMode: 0 + m_AspectRatio: 2 + m_DataSource: 0 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 0.127 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] +--- !u!114 &517675872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!82 &517675873 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517675867} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 9b803968033a9a2418f8ca5ada9903a6, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &606541539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 606541540} + - component: {fileID: 606541542} + - component: {fileID: 606541541} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &606541540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606541539} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1777370880} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 737.7, y: -350} + m_SizeDelta: {x: 250.96, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &606541541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606541539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Press escape or east gamepad button to skip + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &606541542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606541539} + m_CullTransparentMesh: 0 +--- !u!1001 &896328465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4662333533166999856, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} + propertyPath: m_Name + value: EventSystem + objectReference: {fileID: 0} + - target: {fileID: 4662333533166999859, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4662333533166999859, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4662333533166999859, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4662333533166999859, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} +--- !u!1 &1194510843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1194510845} + - component: {fileID: 1194510844} + m_Layer: 0 + m_Name: Player Input Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1194510844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194510843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 621567455fd1c4ceb811cc8a00b6a1a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NotificationBehavior: 0 + m_MaxPlayerCount: -1 + m_AllowJoining: 1 + m_JoinBehavior: 0 + m_PlayerJoinedEvent: + m_PersistentCalls: + m_Calls: [] + m_PlayerLeftEvent: + m_PersistentCalls: + m_Calls: [] + m_JoinAction: + m_UseReference: 0 + m_Action: + m_Name: Join + m_Type: 0 + m_ExpectedControlType: + m_Id: 42faffee-f80f-40d7-b899-ec2b204f931b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Reference: {fileID: 0} + m_PlayerPrefab: {fileID: 6054018094751434213, guid: 72134bd3c9caa9c4291461d9bb4fc933, type: 3} + m_SplitScreen: 0 + m_MaintainAspectRatioInSplitScreen: 0 + m_FixedNumberOfSplitScreens: -1 + m_SplitScreenRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!4 &1194510845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194510843} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1457670798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1457670800} + - component: {fileID: 1457670799} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1457670799 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1457670798} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1457670800 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1457670798} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1777370876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1777370880} + - component: {fileID: 1777370879} + - component: {fileID: 1777370878} + - component: {fileID: 1777370877} + - component: {fileID: 1777370881} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1777370877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777370876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1777370878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777370876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1777370879 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777370876} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 517675869} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1777370880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777370876} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 606541540} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1777370881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777370876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d08a70fc7f3220e4291102647bf3af54, type: 3} + m_Name: + m_EditorClassIdentifier: + skipText: {fileID: 606541540} diff --git a/Assets/Scenes/Intro.unity.meta b/Assets/Scenes/Intro.unity.meta new file mode 100644 index 00000000..03e6b236 --- /dev/null +++ b/Assets/Scenes/Intro.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 18c08e020d6ed0d4c8e04b44400952ab +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_Menu.unity b/Assets/Scenes/Main_Menu.unity index 059cf817..8c15b1e6 100644 --- a/Assets/Scenes/Main_Menu.unity +++ b/Assets/Scenes/Main_Menu.unity @@ -679,6 +679,81 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2aac27770696c6149aca1e10e824e2ea, type: 3} +--- !u!1 &202786302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 202786303} + - component: {fileID: 202786305} + - component: {fileID: 202786304} + m_Layer: 5 + m_Name: Black + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &202786303 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 202786302} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1626856229} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &202786304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 202786302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &202786305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 202786302} + m_CullTransparentMesh: 0 --- !u!1 &279457984 GameObject: m_ObjectHideFlags: 0 @@ -752,7 +827,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1626856229} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -973,7 +1048,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -1178,7 +1253,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 24f943e131cc93f47b8edcf66a040628, type: 3} + m_Sprite: {fileID: 21300000, guid: 186d4841f930f5842a603f312d1789ab, type: 3} m_Type: 3 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1447,7 +1522,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -2052,7 +2127,7 @@ RectTransform: - {fileID: 2017846406} - {fileID: 449667588} m_Father: {fileID: 1626856229} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2079,7 +2154,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de5e8833ce3f6164fa6f0315432f0391, type: 3} + m_Sprite: {fileID: 21300000, guid: 49b59a104c6d0d047994848f88f83b3b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2328,7 +2403,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -2589,7 +2664,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1626856229} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2725,7 +2800,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -3027,7 +3102,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -3809,6 +3884,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 202786303} - {fileID: 760276798} - {fileID: 1947769332} - {fileID: 280143610} @@ -4213,7 +4289,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 96922d4feadcf4d44ad839f762410ef4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c8c8388f2d6e014f9fc6ca9e3c1abd2, type: 3} m_Type: 3 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4551,7 +4627,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 00a91cb4ec9fd4a45a5da14a151e04b3, type: 3} + m_Sprite: {fileID: 21300000, guid: 08560965d51841946b785a1d1f40b852, type: 3} m_Type: 3 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4889,7 +4965,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1626856229} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5015,7 +5091,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -5159,7 +5235,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0707b0a841e208a489fd30c90196c5d3, type: 3} + m_Sprite: {fileID: 21300000, guid: 721d5fd84924f6b4c9ee096c7b96d11c, type: 3} m_Type: 3 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5234,9 +5310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Arcade - -' + m_text: Start Game m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2} m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2} diff --git a/Assets/Scenes/Options.unity b/Assets/Scenes/Options.unity index 954225fa..07ba57a0 100644 --- a/Assets/Scenes/Options.unity +++ b/Assets/Scenes/Options.unity @@ -218,11 +218,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_DisabledColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -266,7 +266,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -636,11 +636,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.8588236, g: 0.8588236, b: 0.8588236, a: 1} + m_DisabledColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -684,7 +684,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -951,7 +951,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -999,7 +999,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2271,7 +2271,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2669,7 +2669,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7169812, g: 0.42070502, b: 0.22659309, a: 1} + m_Color: {r: 0.4339623, g: 0.2609669, b: 0.14943041, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2916,7 +2916,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -2964,7 +2964,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3288,11 +3288,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.8588236, g: 0.8588236, b: 0.8588236, a: 1} + m_DisabledColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -3336,7 +3336,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3456,11 +3456,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.8588236, g: 0.8588236, b: 0.8588236, a: 1} + m_DisabledColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -3504,7 +3504,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5475,7 +5475,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7042,11 +7042,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_NormalColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.8588236, g: 0.8588236, b: 0.8588236, a: 1} + m_DisabledColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -7118,7 +7118,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Scripts/Enemy/Enemies/Golem/GolemController.cs b/Assets/Scripts/Enemy/Enemies/Golem/GolemController.cs index 0d249630..41ec0909 100644 --- a/Assets/Scripts/Enemy/Enemies/Golem/GolemController.cs +++ b/Assets/Scripts/Enemy/Enemies/Golem/GolemController.cs @@ -55,6 +55,9 @@ public class GolemController : Enemy [SerializeField] private AudioSource headbutt = default; + [SerializeField] + private GameObject deadGolem = default; + protected override void Start() { baseTransform = BaseController.Singleton.transform; @@ -65,7 +68,8 @@ protected override void Start() private void AchievementDeath(DamageInfo dmg) { - SteamManager.Singleton.SetAchievement("ACH_SLAPPED_BACK"); + if(SteamManager.Singleton != null) + SteamManager.Singleton.SetAchievement("ACH_SLAPPED_BACK"); } public Transform AggroTarget @@ -123,7 +127,7 @@ void OnTriggerEnter(Collider other) protected override void HandleStateChange(EnemyState oldState, EnemyState newState) { if (newState == EnemyState.DEAD) - Destroy(gameObject); + StartCoroutine(nameof(Death)); } private void UpdateNextPosition() @@ -251,4 +255,27 @@ public void OnDealDamage() Vector3 knockBackDir = (AggroTarget.position - transform.position + Vector3.up * 2).normalized; targetHealth.OnReceiveDamage(this, damage, knockBackDir, 10f); } + + IEnumerator Death() + { + yield return new WaitForSeconds(0.5f); + GameObject DeadGolem = Instantiate(deadGolem, transform.position, transform.rotation); + + // Add an explosion force on the base + foreach (Rigidbody rb in DeadGolem.GetComponentsInChildren()) + { + // Add force + rb.AddForce(new Vector3(Random.Range(-250f, 250f), Random.Range(500f, 800f), Random.Range(-250f, 250f))); + // Add torque + Vector3 torque = new Vector3( + Random.Range(-200, 200), + Random.Range(-200, 200), + Random.Range(-200, 200)); + rb.GetComponent().torque = torque; + } + + // Cleanup + Destroy(DeadGolem, 5f); + Destroy(gameObject); + } } diff --git a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonController.cs b/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonController.cs index 03d896a4..aabd872b 100644 --- a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonController.cs +++ b/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonController.cs @@ -15,17 +15,20 @@ public class SkeletonController : EnemyLight protected float baseAttackDistance = 2f; [SerializeField] - protected float playerAttackDistance = 1f; + protected float playerAttackDistance = 0.8f; [SerializeField] - protected float playerChaseStopDistance = 4f; + protected float playerChaseStopDistance = 1f; [SerializeField] private AudioSource audioSource = default; + private static readonly int attackAnimatorParam = Animator.StringToHash("Attack"); private static readonly int chasingAnimatorParam = Animator.StringToHash("Chasing"); private static readonly int walkModeAnimatorParam = Animator.StringToHash("WalkMode"); + private static readonly int deadAnimatorParam = Animator.StringToHash("Dead"); + private static readonly int deathModeAnimatorParam = Animator.StringToHash("DeathMode"); protected override void Start() { @@ -49,6 +52,14 @@ private void AnimationSetup() // Set random walk animation anim.SetFloat(walkModeAnimatorParam, Random.Range(0, 3)); } + protected override void SetRagdollAnimatorParams() + { + base.SetRagdollAnimatorParams(); + + anim.SetBool(deadAnimatorParam, true); + // Set random death animation + anim.SetFloat(deathModeAnimatorParam, Random.Range(0, 8)); + } void FixedUpdate() { diff --git a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs b/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs deleted file mode 100644 index cf3a05ed..00000000 --- a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public class SkeletonRagdollController : EnemyLightRagdollController -{ - private static readonly int deadAnimatorParam = Animator.StringToHash("Dead"); - private static readonly int deathModeAnimatorParam = Animator.StringToHash("DeathMode"); - - protected override void SetAnimatorParams() - { - base.SetAnimatorParams(); - - animator.SetBool(deadAnimatorParam, true); - // Set random death animation - animator.SetFloat(deathModeAnimatorParam, Random.Range(0, 8)); - } -} diff --git a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs.meta b/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs.meta deleted file mode 100644 index a835235f..00000000 --- a/Assets/Scripts/Enemy/Enemies/Skeleton/SkeletonRagdollController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 44aeb75c17c6bb242b9da7bec99c01aa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemController.cs b/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemController.cs index 03a0e222..6bccf423 100644 --- a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemController.cs +++ b/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemController.cs @@ -69,4 +69,12 @@ void FixedUpdate() if (Vector3.Distance(transform.position, baseTransform.position) < detonationDistance) baseHealth?.OnReceiveDamage(this, attackDamage); } + + protected override Vector3 GetLaunchTorque() + { + // Using `forward` here would have made the most sense to me + // (getting the body to rotate in the same direction as this collider is facing), + // but that would have caused the body to rotate in its left-facing direction + return agent.speed * colliderToEnable.transform.right; + } } diff --git a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs b/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs deleted file mode 100644 index 73bcad6c..00000000 --- a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public class UnigolemRagdollController : EnemyLightRagdollController -{ - protected override Vector3 GetLaunchTorque() - { - // Using `forward` here would have made the most sense to me - // (getting the body to rotate in the same direction as this collider is facing), - // but that would have caused the body to rotate in its left-facing direction - return agent.speed * colliderToEnable.transform.right; - } -} diff --git a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs.meta b/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs.meta deleted file mode 100644 index beab5885..00000000 --- a/Assets/Scripts/Enemy/Enemies/Unigolem/UnigolemRagdollController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 038f81e2cfae591409b8a2244bbe762f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyLight.cs b/Assets/Scripts/Enemy/EnemyLight.cs index d336ddea..5cee4b13 100644 --- a/Assets/Scripts/Enemy/EnemyLight.cs +++ b/Assets/Scripts/Enemy/EnemyLight.cs @@ -12,13 +12,25 @@ public abstract class EnemyLight : Enemy [SerializeField] protected float durationBeforeDespawn = 2.5f; - protected EnemyLightRagdollController ragdollController; + //protected EnemyLightRagdollController ragdollController; + + [Header("Ragdoll related fields")] + [SerializeField] + protected Collider colliderToDisable = default; + + [SerializeField] + protected Collider colliderToEnable = default; + + [SerializeField] + protected float launchRotationSpeed = default; + + private Rigidbody body; + protected override void Awake() { base.Awake(); - - ragdollController = GetComponent(); + body = GetComponent(); } protected override void Die(DamageInfo damageInfo) @@ -26,6 +38,34 @@ protected override void Die(DamageInfo damageInfo) base.Die(damageInfo); // Ensure that the enemy is launched *after* the `SetState()` logic is executed, to not mess up things like the navmesh agent - ragdollController.Launch(damageInfo); + Launch(damageInfo); + } + + // Ragdoll methods + public void Launch(DamageInfo dmg) + { + SetRagdollAnimatorParams(); + + agent.enabled = false; + colliderToDisable.enabled = false; + colliderToEnable.enabled = true; + + // Assumes that the collider is placed at (0, 0, 0) relative to the Rigidbody gameobject + body.centerOfMass = transform.InverseTransformPoint(colliderToEnable.bounds.center); + body.isKinematic = false; + body.useGravity = true; + body.maxAngularVelocity = Mathf.Infinity; + + body.AddForce(dmg.KnockBackDir * dmg.KnockBackForce, ForceMode.VelocityChange); + body.AddTorque(GetLaunchTorque(), ForceMode.VelocityChange); + } + + protected virtual void SetRagdollAnimatorParams() + { } + + protected virtual Vector3 GetLaunchTorque() + { + float randomLaunchRotationSpeed = Mathf.Pow(Random.value, 2) * launchRotationSpeed; + return randomLaunchRotationSpeed * Random.onUnitSphere; } } diff --git a/Assets/Scripts/Enemy/EnemyLightRagdollController.cs b/Assets/Scripts/Enemy/EnemyLightRagdollController.cs deleted file mode 100644 index ef925369..00000000 --- a/Assets/Scripts/Enemy/EnemyLightRagdollController.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.AI; - - -[RequireComponent(typeof(HealthLogic))] -public class EnemyLightRagdollController : MonoBehaviour -{ - [SerializeField] - protected Collider colliderToDisable = default; - - [SerializeField] - protected Collider colliderToEnable = default; - - [SerializeField] - protected float launchRotationSpeed = default; - - protected Rigidbody body; - protected NavMeshAgent agent; - protected Animator animator; - - void Awake() - { - body = GetComponent(); - agent = GetComponent(); - animator = GetComponentInChildren(); - } - - public void Launch(DamageInfo dmg) - { - SetAnimatorParams(); - - agent.enabled = false; - colliderToDisable.enabled = false; - colliderToEnable.enabled = true; - - // Assumes that the collider is placed at (0, 0, 0) relative to the Rigidbody gameobject - body.centerOfMass = transform.InverseTransformPoint(colliderToEnable.bounds.center); - body.isKinematic = false; - body.useGravity = true; - body.maxAngularVelocity = Mathf.Infinity; - - body.AddForce(dmg.KnockBackDir * dmg.KnockBackForce, ForceMode.VelocityChange); - body.AddTorque(GetLaunchTorque(), ForceMode.VelocityChange); - } - - protected virtual void SetAnimatorParams() - {} - - protected virtual Vector3 GetLaunchTorque() - { - float randomLaunchRotationSpeed = Mathf.Pow(Random.value, 2) * launchRotationSpeed; - return randomLaunchRotationSpeed * Random.onUnitSphere; - } -} diff --git a/Assets/Scripts/GameState/BaseController.cs b/Assets/Scripts/GameState/BaseController.cs index 6f6f5a90..8bc1b345 100644 --- a/Assets/Scripts/GameState/BaseController.cs +++ b/Assets/Scripts/GameState/BaseController.cs @@ -128,6 +128,7 @@ void Awake() healthController.onDeath += Die; anim = GetComponent(); audioSource = GetComponent(); + Camera.main.orthographic = true; if (mainCrystal == null) Debug.LogError("Main Crystal not set."); @@ -140,7 +141,7 @@ void Start() gameManager = EndlessMode.Singleton; InvokeRepeating("WaveExplosionCounter",3f, 1f); matCrystal.SetFloat("Charge_Percent", 0); - + Cursor.visible = false; } void OnDestroy() @@ -283,9 +284,23 @@ public int GetIdVFX(Transform t) return -2; } - public void OnPlayerDeath() + public Transform OnPlayerDeath(Transform player) { waveExplosionTimer = waveExplosionTimer - waveTimePunishment < 0 ? 0 : waveExplosionTimer - waveTimePunishment; + + // Create lightning VFX + Transform ray = Instantiate(enemyZap, mainCrystal.transform.position, mainCrystal.transform.rotation, mainCrystal).transform; + + // TODO: refactor this, to reduce code duplication with `OnTriggerEnter()` below + // 1 is the index of the first child (after the parent itself) + Transform rayTarget = ray.GetComponentsInChildren()[1]; + rayTarget.SetParent(player.GetComponent().initialForceTarget.transform); + rayTarget.localPosition = Vector3.zero; + // Set the ray target's position to the center of the enemy + + StartCoroutine(ZapSound()); + + return ray; } public void OnCrystalCollected() @@ -356,6 +371,7 @@ IEnumerator Explode() // Ensure correct camera focus Camera.main.GetComponent().Focus(transform); + Camera.main.orthographic = false; yield return new WaitForSeconds(explosionLightningSpawnDelay); } @@ -381,6 +397,7 @@ IEnumerator Explode() // Creates the GUI "GameOverScreen" Instantiate(gameOverScreen); + Cursor.visible = true; // Add particle system Instantiate(deathParticles, transform.position + new Vector3(0, 3, 0), deathParticles.transform.rotation); diff --git a/Assets/Scripts/GameState/GameOverScreen.cs b/Assets/Scripts/GameState/GameOverScreen.cs index be1be9e4..6e8a8c2e 100644 --- a/Assets/Scripts/GameState/GameOverScreen.cs +++ b/Assets/Scripts/GameState/GameOverScreen.cs @@ -66,6 +66,10 @@ private void UpdateLeaderboardAndLoadScene(string sceneName) // Update leaderboard LeaderboardData.AddScore(UIManager.Singleton.Score, SteamManager.Singleton.GetPlayerName()); + // Make sure slow-mo fx are normalized + Time.timeScale = 1.0f; + Time.fixedDeltaTime = 0.02f * Time.timeScale; + SceneManager.LoadScene(sceneName); } } diff --git a/Assets/Scripts/GameState/PauseManager.cs b/Assets/Scripts/GameState/PauseManager.cs index 2efa5527..1e36edcf 100644 --- a/Assets/Scripts/GameState/PauseManager.cs +++ b/Assets/Scripts/GameState/PauseManager.cs @@ -59,6 +59,7 @@ public void PauseGame() IsPaused = !IsPaused; Time.timeScale = IsPaused ? 0 : initialTimeScale; ui.SetActive(IsPaused); + Cursor.visible = IsPaused; // Pause every audiosource in array. foreach (AudioSource source in audioSources) @@ -77,10 +78,12 @@ public void MainMenu() { // Unpause the game PauseGame(); - - //Make sure to remove button event listeners + // Make sure to remove slow-mo FX + Time.timeScale = 1.0f; + Time.fixedDeltaTime = 0.02f * Time.timeScale; + // Make sure to remove button event listeners Destroy(GameObject.FindObjectOfType().gameObject); - + Cursor.visible = true; SceneManager.LoadScene("Main_Menu"); } public void QuitGame() diff --git a/Assets/Scripts/Interactables/Loot.cs b/Assets/Scripts/Interactables/Loot.cs index b5ab2331..c0bf3300 100644 --- a/Assets/Scripts/Interactables/Loot.cs +++ b/Assets/Scripts/Interactables/Loot.cs @@ -37,8 +37,6 @@ public class Loot : Interactable [SerializeField] private int lootValue = 10; - private InventoryManager inventory = default; - // Loot Rigidbody private new Rigidbody rigidbody; @@ -66,7 +64,6 @@ void Awake() void Start() { baseController = BaseController.Singleton; - inventory = InventoryManager.Singleton; } void Update() @@ -101,7 +98,7 @@ private void DestroyAnimation() //Add resources to inventory baseController.crystals++; baseController.OnCrystalCollected(); - inventory.ResourceAmount += lootValue; + UIManager.Singleton.SetResourceAmount(new ResourceInfo(lootValue, gameObject)); baseController.GetComponent().Heal(this, baseHealAmount); Destroy(gameObject); diff --git a/Assets/Scripts/Player/PlayerControls.cs b/Assets/Scripts/Player/PlayerControls.cs index ed3b14fc..a0c22529 100644 --- a/Assets/Scripts/Player/PlayerControls.cs +++ b/Assets/Scripts/Player/PlayerControls.cs @@ -121,6 +121,14 @@ public @PlayerControls() ""expectedControlType"": """", ""processors"": """", ""interactions"": """" + }, + { + ""name"": ""Build"", + ""type"": ""Button"", + ""id"": ""0f32dc60-99a7-4bfe-b879-e62dd5de833d"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """" } ], ""bindings"": [ @@ -475,6 +483,28 @@ public @PlayerControls() ""action"": ""Join"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""36179d5c-e459-48a7-b483-65037e386747"", + ""path"": ""/buttonWest"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Controller"", + ""action"": ""Build"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""1d81c03c-c3f5-49cf-b2a1-5dc6c38f9775"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard"", + ""action"": ""Build"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -767,6 +797,7 @@ public @PlayerControls() m_MovePlayer_DLeft = m_MovePlayer.FindAction("DLeft", throwIfNotFound: true); m_MovePlayer_DRight = m_MovePlayer.FindAction("DRight", throwIfNotFound: true); m_MovePlayer_Join = m_MovePlayer.FindAction("Join", throwIfNotFound: true); + m_MovePlayer_Build = m_MovePlayer.FindAction("Build", throwIfNotFound: true); // Menu m_Menu = asset.FindActionMap("Menu", throwIfNotFound: true); m_Menu_MouseMove = m_Menu.FindAction("MouseMove", throwIfNotFound: true); @@ -837,6 +868,7 @@ public void Disable() private readonly InputAction m_MovePlayer_DLeft; private readonly InputAction m_MovePlayer_DRight; private readonly InputAction m_MovePlayer_Join; + private readonly InputAction m_MovePlayer_Build; public struct MovePlayerActions { private @PlayerControls m_Wrapper; @@ -854,6 +886,7 @@ public struct MovePlayerActions public InputAction @DLeft => m_Wrapper.m_MovePlayer_DLeft; public InputAction @DRight => m_Wrapper.m_MovePlayer_DRight; public InputAction @Join => m_Wrapper.m_MovePlayer_Join; + public InputAction @Build => m_Wrapper.m_MovePlayer_Build; public InputActionMap Get() { return m_Wrapper.m_MovePlayer; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -902,6 +935,9 @@ public void SetCallbacks(IMovePlayerActions instance) @Join.started -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnJoin; @Join.performed -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnJoin; @Join.canceled -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnJoin; + @Build.started -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnBuild; + @Build.performed -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnBuild; + @Build.canceled -= m_Wrapper.m_MovePlayerActionsCallbackInterface.OnBuild; } m_Wrapper.m_MovePlayerActionsCallbackInterface = instance; if (instance != null) @@ -945,6 +981,9 @@ public void SetCallbacks(IMovePlayerActions instance) @Join.started += instance.OnJoin; @Join.performed += instance.OnJoin; @Join.canceled += instance.OnJoin; + @Build.started += instance.OnBuild; + @Build.performed += instance.OnBuild; + @Build.canceled += instance.OnBuild; } } } @@ -1055,6 +1094,7 @@ public interface IMovePlayerActions void OnDLeft(InputAction.CallbackContext context); void OnDRight(InputAction.CallbackContext context); void OnJoin(InputAction.CallbackContext context); + void OnBuild(InputAction.CallbackContext context); } public interface IMenuActions { diff --git a/Assets/Scripts/Player/PlayerRagdollController.cs b/Assets/Scripts/Player/PlayerRagdollController.cs index ed6f008b..ae546200 100644 --- a/Assets/Scripts/Player/PlayerRagdollController.cs +++ b/Assets/Scripts/Player/PlayerRagdollController.cs @@ -17,12 +17,12 @@ public class PlayerRagdollController : MonoBehaviour [SerializeField] private List collidersToDisable = default; - [SerializeField] - private Rigidbody initialForceTarget = default; + public Rigidbody initialForceTarget = default; [SerializeField] private float impactForceMultiplier = 1f; + public void Ragdoll(DamageInfo info) { foreach (var body in bodiesToEnable) @@ -39,4 +39,14 @@ public void Ragdoll(DamageInfo info) initialForceTarget.AddForce(info.KnockBackDir * info.KnockBackForce * impactForceMultiplier, ForceMode.Impulse); } + + public void UnRagdoll() + { + foreach (var body in GetComponentsInChildren()) + { + body.isKinematic = true; + body.velocity = Vector3.zero; body.angularVelocity = Vector3.zero; + } + + } } diff --git a/Assets/Scripts/Player/PlayerSpecificManager.cs b/Assets/Scripts/Player/PlayerSpecificManager.cs index dd81473d..8056df05 100644 --- a/Assets/Scripts/Player/PlayerSpecificManager.cs +++ b/Assets/Scripts/Player/PlayerSpecificManager.cs @@ -47,20 +47,38 @@ public void InitializePlayer() GameObject playerToSpawn = playerPrefabs[playerIndex % playerPrefabs.Length]; instantiatedPlayer = Instantiate(playerToSpawn, spawnPoint, playerToSpawn.transform.rotation).GetComponent(); instantiatedPlayer.SetUpInput(input, this, playerColor); + + //instantiatedPlayer.GetComponent().onDeath += + CameraFocusController.Singleton.AddFocusObject(instantiatedPlayer.transform); } - public void RespawnPlayer(float delay) + public void StartRespawnPlayer(float delay) { StartCoroutine(WaitForRespawn(delay)); //Hurt the base for respawning a player (Damage is based on players lifetotal) BaseController.Singleton.HealthController.OnReceiveDamage(this, respawnCost); } + public void RespawnPlayer() + { + if (BaseController.Singleton.isGameOver) { return; } + GameObject playerToSpawn = playerPrefabs[playerIndex % playerPrefabs.Length]; + instantiatedPlayer = Instantiate(playerToSpawn, spawnPoint, playerToSpawn.transform.rotation).GetComponent(); + instantiatedPlayer.SetUpInput(input, this, playerColor); + } + private IEnumerator WaitForRespawn(float delay) { + //Create new spawnpoint + spawnPoint = BaseController.Singleton ? BaseController.Singleton.SpawnPoint.position : Vector3.zero; + spawnPoint += new Vector3(Random.Range(-5, 5), 1, Random.Range(-5, 5)); + + // Delay yield return new WaitForSeconds(delay); - InitializePlayer(); + + instantiatedPlayer.ReturnPlayerToSpawn(); + instantiatedPlayer.GetComponent().UnRagdoll(); } } diff --git a/Assets/Scripts/Player/PlayerStateController.cs b/Assets/Scripts/Player/PlayerStateController.cs index f6d0d2b8..c7642f76 100644 --- a/Assets/Scripts/Player/PlayerStateController.cs +++ b/Assets/Scripts/Player/PlayerStateController.cs @@ -27,7 +27,6 @@ public partial class PlayerStateController : MonoBehaviour private PlayerSpecificManager manager; private PlayerMotion motion; private PlayerUi ui; - private InventoryManager inventoryManager; private HashSet interactables = new HashSet(); // List of interactables in range @@ -70,6 +69,12 @@ public partial class PlayerStateController : MonoBehaviour private static readonly int planningAnimatorParam = Animator.StringToHash("Planning"); private static readonly int borderScaleShaderProperty = Shader.PropertyToID("BorderScale"); + public bool deathCooldownOver = false; + private float deathCooldown = 2f; + private PlayerRagdollController ragdollCont; + + private Transform deadplayerVFX; + void Awake() { motion = GetComponent(); @@ -79,6 +84,7 @@ void Awake() ui = GetComponent(); messageUI = GetComponent(); uiInputController = GetComponent(); + ragdollCont = GetComponent(); } void OnDestroy() @@ -94,11 +100,8 @@ private void Die(DamageInfo dmg) if (liftedObject) liftedObject.GetComponent().Interact(this); - SetState(PlayerStates.DEAD); - manager.RespawnPlayer(1f); - BaseController.Singleton.OnPlayerDeath(); - + manager.StartRespawnPlayer(deathCooldown); CameraFocusController.Singleton.RemoveFocusObject(transform); GetComponent()?.Ragdoll(dmg); @@ -106,14 +109,10 @@ private void Die(DamageInfo dmg) //Makes sure respawn blink is disabled before ragdoll is made. DisableOutline(); - - Destroy(gameObject, 2f); } void Start() { - inventoryManager = InventoryManager.Singleton; - CurrentState = PlayerStates.FREE; StartCoroutine(SpawnEffectTimer()); @@ -130,6 +129,7 @@ void FixedUpdate() motion.Move(); break; case PlayerStates.DEAD: + MoveBackToSpawn(); break; case PlayerStates.FREE: UpdateFocusedInteractable(); @@ -139,7 +139,6 @@ void FixedUpdate() SetState(PlayerStates.IN_TURRET_MENU); break; case PlayerStates.IN_TURRET_MENU: - ui.Select(); motion.Move(); break; case PlayerStates.BUILDING: @@ -152,18 +151,49 @@ void FixedUpdate() SetState(PlayerStates.FREE); } - if (Interact) - SetState(PlayerStates.FREE); - + if (Interact && !ui.GetBuildToggle()) + { + OnInteract(); + //SetState(PlayerStates.FREE); + } break; } } + public void ReturnPlayerToSpawn() + { + deathCooldownOver = true; + deadplayerVFX = BaseController.Singleton.OnPlayerDeath(this.transform); + } + + private void MoveBackToSpawn() + { + if(deathCooldownOver) + { + foreach (var t in ragdollCont.initialForceTarget.transform.parent.GetComponentsInChildren()) + { + t.localPosition = Vector3.Lerp(t.localPosition, Vector3.zero, Time.deltaTime); + } + + ragdollCont.initialForceTarget.transform.parent.position = Vector3.Lerp(ragdollCont.initialForceTarget.transform.parent.position, manager.spawnPoint, Time.deltaTime); + + transform.position = Vector3.Lerp(transform.position, manager.spawnPoint, Time.deltaTime); + anim.enabled = true; + + if (Vector3.Distance(ragdollCont.transform.position, manager.spawnPoint) < 0.1f) + { + manager.RespawnPlayer();// Respawn a new play + Destroy(deadplayerVFX.gameObject); // Destroy lightning + Destroy(gameObject); // Destroy Game object + } + } + } + private void UpdateConstructionTower() { TurretPrefabConstruction turretConstruction = focusedInteractable.GetComponent(); - HexCell newTargetCell = HexGrid.Singleton.GetCell(transform.position + HexMetrics.OUTER_RADIUS * 2f * transform.forward); + HexCell newTargetCell = HexGrid.Singleton.GetCell(transform.position + HexGrid.OUTER_RADIUS * 2f * transform.forward); if (newTargetCell != targetCell) { targetCell = newTargetCell; @@ -234,6 +264,7 @@ public void SetState(PlayerStates state) case PlayerStates.IN_TURRET_MENU: SetFocusedInteractable(null); anim.SetBool(planningAnimatorParam, true); + ui.SetActiveUI(true); break; case PlayerStates.BUILDING: anim.SetBool(liftingAnimatorParam, true); @@ -278,7 +309,6 @@ private void OnMoveTower() return; tower.TowerScriptableObject.InstantiateConstructionTower(this); - SetState(PlayerStates.BUILDING); RemoveInteractable(tower); Destroy(tower.gameObject); @@ -359,7 +389,7 @@ private void SellTower() if (!(heldInteractable is TurretPrefabConstruction tower)) return; - inventoryManager.ResourceAmount += tower.TowerScriptableObject.Cost; + UIManager.Singleton.SetResourceAmount(new ResourceInfo(tower.TowerScriptableObject.Cost, gameObject)); messageUI.DisplayMessage($"+{tower.TowerScriptableObject.Cost}", MessageTextColor.GREEN); RemoveInteractable(tower); @@ -390,6 +420,11 @@ public void PrepareTurret(Interactable turret) UpdateConstructionTower(); } + private void ToggleBuild() + { + ui.ToggleBuildMenu(); + } + private void ResetOutline() { toggleMaterial.materials[1].SetFloat(borderScaleShaderProperty, 1.04f); diff --git a/Assets/Scripts/Player/PlayerStateController_Input.cs b/Assets/Scripts/Player/PlayerStateController_Input.cs index 30852231..270d1d89 100644 --- a/Assets/Scripts/Player/PlayerStateController_Input.cs +++ b/Assets/Scripts/Player/PlayerStateController_Input.cs @@ -44,13 +44,17 @@ private void AimInput_Performed(InputAction.CallbackContext ctx) } private void AimInput_Canceled(InputAction.CallbackContext ctx) => AimInput = Vector2.zero; - private void InteractInput_Performed(InputAction.CallbackContext ctx) => OnInteract(); + private void InteractInput(InputAction.CallbackContext ctx) => OnInteract(); + private void InteractInput_Performed(InputAction.CallbackContext ctx) => Interact = true; + private void InteractInput_Cancelled(InputAction.CallbackContext ctx) => Interact = false; private void CancelInput_Performed(InputAction.CallbackContext ctx) => Cancel = true; private void CancelInput_Canceled(InputAction.CallbackContext ctx) => Cancel = false; private void SelectInput_Performed(InputAction.CallbackContext ctx) => Select = true; private void SelectInput_Canceled(InputAction.CallbackContext ctx) => Select = false; private void PauseInput_Performed(InputAction.CallbackContext ctx) => PauseManager.Singleton.PauseGame(); + private void BuildInput_performed(InputAction.CallbackContext ctx) => ToggleBuild(); + #region D-pad private void DLeft_Performed(InputAction.CallbackContext ctx) @@ -105,12 +109,15 @@ public void SetUpInput(PlayerInput newInput, PlayerSpecificManager newManager, C newInput.actions["Aim"].performed += AimInput_Performed; newInput.actions["Aim"].canceled += AimInput_Canceled; newInput.actions["Interact"].performed += InteractInput_Performed; + newInput.actions["Interact"].canceled += InteractInput_Cancelled; + newInput.actions["Interact"].performed += InteractInput; newInput.actions["Cancel"].performed += CancelInput_Performed; newInput.actions["Cancel"].canceled += CancelInput_Canceled; newInput.actions["Select"].performed += SelectInput_Performed; newInput.actions["Select"].canceled += SelectInput_Canceled; newInput.actions["Pause"].performed += PauseInput_Performed; newInput.actions["Move tower"].performed += MoveTowerInput_Performed; + newInput.actions["Build"].performed += BuildInput_performed; #region D-pad @@ -141,6 +148,8 @@ private void OnDestroy_Input() input.actions["Aim"].performed -= AimInput_Performed; input.actions["Aim"].canceled -= AimInput_Canceled; input.actions["Interact"].performed -= InteractInput_Performed; + input.actions["Interact"].canceled -= InteractInput_Cancelled; + input.actions["Interact"].performed -= InteractInput; input.actions["Cancel"].performed -= CancelInput_Performed; input.actions["Cancel"].canceled -= CancelInput_Canceled; input.actions["Select"].performed -= SelectInput_Performed; @@ -194,13 +203,12 @@ private void OnDDown() private void DoDPadAction(int towerIndex) { TowerScriptableObject tower = ui.ControllerWheel.GetTower(towerIndex); - if (inventoryManager.ResourceAmount < tower.Cost) + if (UIManager.Singleton.ResourceAmount < tower.Cost) messageUI.DisplayMessage("Not enough crystals", MessageTextColor.RED); - if (_currentState == PlayerStates.FREE && inventoryManager.ResourceAmount >= tower.Cost) + if (_currentState == PlayerStates.FREE && UIManager.Singleton.ResourceAmount >= tower.Cost) { - inventoryManager.ResourceAmount -= tower.Cost; + UIManager.Singleton.SetResourceAmount(new ResourceInfo(-tower.Cost, gameObject)); tower.InstantiateConstructionTower(this); - SetState(PlayerStates.BUILDING); } } diff --git a/Assets/Scripts/Player/PlayerUi.cs b/Assets/Scripts/Player/PlayerUi.cs index 3269c9a4..d2d7b9bf 100644 --- a/Assets/Scripts/Player/PlayerUi.cs +++ b/Assets/Scripts/Player/PlayerUi.cs @@ -13,9 +13,9 @@ public class PlayerUi : MonoBehaviour private GameObject ui = default; private Transform mainCameraTransform; - private InventoryManager inventory; private UIWheel controllerWheel; private MessageUI messageUI; + private bool buildToggle = false; public UIWheel ControllerWheel => controllerWheel; @@ -28,13 +28,65 @@ void Awake() void Start() { mainCameraTransform = Camera.main.transform; - inventory = InventoryManager.Singleton; messageUI = GetComponent(); } + public bool GetBuildToggle() + { + return buildToggle; + } + public void SetActiveUI(bool value) { - ui.SetActive(value); + ui.SetActive(value); + } + + public void ToggleBuildMenu() + { + if (playerStateController.CurrentState == PlayerStates.BUILDING) { return; } + buildToggle = !buildToggle; + SetActiveUI(buildToggle); + if (buildToggle) + { + playerStateController.SetState(PlayerStates.IN_TURRET_MENU); + } + else + { + playerStateController.SetState(PlayerStates.FREE); + } + } + + private void FixedUpdate() + { + if (ui.activeInHierarchy) + { + if (buildToggle) + { + if (playerStateController.Cancel) + { + ToggleBuildMenu(); + } + + if (playerStateController.Interact) + { + SetActiveUI(false); + StartCoroutine(WaitChange()); + Select(); + return; + + } + UpdatePos(); + return; + } + + // If the select button is no longer pressed, handle the selection + if (!playerStateController.Select) + { + Select(); + return; + } + UpdatePos(); + } } void LateUpdate() @@ -51,50 +103,41 @@ public TowerScriptableObject GetSelectedSegment() public void Select() { - //Turns on the UI - ui.gameObject.SetActive(true); - UpdatePos(); - //Turns off the UI if button no longer held - if (!playerStateController.Select) + TowerScriptableObject selectedSegment = GetSelectedSegment(); + if (UIManager.Singleton.ResourceAmount - selectedSegment.Cost >= 0) { - TowerScriptableObject selectedSegment = GetSelectedSegment(); - if (selectedSegment - && inventory.ResourceAmount - selectedSegment.Cost >= 0) - { - inventory.ResourceAmount -= selectedSegment.Cost; - selectedSegment.InstantiateConstructionTower(playerStateController); - playerStateController.SetState(PlayerStates.BUILDING); - } else - { - playerStateController.SetState(PlayerStates.FREE); - if (inventory.ResourceAmount - selectedSegment.Cost < 0) - messageUI.DisplayMessage("Missing crystals", MessageTextColor.RED); - } - - ui.gameObject.SetActive(false); + UIManager.Singleton.SetResourceAmount(new ResourceInfo(-selectedSegment.Cost, gameObject)); + selectedSegment.InstantiateConstructionTower(playerStateController); + } + else + { + playerStateController.SetState(PlayerStates.FREE); + if (UIManager.Singleton.ResourceAmount - selectedSegment.Cost < 0) + messageUI.DisplayMessage("Missing crystals", MessageTextColor.RED); } } - //Finds which segment of the radialUi the control stick is pointing towards + // Finds which segment of the radialUi the control stick is pointing towards private void UpdatePos() { - if (playerStateController.CurrentState != PlayerStates.IN_TURRET_MENU) - { - Debug.LogError("You seem to be in the wrong state for the UI"); - return; - } - // The controller points to nothing if (playerStateController.AimInput == Vector2.zero) return; float inputAngle = Mathf.Atan2(playerStateController.AimInput.x, playerStateController.AimInput.y) * Mathf.Rad2Deg; float segmentAreaDegrees = 360f / controllerWheel.GetNumSegments(); - //Update inputAngle to take into account that the origin of the icon is the middle and not the start of a segment + // Update inputAngle to take into account that the origin of the icon is the middle and not the start of a segment inputAngle = MathUtils.NormalizeDegreeAngle(inputAngle + segmentAreaDegrees / 2f); - //Find/set correct index + // Find/set correct index int selectedSegmentIndex = Mathf.FloorToInt(inputAngle / segmentAreaDegrees); controllerWheel.SelectedSegmentIndex = selectedSegmentIndex; } + + private IEnumerator WaitChange() + { + yield return new WaitForSeconds(1f); + buildToggle = false; + SetActiveUI(false); + } } diff --git a/Assets/Scripts/ScriptableObjects/TowerScriptableObject.cs b/Assets/Scripts/ScriptableObjects/TowerScriptableObject.cs index 9261a053..2aab0151 100644 --- a/Assets/Scripts/ScriptableObjects/TowerScriptableObject.cs +++ b/Assets/Scripts/ScriptableObjects/TowerScriptableObject.cs @@ -23,6 +23,7 @@ public class TowerScriptableObject : ScriptableObject public TurretPrefabConstruction InstantiateConstructionTower(PlayerStateController controller) { + controller.SetState(PlayerStates.BUILDING); GameObject spawnedConstructionTower = Instantiate(towerConstructionPrefab.gameObject); controller.PrepareTurret(spawnedConstructionTower.GetComponent()); diff --git a/Assets/Scripts/Terrain/HexCoordinates.cs b/Assets/Scripts/Terrain/HexCoordinates.cs index 25cdd096..24329c60 100644 --- a/Assets/Scripts/Terrain/HexCoordinates.cs +++ b/Assets/Scripts/Terrain/HexCoordinates.cs @@ -30,10 +30,10 @@ public static HexCoordinates FromOffsetCoordinates(int x, int z) public static HexCoordinates FromPosition(Vector3 position) { - float x = position.x / (HexMetrics.INNER_RADIUS * 2f); + float x = position.x / (HexGrid.INNER_RADIUS * 2f); float y = -x; - float offset = position.z / (HexMetrics.OUTER_RADIUS * 3f); + float offset = position.z / (HexGrid.OUTER_RADIUS * 3f); x -= offset; y -= offset; diff --git a/Assets/Scripts/Terrain/HexGrid.cs b/Assets/Scripts/Terrain/HexGrid.cs index d35dfe23..087f47b4 100644 --- a/Assets/Scripts/Terrain/HexGrid.cs +++ b/Assets/Scripts/Terrain/HexGrid.cs @@ -8,6 +8,17 @@ public class HexGrid : MonoBehaviour { public static HexGrid Singleton { get; private set; } + public const float OUTER_RADIUS = 1f; + + public static readonly float INNER_RADIUS = OUTER_RADIUS * Mathf.Sqrt(3) / 2f; + + public const float ELEVATION_STEP = 0.1f; + + public const int CHUNK_SIZE_X = 5; + public const int CHUNK_SIZE_Z = 5; + + + private int cellCountX; private int cellCountZ; @@ -54,7 +65,7 @@ public class HexGrid : MonoBehaviour [Header("Noise Scale")] [SerializeField] - private float noiseScale = default; + private float noiseScale = 0.003f; // Custom inspector variables [Header("Cell Variables")] @@ -72,11 +83,6 @@ public class HexGrid : MonoBehaviour public HexCell[] SpawnableEdgeCells { get => _spawnableEdgeCells; private set => _spawnableEdgeCells = value; } - void OnEnable() - { - HexMetrics.noiseScale = noiseScale; - } - void Awake() { #region Singleton boilerplate @@ -102,8 +108,8 @@ void Awake() tallestCellType = cellTypes.Aggregate((t1, t2) => t1.elevation > t2.elevation ? t1 : t2); // Calculate borders for the terrain - cellCountX = chunkCountX * HexMetrics.CHUNK_SIZE_X; - cellCountZ = chunkCountZ * HexMetrics.CHUNK_SIZE_Z; + cellCountX = chunkCountX * CHUNK_SIZE_X; + cellCountZ = chunkCountZ * CHUNK_SIZE_Z; SpawnableEdgeCells = GetSpawnableEdgeCells(); @@ -125,8 +131,8 @@ void Awake() public void RebuildTerrain() { // Calculate borders - cellCountX = chunkCountX * HexMetrics.CHUNK_SIZE_X; - cellCountZ = chunkCountZ * HexMetrics.CHUNK_SIZE_Z; + cellCountX = chunkCountX * CHUNK_SIZE_X; + cellCountZ = chunkCountZ * CHUNK_SIZE_Z; // Create the terrain CreateChunks(); @@ -166,9 +172,9 @@ private void CreateChunks() chunk.transform.SetParent(transform); chunk.name = $"Chunk ({x}, {z})"; chunk.transform.position -= new Vector3( - HexMetrics.INNER_RADIUS * cellCountX, + INNER_RADIUS * cellCountX, 0, - HexMetrics.OUTER_RADIUS * cellCountZ * 1.5f / 2f + OUTER_RADIUS * cellCountZ * 1.5f / 2f ); } } @@ -201,9 +207,9 @@ private void CreateCell(int x, int z, int i) { // Determine the position of the cell Vector3 position; - position.x = (x + z * 0.5f - z / 2) * (HexMetrics.INNER_RADIUS * 2f); + position.x = (x + z * 0.5f - z / 2) * (INNER_RADIUS * 2f); position.y = 0f; - position.z = z * (HexMetrics.OUTER_RADIUS * 1.5f); + position.z = z * (OUTER_RADIUS * 1.5f); // Instantiate and set up the cell HexCell cell = cells[i] = Instantiate(cellPrefab); @@ -231,8 +237,8 @@ private void CreateCell(int x, int z, int i) } // Add cell to correlating chunk - int chunkX = x / HexMetrics.CHUNK_SIZE_X; - int chunkZ = z / HexMetrics.CHUNK_SIZE_Z; + int chunkX = x / CHUNK_SIZE_X; + int chunkZ = z / CHUNK_SIZE_Z; cell.transform.SetParent(chunks[chunkX + chunkZ * chunkCountX]); @@ -245,7 +251,7 @@ private void CreateCell(int x, int z, int i) /// The target cell private void SetTypeForCell(HexCell cell) { - float noiseValue = HexMetrics.SampleNoise(cell.transform.localPosition, noise).y; // will be between 0.0 and 1.0 (both inclusive) + float noiseValue = SampleNoise(cell.transform.localPosition, noise).y; // will be between 0.0 and 1.0 (both inclusive) int cellTypeIndex = Mathf.FloorToInt(noiseValue * cellTypes.Length * 0.99f); // will be between 0 and the last index of `cellTypes` cell.CellType = cellTypes[cellTypeIndex]; } @@ -337,6 +343,14 @@ private void PlaceSceneryOnPlayArea(GameObject[] sceneryObjects, bool occupying) } } + private Vector4 SampleNoise(Vector3 position, Texture2D noiseSource) + { + return noiseSource.GetPixelBilinear( + position.x * noiseScale, + position.z * noiseScale + ); + } + public void SaveTerrain() { SaveSystem.SaveTerrain(this); diff --git a/Assets/Scripts/Terrain/HexMetrics.cs b/Assets/Scripts/Terrain/HexMetrics.cs deleted file mode 100644 index e99dccdb..00000000 --- a/Assets/Scripts/Terrain/HexMetrics.cs +++ /dev/null @@ -1,24 +0,0 @@ -using UnityEngine; - - -public static class HexMetrics -{ - public const float OUTER_RADIUS = 1f; - - public static readonly float INNER_RADIUS = OUTER_RADIUS * Mathf.Sqrt(3) / 2f; - - public const float ELEVATION_STEP = 0.1f; - - public static float noiseScale = 0.003f; - - public const int CHUNK_SIZE_X = 5; - public const int CHUNK_SIZE_Z = 5; - - public static Vector4 SampleNoise(Vector3 position, Texture2D noiseSource) - { - return noiseSource.GetPixelBilinear( - position.x * noiseScale, - position.z * noiseScale - ); - } -} diff --git a/Assets/Scripts/Terrain/HexMetrics.cs.meta b/Assets/Scripts/Terrain/HexMetrics.cs.meta deleted file mode 100644 index 6c4bd407..00000000 --- a/Assets/Scripts/Terrain/HexMetrics.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 26ab57673a18543569e22b18a3188c67 -timeCreated: 1453991566 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Towers/TowerLogic.cs b/Assets/Scripts/Towers/TowerLogic.cs index f8aa021b..39391185 100644 --- a/Assets/Scripts/Towers/TowerLogic.cs +++ b/Assets/Scripts/Towers/TowerLogic.cs @@ -21,6 +21,8 @@ public class TowerLogic : AbstractTower private RepairAnimationController repairAnimationController; private int lastTweenId = -1; + private PlayerStateController currentPlayer; + new void Awake() { base.Awake(); @@ -56,6 +58,8 @@ private void ChangeDirection() // Allow turret to be operated when focused public override void Focus(PlayerStateController player) { + if (currentPlayer != null) { return; } + currentPlayer = player; turretInput = player.GetComponent(); if (directionalPointer) @@ -71,6 +75,8 @@ public override void Focus(PlayerStateController player) // When player leaves, prevent it from changing the turret position public override void Unfocus(PlayerStateController player) { + if (currentPlayer != player) { return; } + currentPlayer = null; turretInput = null; if (directionalPointer) diff --git a/Assets/Scripts/UI/Gallery/GalleryInputController.cs b/Assets/Scripts/UI/Gallery/GalleryInputController.cs index 64a0dbba..554b8a64 100644 --- a/Assets/Scripts/UI/Gallery/GalleryInputController.cs +++ b/Assets/Scripts/UI/Gallery/GalleryInputController.cs @@ -25,6 +25,7 @@ void Awake() protected override void Move() { ChangeSelectedButton(); + Select(); } protected override void Select() diff --git a/Assets/Scripts/UI/Intro.cs b/Assets/Scripts/UI/Intro.cs new file mode 100644 index 00000000..68bb0257 --- /dev/null +++ b/Assets/Scripts/UI/Intro.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class Intro : MonoBehaviour +{ + [SerializeField] + private RectTransform skipText; + + // Start is called before the first frame update + void Start() + { + StartCoroutine(WaitForSceneChange()); + } + + // Update is called once per frame + void Update() + { + + } + + private IEnumerator WaitForSceneChange() + { + yield return new WaitForSeconds(7f); + skipText.gameObject.SetActive(false); + yield return new WaitForSeconds(32f); + SceneManager.LoadScene("Main_Menu"); + } +} diff --git a/Assets/Scripts/Enemy/EnemyLightRagdollController.cs.meta b/Assets/Scripts/UI/Intro.cs.meta similarity index 83% rename from Assets/Scripts/Enemy/EnemyLightRagdollController.cs.meta rename to Assets/Scripts/UI/Intro.cs.meta index ecee816d..821f1a1c 100644 --- a/Assets/Scripts/Enemy/EnemyLightRagdollController.cs.meta +++ b/Assets/Scripts/UI/Intro.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 346f67067ccd5234bad55c3ea351f17c +guid: d08a70fc7f3220e4291102647bf3af54 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/UI/ResourceUI.cs b/Assets/Scripts/UI/ResourceUI.cs index 84addef0..fb7aba65 100644 --- a/Assets/Scripts/UI/ResourceUI.cs +++ b/Assets/Scripts/UI/ResourceUI.cs @@ -9,16 +9,8 @@ public class ResourceUI : MonoBehaviour [SerializeField] private Text resourceAmount = default; - private InventoryManager inventory; - void Start() { - inventory = InventoryManager.Singleton; - UpdateUI(); } - public void UpdateUI() - { - resourceAmount.text = inventory.ResourceAmount.ToString(); - } } diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index 34ee4ba2..52405ee0 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -4,12 +4,26 @@ using UnityEngine.UI; using TMPro; +public struct ResourceInfo +{ + public int delta; + public GameObject source; + public ResourceInfo(int delta, GameObject source) + { + this.delta = delta; + this.source = source; + } +} public class UIManager : MonoBehaviour { public static UIManager Singleton { get; private set; } [Header("Resource UI")] + + [SerializeField] + private int resourceStartAmount = 100; + [SerializeField] private TextMeshProUGUI resourceText = default; @@ -23,6 +37,9 @@ public class UIManager : MonoBehaviour [SerializeField] private RectTransform startHelpPanel = default; + [SerializeField] + private RectTransform startTutorial = default; + [Header("Health bar variables")] [SerializeField] private Slider healthbar = default; @@ -39,7 +56,6 @@ public class UIManager : MonoBehaviour [Range(0, 5), SerializeField] private float followBarDelay = 2f; - private InventoryManager inventory; private BaseController baseController; private float baseMaxHealth; @@ -52,6 +68,10 @@ public class UIManager : MonoBehaviour public int Score => score; + private int resourceAmount = 0; + + public int ResourceAmount { get => resourceAmount; } + void Awake() { #region Singleton boilerplate @@ -70,11 +90,11 @@ void Awake() Singleton = this; #endregion Singleton boilerplate + resourceAmount = resourceStartAmount; } void Start() { - inventory = InventoryManager.Singleton; baseController = BaseController.Singleton; UpdateResourceUI(); @@ -86,6 +106,7 @@ void Start() healthbar.maxValue = followBar.maxValue = baseMaxHealth; healthbar.value = followBar.value = actualHealth; + StartCoroutine(DisableControlTutorial()); } void OnDestroy() @@ -98,7 +119,13 @@ void OnDestroy() public void UpdateResourceUI() { - resourceText.text = inventory.ResourceAmount.ToString(); + resourceText.text = ResourceAmount.ToString(); + } + + public void SetResourceAmount(ResourceInfo resourceInfo) + { + resourceAmount += resourceInfo.delta; + UpdateResourceUI(); } public void IncreaseScore(int increase) @@ -141,6 +168,14 @@ private void UpdateBaseHealth(DamageInfo damage) (healthAnimDiff >= 0 ? healthbar : followBar).value = actualHealth; } + private IEnumerator DisableControlTutorial() + { + yield return new WaitForSeconds(16f); + startTutorial.LeanAlpha(0, 2f); + yield return new WaitForSeconds(2f); + startTutorial.gameObject.SetActive(false); + } + public void DisableTutorial() { startHelpPanel.gameObject.SetActive(false); diff --git a/Assets/Scripts/Util/InventoryManager.cs b/Assets/Scripts/Util/InventoryManager.cs deleted file mode 100644 index 7b52d949..00000000 --- a/Assets/Scripts/Util/InventoryManager.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public class InventoryManager : MonoBehaviour -{ - public static InventoryManager Singleton { get; private set; } - - [SerializeField] - private UIManager ui = default; - - //Total amount of resources. - private int resourceAmount = 100; - - public int ResourceAmount - { - get => resourceAmount; - set - { - resourceAmount = value; - ui.UpdateResourceUI(); - } - } - - void Awake() - { - #region Singleton boilerplate - - if (Singleton != null) - { - if (Singleton != this) - { - Debug.LogWarning($"There's more than one {Singleton.GetType()} in the scene!"); - Destroy(gameObject); - } - - return; - } - - Singleton = this; - - #endregion Singleton boilerplate - } - - void Start() - { - if (ui == null) - ui = UIManager.Singleton; - } -} diff --git a/Assets/Scripts/Util/InventoryManager.cs.meta b/Assets/Scripts/Util/InventoryManager.cs.meta deleted file mode 100644 index 615ad5fc..00000000 --- a/Assets/Scripts/Util/InventoryManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f18479ccbba64d640b023469f0d52121 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Menu/MainMenuEyes1.png b/Assets/Textures/Menu/MainMenuEyes1.png new file mode 100644 index 00000000..fc89e59f Binary files /dev/null and b/Assets/Textures/Menu/MainMenuEyes1.png differ diff --git a/Assets/Textures/Menu/MainMenuEyes1png.png.meta b/Assets/Textures/Menu/MainMenuEyes1.png.meta similarity index 90% rename from Assets/Textures/Menu/MainMenuEyes1png.png.meta rename to Assets/Textures/Menu/MainMenuEyes1.png.meta index 5bbdd3e8..1557b69a 100644 --- a/Assets/Textures/Menu/MainMenuEyes1png.png.meta +++ b/Assets/Textures/Menu/MainMenuEyes1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96922d4feadcf4d44ad839f762410ef4 +guid: 1c8c8388f2d6e014f9fc6ca9e3c1abd2 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -121,18 +121,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/Menu/MainMenuEyes1png.png b/Assets/Textures/Menu/MainMenuEyes1png.png deleted file mode 100644 index 358e9320..00000000 Binary files a/Assets/Textures/Menu/MainMenuEyes1png.png and /dev/null differ diff --git a/Assets/Textures/Menu/MainMenuEyes2.png b/Assets/Textures/Menu/MainMenuEyes2.png new file mode 100644 index 00000000..df6662f2 Binary files /dev/null and b/Assets/Textures/Menu/MainMenuEyes2.png differ diff --git a/Assets/Textures/Menu/MainMenuEyes2png.png.meta b/Assets/Textures/Menu/MainMenuEyes2.png.meta similarity index 90% rename from Assets/Textures/Menu/MainMenuEyes2png.png.meta rename to Assets/Textures/Menu/MainMenuEyes2.png.meta index a8881270..6bb3b573 100644 --- a/Assets/Textures/Menu/MainMenuEyes2png.png.meta +++ b/Assets/Textures/Menu/MainMenuEyes2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00a91cb4ec9fd4a45a5da14a151e04b3 +guid: 08560965d51841946b785a1d1f40b852 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -121,18 +121,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/Menu/MainMenuEyes2png.png b/Assets/Textures/Menu/MainMenuEyes2png.png deleted file mode 100644 index b292d4da..00000000 Binary files a/Assets/Textures/Menu/MainMenuEyes2png.png and /dev/null differ diff --git a/Assets/Textures/Menu/MainMenuEyes3.png b/Assets/Textures/Menu/MainMenuEyes3.png new file mode 100644 index 00000000..113452c7 Binary files /dev/null and b/Assets/Textures/Menu/MainMenuEyes3.png differ diff --git a/Assets/Textures/Menu/MainMenuEyes3png.png.meta b/Assets/Textures/Menu/MainMenuEyes3.png.meta similarity index 90% rename from Assets/Textures/Menu/MainMenuEyes3png.png.meta rename to Assets/Textures/Menu/MainMenuEyes3.png.meta index 9925c149..44006a61 100644 --- a/Assets/Textures/Menu/MainMenuEyes3png.png.meta +++ b/Assets/Textures/Menu/MainMenuEyes3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0707b0a841e208a489fd30c90196c5d3 +guid: 721d5fd84924f6b4c9ee096c7b96d11c TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -121,18 +121,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/Menu/MainMenuEyes3png.png b/Assets/Textures/Menu/MainMenuEyes3png.png deleted file mode 100644 index 4ab2c367..00000000 Binary files a/Assets/Textures/Menu/MainMenuEyes3png.png and /dev/null differ diff --git a/Assets/Textures/Menu/MainMenuEyes4.png b/Assets/Textures/Menu/MainMenuEyes4.png new file mode 100644 index 00000000..37dc9eef Binary files /dev/null and b/Assets/Textures/Menu/MainMenuEyes4.png differ diff --git a/Assets/Textures/Menu/MainMenuEyes4png.png.meta b/Assets/Textures/Menu/MainMenuEyes4.png.meta similarity index 90% rename from Assets/Textures/Menu/MainMenuEyes4png.png.meta rename to Assets/Textures/Menu/MainMenuEyes4.png.meta index 00d84577..6babae3e 100644 --- a/Assets/Textures/Menu/MainMenuEyes4png.png.meta +++ b/Assets/Textures/Menu/MainMenuEyes4.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24f943e131cc93f47b8edcf66a040628 +guid: 186d4841f930f5842a603f312d1789ab TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -121,18 +121,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/Menu/MainMenuEyes4png.png b/Assets/Textures/Menu/MainMenuEyes4png.png deleted file mode 100644 index 9cffb6ad..00000000 Binary files a/Assets/Textures/Menu/MainMenuEyes4png.png and /dev/null differ diff --git a/Assets/Textures/Menu/lifebar.png.meta b/Assets/Textures/Menu/lifebar.png.meta index 1b2ff1fa..f26f457d 100644 --- a/Assets/Textures/Menu/lifebar.png.meta +++ b/Assets/Textures/Menu/lifebar.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 7 spritePivot: {x: 0.5, y: 0} spritePixelsToUnits: 100 - spriteBorder: {x: 352, y: 10, z: 356, w: 19} + spriteBorder: {x: 352, y: 10, z: 356, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/Textures/Menu/mainMenu_BG2.png b/Assets/Textures/Menu/mainMenu_BG2.png new file mode 100644 index 00000000..cfc26d10 Binary files /dev/null and b/Assets/Textures/Menu/mainMenu_BG2.png differ diff --git a/Assets/Textures/Menu/mainMenu_BG2.png.meta b/Assets/Textures/Menu/mainMenu_BG2.png.meta new file mode 100644 index 00000000..0e9d7802 --- /dev/null +++ b/Assets/Textures/Menu/mainMenu_BG2.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 49b59a104c6d0d047994848f88f83b3b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + 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: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/UI/keyboardControls.png b/Assets/Textures/UI/keyboardControls.png new file mode 100644 index 00000000..520a4773 Binary files /dev/null and b/Assets/Textures/UI/keyboardControls.png differ diff --git a/Assets/Textures/UI/keyboardControls.png.meta b/Assets/Textures/UI/keyboardControls.png.meta new file mode 100644 index 00000000..0ef53c06 --- /dev/null +++ b/Assets/Textures/UI/keyboardControls.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: b3c096a45208aba4793e2919c3d7cbee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 76c3bc4f..32c82678 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/Intro.unity + guid: 18c08e020d6ed0d4c8e04b44400952ab - enabled: 1 path: Assets/Scenes/Main_Menu.unity guid: 23f192a6fa34ae54c8acbf6be4b7fbfe