Skip to content

Commit

Permalink
Avoid using generic list bd (#305)
Browse files Browse the repository at this point in the history
* fix: stop using generic list, it gives problems at building game

* fix: typo errors in dialogs

* fix: rounded tile changed for squared tile

* feat: kassandra/Cassandra's voice files changed

* feat: changed ajax rigid body and camera in sone scenes

Co-authored-by: Judit Quintana <[email protected]>
  • Loading branch information
wilberquito and Jumalita authored Aug 10, 2022
1 parent 325d5ff commit c49b725
Show file tree
Hide file tree
Showing 13 changed files with 728 additions and 701 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public void NextSceneEntrance(EntranceID entranceTag)
//post: player stats are the ones saved in data
private int LoadSavedData()
{
Debug.Log("Loading data");
PlayerState playerState = SaveSystem.LoadPlayerState();

var playerHealth = PlayerController.Instance.PlayerData.Health;
Expand Down
5 changes: 2 additions & 3 deletions Erlang-Legacy/Assets/Core/IA/Behavior/Task/Action/Shoot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@
using BehaviorDesigner.Runtime.Tasks;
using Core.Combat;
using Core.Combat.IA;
using Core.IA.Bahavior.SharedVariable;
using Core.Manager;
using UnityEngine;

public class Shoot : EnemyAction
{
public SharedGenericList<Weapon> weapons;
public Weapon[] weapons;
public SharedBool shakeCamera;
public SharedFloat shakeIntensity = 1;

public override TaskStatus OnUpdate()
{
foreach (var weapon in weapons.Value)
foreach (var weapon in weapons)
{
var projectile = Object.Instantiate(weapon.projectilePrefab, weapon.weaponTransform.position, weapon.weaponTransform.rotation);
projectile.Shooter = gameObject;
Expand Down
2 changes: 1 addition & 1 deletion Erlang-Legacy/Assets/Prefabs/Ajax/Ajax.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ Rigidbody2D:
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 10
m_GravityScale: 7
m_Material: {fileID: 0}
m_Interpolate: 1
m_SleepingMode: 0
Expand Down
Loading

0 comments on commit c49b725

Please sign in to comment.