diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index 226fabe..14ad1f2 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 110360D3244B101A008610AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360D2244B101A008610AF /* AppDelegate.swift */; }; 110360D5244B101A008610AF /* GameScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 110360D4244B101A008610AF /* GameScene.sks */; }; - 110360D7244B101A008610AF /* Actions.sks in Resources */ = {isa = PBXBuildFile; fileRef = 110360D6244B101A008610AF /* Actions.sks */; }; 110360D9244B101A008610AF /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360D8244B101A008610AF /* GameScene.swift */; }; 110360DB244B101A008610AF /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360DA244B101A008610AF /* GameViewController.swift */; }; 110360DE244B101A008610AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 110360DC244B101A008610AF /* Main.storyboard */; }; @@ -17,6 +16,8 @@ 110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 110360E1244B101B008610AF /* LaunchScreen.storyboard */; }; 110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; }; 110360F9244B101B008610AF /* GoldWarsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360F8244B101B008610AF /* GoldWarsUITests.swift */; }; + 11036111244B3D6A008610AF /* MenuScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 11036110244B3D6A008610AF /* MenuScene.sks */; }; + 11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,7 +41,6 @@ 110360CF244B101A008610AF /* GoldWars.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoldWars.app; sourceTree = BUILT_PRODUCTS_DIR; }; 110360D2244B101A008610AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 110360D4244B101A008610AF /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = ""; }; - 110360D6244B101A008610AF /* Actions.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Actions.sks; sourceTree = ""; }; 110360D8244B101A008610AF /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = ""; }; 110360DA244B101A008610AF /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; 110360DD244B101A008610AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -53,6 +53,8 @@ 110360F4244B101B008610AF /* GoldWarsUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoldWarsUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 110360F8244B101B008610AF /* GoldWarsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoldWarsUITests.swift; sourceTree = ""; }; 110360FA244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 11036110244B3D6A008610AF /* MenuScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = MenuScene.sks; sourceTree = ""; }; + 11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,10 +105,9 @@ 110360D1244B101A008610AF /* GoldWars */ = { isa = PBXGroup; children = ( + 11036114244B3E8A008610AF /* Menu */, + 1103610F244B3D48008610AF /* Game */, 110360D2244B101A008610AF /* AppDelegate.swift */, - 110360D4244B101A008610AF /* GameScene.sks */, - 110360D6244B101A008610AF /* Actions.sks */, - 110360D8244B101A008610AF /* GameScene.swift */, 110360DA244B101A008610AF /* GameViewController.swift */, 110360DC244B101A008610AF /* Main.storyboard */, 110360DF244B101B008610AF /* Assets.xcassets */, @@ -134,6 +135,24 @@ 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 = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -239,10 +258,10 @@ buildActionMask = 2147483647; files = ( 110360DE244B101A008610AF /* Main.storyboard in Resources */, + 11036111244B3D6A008610AF /* MenuScene.sks in Resources */, 110360D5244B101A008610AF /* GameScene.sks in Resources */, 110360E0244B101B008610AF /* Assets.xcassets in Resources */, 110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */, - 110360D7244B101A008610AF /* Actions.sks in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,6 +287,7 @@ buildActionMask = 2147483647; files = ( 110360D9244B101A008610AF /* GameScene.swift in Sources */, + 11036113244B3E30008610AF /* MenuScene.swift in Sources */, 110360DB244B101A008610AF /* GameViewController.swift in Sources */, 110360D3244B101A008610AF /* AppDelegate.swift in Sources */, ); diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/Contents.json new file mode 100644 index 0000000..987af42 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_boxCheckmark.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/yellow_boxCheckmark.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/yellow_boxCheckmark.png new file mode 100644 index 0000000..72fe388 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/yellow_boxCheckmark.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/Contents.json new file mode 100644 index 0000000..a595e6a --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_boxCross.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/yellow_boxCross.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/yellow_boxCross.png new file mode 100644 index 0000000..be0df40 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/yellow_boxCross.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json new file mode 100644 index 0000000..94117cd --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_boxTick.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png new file mode 100644 index 0000000..5be09e6 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json new file mode 100644 index 0000000..21140b0 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button00.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png new file mode 100644 index 0000000..b25aceb Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json new file mode 100644 index 0000000..0895953 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button01.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png new file mode 100644 index 0000000..b9da991 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json new file mode 100644 index 0000000..457c9fb --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button02.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png new file mode 100644 index 0000000..15b1f3d Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json new file mode 100644 index 0000000..6aa93af --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button03.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png new file mode 100644 index 0000000..70ee720 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json new file mode 100644 index 0000000..fe79039 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button04.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png new file mode 100644 index 0000000..43e2aae Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json new file mode 100644 index 0000000..7557325 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button05.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png new file mode 100644 index 0000000..1523ad5 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json new file mode 100644 index 0000000..67c09eb --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button06.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png new file mode 100644 index 0000000..4f53cb1 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json new file mode 100644 index 0000000..8f19caf --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button07.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png new file mode 100644 index 0000000..71622ea Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json new file mode 100644 index 0000000..58af4de --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button08.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png new file mode 100644 index 0000000..77a23b4 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json new file mode 100644 index 0000000..4bba4fc --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button09.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png new file mode 100644 index 0000000..e00e7e3 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json new file mode 100644 index 0000000..83e3d75 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button10.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png new file mode 100644 index 0000000..4c431d6 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json new file mode 100644 index 0000000..f650890 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button11.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png new file mode 100644 index 0000000..f3f236a Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json new file mode 100644 index 0000000..fa01808 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button12.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png new file mode 100644 index 0000000..8b271b0 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json new file mode 100644 index 0000000..64106fd --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_button13.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png new file mode 100644 index 0000000..f75b3a1 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json new file mode 100644 index 0000000..baedfb5 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_checkmark.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/yellow_checkmark.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/yellow_checkmark.png new file mode 100644 index 0000000..95b43cc Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/yellow_checkmark.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/Contents.json new file mode 100644 index 0000000..a6b8d3f --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_circle.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/yellow_circle.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/yellow_circle.png new file mode 100644 index 0000000..1459858 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/yellow_circle.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/Contents.json new file mode 100644 index 0000000..4520ecc --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_cross.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/yellow_cross.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/yellow_cross.png new file mode 100644 index 0000000..cdd77e0 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/yellow_cross.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/Contents.json new file mode 100644 index 0000000..904e5f4 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_panel.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/yellow_panel.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/yellow_panel.png new file mode 100644 index 0000000..a377f8c Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/yellow_panel.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json new file mode 100644 index 0000000..3d22dba --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_sliderDown.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/yellow_sliderDown.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/yellow_sliderDown.png new file mode 100644 index 0000000..5b8f9d6 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/yellow_sliderDown.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json new file mode 100644 index 0000000..71fa343 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_sliderLeft.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/yellow_sliderLeft.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/yellow_sliderLeft.png new file mode 100644 index 0000000..9ec9498 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/yellow_sliderLeft.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/Contents.json new file mode 100644 index 0000000..d65ee13 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_sliderRight.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/yellow_sliderRight.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/yellow_sliderRight.png new file mode 100644 index 0000000..452ae60 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/yellow_sliderRight.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json new file mode 100644 index 0000000..8ec95ef --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_sliderUp.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/yellow_sliderUp.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/yellow_sliderUp.png new file mode 100644 index 0000000..951d291 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/yellow_sliderUp.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/Contents.json new file mode 100644 index 0000000..8860d58 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "yellow_tick.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/yellow_tick.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/yellow_tick.png new file mode 100644 index 0000000..6589596 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/yellow_tick.png differ diff --git a/GoldWars/GoldWars/GameScene.sks b/GoldWars/GoldWars/Game/GameScene.sks similarity index 100% rename from GoldWars/GoldWars/GameScene.sks rename to GoldWars/GoldWars/Game/GameScene.sks diff --git a/GoldWars/GoldWars/GameScene.swift b/GoldWars/GoldWars/Game/GameScene.swift similarity index 100% rename from GoldWars/GoldWars/GameScene.swift rename to GoldWars/GoldWars/Game/GameScene.swift diff --git a/GoldWars/GoldWars/GameViewController.swift b/GoldWars/GoldWars/GameViewController.swift index 880b8ba..90982d7 100644 --- a/GoldWars/GoldWars/GameViewController.swift +++ b/GoldWars/GoldWars/GameViewController.swift @@ -14,30 +14,14 @@ class GameViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - - // Load 'GameScene.sks' as a GKScene. This provides gameplay related content - // including entities and graphs. - if let scene = GKScene(fileNamed: "GameScene") { - - // Get the SKScene from the loaded GKScene - if let sceneNode = scene.rootNode as! GameScene? { - - // Copy gameplay related content over to the scene - sceneNode.entities = scene.entities - sceneNode.graphs = scene.graphs - - // Set the scale mode to scale to fit the window - sceneNode.scaleMode = .aspectFill - - // Present the scene - if let view = self.view as! SKView? { - view.presentScene(sceneNode) - - view.ignoresSiblingOrder = true - - view.showsFPS = true - view.showsNodeCount = true - } + + if let view = self.view as! SKView? { + if let scene = SKScene(fileNamed: "MenuScene") { + scene.scaleMode = .aspectFill + view.presentScene(scene) + //TODO: create dev profile or remove on delivery + view.showsFPS = true + view.showsNodeCount = true } } } diff --git a/GoldWars/GoldWars/Menu/MenuScene.sks b/GoldWars/GoldWars/Menu/MenuScene.sks new file mode 100644 index 0000000..735bd90 Binary files /dev/null and b/GoldWars/GoldWars/Menu/MenuScene.sks differ diff --git a/GoldWars/GoldWars/Menu/MenuScene.swift b/GoldWars/GoldWars/Menu/MenuScene.swift new file mode 100644 index 0000000..137a5d4 --- /dev/null +++ b/GoldWars/GoldWars/Menu/MenuScene.swift @@ -0,0 +1,36 @@ +// +// MenuScene.swift +// GoldWars +// +// Created by Alsen Duraki on 18.04.20. +// Copyright © 2020 SP2. All rights reserved. +// + +import SpriteKit + +class MenuScene: SKScene { + + var startGameButtonNode:SKSpriteNode! + var settingsButtonNode:SKSpriteNode! + + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + guard let touch = touches.first else { + return + } + let gameScene = GameScene(fileNamed: "GameScene")! + let location = touch.location(in: self) + let frontTouchedNode = atPoint(location).name + + let transition = SKTransition.moveIn(with: .right, duration: 1) + + if frontTouchedNode == "startGameBtn" || frontTouchedNode == "tmpStartGameLbl"{ + self.view?.presentScene(gameScene, transition: transition) + } + + if frontTouchedNode == "settingsBtn" || frontTouchedNode == "tmpSettingsLbl"{ + //TODO: Implement settings functionality + } + } + +}