nicecat-studios/jump-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10 from cwchristerw/fixes

Browse Source 
Fixes
This commit is contained in:
Christer Warén
2020-05-19 16:39:51 +03:00
committed by GitHub
parent f32ce4c982 ebe7a8d490
commit ed00632b9e
6 changed files with 258 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Jump Game/Assets/Images/NiceCat-Jump-Game-Symbol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

91
Jump Game/Assets/Images/NiceCat-Jump-Game-Symbol.png.meta Normal file
View File

@@ -0,0 +1,91 @@
fileFormatVersion: 2
guid: a61bfcf9a333deb4790028db5b09c468
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

186
Jump Game/Assets/Scenes/Scene0_Menu.unity
View File

@@ -1333,7 +1333,7 @@ RectTransform:
m_LocalScale: {x: 0.75, y: 0.75, z: 1}
m_Children: []
m_Father: {fileID: 2065833043}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -2523,7 +2523,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2065833043}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -2615,17 +2615,17 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -2635,7 +2635,7 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -2655,22 +2655,22 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -85
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -150
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 70
value: 100
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -2702,6 +2702,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -3188,17 +3198,17 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -3208,7 +3218,7 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -3228,7 +3238,7 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 300
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -3238,12 +3248,12 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 300
value: 400
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 100
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -3275,6 +3285,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -3340,6 +3360,79 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 662286516}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1665809683
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1665809684}
- component: {fileID: 1665809686}
- component: {fileID: 1665809685}
m_Layer: 5
m_Name: Game Name (symbol)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1665809684
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1665809683}
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: 2065833043}
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: -400, y: 0}
m_SizeDelta: {x: 750, y: 750}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1665809685
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1665809683}
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_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a61bfcf9a333deb4790028db5b09c468, 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 &1665809686
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1665809683}
m_CullTransparentMesh: 0
--- !u!224 &1701846673 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
@@ -3711,7 +3804,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1932298592
RectTransform:
m_ObjectHideFlags: 0
@@ -3724,7 +3817,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2065833043}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -4188,6 +4281,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1665809684}
- {fileID: 1932298592}
- {fileID: 1169074426}
- {fileID: 593435231}
@@ -4452,17 +4546,17 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -4472,7 +4566,7 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -4492,22 +4586,22 @@ PrefabInstance:
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 85
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 150
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 100
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
@@ -4539,6 +4633,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4302189230082019122, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4604532315722087914, guid: 849f48437cf3cb841a32cc7467d8a2e5,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size

16
Jump Game/Assets/Scenes/Scene2_Game.unity
View File

@@ -3419,10 +3419,10 @@ RectTransform:
m_Father: {fileID: 1600980039}
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: -885.7, y: 419.3601}
m_SizeDelta: {x: 116.9, y: 39.35}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -60}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &710597522
MonoBehaviour:
@@ -3444,10 +3444,10 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontSize: 20
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
@@ -3455,9 +3455,9 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Press ESC to quit
m_Text: 'Press ESC to
the game'
go to main menu'
--- !u!222 &710597523
CanvasRenderer:
m_ObjectHideFlags: 0

5
Jump Game/Assets/Scripts/Player/PlayerController.cs
View File

@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class PlayerController : Player
{
@@ -53,7 +54,9 @@ public class PlayerController : Player
isGrounded = Physics2D.OverlapArea(feetPos.position, checkRadius.position, whatIsGround); //return true for overlap
moveInput = Input.GetAxis("Horizontal");
if (Input.GetKeyDown(KeyCode.Escape)) { Application.Quit(); } //temporary exit measure
if (Input.GetKeyDown(KeyCode.Escape)) {
SceneManager.LoadScene(0);
}
if(_isGrounded && Input.GetAxis("Horizontal") != -1 && Input.GetAxis("Horizontal") != 1) { Player.rbody.velocity = new Vector2(0, Player.rbody.velocity.y); }

13
Jump Game/ProjectSettings/ProjectSettings.asset
View File

@@ -98,7 +98,7 @@ PlayerSettings:
visibleInBackground: 1
allowFullscreenSwitch: 1
graphicsJobMode: 0
fullscreenMode: 3
fullscreenMode: 1
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
xboxEnableGuest: 0
@@ -121,7 +121,7 @@ PlayerSettings:
m_SupportedAspectRatios:
4:3: 0
5:4: 0
16:10: 1
16:10: 0
16:9: 1
Others: 0
bundleVersion: 0.1
@@ -280,7 +280,14 @@ PlayerSettings:
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: a61bfcf9a333deb4790028db5b09c468, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: