From 9f569c30fad711a482f56a66b0e13be69fc864ac Mon Sep 17 00:00:00 2001 From: Aldin Duraki <62dual1bif@hft-stuttgart.de> Date: Fri, 1 May 2020 14:49:55 +0200 Subject: [PATCH] Flatten Project --- GoldWars/GoldWars.xcodeproj/project.pbxproj | 44 +++---------------- GoldWars/GoldWars/{Base => }/Base.swift | 0 GoldWars/GoldWars/{Game => }/GameScene.sks | Bin GoldWars/GoldWars/{Game => }/GameScene.swift | 0 GoldWars/GoldWars/{Menu => }/MenuScene.sks | Bin GoldWars/GoldWars/{Menu => }/MenuScene.swift | 0 GoldWars/GoldWars/{Unit => }/Unit.swift | 0 7 files changed, 6 insertions(+), 38 deletions(-) rename GoldWars/GoldWars/{Base => }/Base.swift (100%) rename GoldWars/GoldWars/{Game => }/GameScene.sks (100%) rename GoldWars/GoldWars/{Game => }/GameScene.swift (100%) rename GoldWars/GoldWars/{Menu => }/MenuScene.sks (100%) rename GoldWars/GoldWars/{Menu => }/MenuScene.swift (100%) rename GoldWars/GoldWars/{Unit => }/Unit.swift (100%) diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index 837e018..456b3d9 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -109,11 +109,13 @@ 110360D1244B101A008610AF /* GoldWars */ = { isa = PBXGroup; children = ( - 11738A3C24508F8C004426F1 /* Unit */, - ABA03D9E244BD53D00A66916 /* Base */, - 11036114244B3E8A008610AF /* Menu */, - 1103610F244B3D48008610AF /* Game */, + ABA03D9F244BD54F00A66916 /* Base.swift */, + 11738A3A24508F68004426F1 /* Unit.swift */, + 11036112244B3E30008610AF /* MenuScene.swift */, + 11036110244B3D6A008610AF /* MenuScene.sks */, 110360D2244B101A008610AF /* AppDelegate.swift */, + 110360D8244B101A008610AF /* GameScene.swift */, + 110360D4244B101A008610AF /* GameScene.sks */, 110360DA244B101A008610AF /* GameViewController.swift */, 110360DC244B101A008610AF /* Main.storyboard */, 110360DF244B101B008610AF /* Assets.xcassets */, @@ -141,40 +143,6 @@ path = GoldWarsUITests; sourceTree = ""; }; - 1103610F244B3D48008610AF /* Game */ = { - isa = PBXGroup; - children = ( - 110360D4244B101A008610AF /* GameScene.sks */, - 110360D8244B101A008610AF /* GameScene.swift */, - ); - path = Game; - sourceTree = ""; - }; - 11036114244B3E8A008610AF /* Menu */ = { - isa = PBXGroup; - children = ( - 11036110244B3D6A008610AF /* MenuScene.sks */, - 11036112244B3E30008610AF /* MenuScene.swift */, - ); - path = Menu; - sourceTree = ""; - }; - 11738A3C24508F8C004426F1 /* Unit */ = { - isa = PBXGroup; - children = ( - 11738A3A24508F68004426F1 /* Unit.swift */, - ); - path = Unit; - sourceTree = ""; - }; - ABA03D9E244BD53D00A66916 /* Base */ = { - isa = PBXGroup; - children = ( - ABA03D9F244BD54F00A66916 /* Base.swift */, - ); - path = Base; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ diff --git a/GoldWars/GoldWars/Base/Base.swift b/GoldWars/GoldWars/Base.swift similarity index 100% rename from GoldWars/GoldWars/Base/Base.swift rename to GoldWars/GoldWars/Base.swift diff --git a/GoldWars/GoldWars/Game/GameScene.sks b/GoldWars/GoldWars/GameScene.sks similarity index 100% rename from GoldWars/GoldWars/Game/GameScene.sks rename to GoldWars/GoldWars/GameScene.sks diff --git a/GoldWars/GoldWars/Game/GameScene.swift b/GoldWars/GoldWars/GameScene.swift similarity index 100% rename from GoldWars/GoldWars/Game/GameScene.swift rename to GoldWars/GoldWars/GameScene.swift diff --git a/GoldWars/GoldWars/Menu/MenuScene.sks b/GoldWars/GoldWars/MenuScene.sks similarity index 100% rename from GoldWars/GoldWars/Menu/MenuScene.sks rename to GoldWars/GoldWars/MenuScene.sks diff --git a/GoldWars/GoldWars/Menu/MenuScene.swift b/GoldWars/GoldWars/MenuScene.swift similarity index 100% rename from GoldWars/GoldWars/Menu/MenuScene.swift rename to GoldWars/GoldWars/MenuScene.swift diff --git a/GoldWars/GoldWars/Unit/Unit.swift b/GoldWars/GoldWars/Unit.swift similarity index 100% rename from GoldWars/GoldWars/Unit/Unit.swift rename to GoldWars/GoldWars/Unit.swift