Revert "スクリプトの整理"

This reverts commit e8bdb0920d.
2026-06-30 10:02:08 +09:00
parent 7ffd50bcfd
commit c13225f5e3
6 changed files with 123 additions and 74 deletions
--- a/Assets/Scenes/BossStage.unity
+++ b/Assets/Scenes/BossStage.unity
@@ -193,8 +193,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3}
  m_PrefabInstance: {fileID: 13762580}
  m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
-=======
 --- !u!1001 &48320566
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -256,7 +254,6 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 483f930f7cf5dca46a4974b3a5f3231a, type: 3}
->>>>>>> 4d1dc01b620a200265bcb2d187a5e148601b69d5
 --- !u!1001 &64373871
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -6834,3 +6831,4 @@ SceneRoots:
  - {fileID: 581708908}
  - {fileID: 73494051}
  - {fileID: 1033763925}
+  - {fileID: 48320566}