Merge remote-tracking branch 'origin/main'

This commit is contained in:
Sveske Juice 2024-02-29 15:45:06 +01:00
commit 4e8464a52d
2 changed files with 27 additions and 0 deletions

View File

@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 5063378671874793948} - component: {fileID: 5063378671874793948}
- component: {fileID: -2259174063119120971} - component: {fileID: -2259174063119120971}
- component: {fileID: -9003688753200063495} - component: {fileID: -9003688753200063495}
- component: {fileID: 7159876145595507269}
m_Layer: 0 m_Layer: 0
m_Name: EnemyBase m_Name: EnemyBase
m_TagString: Enemy m_TagString: Enemy
@ -113,3 +114,24 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
flipTrans: {fileID: 0} flipTrans: {fileID: 0}
body: {fileID: 0} body: {fileID: 0}
--- !u!114 &7159876145595507269
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7065654593080984807}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 0
InScenePlacedSourceGlobalObjectIdHash: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1

View File

@ -29,3 +29,8 @@ MonoBehaviour:
SourcePrefabToOverride: {fileID: 0} SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0 SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0} OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 7065654593080984807, guid: cfacc720818aabb4e9217dd1ae770886, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}