itai.sharim/TagFight - Change QAL5AGRNWU7JFNK76L3CZLHAZZAIW7FNSVET6BTAQ4WJYHQ6ZZFAC

fix conflicts

Created by itai.sharim on November 12, 2022

QAL5AGRNWU7JFNK76L3CZLHAZZAIW7FNSVET6BTAQ4WJYHQ6ZZFAC

Dependencies

In channels

main

Change contents

File deletion: Double Count.asset, Double Count.asset

BFD:BFD[4.790] → [5.1049:1091]

BFD:BFD[5.1091] → [5.241:241]

B:BD[6.23994] → [2.8324:8476]

B:BD[6.24277] → [2.8477:8529]

∅:D[2.8529] → [6.24359:24609]

∅:D[2.8476] → [6.23994:24025]

    - rid: 4320157327971844096
      type: {class: OnTimePass, ns: TagFighter.Effects.Triggers, asm: Assembly-CSharp}
      data:
        _frequency: 1
        Trigger:
          rid: 4320157327971844096
    - rid: 7043444593006739637
      type: {class: Single, ns: TagFighter.Effects.AoeShapes, asm: Assembly-CSharp}
    - rid: 7043444593006739638
      type: {class: AoeEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}
      data:
        Shape:
    - rid: 7043444593006739635

File deletion: DemoCount.asset, DemoCount.asset

BFD:BFD[4.790] → [7.3136:3175]

BFD:BFD[7.3175] → [7.2213:2213]

B:BD[8.10115] → [2.8532:8565]

B:BD[9.19546] → [2.9397:9417]

∅:D[2.9417] → [6.25695:25726]

B:BD[10.13932] → [2.8566:9248]

B:BD[2.9271] → [2.9271:9396]

∅:D[2.9396] → [6.25338:25473]

∅:D[2.8565] → [8.10148:10162]

        rid: 4320157327971844097
          Addend: 1
    - rid: 7043444593006739620
    - rid: 4320157327971844097
      type: {class: PeriodicWeave, ns: TagFighter.Effects, asm: Assembly-CSharp}
      data:
        AreaOfEffect:
          rid: 4320157327971844098
        Duration:
          Resource:
            rid: -2
          Location:
            rid: -2
          Multiplier: 1
          Addend: 30
        Trigger:
          rid: 4320157327971844106
    - rid: 4320157327971844098
      type: {class: Single, ns: TagFighter.Effects.AoeShapes, asm: Assembly-CSharp}
    - rid: 4320157327971844106
      type: {class: OnResourceIncrease, ns: TagFighter.Effects.Triggers, asm: Assembly-CSharp}
      data:
        Resource:
          rid: 4320157327971844107
    - rid: 4320157327971844107
      type: {class: Pain, ns: TagFighter.Effects.ResourceTypeAccessors, asm: Assembly-CSharp}
    - rid: 7043444593006739612
      type: {class: AoeEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}
      data:
        Shape:
      Effect:

Deletion in Assets/Scenes/SampleScene.unity at line 5861 [11.780110080]
B:BD[11.780121071] → [2.9498:9579]
```
  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}
```
Deletion in Assets/Scenes/SampleScene.unity at line 8777 [11.780110080]
B:BD[11.780162310] → [2.9580:9661]
```
  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}
```