Browse Source

did some bug fixes

master
Joshua Reason 4 years ago
parent
commit
a59a33c039
7 changed files with 8 additions and 15 deletions
  1. +1
    -1
      Assets/Data/Inventory/BaseInventory.asset
  2. +2
    -2
      Assets/Data/Logic Blocks/Missile.asset
  3. +0
    -8
      Assets/Plugins/IngameDebugConsole/Sprites.meta
  4. +1
    -1
      Assets/Scripts/Logic/Blocks/Jump.cs
  5. +2
    -1
      Assets/Scripts/Projectiles/HomingMissile.cs
  6. +1
    -1
      Assets/Scripts/Projectiles/Hookshot.cs
  7. +1
    -1
      ProjectSettings/EditorBuildSettings.asset

+ 1
- 1
Assets/Data/Inventory/BaseInventory.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78ae471f15115791ca45bbfb08426eee099b2279851a3178a457837c0032e2ec
oid sha256:c81ff8a2a9d20a7dbf315a47e3f940b787afa602a751c355d85b064e6b90a9fd
size 1313

+ 2
- 2
Assets/Data/Logic Blocks/Missile.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dee86c4c1ae6c1d17728507226c604655958d6ddbc22576fe9125f081716b168
size 571
oid sha256:45faf754a522a335f2292b5e89d19084c7f144fc1882aec0496144deff06bccc
size 670

+ 0
- 8
Assets/Plugins/IngameDebugConsole/Sprites.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: cb5d7b23a9e684a41a6a5d4f300eb1e6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 1
- 1
Assets/Scripts/Logic/Blocks/Jump.cs View File

@ -35,7 +35,7 @@ public class Jump : LogicBlock
player.justMoved = true;
Block endBlock = GetEndBlock(player.CurrentBlock, player.transform, ~player.Ignore);
while(endBlock.CurrentPlayer != null)
while(endBlock.CurrentPlayer != null && endBlock.CurrentPlayer != player)
{
yield return player.StartCoroutine(player.AnimateToPosition(endBlock.VisualPosition + Vector3.up * 0.5f, Character.Animation.Jump, 0.8f));
endBlock.CurrentPlayer.StartAnimation(Character.Animation.Hit);

+ 2
- 1
Assets/Scripts/Projectiles/HomingMissile.cs View File

@ -32,9 +32,10 @@ public class HomingMissile : Projectile
for (int i = 0; i < 4; i++)
{
if (Block.isBlockAtPosition( player.transform.position + possibleDirections[i].ToVector() + Vector3.up, 1, ~0))
if (Block.isBlockAtPosition(player.CurrentBlock.position + possibleDirections[i].ToVector() + Vector3.up, 1, ~0))
continue;
Debug.Log("Pushing player " + possibleDirections[i]);
yield return StartCoroutine(player.CurrentBlock.DoPush(player, possibleDirections[i].ToVector()));
break;
}

+ 1
- 1
Assets/Scripts/Projectiles/Hookshot.cs View File

@ -22,7 +22,7 @@ public class Hookshot : Projectile
if (hitBlock == player.CurrentBlock)
{
//fire something out then back in here
StartCoroutine(lerpShot(hookObject, hookObject.position, hookObject.position + direction*10, 1.0f));
yield return StartCoroutine(lerpShot(hookObject, hookObject.position, hookObject.position + direction*10, 1.0f));
yield break;
}

+ 1
- 1
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e
oid sha256:81dc2bb76c1a5b7639713c40b44bce40b5757f89e1fe33e7033950ea47e88071
size 1282

Loading…
Cancel
Save