itai.sharim/TurnBasedStrategyCourse - Change 4MH3FNJEGI54VVOOMPTODKJG2N744XELV3RSEYZBJH5VGTO5YVZAC

Change TurnSystem to ScriptableObject instead of GameObject

Created by itai.sharim on August 7, 2022

4MH3FNJEGI54VVOOMPTODKJG2N744XELV3RSEYZBJH5VGTO5YVZAC

Dependencies

[2] KX24MMJSQ3FHM7SDXF65QSAHT44INS33SHKQSRCVGZRPKZPEVDSQC

In channels

main

Change contents

File deletion: TurnSystem.cs.meta

BF:BFD[2.3598949] → [2.3631002:3631044]

BF:BFD[2.3631044] → [2.3630757:3630757]

B:BD[2.3630757] → [2.3630758:3631001]

fileFormatVersion: 2
guid: 47518c843f5454846a5967890d1a997c
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: TurnSystem.cs

BF:BFD[2.3598949] → [2.3631891:3631928]

BF:BFD[2.3631928] → [2.3631046:3631046]

B:BD[2.3631046] → [2.3631047:3631890]

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
public class TurnSystem : MonoBehaviour
{
    public static TurnSystem Instance {get; private set;}
    private int turnNumber = 1;
    public event EventHandler OnTurnChanged;
    private bool isPlayerTurn = true;
    private void Awake() 
    {
        if (Instance != null)
        {
            Debug.LogError("There's more than one TurnSystem" + transform + " - " + Instance);
            Destroy(gameObject);
            return;
        }
        Instance = this;
    }
    public void EndTurn() {
        turnNumber++;
        isPlayerTurn = !isPlayerTurn;
        OnTurnChanged?.Invoke(this, EventArgs.Empty);
    }
    public int GetTurnNumber() => turnNumber;
    public bool IsPlayerTurn() => isPlayerTurn;
}

Insertion in Assets/Scripts/UnitActionSystem.cs at line 27 [2.3609413]
[2.3610195]
[2.3610195]
```
    [SerializeField] private TurnSystem turnSystem;
```
Replacement in Assets/Scripts/UnitActionSystem.cs at line 53 [2.3609413]
B:BD[2.3610770] → [2.3610770:3610822]
```
        if (!TurnSystem.Instance.IsPlayerTurn()) {
```
[2.3610770]
[2.3610822]
```
        if (!turnSystem.IsPlayerTurn()) {
```
Insertion in Assets/Scripts/Unit.cs at line 16 [2.3614098]
[2.3614537]
[2.3614537]
```
    [SerializeField] private TurnSystem turnSystem;
```

Replacement in Assets/Scripts/Unit.cs at line 33 [2.3614098]

B:BD[2.3615246] → [2.3615246:3615318]

        TurnSystem.Instance.OnTurnChanged += TurnSystem_OnTurnChanged;

[2.3615246]

[2.3615318]

        turnSystem.OnTurnChanged += TurnSystem_OnTurnChanged;

Replacement in Assets/Scripts/Unit.cs at line 83 [2.3614098]

B:BD[2.3617127] → [2.3617127:3617210]

    private bool IsMyTurn() => (TurnSystem.Instance.IsPlayerTurn() != IsEnemy());

[2.3617127]

[2.3617210]

    private bool IsMyTurn() => (turnSystem.IsPlayerTurn() != IsEnemy());

Replacement in Assets/Scripts/Unit.cs at line 95 [2.3614098]

B:BD[2.3617570] → [2.3617570:3617648]

        int turnExpiration = TurnSystem.Instance.GetTurnNumber() + duration;

[2.3617570]

[2.3617648]

        int turnExpiration = turnSystem.GetTurnNumber() + duration;

Replacement in Assets/Scripts/Unit.cs at line 116 [2.3614098]

B:BD[2.3618216] → [2.3618216:3618285]

        buffDictionary.Remove(TurnSystem.Instance.GetTurnNumber());

[2.3618216]

[2.3618285]

        buffDictionary.Remove(turnSystem.GetTurnNumber());

Insertion in Assets/Scripts/UI/TurnSystemUI.cs at line 13 [2.3624090]
[2.3624459]
[2.3624459]
```
    [SerializeField] private TurnSystem turnSystem;
```
Insertion in Assets/Scripts/UI/TurnSystemUI.cs at line 15 [2.3624090]
[2.3624461]
[2.3624461]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 19 [2.3624090]

B:BD[2.3624573] → [2.3624573:3624629]

            TurnSystem.Instance.EndTurn();

[2.3624573]

[2.3624629]

            turnSystem.EndTurn();

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 21 [2.3624090]

B:BD[2.3624642] → [2.3624642:3624714]

        TurnSystem.Instance.OnTurnChanged += TurnSystem_OnTurnChanged;

