itai.sharim/TurnBasedStrategyCourse - Change ODDA36T4D3TGJS44ZBETQAT7PTIPIDSPVOHGW4K2CCCB6PUQ3FYQC

Change UnitManager to ScriptableObject instead of GameObject

Created by itai.sharim on August 7, 2022

ODDA36T4D3TGJS44ZBETQAT7PTIPIDSPVOHGW4K2CCCB6PUQ3FYQC

Dependencies

In channels

main

Change contents

File addition: Systems.meta (---x------)

[4.87]

fileFormatVersion: 2
guid: 8bfd2649a97be2c45b604a36f9309fad
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: UnitManager.asset.meta (---x------)

[3.1]

fileFormatVersion: 2
guid: 500eca3840d24134cafb0fa090840dfa
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: UnitManager.asset (---x------)

[3.1]

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
  m_ObjectHideFlags: 0
  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: b9a946ca18962744d9ee6415c5f8551d, type: 3}
  m_Name: UnitManager
  m_EditorClassIdentifier:

File deletion: UnitManager.cs.meta

BF:BFD[5.3598949] → [5.3603433:3603476]

BF:BFD[5.3603476] → [5.3603186:3603186]

B:BD[5.3603186] → [5.3603187:3603432]

fileFormatVersion: 2
guid: b9a946ca18962744d9ee6415c5f8551d
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: -10
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: UnitManager.cs

BF:BFD[5.3598949] → [5.3605177:3605215]

BF:BFD[5.3605215] → [5.3603478:3603478]

B:BD[5.3603478] → [5.3603479:3605176]

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class UnitManager : MonoBehaviour
{
    public static UnitManager Instance {get; private set;}
    private List<Unit> unitList;
    private List<Unit> enemyUnitList;
    private List<Unit> friendlyUnitList;
    private void Start() {
        Unit.OnAnyUnitDead += Unit_OnAnyUnitDead;
        Unit.OnAnyUnitSpawned += Unit_OnAnyUnitSpawned;
    }
    private void Awake() {
        if (Instance != null)
        {
            Debug.LogError("There's more than one UnitActionSystem" + transform + " - " + Instance);
            Destroy(gameObject);
            return;
        }
        Instance = this;
        unitList = new List<Unit>();
        enemyUnitList = new List<Unit>();
        friendlyUnitList = new List<Unit>();
    }
    private void Unit_OnAnyUnitSpawned(object sender, EventArgs empty) {
        Unit unit = sender as Unit;
        if (unit.IsEnemy()) {
            enemyUnitList.Add(unit);
        } else {
            friendlyUnitList.Add(unit);
        }
        unitList.Add(unit);
    }
    private void Unit_OnAnyUnitDead(object sender, EventArgs empty) {
        Unit unit = sender as Unit;
        if (unit.IsEnemy()) {
            enemyUnitList.Remove(unit);
        } else {
            friendlyUnitList.Remove(unit);
        }
        unitList.Remove(unit);
    }
    public List<Unit> GetUnitList() {
        return unitList;
    }
    public List<Unit> GetEnemyUnitList() {
        return enemyUnitList;
    }
    public List<Unit> GetFriendlyUnitList() {
        return friendlyUnitList;
    }
}

Insertion in Assets/Scripts/UnitActionSystem.cs at line 28 [5.3609413]
[2.211]
[5.3610195]
```
    [SerializeField] private UnitManager unitManager;
```

Replacement in Assets/Scripts/UnitActionSystem.cs at line 146 [5.3609413]

B:BD[5.3613550] → [5.3613550:3613630]

            var friendlyUnitList = UnitManager.Instance.GetFriendlyUnitList();

[5.3613550]

[5.3613630]

            var friendlyUnitList = unitManager.GetFriendlyUnitList();

Replacement in Assets/Scripts/Unit.cs.meta at line 7 [5.3613814]
B:BD[5.3613958] → [5.3613958:3613979]
```
  executionOrder: -5
```
[5.3613958]
[5.3613979]
```
  executionOrder: -15
```

File addition: Systems.meta (---x------)

[5.3598949]

fileFormatVersion: 2
guid: 70db6889caa5ebf4fad46968df4c7e51
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: UnitManager.cs.meta (---x------)

[3.703]

fileFormatVersion: 2
guid: b9a946ca18962744d9ee6415c5f8551d
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: -50
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: UnitManager.cs (---x------)

