Merge branch '3-hauptmenu' into 'development'
"Hauptmenü" first-steps See merge request marcel.schwarz/software-projekt-2!5
@ -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 = "<group>"; };
|
||||
110360D4244B101A008610AF /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = "<group>"; };
|
||||
110360D6244B101A008610AF /* Actions.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Actions.sks; sourceTree = "<group>"; };
|
||||
110360D8244B101A008610AF /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = "<group>"; };
|
||||
110360DA244B101A008610AF /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = "<group>"; };
|
||||
110360DD244B101A008610AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
@ -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 = "<group>"; };
|
||||
110360FA244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
11036110244B3D6A008610AF /* MenuScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = MenuScene.sks; sourceTree = "<group>"; };
|
||||
11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; };
|
||||
/* 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 = "<group>";
|
||||
};
|
||||
1103610F244B3D48008610AF /* Game */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
110360D4244B101A008610AF /* GameScene.sks */,
|
||||
110360D8244B101A008610AF /* GameScene.swift */,
|
||||
);
|
||||
path = Game;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
11036114244B3E8A008610AF /* Menu */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
11036110244B3D6A008610AF /* MenuScene.sks */,
|
||||
11036112244B3E30008610AF /* MenuScene.swift */,
|
||||
);
|
||||
path = Menu;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* 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 */,
|
||||
);
|
||||
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
@ -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"
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 768 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/yellow_boxCross.png
vendored
Normal file
After Width: | Height: | Size: 712 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png
vendored
Normal file
After Width: | Height: | Size: 963 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png
vendored
Normal file
After Width: | Height: | Size: 491 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png
vendored
Normal file
After Width: | Height: | Size: 432 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png
vendored
Normal file
After Width: | Height: | Size: 522 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png
vendored
Normal file
After Width: | Height: | Size: 458 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png
vendored
Normal file
After Width: | Height: | Size: 640 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png
vendored
Normal file
After Width: | Height: | Size: 557 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png
vendored
Normal file
After Width: | Height: | Size: 437 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png
vendored
Normal file
After Width: | Height: | Size: 426 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png
vendored
Normal file
After Width: | Height: | Size: 369 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png
vendored
Normal file
After Width: | Height: | Size: 452 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png
vendored
Normal file
After Width: | Height: | Size: 395 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png
vendored
Normal file
After Width: | Height: | Size: 563 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png
vendored
Normal file
After Width: | Height: | Size: 500 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png
vendored
Normal file
After Width: | Height: | Size: 510 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 358 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/yellow_circle.png
vendored
Normal file
After Width: | Height: | Size: 870 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/yellow_cross.png
vendored
Normal file
After Width: | Height: | Size: 290 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/yellow_panel.png
vendored
Normal file
After Width: | Height: | Size: 612 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 434 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 507 B |
@ -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"
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 498 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/yellow_sliderUp.png
vendored
Normal file
After Width: | Height: | Size: 427 B |
21
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/Contents.json
vendored
Normal file
@ -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"
|
||||
}
|
||||
}
|
BIN
GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/yellow_tick.png
vendored
Normal file
After Width: | Height: | Size: 293 B |
@ -15,29 +15,13 @@ 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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
BIN
GoldWars/GoldWars/Menu/MenuScene.sks
Normal file
36
GoldWars/GoldWars/Menu/MenuScene.swift
Normal file
@ -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<UITouch>, 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
|
||||
}
|
||||
}
|
||||
|
||||
}
|