[2.3624642]

[2.3624714]

        turnSystem.OnTurnChanged += TurnSystem_OnTurnChanged;

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 31 [2.3624090]

B:BD[2.3625031] → [2.3625031:3625113]

        turnNumberTextMesh.text = $"TURN {TurnSystem.Instance.GetTurnNumber()}";

[2.3625031]

[2.3625113]

        turnNumberTextMesh.text = $"TURN {turnSystem.GetTurnNumber()}";

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 35 [2.3624090]

B:BD[2.3625166] → [2.3625166:3625249]

        enemyTurnVisualGameObject.SetActive(!TurnSystem.Instance.IsPlayerTurn());

[2.3625166]

[2.3625249]

        enemyTurnVisualGameObject.SetActive(!turnSystem.IsPlayerTurn());

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 39 [2.3624090]

B:BD[2.3625310] → [2.3625310:3625391]

        endTurnButton.gameObject.SetActive(TurnSystem.Instance.IsPlayerTurn());

[2.3625310]

[2.3625391]

        endTurnButton.gameObject.SetActive(turnSystem.IsPlayerTurn());

Insertion in Assets/Scripts/EnemyAI.cs at line 11 [2.3681839]
[2.3682056]
[2.3682056]
```
    [SerializeField] private TurnSystem turnSystem;
```

Replacement in Assets/Scripts/EnemyAI.cs at line 24 [2.3681839]

B:BD[2.3682324] → [2.3682324:3682396]

        TurnSystem.Instance.OnTurnChanged += TurnSystem_OnTurnChanged;

[2.3682324]

[2.3682396]

        turnSystem.OnTurnChanged += TurnSystem_OnTurnChanged;

Replacement in Assets/Scripts/EnemyAI.cs at line 27 [2.3681839]
B:BD[2.3682432] → [2.3682432:3682483]
```
        if (TurnSystem.Instance.IsPlayerTurn()) {
```
[2.3682432]
[2.3682483]
```
        if (turnSystem.IsPlayerTurn()) {
```

Replacement in Assets/Scripts/EnemyAI.cs at line 40 [2.3681839]

B:BD[2.3682878] → [2.3682878:3682934]

                        TurnSystem.Instance.EndTurn();

[2.3682878]

[2.3682934]

                        turnSystem.EndTurn();

Replacement in Assets/Scripts/EnemyAI.cs at line 54 [2.3681839]
B:BD[2.3683261] → [2.3683261:3683313]
```
        if (!TurnSystem.Instance.IsPlayerTurn()) {
```
[2.3683261]
[2.3683313]
```
        if (!turnSystem.IsPlayerTurn()) {
```
Replacement in Assets/Scenes/GameScene.unity at line 521 [2.3721646]
B:BD[2.3736088] → [2.3736088:3736106]
```
  m_RootOrder: 30
```
[2.3736088]
[2.3736106]
```
  m_RootOrder: 29
```
Insertion in Assets/Scenes/GameScene.unity at line 556 [2.3721646]
[2.3737012]
[2.3737012]
```
  turnSystem: {fileID: 11400000, guid: 7fe8464920cbc2f4fb1dccb492d5e0b1, type: 2}
```
Replacement in Assets/Scenes/GameScene.unity at line 4475 [2.3721646]
B:BD[2.3881455] → [2.3881455:3881473]
```
  m_RootOrder: 20
```
[2.3881455]
[2.3881473]
```
  m_RootOrder: 19
```
Replacement in Assets/Scenes/GameScene.unity at line 4672 [2.3721646]
B:BD[2.3887972] → [2.3887972:3887990]
```
  m_RootOrder: 24
```
[2.3887972]
[2.3887990]
```
  m_RootOrder: 23
```
Replacement in Assets/Scenes/GameScene.unity at line 5724 [2.3721646]
B:BD[2.3921471] → [2.3921471:3921489]
```
  m_RootOrder: 21
```
[2.3921471]
[2.3921489]
```
  m_RootOrder: 20
```

Deletion in Assets/Scenes/GameScene.unity at line 5726 [2.3721646]

B:BD[2.3921534] → [2.3921534:3922754]

--- !u!1 &1152127347
GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1152127349}
  - component: {fileID: 1152127348}
  m_Layer: 0
  m_Name: TurnSystem
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!114 &1152127348
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1152127347}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 47518c843f5454846a5967890d1a997c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!4 &1152127349
Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1152127347}
  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: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Insertion in Assets/Scenes/GameScene.unity at line 5781 [2.3721646]