[3.703]

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[CreateAssetMenu(fileName = "New UnitManager", menuName = "ScriptableObjects/UnitManager")]
public class UnitManager : ScriptableObject
{
    private List<Unit> unitList;
    private List<Unit> enemyUnitList;
    private List<Unit> friendlyUnitList;
    private void Awake() {
        unitList = new List<Unit>();
        enemyUnitList = new List<Unit>();
        friendlyUnitList = new List<Unit>();
    }
    private void OnEnable() {
        Unit.OnAnyUnitDead += Unit_OnAnyUnitDead;
        Unit.OnAnyUnitSpawned += Unit_OnAnyUnitSpawned;
    }
    private void OnDisable() {
        Unit.OnAnyUnitDead -= Unit_OnAnyUnitDead;
        Unit.OnAnyUnitSpawned -= Unit_OnAnyUnitSpawned;
    }
    private void Unit_OnAnyUnitSpawned(object sender, EventArgs empty) {
        Unit unit = sender as Unit;
        if (unit.IsEnemy()) {
            enemyUnitList.Add(unit);
        } else {
            friendlyUnitList.Add(unit);
        }
        unitList.Add(unit);
    }
    private void Unit_OnAnyUnitDead(object sender, EventArgs empty) {
        Debug.Log("UnitManager Unit_OnAnyUnitDead");
        Unit unit = sender as Unit;
        if (unit.IsEnemy()) {
            enemyUnitList.Remove(unit);
        } else {
            friendlyUnitList.Remove(unit);
        }
        unitList.Remove(unit);
    }
    public List<Unit> GetUnitList() {
        return unitList;
    }
    public List<Unit> GetEnemyUnitList() {
        return enemyUnitList;
    }
    public List<Unit> GetFriendlyUnitList() {
        return friendlyUnitList;
    }
}

Replacement in Assets/Scripts/Systems/TurnSystem.cs.meta at line 7 [3.724]
B:BD[3.868] → [3.868:888]
```
  executionOrder: 0
```
[3.868]
[3.888]
```
  executionOrder: -10
```

Replacement in Assets/Scripts/Systems/TurnSystem.cs at line 6 [3.1013]

B:BD[3.1113] → [3.1113:1205]

[CreateAssetMenu(fileName = "Data", menuName = "ScriptableObjects/TurnSystem", order = 1)]

[3.1113]

[3.1205]

[CreateAssetMenu(fileName = "New TurnSystem", menuName = "ScriptableObjects/TurnSystem")]

Insertion in Assets/Scripts/Systems/TurnSystem.cs at line 12 [3.1013]

[3.1371]


    public void OnEnable()
    {
        turnNumber = 1;
        isPlayerTurn = true;
    }

Replacement in Assets/Scripts/Systems/TurnSystem.cs at line 24 [3.1013]
B:BD[3.1524] → [3.1524:1571]
```
    public int GetTurnNumber() => turnNumber;
```
[3.1524]
[3.1571]
```
    public int GetTurnNumber() => turnNumber;   
```
Insertion in Assets/Scripts/EnemyAI.cs at line 12 [5.3681839]
[2.1100]
[5.3682056]
```
    [SerializeField] private UnitManager unitManager;
```
Deletion in Assets/Scripts/EnemyAI.cs at line 24 [5.3681839]
B:BD[5.3682314] → [5.3682314:3682324]
```
        
```
Deletion in Assets/Scripts/EnemyAI.cs at line 30 [5.3681839]
B:BD[5.3682515] → [5.3682515:3682525]
```
        
```

Replacement in Assets/Scripts/EnemyAI.cs at line 60 [5.3681839]

B:BD[5.3683472] → [5.3683472:3683604]

        return UnitManager.Instance.GetEnemyUnitList().Any(enemyUnit => TryTakeEnemyAIAction(enemyUnit, onEnemyAIActionComplete));

[5.3683472]

[5.3683604]

        return unitManager.GetEnemyUnitList().Any(enemyUnit => TryTakeEnemyAIAction(enemyUnit, onEnemyAIActionComplete));

Deletion in Assets/Scripts/Buffs/HasteBuff.cs at line 10 [5.3695051]
B:BD[5.3695266] → [5.3695266:3695311]
```
        Debug.Log($"Hasting {targetUnit}");
```
Replacement in Assets/Scenes/GameScene.unity at line 521 [5.3721646]
B:BD[5.3736088] → [2.1338:1356]
```
  m_RootOrder: 29
```
[5.3736088]
[5.3736106]
```
  m_RootOrder: 28
```

Insertion in Assets/Scenes/GameScene.unity at line 557 [5.3721646]

[2.1439]

[5.3737012]

  unitManager: {fileID: 11400000, guid: 500eca3840d24134cafb0fa090840dfa, type: 2}

Replacement in Assets/Scenes/GameScene.unity at line 2503 [5.3721646]

B:BD[5.3809270] → [5.3809270:3809363]

  m_LocalRotation: {x: 0.3006394, y: 0.000000016410377, z: -0.000000005172915, w: 0.9537379}

[5.3809270]

[5.3809363]

  m_LocalRotation: {x: 0.3006394, y: -0.000000016410377, z: 0.000000005172915, w: 0.9537379}

Replacement in Assets/Scenes/GameScene.unity at line 4673 [5.3721646]
B:BD[5.3887972] → [2.1459:1477]
```
  m_RootOrder: 23
```
[5.3887972]
[5.3887990]
```
  m_RootOrder: 22
```

