diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index d42f8be..0ac3534 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 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 */; }; - 110360E0244B101B008610AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 110360DF244B101B008610AF /* Assets.xcassets */; }; + 110360E0244B101B008610AF /* GoldWarsAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 110360DF244B101B008610AF /* GoldWarsAssets.xcassets */; }; 110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 110360E1244B101B008610AF /* LaunchScreen.storyboard */; }; 110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; }; 11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; }; @@ -23,8 +23,13 @@ 3E6785422472CBEC007B9DE4 /* Way.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785412472CBEC007B9DE4 /* Way.swift */; }; 3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EAD889424801B6A0048A10A /* RoundTimer.swift */; }; 3EBD242E245D9332003CECE7 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD242D245D9332003CECE7 /* Team.swift */; }; + 3F37551824A5490B00F9E331 /* SnapshotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551724A5490B00F9E331 /* SnapshotModel.swift */; }; + 3F37551A24A5497300F9E331 /* RoundDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551924A5497300F9E331 /* RoundDataModel.swift */; }; + 3F37551C24A5498C00F9E331 /* NotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551B24A5498C00F9E331 /* NotificationModel.swift */; }; + 3F37551E24A54A1100F9E331 /* HeartbeatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */; }; 3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */ = {isa = PBXBuildFile; fileRef = 3F79FFDF2486F7CD003F79C3 /* Explosion.sks */; }; 3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */; }; + 3FF5DA5D24A546B600ED668F /* ModalType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF5DA5C24A546B600ED668F /* ModalType.swift */; }; 8B9CA5F1249A3C2E00561704 /* SkillButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */; }; 8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */; }; 9E0E459724796262009817A6 /* GameCenterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E0E459624796262009817A6 /* GameCenterManager.swift */; }; @@ -42,7 +47,6 @@ 9EA3ABE9245C6DAA006BC61D /* DefaultBaseComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */; }; 9EA3ABEB245C6DFA006BC61D /* BaseNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */; }; 9EC239E1246878A900952F74 /* MultiplayerNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */; }; - 9EC2FBA72476B1EC00ABF11F /* PlayerInfoComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */; }; 9EC7E48B2461FBF700396BCD /* SliderNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC7E48A2461FBF700396BCD /* SliderNode.swift */; }; 9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC86B9E245C88A300796EF3 /* Modal.swift */; }; 9EEDE02D246FCD770096C735 /* SpinningLogoEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EEDE02C246FCD770096C735 /* SpinningLogoEntity.swift */; }; @@ -77,7 +81,7 @@ 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 = ""; }; - 110360DF244B101B008610AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 110360DF244B101B008610AF /* GoldWarsAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = GoldWarsAssets.xcassets; sourceTree = ""; }; 110360E2244B101B008610AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 110360E4244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 110360E9244B101B008610AF /* GoldWarsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoldWarsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -92,8 +96,13 @@ 3E6785412472CBEC007B9DE4 /* Way.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Way.swift; sourceTree = ""; }; 3EAD889424801B6A0048A10A /* RoundTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundTimer.swift; sourceTree = ""; }; 3EBD242D245D9332003CECE7 /* Team.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Team.swift; sourceTree = ""; }; + 3F37551724A5490B00F9E331 /* SnapshotModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotModel.swift; sourceTree = ""; }; + 3F37551924A5497300F9E331 /* RoundDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundDataModel.swift; sourceTree = ""; }; + 3F37551B24A5498C00F9E331 /* NotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationModel.swift; sourceTree = ""; }; + 3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeartbeatModel.swift; sourceTree = ""; }; 3F79FFDF2486F7CD003F79C3 /* Explosion.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Explosion.sks; sourceTree = ""; }; 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundCalculatorService.swift; sourceTree = ""; }; + 3FF5DA5C24A546B600ED668F /* ModalType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalType.swift; sourceTree = ""; }; 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkillButtonNode.swift; sourceTree = ""; }; 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingeClickButtonNode.swift; sourceTree = ""; }; 9E0E459624796262009817A6 /* GameCenterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCenterManager.swift; sourceTree = ""; }; @@ -111,7 +120,6 @@ 9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultBaseComponent.swift; sourceTree = ""; wrapsLines = 1; }; 9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNode.swift; sourceTree = ""; }; 9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiplayerNetwork.swift; sourceTree = ""; }; - 9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerInfoComponent.swift; sourceTree = ""; }; 9EC7E48A2461FBF700396BCD /* SliderNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderNode.swift; sourceTree = ""; }; 9EC86B9E245C88A300796EF3 /* Modal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modal.swift; sourceTree = ""; }; 9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = GoldWars.entitlements; sourceTree = ""; }; @@ -172,31 +180,19 @@ 110360D1244B101A008610AF /* GoldWars */ = { isa = PBXGroup; children = ( - C04783ED2468583F004961FB /* intro-music.mp3 */, - 20F1990624A4FAC1004B7A30 /* attack_base.wav */, - 20F1990424A4FAC1004B7A30 /* new_round.wav */, - 20F1990524A4FAC1004B7A30 /* use_boost.wav */, - 9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */, - 9E11FF74245CD79100EED3BE /* Partikels */, - 116060F5245C5709004E5A36 /* Entities */, - AB1D759E245DD2EA00671525 /* Map */, + 3F003F3924A5589E00B5ACEA /* Assets */, 116060F4245C56EA004E5A36 /* Components */, + 116060F5245C5709004E5A36 /* Entities */, 9EC86BA2245C89B200796EF3 /* Enums */, + AB1D759E245DD2EA00671525 /* Map */, + 3F37551624A548D900F9E331 /* Models */, 9EC86BA4245C8A1E00796EF3 /* Scenes */, + 3FF5DA5B24A5464E00ED668F /* Services */, 9EC86BA3245C89F400796EF3 /* Storyboards */, 110360D2244B101A008610AF /* AppDelegate.swift */, - C05FAED52468559D0006AF2E /* SoundManager.swift */, 110360DA244B101A008610AF /* GameViewController.swift */, - 110360DF244B101B008610AF /* Assets.xcassets */, - 9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */, - C099579B246C5E5C0016AA22 /* DataService.swift */, 110360E4244B101B008610AF /* Info.plist */, - 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */, - 9E0E459624796262009817A6 /* GameCenterManager.swift */, - C04783EF24685995004961FB /* SettingsScene.swift */, - 3EAD889424801B6A0048A10A /* RoundTimer.swift */, - AB671B242494ECF0003FBE8D /* EloHelper.swift */, - AE0C8E2E249BCC2A00996360 /* RulesScene.swift */, + 9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */, ); path = GoldWars; sourceTree = ""; @@ -213,20 +209,13 @@ 116060F4245C56EA004E5A36 /* Components */ = { isa = PBXGroup; children = ( + 3F37551F24A54A8200F9E331 /* Nodes */, 9E174C87245DF1FF00209FF0 /* BackgroundComponent.swift */, - 9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */, 9E174C85245DD91500209FF0 /* ButtonComponent.swift */, - 9E174C81245DD81D00209FF0 /* ButtonNode.swift */, 9EA3ABE8245C6DAA006BC61D /* DefaultBaseComponent.swift */, C064E9A9246C114C0022B228 /* LabelComponent.swift */, - C064E9A7246C0EA50022B228 /* LabelNode.swift */, - 9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */, - 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */, - 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */, C05BB9C3247D890C00411249 /* SliderComponent.swift */, - 9EC7E48A2461FBF700396BCD /* SliderNode.swift */, 9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */, - 9E61EAC6249BB61A00334DDE /* SpinningLogo3DNode.swift */, ); path = Components; sourceTree = ""; @@ -247,6 +236,66 @@ path = Entities; sourceTree = ""; }; + 3F003F3924A5589E00B5ACEA /* Assets */ = { + isa = PBXGroup; + children = ( + 3F003F3A24A5590100B5ACEA /* Music */, + 9E11FF74245CD79100EED3BE /* Partikels */, + 110360DF244B101B008610AF /* GoldWarsAssets.xcassets */, + ); + path = Assets; + sourceTree = ""; + }; + 3F003F3A24A5590100B5ACEA /* Music */ = { + isa = PBXGroup; + children = ( + C04783ED2468583F004961FB /* intro-music.mp3 */, + 20F1990624A4FAC1004B7A30 /* attack_base.wav */, + 20F1990424A4FAC1004B7A30 /* new_round.wav */, + 20F1990524A4FAC1004B7A30 /* use_boost.wav */, + ); + path = Music; + sourceTree = ""; + }; + 3F37551624A548D900F9E331 /* Models */ = { + isa = PBXGroup; + children = ( + 3F37551724A5490B00F9E331 /* SnapshotModel.swift */, + 3F37551924A5497300F9E331 /* RoundDataModel.swift */, + 3F37551B24A5498C00F9E331 /* NotificationModel.swift */, + 3F37551D24A54A1100F9E331 /* HeartbeatModel.swift */, + ); + path = Models; + sourceTree = ""; + }; + 3F37551F24A54A8200F9E331 /* Nodes */ = { + isa = PBXGroup; + children = ( + 9EA3ABEA245C6DFA006BC61D /* BaseNode.swift */, + 9E174C81245DD81D00209FF0 /* ButtonNode.swift */, + C064E9A7246C0EA50022B228 /* LabelNode.swift */, + 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */, + 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */, + 9EC7E48A2461FBF700396BCD /* SliderNode.swift */, + 9E61EAC6249BB61A00334DDE /* SpinningLogo3DNode.swift */, + ); + path = Nodes; + sourceTree = ""; + }; + 3FF5DA5B24A5464E00ED668F /* Services */ = { + isa = PBXGroup; + children = ( + 9E0E459624796262009817A6 /* GameCenterManager.swift */, + C05FAED52468559D0006AF2E /* SoundManager.swift */, + C099579B246C5E5C0016AA22 /* DataService.swift */, + AB671B242494ECF0003FBE8D /* EloHelper.swift */, + 9EC239E0246878A900952F74 /* MultiplayerNetwork.swift */, + 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */, + 3EAD889424801B6A0048A10A /* RoundTimer.swift */, + ); + path = Services; + sourceTree = ""; + }; 9E11FF74245CD79100EED3BE /* Partikels */ = { isa = PBXGroup; children = ( @@ -269,6 +318,7 @@ isa = PBXGroup; children = ( 3EBD242D245D9332003CECE7 /* Team.swift */, + 3FF5DA5C24A546B600ED668F /* ModalType.swift */, ); path = Enums; sourceTree = ""; @@ -287,6 +337,8 @@ children = ( 11036112244B3E30008610AF /* MenuScene.swift */, 110360D8244B101A008610AF /* GameScene.swift */, + C04783EF24685995004961FB /* SettingsScene.swift */, + AE0C8E2E249BCC2A00996360 /* RulesScene.swift */, ); path = Scenes; sourceTree = ""; @@ -386,7 +438,7 @@ 20F1990924A4FAC1004B7A30 /* attack_base.wav in Resources */, 9E11FF79245CD81100EED3BE /* Fire.sks in Resources */, 20F1990724A4FAC1004B7A30 /* new_round.wav in Resources */, - 110360E0244B101B008610AF /* Assets.xcassets in Resources */, + 110360E0244B101B008610AF /* GoldWarsAssets.xcassets in Resources */, 110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */, 9E61EAC4249BAC9100334DDE /* LoserFire.sks in Resources */, 20F1990824A4FAC1004B7A30 /* use_boost.wav in Resources */, @@ -409,7 +461,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3F37551A24A5497300F9E331 /* RoundDataModel.swift in Sources */, 9E78ACB8245CB75B00526FF7 /* TeamComponent.swift in Sources */, + 3FF5DA5D24A546B600ED668F /* ModalType.swift in Sources */, 9E0E459724796262009817A6 /* GameCenterManager.swift in Sources */, 3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */, 9EC239E1246878A900952F74 /* MultiplayerNetwork.swift in Sources */, @@ -422,12 +476,13 @@ 3EBD242E245D9332003CECE7 /* Team.swift in Sources */, 9E174C88245DF1FF00209FF0 /* BackgroundComponent.swift in Sources */, 9E78ACBA245CBDAF00526FF7 /* HUD.swift in Sources */, - 9EC2FBA72476B1EC00ABF11F /* PlayerInfoComponent.swift in Sources */, 9EEDE02D246FCD770096C735 /* SpinningLogoEntity.swift in Sources */, 9E174C86245DD91500209FF0 /* ButtonComponent.swift in Sources */, AB671B252494ECF0003FBE8D /* EloHelper.swift in Sources */, 11036113244B3E30008610AF /* MenuScene.swift in Sources */, + 3F37551824A5490B00F9E331 /* SnapshotModel.swift in Sources */, C099579C246C5E5C0016AA22 /* DataService.swift in Sources */, + 3F37551E24A54A1100F9E331 /* HeartbeatModel.swift in Sources */, AB21D7D5246C748A00B09CBA /* MapFactory.swift in Sources */, 9EA3ABE9245C6DAA006BC61D /* DefaultBaseComponent.swift in Sources */, 9E174C8A245E1A0A00209FF0 /* Background.swift in Sources */, @@ -448,6 +503,7 @@ C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */, 110360D3244B101A008610AF /* AppDelegate.swift in Sources */, 9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */, + 3F37551C24A5498C00F9E331 /* NotificationModel.swift in Sources */, C05FAED62468559D0006AF2E /* SoundManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/README.txt b/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/README.txt deleted file mode 100644 index 8177749..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/README.txt +++ /dev/null @@ -1,23 +0,0 @@ - -The different image sizes are used for: - -App Store: logo.png -iPad Pro - App Icon: logo_167.png -iPad, iPad Mini - App Icon: logo_152.png -iPad (all) - Spotlight: logo_80.png -iPad (all) - Settings: logo_58.png -iPad (all) - Notifications: logo_40.png - - -Color Codes: - -Coin: - Main: #ae841a - Edges: #daa520 (goldenrod) - -Background flow: - From: #a9003c - To: #2f0011 - - -The logo.svg file is a vectorized version of the coin without the background. \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.svg b/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.svg deleted file mode 100644 index e383582..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Backgorund.png b/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Backgorund.png deleted file mode 100644 index 1137158..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Backgorund.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@2x.png b/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@2x.png deleted file mode 100644 index 0bc9d0f..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@2x.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@3x.png b/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@3x.png deleted file mode 100644 index 064e40c..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Background@3x.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Contents.json deleted file mode 100644 index 1029a8b..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/Background.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Backgorund.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Background@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Background@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} 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 deleted file mode 100644 index 987af42..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 72fe388..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCheckmark.imageset/yellow_boxCheckmark.png and /dev/null 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 deleted file mode 100644 index a595e6a..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index be0df40..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxCross.imageset/yellow_boxCross.png and /dev/null 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 deleted file mode 100644 index baedfb5..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 95b43cc..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_checkmark.imageset/yellow_checkmark.png and /dev/null 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 deleted file mode 100644 index a6b8d3f..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 1459858..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_circle.imageset/yellow_circle.png and /dev/null 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 deleted file mode 100644 index 4520ecc..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index cdd77e0..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_cross.imageset/yellow_cross.png and /dev/null 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 deleted file mode 100644 index 904e5f4..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index a377f8c..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_panel.imageset/yellow_panel.png and /dev/null 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 deleted file mode 100644 index 3d22dba..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 5b8f9d6..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderDown.imageset/yellow_sliderDown.png and /dev/null 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 deleted file mode 100644 index 71fa343..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 9ec9498..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderLeft.imageset/yellow_sliderLeft.png and /dev/null 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 deleted file mode 100644 index d65ee13..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 452ae60..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderRight.imageset/yellow_sliderRight.png and /dev/null 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 deleted file mode 100644 index 8ec95ef..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 951d291..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_sliderUp.imageset/yellow_sliderUp.png and /dev/null 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 deleted file mode 100644 index 8860d58..0000000 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 6589596..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_tick.imageset/yellow_tick.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/Contents.json similarity index 55% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/Contents.json index 609d5d4..50b16cd 100644 --- a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/Contents.json @@ -2,107 +2,107 @@ "images" : [ { "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "idiom" : "ipad", - "size" : "20x20", "filename" : "logo_20.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" }, { - "idiom" : "ipad", - "size" : "20x20", "filename" : "logo_40.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" }, { - "idiom" : "ipad", - "size" : "29x29", "filename" : "logo_29.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" }, { - "idiom" : "ipad", - "size" : "29x29", "filename" : "logo_58.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" }, { - "idiom" : "ipad", - "size" : "40x40", "filename" : "logo_40.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "idiom" : "ipad", - "size" : "40x40", "filename" : "logo_80.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" }, { - "idiom" : "ipad", - "size" : "76x76", "filename" : "logo_76.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" }, { - "idiom" : "ipad", - "size" : "76x76", "filename" : "logo_152.png", - "scale" : "2x" - }, - { "idiom" : "ipad", - "size" : "83.5x83.5", - "filename" : "logo_167.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "logo_167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" }, { - "idiom" : "ios-marketing", - "size" : "1024x1024", "filename" : "logo.png", - "scale" : "1x" + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_152.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_152.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_152.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_152.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_167.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_167.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_167.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_167.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_20.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_20.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_20.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_20.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_29.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_29.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_29.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_29.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_40.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_40.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_40.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_40.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_58.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_58.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_58.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_58.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_76.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_76.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_76.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_76.png diff --git a/GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_80.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_80.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/AppIcon.appiconset/logo_80.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/AppIcon.appiconset/logo_80.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Base.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Base_2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/BaseTexture_2.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/ModalBackground.imageset/ModalBackground.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldLettering.imageset/goldLettering.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/goldWarsLettering.imageset/goldWarsName.png diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/logo_no_background.imageset/logo_no_background.png diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/warsLettering.imageset/warsLettering.png diff --git a/GoldWars/GoldWars/Assets.xcassets/winner.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/winner.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/winner.imageset/winner.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/GW/winner.imageset/winner.png diff --git a/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/atk_button.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/atk_button.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/atk_button.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/atk_button.imageset/atk_button.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/atk_button.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/atk_button.imageset/atk_button.png diff --git a/GoldWars/GoldWars/Assets.xcassets/def_button.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/def_button.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/def_button.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/def_button.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/def_button.imageset/def_button.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/def_button.imageset/def_button.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/def_button.imageset/def_button.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/def_button.imageset/def_button.png diff --git a/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/spy_button.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/spy_button.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/spy_button.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/spy_button.imageset/spy_button.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/spy_button.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/HUD/spy_button.imageset/spy_button.png diff --git a/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/Credits.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Credits.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/Credits.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Credits.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/Credits.imageset/Credits.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Credits.imageset/Credits.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/Credits.imageset/Credits.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/Credits.imageset/Credits.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesBasen.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBasen.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesBasen.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBasen.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesBasen.imageset/RulesBasen.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBasen.imageset/RulesBasen.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesBasen.imageset/RulesBasen.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBasen.imageset/RulesBasen.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesBoost.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBoost.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesBoost.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBoost.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesBoost.imageset/RulesBoost.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBoost.imageset/RulesBoost.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesBoost.imageset/RulesBoost.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesBoost.imageset/RulesBoost.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesEinheiten.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesEinheiten.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesEinheiten.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesEinheiten.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesEinheiten.imageset/RulesEinheiten.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesEinheiten.imageset/RulesEinheiten.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesEinheiten.imageset/RulesEinheiten.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesEinheiten.imageset/RulesEinheiten.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesErfolge.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesErfolge.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesErfolge.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesErfolge.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesErfolge.imageset/RulesErfolge.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesErfolge.imageset/RulesErfolge.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesErfolge.imageset/RulesErfolge.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesErfolge.imageset/RulesErfolge.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesSpiel.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpiel.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesSpiel.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpiel.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesSpiel.imageset/RulesSpiel.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpiel.imageset/RulesSpiel.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesSpiel.imageset/RulesSpiel.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpiel.imageset/RulesSpiel.png diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesSpielende.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpielende.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesSpielende.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpielende.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/RulesSpielende.imageset/RulesSpielende.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpielende.imageset/RulesSpielende.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/RulesSpielende.imageset/RulesSpielende.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/Rules/RulesSpielende.imageset/RulesSpielende.png diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/SkyBackground.imageset/SkyBackground.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button.imageset/gold_button00.png diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_2.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_2.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/gold_button_2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_2.imageset/gold_button_2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/gold_button_2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_2.imageset/gold_button_2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_3.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_3.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_3.imageset/gold_button_3.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/gold_button_3.imageset/gold_button_3.png diff --git a/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/questionmark.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/questionmark.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/questionmark.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/questionmark.imageset/questionmark.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/questionmark.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/questionmark.imageset/questionmark.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture-1.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture-1.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture-1.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture-1.png diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture-2.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture-2.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture-2.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture-2.png diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/roundInfo_texture.imageset/roundInfo_texture.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/roundInfo_texture.imageset/roundInfo_texture.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_boxTick.imageset/yellow_boxTick.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json similarity index 85% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json index 21140b0..130c74e 100644 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/Contents.json @@ -1,8 +1,8 @@ { "images" : [ { - "idiom" : "universal", "filename" : "yellow_button00.png", + "idiom" : "universal", "scale" : "1x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ 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/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button00.imageset/yellow_button00.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json similarity index 85% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json index 0895953..a14762e 100644 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/Contents.json @@ -1,8 +1,8 @@ { "images" : [ { - "idiom" : "universal", "filename" : "yellow_button01.png", + "idiom" : "universal", "scale" : "1x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ 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/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button01.imageset/yellow_button01.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json similarity index 85% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json index 457c9fb..62b81c2 100644 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/Contents.json @@ -1,8 +1,8 @@ { "images" : [ { - "idiom" : "universal", "filename" : "yellow_button02.png", + "idiom" : "universal", "scale" : "1x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ 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/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button02.imageset/yellow_button02.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json similarity index 85% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json index 6aa93af..9b97bc8 100644 --- a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/Contents.json @@ -1,8 +1,8 @@ { "images" : [ { - "idiom" : "universal", "filename" : "yellow_button03.png", + "idiom" : "universal", "scale" : "1x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ 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/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button03.imageset/yellow_button03.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button04.imageset/yellow_button04.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button05.imageset/yellow_button05.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button06.imageset/yellow_button06.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button07.imageset/yellow_button07.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button08.imageset/yellow_button08.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button09.imageset/yellow_button09.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button10.imageset/yellow_button10.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button11.imageset/yellow_button11.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button12.imageset/yellow_button12.png diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/UITexture.spriteatlas/yellow_button13.imageset/yellow_button13.png diff --git a/GoldWars/GoldWars/Assets.xcassets/spark.imageset/Contents.json b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/spark.imageset/Contents.json similarity index 100% rename from GoldWars/GoldWars/Assets.xcassets/spark.imageset/Contents.json rename to GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/spark.imageset/Contents.json diff --git a/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/spark.imageset/spark.png b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/spark.imageset/spark.png new file mode 100644 index 0000000..acb709e Binary files /dev/null and b/GoldWars/GoldWars/Assets/GoldWarsAssets.xcassets/spark.imageset/spark.png differ diff --git a/GoldWars/GoldWars/attack_base.wav b/GoldWars/GoldWars/Assets/Music/attack_base.wav similarity index 100% rename from GoldWars/GoldWars/attack_base.wav rename to GoldWars/GoldWars/Assets/Music/attack_base.wav diff --git a/GoldWars/GoldWars/intro-music.mp3 b/GoldWars/GoldWars/Assets/Music/intro-music.mp3 similarity index 100% rename from GoldWars/GoldWars/intro-music.mp3 rename to GoldWars/GoldWars/Assets/Music/intro-music.mp3 diff --git a/GoldWars/GoldWars/new_round.wav b/GoldWars/GoldWars/Assets/Music/new_round.wav similarity index 100% rename from GoldWars/GoldWars/new_round.wav rename to GoldWars/GoldWars/Assets/Music/new_round.wav diff --git a/GoldWars/GoldWars/use_boost.wav b/GoldWars/GoldWars/Assets/Music/use_boost.wav similarity index 100% rename from GoldWars/GoldWars/use_boost.wav rename to GoldWars/GoldWars/Assets/Music/use_boost.wav diff --git a/GoldWars/GoldWars/Partikels/Explosion.sks b/GoldWars/GoldWars/Assets/Partikels/Explosion.sks similarity index 100% rename from GoldWars/GoldWars/Partikels/Explosion.sks rename to GoldWars/GoldWars/Assets/Partikels/Explosion.sks diff --git a/GoldWars/GoldWars/Partikels/Fire.sks b/GoldWars/GoldWars/Assets/Partikels/Fire.sks similarity index 92% rename from GoldWars/GoldWars/Partikels/Fire.sks rename to GoldWars/GoldWars/Assets/Partikels/Fire.sks index 93a4b74..6c1db2a 100644 Binary files a/GoldWars/GoldWars/Partikels/Fire.sks and b/GoldWars/GoldWars/Assets/Partikels/Fire.sks differ diff --git a/GoldWars/GoldWars/Partikels/LoserFire.sks b/GoldWars/GoldWars/Assets/Partikels/LoserFire.sks similarity index 100% rename from GoldWars/GoldWars/Partikels/LoserFire.sks rename to GoldWars/GoldWars/Assets/Partikels/LoserFire.sks diff --git a/GoldWars/GoldWars/Components/BackgroundComponent.swift b/GoldWars/GoldWars/Components/BackgroundComponent.swift index f74d5dd..2c52aae 100644 --- a/GoldWars/GoldWars/Components/BackgroundComponent.swift +++ b/GoldWars/GoldWars/Components/BackgroundComponent.swift @@ -9,11 +9,11 @@ import GameplayKit class BackgroundComponent: GKComponent{ - + var nodes = [SKSpriteNode]() let size: CGSize static var isMovingBackgroundEnabled = true - + init(size: CGSize) { self.size = size for i in 0...2 { @@ -25,9 +25,9 @@ class BackgroundComponent: GKComponent{ nodes.append(sky) } super.init() - } - - func update(){ + } + + func update() { if BackgroundComponent.isMovingBackgroundEnabled { for node in nodes{ node.position.x -= 2 @@ -37,9 +37,8 @@ class BackgroundComponent: GKComponent{ } } } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - } diff --git a/GoldWars/GoldWars/Components/BaseNode.swift b/GoldWars/GoldWars/Components/BaseNode.swift deleted file mode 100644 index 00da238..0000000 --- a/GoldWars/GoldWars/Components/BaseNode.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// BaseNode.swift -// GoldWars -// -// Created by Niko Jochim on 01.05.20. -// Copyright © 2020 SP2. All rights reserved. -// - -import SpriteKit - -class BaseNode: SKSpriteNode{ - - override func touchesBegan(_ touches: Set, with event: UIEvent?) { - // TODO: PopUp Einheiten + Close PopUp - self.run( - SKAction.sequence( - [ - SKAction.resize(byWidth: 20, height: 20, duration: 0.5), - SKAction.resize(byWidth: -20, height: -20, duration: 0.5) - ] - ) - ) - } - - override func touchesMoved(_ touches: Set, with event: UIEvent?) { - // TODO: zeige Angirff Effect - } - - override func touchesEnded(_ touches: Set, with event: UIEvent?) { - // TODO: Open Slider PopUp - } - - -} diff --git a/GoldWars/GoldWars/Components/ButtonComponent.swift b/GoldWars/GoldWars/Components/ButtonComponent.swift index 0597f40..ecba6bd 100644 --- a/GoldWars/GoldWars/Components/ButtonComponent.swift +++ b/GoldWars/GoldWars/Components/ButtonComponent.swift @@ -9,10 +9,10 @@ import GameplayKit class ButtonComponent: GKComponent { - + var buttonNode: ButtonNode - - init(textureName: String, text: String, position: CGPoint, isEnabled:Bool, onButtonPress: @escaping () -> ()) { + + init(textureName: String, text: String, position: CGPoint, isEnabled:Bool, onButtonPress: @escaping () -> ()){ buttonNode = ButtonNode(textureName: textureName, text: text, isEnabled: isEnabled, diff --git a/GoldWars/GoldWars/Components/DefaultBaseComponent.swift b/GoldWars/GoldWars/Components/DefaultBaseComponent.swift index 59a1f58..3ed1874 100644 --- a/GoldWars/GoldWars/Components/DefaultBaseComponent.swift +++ b/GoldWars/GoldWars/Components/DefaultBaseComponent.swift @@ -11,6 +11,7 @@ import SpriteKit import GameKit class DefaultBaseComponent: GKComponent { + var spriteNode: BaseNode init(texture: SKTexture, position: CGPoint) { diff --git a/GoldWars/GoldWars/Components/LabelComponent.swift b/GoldWars/GoldWars/Components/LabelComponent.swift index aa57816..96ba377 100644 --- a/GoldWars/GoldWars/Components/LabelComponent.swift +++ b/GoldWars/GoldWars/Components/LabelComponent.swift @@ -9,6 +9,7 @@ import GameplayKit class LabelComponent: GKComponent { + var labelNode: LabelNode init(fontnamed: String?, name: String, text: String, fontSize: CGFloat, fontColor: UIColor, position: CGPoint, horizontalAlignmentMode: SKLabelHorizontalAlignmentMode, vertikalAligmentMode: SKLabelVerticalAlignmentMode, isAnimationEnabled: Bool, isAnimationInfinite: Bool) { diff --git a/GoldWars/GoldWars/Components/Nodes/BaseNode.swift b/GoldWars/GoldWars/Components/Nodes/BaseNode.swift new file mode 100644 index 0000000..1744920 --- /dev/null +++ b/GoldWars/GoldWars/Components/Nodes/BaseNode.swift @@ -0,0 +1,23 @@ +// +// BaseNode.swift +// GoldWars +// +// Created by Niko Jochim on 01.05.20. +// Copyright © 2020 SP2. All rights reserved. +// + +import SpriteKit + +class BaseNode: SKSpriteNode{ + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + self.run( + SKAction.sequence( + [ + SKAction.resize(byWidth: 20, height: 20, duration: 0.5), + SKAction.resize(byWidth: -20, height: -20, duration: 0.5) + ] + ) + ) + } +} diff --git a/GoldWars/GoldWars/Components/ButtonNode.swift b/GoldWars/GoldWars/Components/Nodes/ButtonNode.swift similarity index 67% rename from GoldWars/GoldWars/Components/ButtonNode.swift rename to GoldWars/GoldWars/Components/Nodes/ButtonNode.swift index 786a4aa..493ca58 100644 --- a/GoldWars/GoldWars/Components/ButtonNode.swift +++ b/GoldWars/GoldWars/Components/Nodes/ButtonNode.swift @@ -9,8 +9,8 @@ import SpriteKit class ButtonNode: SKSpriteNode { - - var isEnabled: Bool{ + + var isEnabled: Bool { didSet{ if isEnabled { self.alpha = 1 @@ -18,12 +18,12 @@ class ButtonNode: SKSpriteNode { } else { self.alpha = 0.3 self.childNode(withName: "label")?.alpha = 0.3 - } + } } } var label: SKLabelNode var onButtonPress: () -> () - + init(textureName: String, text: String, isEnabled: Bool, position: CGPoint, onButtonPress: @escaping () -> ()) { self.onButtonPress = onButtonPress self.isEnabled = isEnabled @@ -42,30 +42,29 @@ class ButtonNode: SKSpriteNode { self.addChild(label) isUserInteractionEnabled = true - } + } func setTexture(textureName: String) { super.texture = SKTexture(imageNamed: textureName) } - - override func touchesBegan(_ touches: Set, with event: UIEvent?) { - if isEnabled { - let action = SKAction.sequence( - [ - SKAction.scale(by: (3/4), duration: 0.3), - SKAction.scale(by: (4/3), duration: 0.3), - ] - ) - - self.childNode(withName: "label")?.run(action) - self.run(action) - onButtonPress() + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + if isEnabled { + let action = SKAction.sequence( + [ + SKAction.scale(by: (3/4), duration: 0.3), + SKAction.scale(by: (4/3), duration: 0.3), + ] + ) + + self.childNode(withName: "label")?.run(action) + self.run(action) + onButtonPress() + } } - } - - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + } diff --git a/GoldWars/GoldWars/Components/LabelNode.swift b/GoldWars/GoldWars/Components/Nodes/LabelNode.swift similarity index 99% rename from GoldWars/GoldWars/Components/LabelNode.swift rename to GoldWars/GoldWars/Components/Nodes/LabelNode.swift index 669a0b5..7f7c138 100644 --- a/GoldWars/GoldWars/Components/LabelNode.swift +++ b/GoldWars/GoldWars/Components/Nodes/LabelNode.swift @@ -9,6 +9,7 @@ import SpriteKit class LabelNode: SKNode { + let colt = SKLabelNode() var labels = [SKLabelNode]() var text = "" { diff --git a/GoldWars/GoldWars/Components/SingeClickButtonNode.swift b/GoldWars/GoldWars/Components/Nodes/SingeClickButtonNode.swift similarity index 98% rename from GoldWars/GoldWars/Components/SingeClickButtonNode.swift rename to GoldWars/GoldWars/Components/Nodes/SingeClickButtonNode.swift index 8b10a71..f48025c 100644 --- a/GoldWars/GoldWars/Components/SingeClickButtonNode.swift +++ b/GoldWars/GoldWars/Components/Nodes/SingeClickButtonNode.swift @@ -14,5 +14,4 @@ class SingeClickButtonNode: ButtonNode { super.touchesBegan(touches, with: event) self.isEnabled = false } - } diff --git a/GoldWars/GoldWars/Components/SkillButtonNode.swift b/GoldWars/GoldWars/Components/Nodes/SkillButtonNode.swift similarity index 95% rename from GoldWars/GoldWars/Components/SkillButtonNode.swift rename to GoldWars/GoldWars/Components/Nodes/SkillButtonNode.swift index 069b9d5..69c42d8 100644 --- a/GoldWars/GoldWars/Components/SkillButtonNode.swift +++ b/GoldWars/GoldWars/Components/Nodes/SkillButtonNode.swift @@ -10,7 +10,6 @@ import SpriteKit class SkillButtonNode: ButtonNode { - var cooldownCounter = 0 var hasCooled: Bool = false let cooldown: Int @@ -22,7 +21,6 @@ class SkillButtonNode: ButtonNode { super.init(textureName: textureName, text: text, isEnabled: isEnabled, position: position, onButtonPress: onButtonPress) } - override func touchesBegan(_ touches: Set, with event: UIEvent?) { super.touchesBegan(touches, with: event) super.isEnabled = false @@ -49,8 +47,7 @@ class SkillButtonNode: ButtonNode { } } - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") + fatalError("init(coder:) has not been implemented") } } diff --git a/GoldWars/GoldWars/Components/SliderNode.swift b/GoldWars/GoldWars/Components/Nodes/SliderNode.swift similarity index 85% rename from GoldWars/GoldWars/Components/SliderNode.swift rename to GoldWars/GoldWars/Components/Nodes/SliderNode.swift index 6919d20..4fe6bf2 100644 --- a/GoldWars/GoldWars/Components/SliderNode.swift +++ b/GoldWars/GoldWars/Components/Nodes/SliderNode.swift @@ -8,12 +8,11 @@ import SpriteKit - -class SliderNode :SKNode { +class SliderNode: SKNode { - var sliderLine :SKShapeNode - var hiddenKnob :SliderKnob - var silderKnob :SKSpriteNode + var sliderLine: SKShapeNode + var hiddenKnob: SliderKnob + var silderKnob: SKSpriteNode var width: CGFloat var getValue: CGFloat{ @@ -30,7 +29,7 @@ class SliderNode :SKNode { sliderLine.fillColor = SKColor.white sliderLine.zPosition = 4 - hiddenKnob = SliderKnob(circleOfRadius: 58 ) + hiddenKnob = SliderKnob(circleOfRadius: 58) hiddenKnob.min = position.x - width / 2 hiddenKnob.max = position.x + width / 2 hiddenKnob.fillColor = SKColor.red @@ -50,7 +49,6 @@ class SliderNode :SKNode { required init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } - } class SliderKnob: SKShapeNode { @@ -62,14 +60,14 @@ class SliderKnob: SKShapeNode { for touch in touches { let touchLocation = touch.location(in: self.scene!) - if self.position.x >= min - 1 && self.position.x <= max + 1{ + if self.position.x >= min - 1 && self.position.x <= max + 1 { self.position.x = touchLocation.x } - if(self.position.x <= min){ + if self.position.x <= min { self.position.x = min } - if(self.position.x >= max){ + if self.position.x >= max { self.position.x = max } diff --git a/GoldWars/GoldWars/Components/Nodes/SpinningLogo3DNode.swift b/GoldWars/GoldWars/Components/Nodes/SpinningLogo3DNode.swift new file mode 100644 index 0000000..d9af88f --- /dev/null +++ b/GoldWars/GoldWars/Components/Nodes/SpinningLogo3DNode.swift @@ -0,0 +1,41 @@ +// +// SpinningLogo3DNode.swift +// GoldWars +// +// Created by Niko Jochim on 18.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +import Foundation +import SpriteKit +import GameKit + +class SpinningLogo3DNode: SK3DNode { + + init() { + super.init(viewportSize: CGSize(width: 250, height: 250)) + let scnScene: SCNScene = { + let scnScene = SCNScene() + let cylinder = SCNCylinder(radius: 250, height: 50) + let logoMaterial = SCNMaterial() + let colorMaterial = SCNMaterial() + logoMaterial.diffuse.contents = UIImage(named: "logo_no_background") + colorMaterial.diffuse.contents = UIColor(red: 0.852, green: 0.649, blue: 0.123, alpha: 1) + cylinder.materials = [colorMaterial,logoMaterial,logoMaterial] + let cylinderNode = SCNNode(geometry: cylinder) + cylinderNode.eulerAngles = SCNVector3(x: Float(CGFloat.pi / 2), y: 0, z: Float(CGFloat.pi / 2)) + let action = SCNAction.rotateBy(x: CGFloat(GLKMathDegreesToRadians(360)), y:0 , z: 0, duration: 8) + let forever = SCNAction.repeatForever(action) + cylinderNode.runAction(forever) + scnScene.rootNode.addChildNode(cylinderNode) + return scnScene + }() + self.scnScene = scnScene + self.position = position + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} + diff --git a/GoldWars/GoldWars/Components/PlayerInfoComponent.swift b/GoldWars/GoldWars/Components/PlayerInfoComponent.swift deleted file mode 100644 index 6b57cda..0000000 --- a/GoldWars/GoldWars/Components/PlayerInfoComponent.swift +++ /dev/null @@ -1,12 +0,0 @@ -// -// PlayerInfoComponent.swift -// GoldWars -// -// Created by Niko Jochim on 21.05.20. -// Copyright © 2020 SP2. All rights reserved. -// - -import Foundation -import GameplayKit -import GameKit - diff --git a/GoldWars/GoldWars/Components/SliderComponent.swift b/GoldWars/GoldWars/Components/SliderComponent.swift index e681e70..6c718c8 100644 --- a/GoldWars/GoldWars/Components/SliderComponent.swift +++ b/GoldWars/GoldWars/Components/SliderComponent.swift @@ -10,15 +10,15 @@ import GameplayKit class SliderComponent: GKComponent { - + var sliderNode: SliderNode - + init(width: CGFloat, position: CGPoint) { sliderNode = SliderNode(width: width, position: position) sliderNode.zPosition = 5 super.init() } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } diff --git a/GoldWars/GoldWars/Components/SpinningLogo3DNode.swift b/GoldWars/GoldWars/Components/SpinningLogo3DNode.swift deleted file mode 100644 index 72a2638..0000000 --- a/GoldWars/GoldWars/Components/SpinningLogo3DNode.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// SpinningLogo3DNode.swift -// GoldWars -// -// Created by Niko Jochim on 18.06.20. -// Copyright © 2020 SP2. All rights reserved. -// - -import Foundation -import SpriteKit -import GameKit -class SpinningLogo3DNode : SK3DNode { - - init() { - super.init(viewportSize: CGSize(width: 250, height: 250)) - let scnScene: SCNScene = { - let scnScene = SCNScene() - let cylinder = SCNCylinder(radius: 250, height: 50) - let logoMaterial = SCNMaterial() - let colorMaterial = SCNMaterial() - logoMaterial.diffuse.contents = UIImage(named: "logo_no_background") - colorMaterial.diffuse.contents = UIColor(red: 0.852, green: 0.649, blue: 0.123, alpha: 1) - cylinder.materials = [colorMaterial,logoMaterial,logoMaterial] - let cylinderNode = SCNNode(geometry: cylinder) - cylinderNode.eulerAngles = SCNVector3(x: Float(CGFloat.pi / 2), y: 0, z: Float(CGFloat.pi / 2)) - let action = SCNAction.rotateBy(x: CGFloat(GLKMathDegreesToRadians(360)), y:0 , z: 0, duration: 8) - let forever = SCNAction.repeatForever(action) - cylinderNode.runAction(forever) - scnScene.rootNode.addChildNode(cylinderNode) - return scnScene - }() - self.scnScene = scnScene - self.position = position - } - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } -} - diff --git a/GoldWars/GoldWars/Entities/Background.swift b/GoldWars/GoldWars/Entities/Background.swift index 6cc1b74..b3e447b 100644 --- a/GoldWars/GoldWars/Entities/Background.swift +++ b/GoldWars/GoldWars/Entities/Background.swift @@ -9,16 +9,16 @@ import GameplayKit class Background: GKEntity { - + init(size: CGSize) { super.init() addComponent(BackgroundComponent(size: size)) } - + override func update(deltaTime seconds: TimeInterval) { - component(ofType: BackgroundComponent.self)?.update() + component(ofType: BackgroundComponent.self)?.update() } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } diff --git a/GoldWars/GoldWars/Entities/Base.swift b/GoldWars/GoldWars/Entities/Base.swift index 8166bad..072eb62 100644 --- a/GoldWars/GoldWars/Entities/Base.swift +++ b/GoldWars/GoldWars/Entities/Base.swift @@ -10,7 +10,7 @@ import SpriteKit import GameplayKit import GameKit -class Base: GKEntity{ +class Base: GKEntity { static var BASE_ID_COUNT: Int = 0 var unitCount: Int var hasAttackBoost = false @@ -67,5 +67,4 @@ class Base: GKEntity{ required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - } diff --git a/GoldWars/GoldWars/Entities/Button.swift b/GoldWars/GoldWars/Entities/Button.swift index cbc4b34..53eba03 100644 --- a/GoldWars/GoldWars/Entities/Button.swift +++ b/GoldWars/GoldWars/Entities/Button.swift @@ -8,11 +8,11 @@ import GameKit -class Button: GKEntity{ +class Button: GKEntity { let name: String var isEnabled = true - + init(name: String, textureName: String, text: String, position: CGPoint, onButtonPress: @escaping () -> ()) { self.name = name super.init() diff --git a/GoldWars/GoldWars/Entities/EntityManager.swift b/GoldWars/GoldWars/Entities/EntityManager.swift index 32443ff..2c410d8 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -26,11 +26,10 @@ class EntityManager { scene = SKScene.init() } - func setScene(scene: SKScene){ + func setScene(scene: SKScene) { self.scene = scene } - func add(_ entity: GKEntity) { entities.insert(entity) @@ -97,7 +96,6 @@ class EntityManager { if let labelNode = entity.component(ofType: LabelComponent.self)?.labelNode { scene.addChild(labelNode) } - } func remove(_ entity: GKEntity) { @@ -115,7 +113,7 @@ class EntityManager { entities.remove(entity) } - func update(_ entities: [GKEntity]){ + func update(_ entities: [GKEntity]) { for entity in entities { self.entities.update(with: entity) let base = (entity as! Base) @@ -163,7 +161,6 @@ class EntityManager { } if getOwnerBySnapBase != nil { if base.ownershipPlayer != getOwnerBySnapBase { - //TODO: Outsource following with a AnimationManager runExplosion(base: base) } @@ -190,9 +187,7 @@ class EntityManager { } } } - getHUD()!.updateUnitSum() - } func runExplosion(base: Base) { @@ -209,7 +204,7 @@ class EntityManager { explosion.run(sequence) } - func getSnapshotBaseById(baseId: Int, snapshotModel: SnapshotModel) -> BaseEntityModel{ + func getSnapshotBaseById(baseId: Int, snapshotModel: SnapshotModel) -> BaseEntityModel { return snapshotModel.baseEntites.filter { $0.baseId == baseId }[0] } @@ -242,9 +237,9 @@ class EntityManager { } func getOpponentBases(for team: Team) -> Set { - if(team == .team1){ + if team == .team1 { return getBasesByTeam(for: .team2) - }else { + } else { return getBasesByTeam(for: .team1) } } @@ -274,7 +269,7 @@ class EntityManager { return entities.filter { $0 is Base && ($0 as! Base).component(ofType: TeamComponent.self)?.player.displayName == GKLocalPlayer.local.displayName }[0].component(ofType: TeamComponent.self)!.team } - func getBasebyID(id: Int) -> Base?{ + func getBasebyID(id: Int) -> Base? { for entity in entities { if entity is Base && (entity as! Base).baseID == id { return (entity as! Base) @@ -320,7 +315,6 @@ class EntityManager { ) ) } - return SnapshotModel(baseEntites: snapBase) } diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift index 070e857..df1528e 100644 --- a/GoldWars/GoldWars/Entities/HUD.swift +++ b/GoldWars/GoldWars/Entities/HUD.swift @@ -12,11 +12,11 @@ import GameKit class HUD: GKEntity { var entityManager = EntityManager.gameEMInstance - var hostLabel:SKLabelNode - var hostUnitsLabel:SKLabelNode + var hostLabel: SKLabelNode + var hostUnitsLabel: SKLabelNode - var peerLabel:SKLabelNode - var peerUnitsLabel:SKLabelNode + var peerLabel: SKLabelNode + var peerUnitsLabel: SKLabelNode var leaveGame: ButtonNode @@ -53,7 +53,7 @@ class HUD: GKEntity { self.roundTimer = RoundTimer() leaveGame = ButtonNode(textureName: "yellow_button04", text: "Verlassen" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.17, y: EntityManager.gameEMInstance.scene.size.height * 0.04), onButtonPress: { - EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil)) + EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil)) }) leaveGame.setScale(0.6) @@ -153,7 +153,7 @@ class HUD: GKEntity { fatalError("init(coder:) has not been implemented") } - func startWithDuration(){ + func startWithDuration() { roundTimer.startTimer() finishButton.isEnabled = true self.roundTimer.roundEnded = "Berechnung" diff --git a/GoldWars/GoldWars/Entities/Modal.swift b/GoldWars/GoldWars/Entities/Modal.swift index 0407dba..e0b73b1 100644 --- a/GoldWars/GoldWars/Entities/Modal.swift +++ b/GoldWars/GoldWars/Entities/Modal.swift @@ -8,14 +8,7 @@ import GameplayKit -enum ModalType: String { - case BaseAttack - case BaseMoveOwnUnits - case PauseGame - case QuitGame -} - -class Modal: GKEntity{ +class Modal: GKEntity { var entityManager = EntityManager.gameEMInstance var unitCount: Int @@ -34,7 +27,6 @@ class Modal: GKEntity{ unitCount = base!.unitCount } - let texture = SKTexture(imageNamed:"ModalBackground") background = SKSpriteNode(texture: texture, size: texture.size()) background.setScale(2.4) @@ -109,15 +101,13 @@ class Modal: GKEntity{ case .PauseGame: break } - - } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - func removeModalEntities(gameScene: SKScene){ + func removeModalEntities(gameScene: SKScene) { for entity in entityManager.entities { if entityManager.isModal && entity.isMember(of: Modal.self) { entityManager.remove(entity) @@ -125,9 +115,9 @@ class Modal: GKEntity{ } } - func sendUnits(currentDraggedBase: Base?, touchLocation: CGPoint, gameScene: SKScene, collisionBase: Base?){ + func sendUnits(currentDraggedBase: Base?, touchLocation: CGPoint, gameScene: SKScene, collisionBase: Base?) { for base in currentDraggedBase!.adjacencyList { - if base == collisionBase { + if base == collisionBase { RoundCalculatorService.sharedInstance.increaseMoveCounter(ownBase: currentDraggedBase?.ownershipPlayer == base.ownershipPlayer) entityManager.update((currentDraggedBase?.doPlayerMoveTypeToBase(base: base, units: Int(GameScene.sendUnits)))!) GameScene.sendUnits = 0 diff --git a/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift b/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift index da88bb6..bcd9e2f 100644 --- a/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift +++ b/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift @@ -9,7 +9,7 @@ import Foundation import GameplayKit -class SpinningLogoEntity : GKEntity { +class SpinningLogoEntity: GKEntity { let spinningLogoNode: SpinningLogo3DNode let goldLetteringNode: SKSpriteNode diff --git a/GoldWars/GoldWars/Entities/Way.swift b/GoldWars/GoldWars/Entities/Way.swift index ccb22c9..1b89d72 100644 --- a/GoldWars/GoldWars/Entities/Way.swift +++ b/GoldWars/GoldWars/Entities/Way.swift @@ -11,9 +11,9 @@ import SpriteKit import GameplayKit class Way: GKEntity { - + var localWayComponent: SKShapeNode - + required init(fromBase: Base, toBase: Base) { let fromBaseX = fromBase.position.x @@ -25,7 +25,7 @@ class Way: GKEntity { let yControll1 = Way.computeY(x1: fromBaseX, x2: toBaseX, y1: fromBaseY, y2: toBaseY, factor: 2/5) let xControll2 = Way.computeX(x1: fromBaseX, x2: toBaseX, y1: fromBaseY, y2: toBaseY, factor: 3/5) let yControll2 = Way.computeY(x1: fromBaseX, x2: toBaseX, y1: fromBaseY, y2: toBaseY, factor: 3/5) - + let pathToDraw = CGMutablePath() pathToDraw.move(to: fromBase.position) pathToDraw.addCurve( @@ -33,7 +33,7 @@ class Way: GKEntity { control1: CGPoint(x: xControll1, y: yControll1), control2: CGPoint(x: xControll2, y: yControll2) ) - + self.localWayComponent = SKShapeNode() self.localWayComponent.path = pathToDraw self.localWayComponent.strokeColor = UIColor(red: 0.852, green: 0.649, blue: 0.123, alpha: 1) @@ -42,7 +42,7 @@ class Way: GKEntity { self.localWayComponent.name = "way" super.init() } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } diff --git a/GoldWars/GoldWars/Enums/ModalType.swift b/GoldWars/GoldWars/Enums/ModalType.swift new file mode 100644 index 0000000..58a69f6 --- /dev/null +++ b/GoldWars/GoldWars/Enums/ModalType.swift @@ -0,0 +1,14 @@ +// +// ModalType.swift +// GoldWars +// +// Created by Aldin Duraki on 25.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +enum ModalType: String { + case BaseAttack + case BaseMoveOwnUnits + case PauseGame + case QuitGame +} diff --git a/GoldWars/GoldWars/Map/MapFactory.swift b/GoldWars/GoldWars/Map/MapFactory.swift index 9b8da1c..f2e1d0d 100644 --- a/GoldWars/GoldWars/Map/MapFactory.swift +++ b/GoldWars/GoldWars/Map/MapFactory.swift @@ -229,7 +229,6 @@ class MapFactory { ways.append(Way(fromBase: p2StartBases["bot"]!, toBase: bottomRight.getRightConnection()!)) } - // Add all bases to the scene entityManager.add(basePlayerOne) p1StartBases.forEach({(key, base) in entityManager.add(base)}) diff --git a/GoldWars/GoldWars/Map/MapUtils.swift b/GoldWars/GoldWars/Map/MapUtils.swift index 732c93a..9dfc3fb 100644 --- a/GoldWars/GoldWars/Map/MapUtils.swift +++ b/GoldWars/GoldWars/Map/MapUtils.swift @@ -46,7 +46,6 @@ struct MapGenerationModel: Codable { bottomRightId: Int.random(in: 0...noOfCElements) ) } - } class CenterElementProvider { diff --git a/GoldWars/GoldWars/Models/HeartbeatModel.swift b/GoldWars/GoldWars/Models/HeartbeatModel.swift new file mode 100644 index 0000000..81f918c --- /dev/null +++ b/GoldWars/GoldWars/Models/HeartbeatModel.swift @@ -0,0 +1,13 @@ +// +// HeartbeatModel.swift +// GoldWars +// +// Created by student on 25.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +import Foundation + +struct Heartbeat: Codable { + var date: Date +} diff --git a/GoldWars/GoldWars/Models/NotificationModel.swift b/GoldWars/GoldWars/Models/NotificationModel.swift new file mode 100644 index 0000000..bee4cb9 --- /dev/null +++ b/GoldWars/GoldWars/Models/NotificationModel.swift @@ -0,0 +1,16 @@ +// +// NotificationModel.swift +// GoldWars +// +// Created by Aldin Duraki on 25.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +struct NotificationModel: Codable { + let name: String + + init(name: String) { + self.name = name + } +} + diff --git a/GoldWars/GoldWars/Models/RoundDataModel.swift b/GoldWars/GoldWars/Models/RoundDataModel.swift new file mode 100644 index 0000000..cbe6a2c --- /dev/null +++ b/GoldWars/GoldWars/Models/RoundDataModel.swift @@ -0,0 +1,25 @@ +// +// RoundDataModel.swift +// GoldWars +// +// Created by Aldin Duraki on 25.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +struct LocalRoundData: Codable { + var localPlayerMoves: [PlayerMove] + var hasAttackBoost: Bool + var hasDefenceBoost: Bool + + init() { + localPlayerMoves = [] + hasAttackBoost = false + hasDefenceBoost = false + } +} + +struct PlayerMove: Codable { + let fromBase: Int + let toBase: Int + var unitCount: Int +} diff --git a/GoldWars/GoldWars/Models/SnapshotModel.swift b/GoldWars/GoldWars/Models/SnapshotModel.swift new file mode 100644 index 0000000..797f3d1 --- /dev/null +++ b/GoldWars/GoldWars/Models/SnapshotModel.swift @@ -0,0 +1,27 @@ +// +// SnapshotModel.swift +// GoldWars +// +// Created by Aldin Duraki on 25.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +class SnapshotModel: Codable { + var baseEntites: [BaseEntityModel] + + init(baseEntites: [BaseEntityModel]) { + self.baseEntites = baseEntites + } +} + +class BaseEntityModel: Codable { + let baseId: Int + var unitCount: Int + var ownership: String? + + init(baseId: Int, unitCount: Int, ownership: String?, hasAttackBoost: Bool, hasDefenceBoost: Bool) { + self.baseId = baseId + self.unitCount = unitCount + self.ownership = ownership + } +} diff --git a/GoldWars/GoldWars/Scenes/GameScene.swift b/GoldWars/GoldWars/Scenes/GameScene.swift index 6acdaf1..39c0f28 100644 --- a/GoldWars/GoldWars/Scenes/GameScene.swift +++ b/GoldWars/GoldWars/Scenes/GameScene.swift @@ -10,15 +10,14 @@ import SpriteKit import GameplayKit import GameKit -class GameScene: SKScene{ +class GameScene: SKScene { var entityManager = EntityManager.gameEMInstance - - var isMoveTouch = false - var currentDraggedBase : Base? static var sendUnits: Int = 0 + var currentDraggedBase: Base? var collisionBase: Base? var gameEndEffects = false + var isMoveTouch = false override func sceneDidLoad() { entityManager.setScene(scene: self) @@ -87,11 +86,10 @@ class GameScene: SKScene{ } - func addAttackDetails(touchLocation: CGPoint){ + func addAttackDetails(touchLocation: CGPoint) { for base in currentDraggedBase!.adjacencyList { if atPoint(touchLocation) == base.component(ofType: DefaultBaseComponent.self)?.spriteNode { collisionBase = base - // TODO: change interaction based on collision instead of touchlocation if currentDraggedBase!.unitCount > 1 { if !checkIfMoveIsAble() { return @@ -111,13 +109,11 @@ class GameScene: SKScene{ } } - func checkSlider(){ + func checkSlider() { for e in entityManager.entities{ if let modal = e as? Modal { if modal.type == ModalType.BaseAttack || modal.type == ModalType.BaseMoveOwnUnits { GameScene.sendUnits = Int(((e.component(ofType: SliderComponent.self)?.sliderNode.getValue ?? 0) * CGFloat((e as! Modal).unitCount)).rounded(.up)) - - //TODO: refactor this quick and dirty fix if GameScene.sendUnits == 0 { GameScene.sendUnits = 1 } else if Int(GameScene.sendUnits) == currentDraggedBase?.unitCount { @@ -129,7 +125,7 @@ class GameScene: SKScene{ } } - func gameEnd(){ + func gameEnd() { entityManager.getHUD()?.blockWholeScreenPane.isHidden = true gameEndEffects = true GameCenterManager.sharedInstance.gameEnded = false @@ -138,14 +134,14 @@ class GameScene: SKScene{ let sequence = SKAction.sequence([move, removeParticle]) var actionAdded = false for nodeChild in children { - if nodeChild.name == "peerLabel" || nodeChild.name == "hostLabel"{ + if nodeChild.name == "peerLabel" || nodeChild.name == "hostLabel" { continue } if nodeChild.name == "way" { nodeChild.run(SKAction.removeFromParent()) continue } - if nodeChild.name != "clouds"{ + if nodeChild.name != "clouds" { nodeChild.run(sequence) { if !actionAdded { let explosion = self.getFinalExplosion() @@ -179,21 +175,19 @@ class GameScene: SKScene{ let sequence = SKAction.sequence([move, removeParticle]) var actionAdded = false for nodeChild in children { - if nodeChild.name == "peerLabel" || nodeChild.name == "hostLabel"{ + if nodeChild.name == "peerLabel" || nodeChild.name == "hostLabel" { nodeChild.removeFromParent() } if nodeChild.name == "way" { nodeChild.run(SKAction.removeFromParent()) continue } - if nodeChild.name != "clouds"{ + if nodeChild.name != "clouds" { nodeChild.run(sequence) { if !actionAdded { let explosion = self.getFinalExplosion() self.addChild(explosion) let action = SKAction.afterDelay(2) { - - let node = ButtonNode(textureName: "yellow_button05", text: "Menü", isEnabled: true, position: CGPoint(x: self.size.width / 2, y: self.size.height / 2 - 300), onButtonPress: { self.backToMenuAction() }) @@ -279,7 +273,7 @@ class GameScene: SKScene{ self.removeFromParent() } - func checkBases(bases: Set, touchLocation: CGPoint){ + func checkBases(bases: Set, touchLocation: CGPoint) { for base in bases { if atPoint(touchLocation) == base.component(ofType: DefaultBaseComponent.self)?.spriteNode { if !base.changeOwnership { @@ -294,13 +288,13 @@ class GameScene: SKScene{ } } - func moveFireAndBase(base: Base, touchLocation: CGPoint){ + func moveFireAndBase(base: Base, touchLocation: CGPoint) { base.component(ofType: DefaultBaseComponent.self)?.spriteNode.position = touchLocation base.component(ofType: TeamComponent.self)?.fire.position = touchLocation base.component(ofType: TeamComponent.self)?.unitcountLabel.position = CGPoint(x:touchLocation.x + 30, y: touchLocation.y - 50) } - func showNearestBases(base: Base){ + func showNearestBases(base: Base) { for adjacencyBase in base.adjacencyList { let node = adjacencyBase.component(ofType: DefaultBaseComponent.self)?.spriteNode node?.run(SKAction.sequence([ @@ -310,7 +304,7 @@ class GameScene: SKScene{ } } - func checkIfMoveIsAble() -> Bool{ + func checkIfMoveIsAble() -> Bool { if isAttackMove() { return RoundCalculatorService.sharedInstance.numberOfAttacks < 2 } else { diff --git a/GoldWars/GoldWars/Scenes/MenuScene.swift b/GoldWars/GoldWars/Scenes/MenuScene.swift index 8c72c82..a960d55 100644 --- a/GoldWars/GoldWars/Scenes/MenuScene.swift +++ b/GoldWars/GoldWars/Scenes/MenuScene.swift @@ -89,6 +89,5 @@ class MenuScene: SKScene { if GameCenterManager.sharedInstance.initIsFinish { self.loadScene(scene: GameCenterManager.sharedInstance.gameScene!) } - } } diff --git a/GoldWars/GoldWars/RulesScene.swift b/GoldWars/GoldWars/Scenes/RulesScene.swift similarity index 100% rename from GoldWars/GoldWars/RulesScene.swift rename to GoldWars/GoldWars/Scenes/RulesScene.swift diff --git a/GoldWars/GoldWars/SettingsScene.swift b/GoldWars/GoldWars/Scenes/SettingsScene.swift similarity index 99% rename from GoldWars/GoldWars/SettingsScene.swift rename to GoldWars/GoldWars/Scenes/SettingsScene.swift index 3614b43..4336046 100644 --- a/GoldWars/GoldWars/SettingsScene.swift +++ b/GoldWars/GoldWars/Scenes/SettingsScene.swift @@ -105,5 +105,4 @@ class SettingsScene: SKScene { entityManager.getBackground()!.update(deltaTime: currentTime) } } - } diff --git a/GoldWars/GoldWars/DataService.swift b/GoldWars/GoldWars/Services/DataService.swift similarity index 63% rename from GoldWars/GoldWars/DataService.swift rename to GoldWars/GoldWars/Services/DataService.swift index 4c5f63a..ad6202c 100644 --- a/GoldWars/GoldWars/DataService.swift +++ b/GoldWars/GoldWars/Services/DataService.swift @@ -7,56 +7,6 @@ // import Foundation -struct Heartbeat: Codable { - var date: Date -} - -struct NotificationModel: Codable { - let name: String - - init(name: String) { - self.name = name - } -} - -struct PlayerMove: Codable { - let fromBase: Int - let toBase: Int - var unitCount: Int -} - -struct LocalRoundData: Codable { - var localPlayerMoves: [PlayerMove] - var hasAttackBoost: Bool - var hasDefenceBoost: Bool - - init() { - localPlayerMoves = [] - hasAttackBoost = false - hasDefenceBoost = false - } -} - -class SnapshotModel: Codable { - var baseEntites: [BaseEntityModel] - - init(baseEntites: [BaseEntityModel]) { - self.baseEntites = baseEntites - } -} - -class BaseEntityModel: Codable { - let baseId: Int - var unitCount: Int - var ownership: String? - - init(baseId: Int, unitCount: Int, ownership: String?, hasAttackBoost: Bool, hasDefenceBoost: Bool) { - self.baseId = baseId - self.unitCount = unitCount - self.ownership = ownership - } -} - class DataService { static let sharedInstance = DataService() var localRoundData: LocalRoundData = LocalRoundData() @@ -66,7 +16,7 @@ class DataService { var mapModel: MapGenerationModel? var entityManager = EntityManager.gameEMInstance - + func addMove(playerMove: PlayerMove) { let equalMoveIdx = localRoundData.localPlayerMoves.firstIndex(where: { (localPlayerMove) -> Bool in localPlayerMove.toBase == playerMove.toBase && localPlayerMove.fromBase == playerMove.fromBase diff --git a/GoldWars/GoldWars/EloHelper.swift b/GoldWars/GoldWars/Services/EloHelper.swift similarity index 100% rename from GoldWars/GoldWars/EloHelper.swift rename to GoldWars/GoldWars/Services/EloHelper.swift index 35d7287..91f3b62 100644 --- a/GoldWars/GoldWars/EloHelper.swift +++ b/GoldWars/GoldWars/Services/EloHelper.swift @@ -21,7 +21,7 @@ class EloHelper { static let IDENTIFIER_ELO = "de.hft.stuttgart.ip2.goldwars.matchmaking" static func updateEloScore(winner: GKPlayer, hatDenNikoGemacht looser: GKPlayer) { - + let leaderboard = GKLeaderboard.init(players: [winner, looser]) leaderboard.identifier = EloHelper.IDENTIFIER_ELO @@ -36,7 +36,7 @@ class EloHelper { let Q_winner = pow(10.0, Double(R_winner.value) / 400.0) let E_looser = Q_looser / (Q_looser + Q_winner) let E_winner = Q_winner / (Q_looser + Q_winner) - + let R_winner_new = Int64(Double(R_winner.value) + 10.0 * (1.0 - E_winner)) let R_looser_new = Int64(Double(R_looser.value) + 10.0 * (0.0 - E_looser)) diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/Services/GameCenterManager.swift similarity index 99% rename from GoldWars/GoldWars/GameCenterManager.swift rename to GoldWars/GoldWars/Services/GameCenterManager.swift index fbf0c8d..65aec4a 100644 --- a/GoldWars/GoldWars/GameCenterManager.swift +++ b/GoldWars/GoldWars/Services/GameCenterManager.swift @@ -61,7 +61,7 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG localPlayerRandomNumber = RandomNumber() } - func reset() { + func reset() { isMatchStarted = false isServer = false localPlayerRandomNumber = RandomNumber() @@ -122,7 +122,7 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG } } } - + func match(_ match: GKMatch, didReceive data: Data, fromRemotePlayer player: GKPlayer) { if myMatch != match { return } let jsonDecoder = JSONDecoder() @@ -205,12 +205,10 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG initIsFinish = true os_log("Peer startet Spiel", log: LOG, type: .info) } - if let notification = try? jsonDecoder.decode(NotificationModel.self, from: data) { os_log("Notification erhalten", log: LOG, type: .info) NotificationCenter.default.post(name: Notification.Name(rawValue: notification.name), object: nil) } - if let eloData = try? jsonDecoder.decode(EloDataForPeer.self, from: data) { print("Recieved elo data: \(eloData.scoreToReport)") EloHelper.reportScore(score: eloData.scoreToReport) @@ -308,6 +306,5 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG } extension Notification.Name { - static let presentGame = Notification.Name(rawValue: "presentGame") static let authenticationChanged = Notification.Name(rawValue: "authenticationChanged") } diff --git a/GoldWars/GoldWars/MultiplayerNetwork.swift b/GoldWars/GoldWars/Services/MultiplayerNetwork.swift similarity index 89% rename from GoldWars/GoldWars/MultiplayerNetwork.swift rename to GoldWars/GoldWars/Services/MultiplayerNetwork.swift index 07cc2a8..a55914a 100644 --- a/GoldWars/GoldWars/MultiplayerNetwork.swift +++ b/GoldWars/GoldWars/Services/MultiplayerNetwork.swift @@ -9,10 +9,14 @@ import GameplayKit import Foundation import GameKit +import os -class MultiplayerNetwork{ +class MultiplayerNetwork { + static let sharedInstance = MultiplayerNetwork() + let LOG = OSLog.init(subsystem: "MultiplayerNetwork", category: "MultiplayerNetwork") + var isSending = false func sendData(data: Data) { @@ -21,17 +25,17 @@ class MultiplayerNetwork{ do { try multiplayerMatch.sendData(toAllPlayers: data, with: .reliable) } catch { + os_log("Could not send data to desired Player", log: LOG, type: .error) } } } func sendDataToHost(data: Data) { - if let multiplayerMatch = GameCenterManager.sharedInstance.myMatch{ do { try multiplayerMatch.send(data, to: [GameCenterManager.sharedInstance.hostingPlayer!], dataMode: .reliable) } catch { - //TODO: Add logging + os_log("Could not send data to Host", log: LOG, type: .error) } } } diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/Services/RoundCalculatorService.swift similarity index 85% rename from GoldWars/GoldWars/RoundCalculatorService.swift rename to GoldWars/GoldWars/Services/RoundCalculatorService.swift index 4aacba7..2190ad1 100644 --- a/GoldWars/GoldWars/RoundCalculatorService.swift +++ b/GoldWars/GoldWars/Services/RoundCalculatorService.swift @@ -15,25 +15,24 @@ class RoundCalculatorService { static let LOG = OSLog.init(subsystem: "Round Calculator", category: "RoundCalculatorService") var allPlayerMoves: [String: [PlayerMove]] = [:] - // TODO: Better data structure var boosts: [String: (Bool, Bool)] = [:] // First bool is atk boost, second is def boost let ATK_BOOST_MULTIPLICATOR = 1.1 let DEF_BOOST_MULTIPLICATOR = 1.1 let MAX_ROUNDS = 20 var currentRound = 1 - var isCalculating = false var numberOfAttacks = 0 var numberOfOwnUnitMoves = 0 + var isCalculating = false func calculateRound() { os_log("Started calculating Round", log: RoundCalculatorService.LOG, type: .info) isCalculating = true let currentSnapshotModel = DataService.sharedInstance.snapshotModel - var baseSpecificMoves = collectBaseSpecificMoves() - - // TODO: Refactor to a less complex way + + os_log("Solving transaction moves", log: RoundCalculatorService.LOG, type: .info) + os_log("Removing attacking forces", log: RoundCalculatorService.LOG, type: .info) for (baseId, playerMovesByBase) in baseSpecificMoves { let targetBase = currentSnapshotModel?.baseEntites.filter { $0.baseId == baseId }[0] let possiblyOwnershipMoves = playerMovesByBase.filter { $0.key == targetBase?.ownership} @@ -63,6 +62,7 @@ class RoundCalculatorService { } } + os_log("Calculate attacking moves", log: RoundCalculatorService.LOG, type: .info) for (baseId, playerMovesByBase) in baseSpecificMoves { var combinePotentionalForces: [String: PlayerMove] = [:] @@ -79,7 +79,6 @@ class RoundCalculatorService { if combinePotentionalForces.count > 0 { let sortedPotentionalCombinedForces = combinePotentionalForces.sorted { $0.1.unitCount > $1.1.unitCount } - var playerMoveWithMaxUnits = sortedPotentionalCombinedForces[0] if playerMovesByBase.count >= 2 { @@ -124,6 +123,7 @@ class RoundCalculatorService { } baseSpecificMoves.removeValue(forKey: baseId) } + os_log("Adding unitgrowth", log: RoundCalculatorService.LOG, type: .info) var player1BaseCount = 0; var player2BaseCount = 0; let player1 = GameCenterManager.sharedInstance.hostingPlayer?.displayName @@ -143,6 +143,7 @@ class RoundCalculatorService { } return BaseEntityModel } + os_log("Validate if game ending criteria is reached", log: RoundCalculatorService.LOG, type: .info) allPlayerMoves.removeAll() DataService.sharedInstance.localRoundData.localPlayerMoves.removeAll() DataService.sharedInstance.localRoundData.hasAttackBoost = false @@ -173,8 +174,10 @@ class RoundCalculatorService { currentRound += 1 entityManager.getHUD()?.setCurrentRound(round: currentRound) + os_log("Sending snapshotmodel to player", log: RoundCalculatorService.LOG, type: .info) MultiplayerNetwork.sharedInstance.sendSnapshotModelToPlayers() DataService.sharedInstance.snapshotModel = currentSnapshotModel + os_log("Updating entities", log: RoundCalculatorService.LOG, type: .info) entityManager.updateSnapshotModel(snapshotModel: currentSnapshotModel!) entityManager.getHUD()?.startWithDuration() os_log("Finished calculating Round", log: RoundCalculatorService.LOG, type: .info) @@ -184,7 +187,6 @@ class RoundCalculatorService { for playerMove in DataService.sharedInstance.remotePlayerMoves { allPlayerMoves[playerMove.key] = playerMove.value.localPlayerMoves } - boosts[GameCenterManager.sharedInstance.hostingPlayer!.displayName] = ( DataService.sharedInstance.localRoundData.hasAttackBoost, DataService.sharedInstance.localRoundData.hasDefenceBoost @@ -215,10 +217,6 @@ class RoundCalculatorService { return baseSpecificMoves } - func resolvePlayerMove(playerMove: PlayerMove, unitCount: Int, ownership: String?, resolveType: String) { - //TODO: outsource playermoves - } - func resetNumberOfAttacksAndFormats() { self.numberOfAttacks = 0; self.numberOfOwnUnitMoves = 0; @@ -243,20 +241,20 @@ class RoundCalculatorService { func determineWinner(by criteria: String) -> String { var winner: String? switch criteria { - case "rounds": - let peerPlayerBasesCount = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.peerPlayer!).count - let hostingPlayerBasesCount = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.hostingPlayer!).count - if peerPlayerBasesCount == hostingPlayerBasesCount { - let hostingPlayerUnitCount = entityManager.getUnitSum(by: GameCenterManager.sharedInstance.hostingPlayer!) - let peerPlayerUnitCount = entityManager.getUnitSum(by: GameCenterManager.sharedInstance.peerPlayer!) - winner = hostingPlayerUnitCount > peerPlayerUnitCount ? GameCenterManager.sharedInstance.hostingPlayer?.displayName : GameCenterManager.sharedInstance.peerPlayer?.displayName - } else { - winner = hostingPlayerBasesCount > peerPlayerBasesCount ? GameCenterManager.sharedInstance.hostingPlayer?.displayName : GameCenterManager.sharedInstance.peerPlayer?.displayName - } - case "capture": - winner = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.hostingPlayer!).count == 0 ? GameCenterManager.sharedInstance.peerPlayer?.displayName : GameCenterManager.sharedInstance.hostingPlayer?.displayName - default: - break + case "rounds": + let peerPlayerBasesCount = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.peerPlayer!).count + let hostingPlayerBasesCount = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.hostingPlayer!).count + if peerPlayerBasesCount == hostingPlayerBasesCount { + let hostingPlayerUnitCount = entityManager.getUnitSum(by: GameCenterManager.sharedInstance.hostingPlayer!) + let peerPlayerUnitCount = entityManager.getUnitSum(by: GameCenterManager.sharedInstance.peerPlayer!) + winner = hostingPlayerUnitCount > peerPlayerUnitCount ? GameCenterManager.sharedInstance.hostingPlayer?.displayName : GameCenterManager.sharedInstance.peerPlayer?.displayName + } else { + winner = hostingPlayerBasesCount > peerPlayerBasesCount ? GameCenterManager.sharedInstance.hostingPlayer?.displayName : GameCenterManager.sharedInstance.peerPlayer?.displayName + } + case "capture": + winner = entityManager.getBasesByPlayer(for: GameCenterManager.sharedInstance.hostingPlayer!).count == 0 ? GameCenterManager.sharedInstance.peerPlayer?.displayName : GameCenterManager.sharedInstance.hostingPlayer?.displayName + default: + break } return winner! } diff --git a/GoldWars/GoldWars/RoundTimer.swift b/GoldWars/GoldWars/Services/RoundTimer.swift similarity index 97% rename from GoldWars/GoldWars/RoundTimer.swift rename to GoldWars/GoldWars/Services/RoundTimer.swift index 666eb7a..09b25d7 100644 --- a/GoldWars/GoldWars/RoundTimer.swift +++ b/GoldWars/GoldWars/Services/RoundTimer.swift @@ -70,7 +70,7 @@ class RoundTimer: Timer { } } - if (!isHeartbeatLocked && (timeLeft % 7 == 0)){ + if (!isHeartbeatLocked && (timeLeft % 7 == 0)) { MultiplayerNetwork.sharedInstance.sendHeartbeatToPlayer() isHeartbeatLocked = true; } diff --git a/GoldWars/GoldWars/SoundManager.swift b/GoldWars/GoldWars/Services/SoundManager.swift similarity index 99% rename from GoldWars/GoldWars/SoundManager.swift rename to GoldWars/GoldWars/Services/SoundManager.swift index bd27bfb..e780252 100644 --- a/GoldWars/GoldWars/SoundManager.swift +++ b/GoldWars/GoldWars/Services/SoundManager.swift @@ -11,6 +11,7 @@ import AVFoundation import os class SoundManager { + public static var sharedInstance = SoundManager() let LOG = OSLog.init(subsystem: "SoundManager", category: "SoundManager") @@ -50,7 +51,7 @@ class SoundManager { effectPlayer.play() } } - + func stopMenuMusic() { audioPlayer.pause() self.isMusicPlaying = false