[2.3924339]
[2.3924339]
```
  turnSystem: {fileID: 11400000, guid: 7fe8464920cbc2f4fb1dccb492d5e0b1, type: 2}
```
Replacement in Assets/Scenes/GameScene.unity at line 5813 [2.3721646]
B:BD[2.3925169] → [2.3925169:3925187]
```
  m_RootOrder: 29
```
[2.3925169]
[2.3925187]
```
  m_RootOrder: 28
```
Replacement in Assets/Scenes/GameScene.unity at line 6008 [2.3721646]
B:BD[2.3931378] → [2.3931378:3931396]
```
  m_RootOrder: 25
```
[2.3931378]
[2.3931396]
```
  m_RootOrder: 24
```
Replacement in Assets/Scenes/GameScene.unity at line 6247 [2.3721646]
B:BD[2.3938208] → [2.3938208:3938226]
```
  m_RootOrder: 23
```
[2.3938208]
[2.3938226]
```
  m_RootOrder: 22
```
Replacement in Assets/Scenes/GameScene.unity at line 6373 [2.3721646]
B:BD[2.3942466] → [2.3942466:3942484]
```
  m_RootOrder: 27
```
[2.3942466]
[2.3942484]
```
  m_RootOrder: 26
```
Replacement in Assets/Scenes/GameScene.unity at line 6583 [2.3721646]
B:BD[2.3948172] → [2.3948172:3948190]
```
  m_RootOrder: 22
```
[2.3948172]
[2.3948190]
```
  m_RootOrder: 21
```
Insertion in Assets/Scenes/GameScene.unity at line 6614 [2.3721646]
[2.3949002]
[2.3949002]
```
  turnSystem: {fileID: 11400000, guid: 7fe8464920cbc2f4fb1dccb492d5e0b1, type: 2}
```
Replacement in Assets/Scenes/GameScene.unity at line 6628 [2.3721646]
B:BD[2.3949392] → [2.3949392:3949410]
```
  m_RootOrder: 19
```
[2.3949392]
[2.3949410]
```
  m_RootOrder: 18
```
Replacement in Assets/Scenes/GameScene.unity at line 6754 [2.3721646]
B:BD[2.3952933] → [2.3952933:3952951]
```
  m_RootOrder: 26
```
[2.3952933]
[2.3952951]
```
  m_RootOrder: 25
```
Replacement in Assets/Scenes/GameScene.unity at line 9657 [2.3721646]
B:BD[2.4060090] → [2.4060090:4060106]
```
      value: 28
```
[2.4060090]
[2.4060106]
```
      value: 27
```

Insertion in Assets/Prefabs/Unit.prefab at line 272 [2.4113037]

[2.4121182]

  turnSystem: {fileID: 11400000, guid: 7fe8464920cbc2f4fb1dccb492d5e0b1, type: 2}

Change TurnSystem to ScriptableObject instead of GameObject

Dependencies

In channels

Change contents

File deletion: TurnSystem.cs.meta

File deletion: TurnSystem.cs

Insertion in Assets/Scripts/UnitActionSystem.cs at line 27 [2.3609413]

Replacement in Assets/Scripts/UnitActionSystem.cs at line 53 [2.3609413]

Insertion in Assets/Scripts/Unit.cs at line 16 [2.3614098]

Replacement in Assets/Scripts/Unit.cs at line 33 [2.3614098]

Replacement in Assets/Scripts/Unit.cs at line 83 [2.3614098]

Replacement in Assets/Scripts/Unit.cs at line 95 [2.3614098]

Replacement in Assets/Scripts/Unit.cs at line 116 [2.3614098]

Insertion in Assets/Scripts/UI/TurnSystemUI.cs at line 13 [2.3624090]

Insertion in Assets/Scripts/UI/TurnSystemUI.cs at line 15 [2.3624090]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 19 [2.3624090]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 21 [2.3624090]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 31 [2.3624090]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 35 [2.3624090]

Replacement in Assets/Scripts/UI/TurnSystemUI.cs at line 39 [2.3624090]

Insertion in Assets/Scripts/EnemyAI.cs at line 11 [2.3681839]

Replacement in Assets/Scripts/EnemyAI.cs at line 24 [2.3681839]

Replacement in Assets/Scripts/EnemyAI.cs at line 27 [2.3681839]

Replacement in Assets/Scripts/EnemyAI.cs at line 40 [2.3681839]

Replacement in Assets/Scripts/EnemyAI.cs at line 54 [2.3681839]

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

Insertion in Assets/Scenes/GameScene.unity at line 556 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 4475 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 4672 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 5724 [2.3721646]

Deletion in Assets/Scenes/GameScene.unity at line 5726 [2.3721646]

Insertion in Assets/Scenes/GameScene.unity at line 5781 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 5813 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6008 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6247 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6373 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6583 [2.3721646]

Insertion in Assets/Scenes/GameScene.unity at line 6614 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6628 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 6754 [2.3721646]

Replacement in Assets/Scenes/GameScene.unity at line 9657 [2.3721646]

Insertion in Assets/Prefabs/Unit.prefab at line 272 [2.4113037]