Replacement in Assets/Scenes/GameScene.unity at line 5239 [5.3721646]

B:BD[5.3905451] → [5.3905451:3905544]

  m_LocalRotation: {x: 0.3006394, y: 0.000000016410377, z: -0.000000005172915, w: 0.9537379}

[5.3905451]

[5.3905544]

  m_LocalRotation: {x: 0.3006394, y: -0.000000016410377, z: 0.000000005172915, w: 0.9537379}

Replacement in Assets/Scenes/GameScene.unity at line 5814 [5.3721646]
B:BD[5.3925169] → [2.1580:1598]
```
  m_RootOrder: 28
```
[5.3925169]
[5.3925187]
```
  m_RootOrder: 27
```
Replacement in Assets/Scenes/GameScene.unity at line 6009 [5.3721646]
B:BD[5.3931378] → [2.1599:1617]
```
  m_RootOrder: 24
```
[5.3931378]
[5.3931396]
```
  m_RootOrder: 23
```
Replacement in Assets/Scenes/GameScene.unity at line 6248 [5.3721646]
B:BD[5.3938208] → [2.1618:1636]
```
  m_RootOrder: 22
```
[5.3938208]
[5.3938226]
```
  m_RootOrder: 21
```
Replacement in Assets/Scenes/GameScene.unity at line 6374 [5.3721646]
B:BD[5.3942466] → [2.1637:1655]
```
  m_RootOrder: 26
```
[5.3942466]
[5.3942484]
```
  m_RootOrder: 25
```

Deletion in Assets/Scenes/GameScene.unity at line 6542 [5.3721646]

B:BD[5.3947014] → [5.3947014:3948172]

B:BD[5.3948172] → [2.1656:1674]

∅:D[2.1674] → [5.3948190:3948235]

B:BD[5.3948190] → [5.3948190:3948235]

--- !u!1 &1522129062
GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1522129064}
  - component: {fileID: 1522129063}
  m_Layer: 0
  m_Name: UnitManager
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!114 &1522129063
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1522129062}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: b9a946ca18962744d9ee6415c5f8551d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!4 &1522129064
Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1522129062}
  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: 0}
  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Insertion in Assets/Scenes/GameScene.unity at line 6572 [5.3721646]

[2.1757]

[5.3949002]

  unitManager: {fileID: 11400000, guid: 500eca3840d24134cafb0fa090840dfa, type: 2}

Replacement in Assets/Scenes/GameScene.unity at line 6712 [5.3721646]
B:BD[5.3952933] → [2.1777:1795]
```
  m_RootOrder: 25
```
[5.3952933]
[5.3952951]
```
  m_RootOrder: 24
```
Replacement in Assets/Scenes/GameScene.unity at line 9615 [5.3721646]
B:BD[5.4060090] → [2.1796:1812]
```
      value: 27
```
[5.4060090]
[5.4060106]
```
      value: 26
```

Change UnitManager to ScriptableObject instead of GameObject

Dependencies

In channels

Change contents

File addition: Systems.meta (---x------)

File addition: UnitManager.asset.meta (---x------)

File addition: UnitManager.asset (---x------)

File deletion: UnitManager.cs.meta

File deletion: UnitManager.cs

Insertion in Assets/Scripts/UnitActionSystem.cs at line 28 [5.3609413]

Replacement in Assets/Scripts/UnitActionSystem.cs at line 146 [5.3609413]

Replacement in Assets/Scripts/Unit.cs.meta at line 7 [5.3613814]

File addition: Systems.meta (---x------)

File addition: UnitManager.cs.meta (---x------)

File addition: UnitManager.cs (---x------)

Replacement in Assets/Scripts/Systems/TurnSystem.cs.meta at line 7 [3.724]

Replacement in Assets/Scripts/Systems/TurnSystem.cs at line 6 [3.1013]

Insertion in Assets/Scripts/Systems/TurnSystem.cs at line 12 [3.1013]

Replacement in Assets/Scripts/Systems/TurnSystem.cs at line 24 [3.1013]

Insertion in Assets/Scripts/EnemyAI.cs at line 12 [5.3681839]

Deletion in Assets/Scripts/EnemyAI.cs at line 24 [5.3681839]

Deletion in Assets/Scripts/EnemyAI.cs at line 30 [5.3681839]

Replacement in Assets/Scripts/EnemyAI.cs at line 60 [5.3681839]

Deletion in Assets/Scripts/Buffs/HasteBuff.cs at line 10 [5.3695051]

Replacement in Assets/Scenes/GameScene.unity at line 521 [5.3721646]

Insertion in Assets/Scenes/GameScene.unity at line 557 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 2503 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 4673 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 5239 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 5814 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6009 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6248 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6374 [5.3721646]

Deletion in Assets/Scenes/GameScene.unity at line 6542 [5.3721646]

Insertion in Assets/Scenes/GameScene.unity at line 6572 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6712 [5.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 9615 [5.3721646]