Compare commits
4
Commits
1.0
...
b2483b7c18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b2483b7c18
|
||
|
|
ba52270205
|
||
|
|
4372f7862f
|
||
|
|
5f430f79b1
|
No files matched your search
Vendored
+1
-1
@@ -66,7 +66,7 @@
|
|||||||
"explorer.fileNesting.patterns": {
|
"explorer.fileNesting.patterns": {
|
||||||
"*.sln": "*.csproj"
|
"*.sln": "*.csproj"
|
||||||
},
|
},
|
||||||
"dotnet.defaultSolution": "BerryDashGuns.sln",
|
"dotnet.defaultSolution": "BerryDashGuns.slnx",
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"dotnet.formatting.organizeImportsOnFormat": true,
|
"dotnet.formatting.organizeImportsOnFormat": true,
|
||||||
"csharp.format.enable": true
|
"csharp.format.enable": true
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ public class GamePlayer : MonoBehaviour
|
|||||||
{
|
{
|
||||||
doMoveRight = true;
|
doMoveRight = true;
|
||||||
}
|
}
|
||||||
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || Keyboard.current.downArrowKey.isPressed || Keyboard.current.sKey.isPressed || Keyboard.current.kKey.isPressed || Keyboard.current.iKey.isPressed || Mouse.current.leftButton.isPressed || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed))
|
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || Keyboard.current.downArrowKey.isPressed || Keyboard.current.sKey.isPressed || Keyboard.current.kKey.isPressed || Keyboard.current.iKey.isPressed || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed))
|
||||||
{
|
{
|
||||||
doJump = true;
|
doJump = true;
|
||||||
}
|
}
|
||||||
@@ -124,13 +124,11 @@ public class GamePlayer : MonoBehaviour
|
|||||||
{
|
{
|
||||||
bird.transform.position += new UnityEngine.Vector3(-movespeed, 0f, 0f);
|
bird.transform.position += new UnityEngine.Vector3(-movespeed, 0f, 0f);
|
||||||
ClampPosition(bird);
|
ClampPosition(bird);
|
||||||
bird.transform.localScale = new UnityEngine.Vector3(1.35f, 1.35f, 1.35f);
|
|
||||||
}
|
}
|
||||||
if (doMoveRight && !doMoveLeft)
|
if (doMoveRight && !doMoveLeft)
|
||||||
{
|
{
|
||||||
bird.transform.position += new UnityEngine.Vector3(movespeed, 0f, 0f);
|
bird.transform.position += new UnityEngine.Vector3(movespeed, 0f, 0f);
|
||||||
ClampPosition(bird);
|
ClampPosition(bird);
|
||||||
bird.transform.localScale = new UnityEngine.Vector3(-1.35f, 1.35f, 1.35f);
|
|
||||||
}
|
}
|
||||||
if (doJump && isGrounded)
|
if (doJump && isGrounded)
|
||||||
{
|
{
|
||||||
@@ -521,7 +519,6 @@ public class GamePlayer : MonoBehaviour
|
|||||||
totalRandomBerries++;
|
totalRandomBerries++;
|
||||||
System.Action[] funcs = {
|
System.Action[] funcs = {
|
||||||
() => DoNormalBerry(randomBerry),
|
() => DoNormalBerry(randomBerry),
|
||||||
() => DoSlowBerry(randomBerry),
|
|
||||||
() => DoUltraBerry(randomBerry),
|
() => DoUltraBerry(randomBerry),
|
||||||
() => DoSpeedyBerry(randomBerry),
|
() => DoSpeedyBerry(randomBerry),
|
||||||
() => DoAntiBerry(randomBerry)
|
() => DoAntiBerry(randomBerry)
|
||||||
@@ -598,7 +595,6 @@ public class GamePlayer : MonoBehaviour
|
|||||||
void Respawn()
|
void Respawn()
|
||||||
{
|
{
|
||||||
bird.transform.position = new UnityEngine.Vector3(0f, -4.3f, 0f);
|
bird.transform.position = new UnityEngine.Vector3(0f, -4.3f, 0f);
|
||||||
bird.transform.localScale = new UnityEngine.Vector3(1.35f, 1.35f, 1.35f);
|
|
||||||
rb.gravityScale = 0f;
|
rb.gravityScale = 0f;
|
||||||
rb.linearVelocity = UnityEngine.Vector2.zero;
|
rb.linearVelocity = UnityEngine.Vector2.zero;
|
||||||
score = 0;
|
score = 0;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public class GunHandler : MonoBehaviour
|
|||||||
|
|
||||||
transform.rotation = Quaternion.Euler(0f, 0f, clamped);
|
transform.rotation = Quaternion.Euler(0f, 0f, clamped);
|
||||||
|
|
||||||
if (Keyboard.current.leftShiftKey.wasPressedThisFrame || Keyboard.current.rightShiftKey.wasPressedThisFrame)
|
if (Keyboard.current.leftShiftKey.wasPressedThisFrame || Keyboard.current.rightShiftKey.wasPressedThisFrame || Keyboard.current.fKey.wasPressedThisFrame || Mouse.current.leftButton.wasPressedThisFrame)
|
||||||
{
|
{
|
||||||
Vector3 offset = new(0.6932073f, 0.352302f, 0f);
|
Vector3 offset = new(0.6932073f, 0.352302f, 0f);
|
||||||
if (flipped) offset.x = -offset.x;
|
if (flipped) offset.x = -offset.x;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
"com.unity.2d.tilemap.extras": "5.0.1",
|
"com.unity.2d.tilemap.extras": "5.0.1",
|
||||||
"com.unity.collab-proxy": "2.9.3",
|
"com.unity.collab-proxy": "2.9.3",
|
||||||
"com.unity.ide.rider": "3.0.38",
|
"com.unity.ide.rider": "3.0.38",
|
||||||
"com.unity.ide.visualstudio": "2.0.23",
|
"com.unity.ide.visualstudio": "2.0.25",
|
||||||
"com.unity.inputsystem": "1.14.2",
|
"com.unity.inputsystem": "1.14.2",
|
||||||
"com.unity.multiplayer.center": "1.0.0",
|
"com.unity.multiplayer.center": "1.0.0",
|
||||||
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
"com.unity.nuget.newtonsoft-json": "3.2.1",
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.burst": {
|
"com.unity.burst": {
|
||||||
"version": "1.8.24",
|
"version": "1.8.25",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -133,11 +133,11 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.ide.visualstudio": {
|
"com.unity.ide.visualstudio": {
|
||||||
"version": "2.0.23",
|
"version": "2.0.25",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.test-framework": "1.1.9"
|
"com.unity.test-framework": "1.1.31"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.test-framework.performance": {
|
"com.unity.test-framework.performance": {
|
||||||
"version": "3.1.0",
|
"version": "3.2.0",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -178,12 +178,12 @@ PlayerSettings:
|
|||||||
AndroidBundleVersionCode: 1
|
AndroidBundleVersionCode: 1
|
||||||
AndroidMinSdkVersion: 23
|
AndroidMinSdkVersion: 23
|
||||||
AndroidTargetSdkVersion: 0
|
AndroidTargetSdkVersion: 0
|
||||||
AndroidPreferredInstallLocation: 0
|
AndroidPreferredInstallLocation: 2
|
||||||
aotOptions:
|
aotOptions:
|
||||||
stripEngineCode: 1
|
stripEngineCode: 1
|
||||||
iPhoneStrippingLevel: 0
|
iPhoneStrippingLevel: 0
|
||||||
iPhoneScriptCallOptimization: 0
|
iPhoneScriptCallOptimization: 0
|
||||||
ForceInternetPermission: 0
|
ForceInternetPermission: 1
|
||||||
ForceSDCardPermission: 0
|
ForceSDCardPermission: 0
|
||||||
CreateWallpaper: 0
|
CreateWallpaper: 0
|
||||||
androidSplitApplicationBinary: 0
|
androidSplitApplicationBinary: 0
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
m_EditorVersion: 6000.2.6f2
|
m_EditorVersion: 6000.2.7f2
|
||||||
m_EditorVersionWithRevision: 6000.2.6f2 (4a4dcaec6541)
|
m_EditorVersionWithRevision: 6000.2.7f2 (2b518236b676)
|
||||||
Reference in new issue
Block a user