Merge remote-tracking branch 'origin/Syntriax' into Over

This commit is contained in:
OverflowNarhoym
2022-02-25 21:38:35 +01:00
34 changed files with 3973 additions and 1070 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 195a574a43515b84da3e006bc1890628
guid: 6645cc2d45a3a2845beadb7bef31fb32
PrefabImporter:
externalObjects: {}
userData:

View File

@@ -13,7 +13,8 @@ GameObject:
- component: {fileID: 4596650117854378813}
- component: {fileID: 5084819958108693599}
- component: {fileID: 6837629660644296000}
m_Layer: 0
- component: {fileID: 2154021251853475818}
m_Layer: 9
m_Name: Basic Projectile
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -76,7 +77,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
m_Sprite: {fileID: -1238109936, guid: 60c98bbea70763a4080e554f79554f6e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -137,3 +138,23 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
damageOnContact: 50
--- !u!95 &2154021251853475818
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2196707779812385060}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8b1954a33390a7b469564230a10d5e6c, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0