itai.sharim/TagFight - Change JCJJQHBBV2KJGV46NWH3RHF5XSFVZUB56DVGR5XTCUOXHWD2KCJAC

Fix merge conflicts

Created by RaniSharim on October 15, 2022

JCJJQHBBV2KJGV46NWH3RHF5XSFVZUB56DVGR5XTCUOXHWD2KCJAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in Assets/Scripts/Tester.cs at line 51 [6.286]

B:B[4.76071] → [5.51045:51102]

BD:B[4.76071] → [5.51045:51102]

B:B[5.51102] → [3.415:560]

BD:B[5.51102] → [3.415:560]

        }
        if (Input.GetKeyDown(KeyCode.M)) {
            effectSystem.ApplyTagsEffect(new TagCounter(){}, affected, new AreaOfEffect() { shape = AoeShape.Radius ,length = 15, width = 15});

Solving an order conflict in Assets/Scripts/Tester.cs at line 51 [6.286]
[7.30185]
[5.51045]
Resurrecting zombie bytes in Assets/Scripts/Controllers/UnitController.cs at line 95 [4.26412]
B:B[4.28622] → [8.15876:15967]
BD:B[4.28622] → [8.15876:15967]
```
    void OnRuneWeavingCastSelected(object sender, EventAggregator.WeaveCastEventArgs e) {
```
Resurrecting zombie bytes in Assets/Scripts/Controllers/UnitController.cs at line 96 [4.26412]
B:B[10.11642] → [3.1421:1524]
BD:B[10.11642] → [3.1421:1524]
```
        SelectedWeaver.TryQueueWeave(new(e.Weave, SelectedWeaver.transform, TargetUnit), TargetUnit);
```
Solving an order conflict in Assets/Scripts/Controllers/UnitController.cs at line 96 [4.26412]
[8.15967]
[3.1421]
Deletion in Assets/Scripts/Controllers/UnitController.cs at line 97 [4.26412]
∅:D[9.1185] → [10.11707:11709]
∅:D[3.1524] → [10.11707:11709]
B:BD[10.11707] → [10.11707:11709]
Deletion in Assets/Scripts/Combat/Tags/TagSystem.cs at line 23 [12.22348]
B:BD[12.23297] → [8.17560:17626]
```
                _eventAggregator.OnTagsChanged(this, eventArgs);
```

Replacement in Assets/Scripts/Combat/Tags/TagSystem.cs at line 24 [12.22348]

B:BD[3.2456] → [3.2456:2532]

                    _eventAggregator.InvokeOnTagsChanged(this, eventArgs);

[3.2456]

[3.2532]

                    _eventAggregator.OnTagsChanged(this, eventArgs);

Deletion in Assets/Scenes/SampleScene.unity at line 5861 [13.780110080]
B:BD[13.780121071] → [2.531:610]
```
  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}
```
Deletion in Assets/Scenes/SampleScene.unity at line 8667 [13.780110080]
B:BD[13.780161886] → [5.54433:54472]
```
    m_SensorSize: {x: 1.8904538, y: 1}
```
Solving an order conflict in Assets/Scenes/SampleScene.unity at line 8667 [13.780110080]
[2.650]
[13.780161925]
Deletion in Assets/Scenes/SampleScene.unity at line 8682 [13.780110080]
B:BD[13.780162310] → [2.651:730]
```
  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}
```

Fix merge conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in Assets/Scripts/Tester.cs at line 51 [6.286]

Solving an order conflict in Assets/Scripts/Tester.cs at line 51 [6.286]

Resurrecting zombie bytes in Assets/Scripts/Controllers/UnitController.cs at line 95 [4.26412]

Resurrecting zombie bytes in Assets/Scripts/Controllers/UnitController.cs at line 96 [4.26412]

Solving an order conflict in Assets/Scripts/Controllers/UnitController.cs at line 96 [4.26412]

Deletion in Assets/Scripts/Controllers/UnitController.cs at line 97 [4.26412]

Deletion in Assets/Scripts/Combat/Tags/TagSystem.cs at line 23 [12.22348]

Replacement in Assets/Scripts/Combat/Tags/TagSystem.cs at line 24 [12.22348]

Deletion in Assets/Scenes/SampleScene.unity at line 5861 [13.780110080]

Deletion in Assets/Scenes/SampleScene.unity at line 8667 [13.780110080]

Solving an order conflict in Assets/Scenes/SampleScene.unity at line 8667 [13.780110080]

Deletion in Assets/Scenes/SampleScene.unity at line 8682 [13.780110080]