From 6937e6a0e02c7842c4a0433e3bb9a58f9a4c1833 Mon Sep 17 00:00:00 2001 From: Abraham Blain Date: Thu, 11 Apr 2024 13:32:28 -0400 Subject: [PATCH] Improved visual of arrow and power bar --- Assembly-CSharp.csproj.DotSettings | 2 + Assets/GolfControls/DirectionArrow.cs | 4 +- Assets/GolfControls/GolfBallController.cs | 4 +- Assets/GolfControls/GolfControl.cs | 41 +- Assets/GolfControls/LightBlueMat.mat | 11 +- Assets/GolfControls/UI/3D RightArrow.fbx | 3 + Assets/GolfControls/UI/3D RightArrow.fbx.meta | 109 ++ Assets/GolfControls/UI/ForceArrow.cs | 134 ++ Assets/GolfControls/UI/ForceArrow.cs.meta | 11 + Assets/GolfControls/UI/PowerBarDisplay.cs | 10 +- Assets/Materials.meta | 8 + Assets/Materials/FloorMat.mat | 137 ++ Assets/Materials/FloorMat.mat.meta | 8 + Assets/Materials/GolfBallMat.mat | 133 ++ Assets/Materials/GolfBallMat.mat.meta | 8 + Assets/Scenes/TestControls.unity | 1194 +++++++++-------- Assets/Scripts.meta | 8 + Assets/Scripts/SceneReloader.cs | 12 + Assets/Scripts/SceneReloader.cs.meta | 11 + Assets/Sprites.meta | 8 + Assets/Sprites/PowerBarGradient.png | 3 + Assets/Sprites/PowerBarGradient.png.meta | 153 +++ Assets/Sprites/PowerBarOutline.png | 3 + Assets/Sprites/PowerBarOutline.png.meta | 153 +++ Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + 26 files changed, 1567 insertions(+), 611 deletions(-) create mode 100644 Assembly-CSharp.csproj.DotSettings create mode 100644 Assets/GolfControls/UI/3D RightArrow.fbx create mode 100644 Assets/GolfControls/UI/3D RightArrow.fbx.meta create mode 100644 Assets/GolfControls/UI/ForceArrow.cs create mode 100644 Assets/GolfControls/UI/ForceArrow.cs.meta create mode 100644 Assets/Materials.meta create mode 100644 Assets/Materials/FloorMat.mat create mode 100644 Assets/Materials/FloorMat.mat.meta create mode 100644 Assets/Materials/GolfBallMat.mat create mode 100644 Assets/Materials/GolfBallMat.mat.meta create mode 100644 Assets/Scripts.meta create mode 100644 Assets/Scripts/SceneReloader.cs create mode 100644 Assets/Scripts/SceneReloader.cs.meta create mode 100644 Assets/Sprites.meta create mode 100644 Assets/Sprites/PowerBarGradient.png create mode 100644 Assets/Sprites/PowerBarGradient.png.meta create mode 100644 Assets/Sprites/PowerBarOutline.png create mode 100644 Assets/Sprites/PowerBarOutline.png.meta diff --git a/Assembly-CSharp.csproj.DotSettings b/Assembly-CSharp.csproj.DotSettings new file mode 100644 index 00000000..0b092a1b --- /dev/null +++ b/Assembly-CSharp.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/Assets/GolfControls/DirectionArrow.cs b/Assets/GolfControls/DirectionArrow.cs index 4f7398b9..5e2d2ef6 100644 --- a/Assets/GolfControls/DirectionArrow.cs +++ b/Assets/GolfControls/DirectionArrow.cs @@ -11,7 +11,7 @@ namespace GolfControls { GolfControl.BallPositionUpdated += UpdatePos; GolfControl.ForceDirectionUpdated += UpdateLine; - GolfControl.PowerPercentFinalized += OnBallHit; + GolfControl.HitPowerDecided += OnBallHit; GolfControl.BallStoppedAtPosition += OnBallStopped; } @@ -19,7 +19,7 @@ namespace GolfControls { GolfControl.BallPositionUpdated -= UpdatePos; GolfControl.ForceDirectionUpdated -= UpdateLine; - GolfControl.PowerPercentFinalized -= OnBallHit; + GolfControl.HitPowerDecided -= OnBallHit; GolfControl.BallStoppedAtPosition -= OnBallStopped; } diff --git a/Assets/GolfControls/GolfBallController.cs b/Assets/GolfControls/GolfBallController.cs index 951da2b6..5972e15e 100644 --- a/Assets/GolfControls/GolfBallController.cs +++ b/Assets/GolfControls/GolfBallController.cs @@ -12,13 +12,13 @@ namespace GolfControls private void OnEnable() { GolfControl.ForceDirectionUpdated += UpdateHitAngle; - GolfControl.PowerPercentFinalized += BeginHit; + GolfControl.HitPowerDecided += BeginHit; } private void OnDisable() { GolfControl.ForceDirectionUpdated -= UpdateHitAngle; - GolfControl.PowerPercentFinalized -= BeginHit; + GolfControl.HitPowerDecided -= BeginHit; } private void UpdateHitAngle(Vector3 vec) diff --git a/Assets/GolfControls/GolfControl.cs b/Assets/GolfControls/GolfControl.cs index 2dca29df..11f5fbc0 100644 --- a/Assets/GolfControls/GolfControl.cs +++ b/Assets/GolfControls/GolfControl.cs @@ -11,13 +11,13 @@ namespace GolfControls public delegate void intDelegate(int value); public static floatDelegate PowerPercentUpdated; - public static floatDelegate PowerPercentFinalized; + public static floatDelegate HitPowerDecided; public static vector3Delegate ForceDirectionUpdated; public static vector3Delegate BallPositionUpdated; public static vector3Delegate BallStoppedAtPosition; public static intDelegate strokeCountUpdated; - private bool buildingPower; + float outputPercent = 0.0f; private bool ballIsMoving; [SerializeField] private float timeToMaxPower = 1.0f; @@ -38,6 +38,7 @@ namespace GolfControls StartCoroutine(UpdateHitAngle()); strokeCount = 1; strokeCountUpdated?.Invoke(strokeCount); + StartCoroutine(SlidePower()); } private void OnEnable() @@ -56,14 +57,17 @@ namespace GolfControls inGoal = true; } - public void ToggleSlide() + public void HitBall() { if (ballIsMoving) return; - buildingPower = !buildingPower; - if (buildingPower) - { - StartCoroutine(SlidePower()); - } + + PowerPercentUpdated?.Invoke(outputPercent); + HitPowerDecided?.Invoke(outputPercent); + + Vector3 hitVector = hitAngle.normalized * (outputPercent * baseForce); + ballBody.AddForce(hitVector); + + StartCoroutine(TrackingBall()); } private IEnumerator UpdateHitAngle() @@ -94,11 +98,13 @@ namespace GolfControls bool goingUp = true; float timerGoal = timeToMaxPower; - float outputPercent = 0.0f; + outputPercent = 0.0f; - while (buildingPower) + while (true) { - yield return null; + while (ballIsMoving) yield return null; + + yield return null; if (inGoal) yield break; @@ -118,22 +124,17 @@ namespace GolfControls PowerPercentUpdated?.Invoke(outputPercent); float pauseTimer = 0.0f; - while (buildingPower && pauseTimer < pauseTimeAtEnds) + while (pauseTimer < pauseTimeAtEnds) { + + while (ballIsMoving) yield return null; + yield return null; pauseTimer += Time.deltaTime; } SwapDirection(); } - - PowerPercentUpdated?.Invoke(0); - PowerPercentFinalized?.Invoke(outputPercent); - - Vector3 hitVector = hitAngle.normalized * (outputPercent * baseForce); - ballBody.AddForce(hitVector); - - StartCoroutine(TrackingBall()); void SwapDirection() { diff --git a/Assets/GolfControls/LightBlueMat.mat b/Assets/GolfControls/LightBlueMat.mat index 5af7a958..859ba8bb 100644 --- a/Assets/GolfControls/LightBlueMat.mat +++ b/Assets/GolfControls/LightBlueMat.mat @@ -26,6 +26,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON + - _RECEIVE_SHADOWS_OFF - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -120,8 +121,8 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _ReceiveShadows: 0 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -130,8 +131,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0, g: 1, b: 0.84887123, a: 0.89411765} - - _Color: {r: 0, g: 1, b: 0.84887123, a: 0.89411765} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 0, g: 1, b: 0.84887123, a: 0.64705884} + - _Color: {r: 0, g: 1, b: 0.84887123, a: 0.64705884} + - _EmissionColor: {r: 0, g: 8, b: 7.079958, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GolfControls/UI/3D RightArrow.fbx b/Assets/GolfControls/UI/3D RightArrow.fbx new file mode 100644 index 00000000..fd3620f1 --- /dev/null +++ b/Assets/GolfControls/UI/3D RightArrow.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d796fe7671a9e66f38465f86be6b052eaa97e8ef97becfbf9e86e040e9027b9 +size 31148 diff --git a/Assets/GolfControls/UI/3D RightArrow.fbx.meta b/Assets/GolfControls/UI/3D RightArrow.fbx.meta new file mode 100644 index 00000000..5af2c207 --- /dev/null +++ b/Assets/GolfControls/UI/3D RightArrow.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: c8389a6832c69794daffd97728da0cb9 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 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 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GolfControls/UI/ForceArrow.cs b/Assets/GolfControls/UI/ForceArrow.cs new file mode 100644 index 00000000..3e9b4325 --- /dev/null +++ b/Assets/GolfControls/UI/ForceArrow.cs @@ -0,0 +1,134 @@ +using System; +using System.Collections; +using TMPro; +using UnityEngine; + +namespace GolfControls +{ + public class ForceArrow : MonoBehaviour + { + public GameObject Model; + + public Vector3 arrowOffset = new Vector3(0, .5f, 0); + + public float maxBounceSpeed = 0.07f; + public float bounceTimeSeconds = 0.5f; + + public TextMeshProUGUI debugText; + + private void Start() + { + StartCoroutine(Bouncing()); + } + + private void OnEnable() + { + GolfControl.BallPositionUpdated += UpdatePos; + GolfControl.ForceDirectionUpdated += UpdateDirection; + GolfControl.HitPowerDecided += OnBallHit; + GolfControl.BallStoppedAtPosition += OnBallStopped; + } + + private void OnDisable() + { + GolfControl.BallPositionUpdated -= UpdatePos; + GolfControl.ForceDirectionUpdated -= UpdateDirection; + GolfControl.HitPowerDecided -= OnBallHit; + GolfControl.BallStoppedAtPosition -= OnBallStopped; + } + + private IEnumerator Bouncing() + { + Transform child = Model.transform; + + int dir = 1; + int startingDir = dir; + + float timer = 0; + + Vector3 startingPos = child.localPosition; + + while (true) + { + while (true) + { + float percent = timer / bounceTimeSeconds; + + Vector3 move = Vector3.up * (Time.deltaTime * percent * maxBounceSpeed * dir); + + child.Translate(move,Space.World); + + timer += Time.deltaTime; + if (timer >= bounceTimeSeconds) + { + timer = 0; + break; + } + + yield return null; + } + + while (true) + { + float percent = timer / bounceTimeSeconds; + + percent = 1.0f - percent; + + Vector3 move = Vector3.up * (Time.deltaTime * percent * maxBounceSpeed * dir); + + child.Translate(move,Space.World); + + timer += Time.deltaTime; + if (timer >= bounceTimeSeconds) + { + timer = 0; + dir = -dir; + + if (dir == startingDir) + { + child.localPosition = startingPos; + } + + break; + } + + yield return null; + } + } + + + } + + + private void OnBallHit(float _) + { + Model.SetActive(false); + } + + private void UpdateDirection(Vector3 direction) + { + double angle = getAngle(Vector2.zero, new Vector2(direction.z, direction.x)); + float trueAngle = (float)angle + 180.0f; + Vector3 euler = new Vector3(0, trueAngle, 0); + transform.localRotation = Quaternion.Euler(euler); + debugText.text = trueAngle + " : "+direction; + + + double getAngle(Vector2 me, Vector2 target) { + return Math.Atan2(target.y - me.y, target.x - me.x) * (180/Math.PI); + } + } + + private void OnBallStopped(Vector3 ballPosition) + { + UpdatePos(ballPosition); + Model.SetActive(true); + } + + private void UpdatePos(Vector3 pos) + { + transform.position = pos + arrowOffset; + } + + } +} diff --git a/Assets/GolfControls/UI/ForceArrow.cs.meta b/Assets/GolfControls/UI/ForceArrow.cs.meta new file mode 100644 index 00000000..04054587 --- /dev/null +++ b/Assets/GolfControls/UI/ForceArrow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9376744b6cad1d5429f2ecfb2a907fa6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GolfControls/UI/PowerBarDisplay.cs b/Assets/GolfControls/UI/PowerBarDisplay.cs index a51d978b..4a779b88 100644 --- a/Assets/GolfControls/UI/PowerBarDisplay.cs +++ b/Assets/GolfControls/UI/PowerBarDisplay.cs @@ -5,8 +5,8 @@ namespace GolfControls { public class PowerBarDisplay : MonoBehaviour { - [SerializeField]private RectTransform barRect; - [SerializeField]private RectTransform fullRect; + [SerializeField]private RectTransform maskRect; + [SerializeField]private RectTransform fillingRect; private void OnEnable() @@ -21,12 +21,12 @@ namespace GolfControls private void UpdateDisplay(float percent) { - float width = fullRect.sizeDelta.x; - float maxHeight = fullRect.sizeDelta.y; + float width = maskRect.sizeDelta.x; + float maxHeight = fillingRect.sizeDelta.y; float scaledHeight = maxHeight * percent; - barRect.sizeDelta = new Vector2(width,scaledHeight); + maskRect.sizeDelta = new Vector2(width,scaledHeight); } } } diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 00000000..a1075022 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c673fee5879703349b0bd8dd51852f95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/FloorMat.mat b/Assets/Materials/FloorMat.mat new file mode 100644 index 00000000..939d6d4f --- /dev/null +++ b/Assets/Materials/FloorMat.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FloorMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.3515415, g: 0.43178323, b: 0.4415095, a: 0.2} + - _Color: {r: 0.35154143, g: 0.4317832, b: 0.44150946, a: 0.2} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &1612411529090646979 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Materials/FloorMat.mat.meta b/Assets/Materials/FloorMat.mat.meta new file mode 100644 index 00000000..56772c83 --- /dev/null +++ b/Assets/Materials/FloorMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 667615024e17b434aa5e749805b96a83 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/GolfBallMat.mat b/Assets/Materials/GolfBallMat.mat new file mode 100644 index 00000000..bfdcb6f5 --- /dev/null +++ b/Assets/Materials/GolfBallMat.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GolfBallMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + - _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8669350262579520661 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Materials/GolfBallMat.mat.meta b/Assets/Materials/GolfBallMat.mat.meta new file mode 100644 index 00000000..4dc1fff8 --- /dev/null +++ b/Assets/Materials/GolfBallMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d384059b225fb5942a7d266cbbdf2398 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 58d9e372..115bb4aa 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -897,6 +897,57 @@ MonoBehaviour: m_Flags: 0 m_Reference: {fileID: 0} m_ButtonPressPoint: 0.5 +--- !u!1 &363616410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 363616411} + - component: {fileID: 363616412} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &363616411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363616410} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1861098572297249915} + m_Father: {fileID: 5335464771215372834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &363616412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363616410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &434066455 GameObject: m_ObjectHideFlags: 0 @@ -962,6 +1013,37 @@ Transform: - {fileID: 1320667994} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &434820020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 434820021} + m_Layer: 0 + m_Name: DirectionalArrowOffset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &434820021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434820020} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2041401174} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -1618,6 +1700,50 @@ MonoBehaviour: m_Flags: 0 m_Reference: {fileID: 0} m_ButtonPressPoint: 0.5 +--- !u!1 &1028760414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1028760416} + - component: {fileID: 1028760415} + m_Layer: 0 + m_Name: SceneLoader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1028760415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028760414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c6bc963a512bff438769c9188ce8e3a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1028760416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028760414} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.1175997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1320667993 GameObject: m_ObjectHideFlags: 0 @@ -1652,6 +1778,260 @@ Transform: - {fileID: 765144258} m_Father: {fileID: 434066458} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1583713030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1583713034} + - component: {fileID: 1583713033} + - component: {fileID: 1583713032} + - component: {fileID: 1583713031} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1583713031 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583713030} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1583713032 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583713030} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 667615024e17b434aa5e749805b96a83, 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 &1583713033 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583713030} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1583713034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583713030} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.025, z: 0} + m_LocalScale: {x: 50, y: 1, z: 50} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1780702392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1780702393} + - component: {fileID: 1780702396} + - component: {fileID: 1780702395} + - component: {fileID: 1780702394} + m_Layer: 5 + m_Name: AngleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1780702393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780702392} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3822666867311385266} + 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: -328.59, y: 272.2} + m_SizeDelta: {x: 800, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1780702394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780702392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93f875f5caf89c74c8bf7325138db5c2, type: 3} + m_Name: + m_EditorClassIdentifier: + numText: {fileID: 1780702395} +--- !u!114 &1780702395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780702392} + 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: + 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: 150 + m_fontSizeBase: 150 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &1780702396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780702392} + m_CullTransparentMesh: 1 --- !u!1 &1807783553 GameObject: m_ObjectHideFlags: 0 @@ -1993,6 +2373,132 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1994603662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1994603663} + - component: {fileID: 1994603665} + - component: {fileID: 1994603664} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1994603663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994603662} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5335464771215372834} + 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 &1994603664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994603662} + 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: a3195108519cd41499e5b8a97c620559, 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 &1994603665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994603662} + m_CullTransparentMesh: 1 +--- !u!1 &2041401173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2041401174} + - component: {fileID: 2041401175} + m_Layer: 0 + m_Name: ForceArrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2041401174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041401173} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 543450652840153337} + - {fileID: 434820021} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2041401175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041401173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9376744b6cad1d5429f2ecfb2a907fa6, type: 3} + m_Name: + m_EditorClassIdentifier: + Model: {fileID: 919132148849281603} + arrowOffset: {x: 0, y: 0.05, z: 0} + maxBounceSpeed: 0.08 + bounceTimeSeconds: 0.5 + debugText: {fileID: 1780702395} --- !u!1 &2085994264 GameObject: m_ObjectHideFlags: 0 @@ -2128,43 +2634,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &377613695778790164 -RectTransform: +--- !u!4 &543450652840153337 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4738526445339317604} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 919132148849281603} + serializedVersion: 2 + m_LocalRotation: {x: 0.60270566, y: -0.60270566, z: 0.36979175, w: 0.36979175} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 4, y: 4, z: 12} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5335464771215372834} - 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: 150.2, y: 453.9} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &567659069188301681 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7087976568617934907} - - component: {fileID: 7912971752749314009} - - component: {fileID: 2724367906070917324} - m_Layer: 5 - m_Name: Filling - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 + m_Father: {fileID: 2041401174} + m_LocalEulerAnglesHint: {x: 63.063, y: -180, z: -90} --- !u!114 &698447725896810587 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2177,9 +2661,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5e3cbe56ffba194f918c58a33a3a411, type: 3} m_Name: m_EditorClassIdentifier: - timeToMaxPower: 0.5 - timeToMinPower: 0.5 - pauseTimeAtEnds: 0.08 + timeToMaxPower: 1.2 + timeToMinPower: 1.2 + pauseTimeAtEnds: 0.02 forceDirectionTransform: {fileID: 1807783554} ballBody: {fileID: 3921340267877587735} baseForce: 50 @@ -2237,7 +2721,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 698447725896810587} m_TargetAssemblyTypeName: GolfControls.GolfControl, Assembly-CSharp - m_MethodName: ToggleSlide + m_MethodName: HitBall m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2277,25 +2761,66 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!224 &1036520383737000379 -RectTransform: +--- !u!1 &919132148849281603 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5547092272119729804} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5335464771215372834} - 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} + serializedVersion: 6 + m_Component: + - component: {fileID: 543450652840153337} + - component: {fileID: 3469287836756402012} + - component: {fileID: 1711813855981742998} + m_Layer: 0 + m_Name: 3D RightArrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1711813855981742998 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148849281603} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fe0b1757fa9fa8d47a57da9423786da6, 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!224 &1861098572297249915 RectTransform: m_ObjectHideFlags: 0 @@ -2303,36 +2828,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5421588830026398718} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5335464771215372834} + m_Father: {fileID: 363616411} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0} ---- !u!224 &1973250482742618604 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3884574305034405333} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5335464771215372834} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: -20, y: 930} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 950} m_Pivot: {x: 0.5, y: 0} --- !u!1 &2050288998095584909 GameObject: @@ -2403,14 +2909,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!222 &2419716069879934466 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8981413233664890814} - m_CullTransparentMesh: 1 --- !u!224 &2607837734526201820 RectTransform: m_ObjectHideFlags: 0 @@ -2430,36 +2928,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2724367906070917324 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 567659069188301681} - 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.103462085, g: 0.7075472, b: 0.34608507, 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!114 &2732314633492448522 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2483,95 +2951,6 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 ---- !u!114 &3001670928339139279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4738526445339317604} - 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: MAX - 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: 82 - m_fontSizeBase: 82 - 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!1 &3137918264321073805 GameObject: m_ObjectHideFlags: 0 @@ -2643,8 +3022,8 @@ LineRenderer: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.14026728 - value: 0.86267406 + time: 0.12211695 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2723,52 +3102,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.103462085, g: 0.7075472, b: 0.34608507, a: 1} + 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: 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 &3274827630358848386 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8757416128350318614} - m_CullTransparentMesh: 1 ---- !u!114 &3411077382368527661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5547092272119729804} - 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: 0.92156863} - 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_Sprite: {fileID: 21300000, guid: 1a0434843ca61f74eb81a5b8942f9e0a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2795,6 +3136,14 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!33 &3469287836756402012 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148849281603} + m_Mesh: {fileID: -7929139438592967118, guid: c8389a6832c69794daffd97728da0cb9, type: 3} --- !u!114 &3570235332418231460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2843,36 +3192,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &3639021495931937771 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3884574305034405333} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.27740285, g: 0.8679245, 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!1 &3811298866580197657 GameObject: m_ObjectHideFlags: 0 @@ -2906,10 +3225,10 @@ RectTransform: m_Children: - {fileID: 4982547860934999910} - {fileID: 5335464771215372834} - - {fileID: 4913404980657310367} - {fileID: 5969245950916785549} - {fileID: 8523137829294198608} - {fileID: 8967829807584265088} + - {fileID: 1780702393} m_Father: {fileID: 3872831913057030603} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2925,36 +3244,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3811298866580197657} m_CullTransparentMesh: 1 ---- !u!114 &3864376797260562865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8757416128350318614} - 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: 0.92156863} - 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!224 &3872831913057030603 RectTransform: m_ObjectHideFlags: 0 @@ -2975,24 +3264,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &3884574305034405333 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1973250482742618604} - - component: {fileID: 5529841702831549646} - - component: {fileID: 3639021495931937771} - m_Layer: 5 - m_Name: MaxFilling - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!54 &3921340267877587735 Rigidbody: m_ObjectHideFlags: 0 @@ -3029,7 +3300,7 @@ Transform: m_GameObject: {fileID: 2050288998095584909} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2.5} + m_LocalPosition: {x: 0, y: 0.391, z: 2.5} m_LocalScale: {x: 0.15, y: 0.5, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3077,32 +3348,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!222 &4648448400217807851 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4738526445339317604} - m_CullTransparentMesh: 1 ---- !u!1 &4738526445339317604 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 377613695778790164} - - component: {fileID: 4648448400217807851} - - component: {fileID: 3001670928339139279} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!136 &4814646082242204439 CapsuleCollider: m_ObjectHideFlags: 0 @@ -3126,28 +3371,6 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!224 &4913404980657310367 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6876106734957907706} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9002771125538478805} - - {fileID: 7177937061953387946} - - {fileID: 7087976568617934907} - m_Father: {fileID: 3822666867311385266} - 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: 808.5, y: 0} - m_SizeDelta: {x: 77, y: 954} - m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &4982547860934999910 RectTransform: m_ObjectHideFlags: 0 @@ -3180,7 +3403,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lineRenderer: {fileID: 3157045881277200977} - lineLength: -0.3 + lineLength: 0.3 --- !u!1 &5163306370002769165 GameObject: m_ObjectHideFlags: 0 @@ -3198,7 +3421,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &5184471032009286746 GameObject: m_ObjectHideFlags: 0 @@ -3236,16 +3459,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1036520383737000379} - - {fileID: 1973250482742618604} - - {fileID: 1861098572297249915} - - {fileID: 377613695778790164} + - {fileID: 363616411} + - {fileID: 1994603663} m_Father: {fileID: 3822666867311385266} 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: -807.5, y: 0} - m_SizeDelta: {x: 85, y: 954} + m_SizeDelta: {x: 85, y: 950} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5357977733061384911 MonoBehaviour: @@ -3354,36 +3575,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &5436922551905329779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8981413233664890814} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.27740285, g: 0.8679245, 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!114 &5504588384531655041 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3396,42 +3587,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1f529ce348a22904a9ab8eeb79569f5a, type: 3} m_Name: m_EditorClassIdentifier: - barRect: {fileID: 1861098572297249915} - fullRect: {fileID: 1973250482742618604} ---- !u!222 &5529841702831549646 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3884574305034405333} - m_CullTransparentMesh: 1 ---- !u!1 &5547092272119729804 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1036520383737000379} - - component: {fileID: 5586935149643284066} - - component: {fileID: 3411077382368527661} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &5586935149643284066 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5547092272119729804} - m_CullTransparentMesh: 1 + maskRect: {fileID: 363616411} + fillingRect: {fileID: 1861098572297249915} --- !u!224 &5969245950916785549 RectTransform: m_ObjectHideFlags: 0 @@ -3483,7 +3640,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!33 &6271493650227159774 MeshFilter: m_ObjectHideFlags: 0 @@ -3492,20 +3649,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050288998095584909} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &6336579220640403643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6876106734957907706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1f529ce348a22904a9ab8eeb79569f5a, type: 3} - m_Name: - m_EditorClassIdentifier: - barRect: {fileID: 7087976568617934907} - fullRect: {fileID: 7177937061953387946} --- !u!4 &6435234068943728827 Transform: m_ObjectHideFlags: 0 @@ -3637,42 +3780,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6597846410583883976} m_CullTransparentMesh: 1 ---- !u!1 &6876106734957907706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4913404980657310367} - - component: {fileID: 6336579220640403643} - m_Layer: 5 - m_Name: PowerBar (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7087976568617934907 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 567659069188301681} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4913404980657310367} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0} --- !u!114 &7118979550050290677 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3716,26 +3823,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 145634223592357450} m_OnClick: m_PersistentCalls: - m_Calls: [] ---- !u!224 &7177937061953387946 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8981413233664890814} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4913404980657310367} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: -20, y: 930} - m_Pivot: {x: 0.5, y: 0} + m_Calls: + - m_Target: {fileID: 1028760415} + m_TargetAssemblyTypeName: SceneReloader, Assembly-CSharp + m_MethodName: Reload + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &7237674694152796921 GameObject: m_ObjectHideFlags: 0 @@ -3809,14 +3909,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!222 &7912971752749314009 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 567659069188301681} - m_CullTransparentMesh: 1 --- !u!222 &8141010434514370326 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3878,7 +3970,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 83eabfe673263a445972586e5d8b56ee, type: 2} + - {fileID: 2100000, guid: d384059b225fb5942a7d266cbbdf2398, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3908,24 +4000,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7237674694152796921} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &8757416128350318614 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9002771125538478805} - - component: {fileID: 3274827630358848386} - - component: {fileID: 3864376797260562865} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &8967829807584265088 RectTransform: m_ObjectHideFlags: 0 @@ -3945,43 +4019,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 435} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8981413233664890814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7177937061953387946} - - component: {fileID: 2419716069879934466} - - component: {fileID: 5436922551905329779} - m_Layer: 5 - m_Name: MaxFilling - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9002771125538478805 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8757416128350318614} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4913404980657310367} - 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3995,3 +4032,6 @@ SceneRoots: - {fileID: 3177154127836038581} - {fileID: 4215445498302113601} - {fileID: 2085994267} + - {fileID: 1028760416} + - {fileID: 1583713034} + - {fileID: 2041401174} diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 00000000..9be206c2 --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f050a550398094f4f98d3ef6d9d9d631 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SceneReloader.cs b/Assets/Scripts/SceneReloader.cs new file mode 100644 index 00000000..b58234ee --- /dev/null +++ b/Assets/Scripts/SceneReloader.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneReloader : MonoBehaviour +{ + public void Reload() + { + SceneManager.LoadScene(0); + } +} diff --git a/Assets/Scripts/SceneReloader.cs.meta b/Assets/Scripts/SceneReloader.cs.meta new file mode 100644 index 00000000..c23f452a --- /dev/null +++ b/Assets/Scripts/SceneReloader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8c6bc963a512bff438769c9188ce8e3a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites.meta b/Assets/Sprites.meta new file mode 100644 index 00000000..d9161515 --- /dev/null +++ b/Assets/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06be9d900a92d49499dcc387aa179f69 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PowerBarGradient.png b/Assets/Sprites/PowerBarGradient.png new file mode 100644 index 00000000..7441b5bd --- /dev/null +++ b/Assets/Sprites/PowerBarGradient.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3a718d127a4d3a673d9260d4585fb49c80df6c7323c087272e1861de24575bb +size 1382 diff --git a/Assets/Sprites/PowerBarGradient.png.meta b/Assets/Sprites/PowerBarGradient.png.meta new file mode 100644 index 00000000..7044c440 --- /dev/null +++ b/Assets/Sprites/PowerBarGradient.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 1a0434843ca61f74eb81a5b8942f9e0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PowerBarOutline.png b/Assets/Sprites/PowerBarOutline.png new file mode 100644 index 00000000..b8c6031f --- /dev/null +++ b/Assets/Sprites/PowerBarOutline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9280c09a4f515a1b411c26898046737923bcc25a79fd126f571b0b12709ee9ba +size 1965 diff --git a/Assets/Sprites/PowerBarOutline.png.meta b/Assets/Sprites/PowerBarOutline.png.meta new file mode 100644 index 00000000..4503aafc --- /dev/null +++ b/Assets/Sprites/PowerBarOutline.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: a3195108519cd41499e5b8a97c620559 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 212de930..203b6599 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.7.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2956d91d..e50dfa49 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -24,6 +24,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.ide.rider": { + "version": "3.0.28", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.visualstudio": { "version": "2.0.22", "depth": 0,