diff --git a/Assets/gamePreview.sketch b/Assets/gamePreview.sketch index b8f4b7f..51596f5 100644 Binary files a/Assets/gamePreview.sketch and b/Assets/gamePreview.sketch differ diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..158fbf0 --- /dev/null +++ b/LICENCE @@ -0,0 +1,30 @@ +Author - @lalabuy948 +Project - MiniSpaceJourney + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + +"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + +to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; to Distribute and Publicly Perform the Work including as incorporated in Collections; and, to Distribute and Publicly Perform Adaptations. The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + +You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. For the avoidance of doubt: + +Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. 5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. 8. Miscellaneous + +Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/MiniSpaceJourney WatchKit App/Info.plist b/MiniSpaceJourney WatchKit App/Info.plist index c786b5e..9e7f6b6 100644 --- a/MiniSpaceJourney WatchKit App/Info.plist +++ b/MiniSpaceJourney WatchKit App/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion 1 UISupportedInterfaceOrientations diff --git a/MiniSpaceJourney WatchKit App/en.lproj/Interface.storyboard b/MiniSpaceJourney WatchKit App/en.lproj/Interface.storyboard index 45abc2b..0fd42b4 100644 --- a/MiniSpaceJourney WatchKit App/en.lproj/Interface.storyboard +++ b/MiniSpaceJourney WatchKit App/en.lproj/Interface.storyboard @@ -1,33 +1,41 @@ - - - - + + - - - + + - + - + + + + + + + + @@ -35,7 +43,7 @@ - + @@ -50,7 +58,7 @@ - + diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon108x108@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon108x108@2x.png new file mode 100644 index 0000000..3024a28 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon108x108@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png new file mode 100644 index 0000000..3dc0cc1 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png new file mode 100644 index 0000000..cda4c9e Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png new file mode 100644 index 0000000..d12d565 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png new file mode 100644 index 0000000..3a5c864 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png new file mode 100644 index 0000000..22671ac Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png new file mode 100644 index 0000000..2bf2d78 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon50x50@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon50x50@2x.png new file mode 100644 index 0000000..70ca6ba Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon50x50@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png new file mode 100644 index 0000000..8e8d159 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png new file mode 100644 index 0000000..04b939a Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Contents.json b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a3f0733 --- /dev/null +++ b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,146 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-Notification@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-Notification@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-Small-40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-Small-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@3x.png", + "scale" : "3x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "icon.png", + "scale" : "1x" + }, + { + "size" : "24x24", + "idiom" : "watch", + "filename" : "AppIcon24x24@2x.png", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "38mm" + }, + { + "size" : "27.5x27.5", + "idiom" : "watch", + "filename" : "AppIcon27.5x27.5@2x.png", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "42mm" + }, + { + "size" : "29x29", + "idiom" : "watch", + "filename" : "AppIcon29x29@2x.png", + "role" : "companionSettings", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "watch", + "filename" : "AppIcon29x29@3x.png", + "role" : "companionSettings", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "watch", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "38mm" + }, + { + "size" : "44x44", + "idiom" : "watch", + "filename" : "AppIcon44x44@2x.png", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "40mm" + }, + { + "size" : "50x50", + "idiom" : "watch", + "filename" : "AppIcon50x50@2x.png", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "44mm" + }, + { + "size" : "86x86", + "idiom" : "watch", + "filename" : "AppIcon86x86@2x.png", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "38mm" + }, + { + "size" : "98x98", + "idiom" : "watch", + "filename" : "AppIcon98x98@2x.png", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "42mm" + }, + { + "size" : "108x108", + "idiom" : "watch", + "filename" : "AppIcon108x108@2x.png", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "44mm" + }, + { + "size" : "1024x1024", + "idiom" : "watch-marketing", + "filename" : "watchicon.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 0000000..a07adf3 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 0000000..8375c78 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@2x.png new file mode 100644 index 0000000..26d262f Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@3x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@3x.png new file mode 100644 index 0000000..3258b9f Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Notification@3x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png new file mode 100644 index 0000000..22671ac Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png new file mode 100644 index 0000000..a07adf3 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png new file mode 100644 index 0000000..d12d565 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png new file mode 100644 index 0000000..3a5c864 Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/icon.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/icon.png new file mode 100644 index 0000000..e25a76e Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/icon.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/watchicon.png b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/watchicon.png new file mode 100644 index 0000000..e25a76e Binary files /dev/null and b/MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/watchicon.png differ diff --git a/MiniSpaceJourney WatchKit Extension/Controller/GameScreenController.swift b/MiniSpaceJourney WatchKit Extension/Controller/GameScreenController.swift index 38b8481..6d517cb 100644 --- a/MiniSpaceJourney WatchKit Extension/Controller/GameScreenController.swift +++ b/MiniSpaceJourney WatchKit Extension/Controller/GameScreenController.swift @@ -47,8 +47,7 @@ class GameScreenController: WKInterfaceController, WKCrownDelegate { let step = NSNumber.init(value: rotationalDelta * crownSensivity).floatValue let cgStep = CGFloat(step) - // log whats happened - // print("Crown: \(cgStep)") + WKInterfaceDevice.current().play(.click) gameScene.moveSpaceshipBy(amountX: cgStep, amountY: 0) } diff --git a/MiniSpaceJourney WatchKit Extension/Controller/MainMenuController.swift b/MiniSpaceJourney WatchKit Extension/Controller/MainMenuController.swift index f262093..e216d44 100644 --- a/MiniSpaceJourney WatchKit Extension/Controller/MainMenuController.swift +++ b/MiniSpaceJourney WatchKit Extension/Controller/MainMenuController.swift @@ -10,11 +10,19 @@ import WatchKit class MainMenuController: WKInterfaceController { + + var highestScorekey: String = "MiniSpaceJourneyHighestScore"; + + @IBOutlet weak var highestScoreLabel: WKInterfaceLabel! override func awake(withContext context: Any?) { super.awake(withContext: context) // Configure interface objects here. + let defaults = UserDefaults.standard; + let highestScore = defaults.integer(forKey: self.highestScorekey); + + highestScoreLabel.setText("Highest score: \(highestScore)"); } override func willActivate() { diff --git a/MiniSpaceJourney WatchKit Extension/GameScene.swift b/MiniSpaceJourney WatchKit Extension/GameScene.swift index da26989..1799cc4 100644 --- a/MiniSpaceJourney WatchKit Extension/GameScene.swift +++ b/MiniSpaceJourney WatchKit Extension/GameScene.swift @@ -10,6 +10,8 @@ import SpriteKit class GameScene: SKScene, SKPhysicsContactDelegate { + var highestScorekey: String = "MiniSpaceJourneyHighestScore"; + private var spinnyNode : SKShapeNode? var gameplayTimer:Timer? @@ -19,7 +21,6 @@ class GameScene: SKScene, SKPhysicsContactDelegate { // just CGFloat null, no magic numbers var cgNull:CGFloat = 0.0; - var amountOfAliens:Int = 1; var alienSpeed:TimeInterval = 6; var spawnAliensSpeed:TimeInterval = 1.0; var spawnTorpedoSpeed:TimeInterval = 0.8; @@ -90,17 +91,13 @@ class GameScene: SKScene, SKPhysicsContactDelegate { alienSpeed -= 0.2 } - if (spawnAliensSpeed >= 0.4) { + if (spawnAliensSpeed >= 0.1) { spawnAliensSpeed -= 0.1 } - if (spawnTorpedoSpeed >= 0.05) { + if (spawnTorpedoSpeed >= 0.01) { spawnTorpedoSpeed -= 0.1 } - - if (amountOfAliens != 0 && amountOfAliens < 5 && score != 0 && score % 20 == 0) { - amountOfAliens += 1 - } } func stopTimers() { @@ -110,48 +107,42 @@ class GameScene: SKScene, SKPhysicsContactDelegate { } func resetGameplay() { - amountOfAliens = 1; alienSpeed = 6; spawnAliensSpeed = 1.0; spawnTorpedoSpeed = 0.8; } @objc func addAlien() { - for _ in 1...amountOfAliens { - let possibleAlien = possibleAliens.randomElement()!; - let alien = SKSpriteNode(imageNamed: possibleAlien); - let randomX = Int.random(in: -Int(self.frame.size.width / 2 - alien.size.width) ..< Int(self.frame.size.width / 2 - alien.size.width)); + let possibleAlien = possibleAliens.randomElement()!; + let alien = SKSpriteNode(imageNamed: possibleAlien); + let randomX = Int.random(in: -Int(self.frame.size.width / 2 - alien.size.width) ..< Int(self.frame.size.width / 2 - alien.size.width)); - alien.position = CGPoint(x: CGFloat(randomX), y: self.frame.size.height / 2 - alien.size.height); + alien.position = CGPoint(x: CGFloat(randomX), y: self.frame.size.height / 2 - alien.size.height); - alien.physicsBody = SKPhysicsBody(rectangleOf: alien.size); - alien.physicsBody?.isDynamic = true; + alien.physicsBody = SKPhysicsBody(rectangleOf: alien.size); + alien.physicsBody?.isDynamic = true; - alien.physicsBody?.categoryBitMask = alienCategory; - alien.physicsBody?.contactTestBitMask = photonTorpedoCategory | spaceshipCategory; - alien.physicsBody?.collisionBitMask = 0; - - self.addChild(alien); - - let animationDuration:TimeInterval = alienSpeed; - var actionArray = [SKAction](); - - var movingToPosition:CGPoint = CGPoint(x: alien.position.x, y: -self.frame.height) - if (Int.random(in: 0...10) % 3 == 0 && score >= 50 ) { - movingToPosition = CGPoint(x: spaceship.position.x, y: -self.frame.height) - } - - actionArray.append(SKAction.move(to: movingToPosition, duration: animationDuration)); - actionArray.append(SKAction.removeFromParent()); - - alien.run(SKAction.sequence(actionArray)); + alien.physicsBody?.categoryBitMask = alienCategory; + alien.physicsBody?.contactTestBitMask = photonTorpedoCategory | spaceshipCategory; + alien.physicsBody?.collisionBitMask = 0; + + self.addChild(alien); + + let animationDuration:TimeInterval = alienSpeed; + var actionArray = [SKAction](); + + var movingToPosition:CGPoint = CGPoint(x: alien.position.x, y: -self.frame.height) + if (Int.random(in: 0...10) % 3 == 0 && score >= 50 ) { + movingToPosition = CGPoint(x: spaceship.position.x, y: -self.frame.height) } + + actionArray.append(SKAction.move(to: movingToPosition, duration: animationDuration)); + actionArray.append(SKAction.removeFromParent()); + + alien.run(SKAction.sequence(actionArray)); } @objc func fireTorpedo() { - // @todo: Find a way how to preload sounds not to have fps drop - // self.run(SKAction.playSoundFileNamed("shoot.wav", waitForCompletion: false)) - let torpedoNode = SKSpriteNode(imageNamed: "torpedo"); torpedoNode.position = spaceship.position; torpedoNode.position.y += 5; @@ -178,7 +169,6 @@ class GameScene: SKScene, SKPhysicsContactDelegate { } func moveSpaceshipBy(amountX:CGFloat, amountY:CGFloat) { - print(amountX) if (amountX >= 2 || amountX <= -2) { if (self.scene?.isPaused == true) { @@ -231,9 +221,6 @@ class GameScene: SKScene, SKPhysicsContactDelegate { self.addChild(explosion); - // @todo: Find a way how to preload sounds not to have fps drop - // self.run(SKAction.playSoundFileNamed(".mp3", waitForCompletion: false)) - torpedoNode.removeFromParent(); alienNode.removeFromParent(); @@ -259,8 +246,10 @@ class GameScene: SKScene, SKPhysicsContactDelegate { explosion.removeFromParent(); } + self.updateHighestScore(score: self.score); + // @todo: Better pause handling - pause() + pause(); score = 0; } @@ -281,7 +270,15 @@ class GameScene: SKScene, SKPhysicsContactDelegate { } } - + func updateHighestScore(score: Int) -> Void { + + let defaults = UserDefaults.standard + + let highestScore = defaults.integer(forKey: self.highestScorekey) + if (highestScore < score) { + defaults.set(score, forKey: self.highestScorekey) + } + } override func update(_ currentTime: TimeInterval) { // Called before each frame is rendered diff --git a/MiniSpaceJourney WatchKit Extension/Info.plist b/MiniSpaceJourney WatchKit Extension/Info.plist index df2ec66..c4b350c 100644 --- a/MiniSpaceJourney WatchKit Extension/Info.plist +++ b/MiniSpaceJourney WatchKit Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion 1 NSExtension diff --git a/MiniSpaceJourney.xcodeproj/project.pbxproj b/MiniSpaceJourney.xcodeproj/project.pbxproj index 340b8f7..fda5610 100644 --- a/MiniSpaceJourney.xcodeproj/project.pbxproj +++ b/MiniSpaceJourney.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -236,7 +236,7 @@ }; }; buildConfigurationList = 8C318893234BBE5100CCC78E /* Build configuration list for PBXProject "MiniSpaceJourney" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 11.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -446,6 +446,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PPKSE537F6; INFOPLIST_FILE = "MiniSpaceJourney WatchKit Extension/Info.plist"; @@ -454,8 +455,10 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -468,6 +471,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PPKSE537F6; INFOPLIST_FILE = "MiniSpaceJourney WatchKit Extension/Info.plist"; @@ -476,8 +480,10 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -491,12 +497,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PPKSE537F6; IBSC_MODULE = MiniSpaceJourney_WatchKit_Extension; INFOPLIST_FILE = "MiniSpaceJourney WatchKit App/Info.plist"; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -510,12 +520,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PPKSE537F6; IBSC_MODULE = MiniSpaceJourney_WatchKit_Extension; INFOPLIST_FILE = "MiniSpaceJourney WatchKit App/Info.plist"; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -527,12 +541,14 @@ 8C3188C0234BBE5200CCC78E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = PPKSE537F6; - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; }; @@ -541,12 +557,14 @@ 8C3188C1234BBE5200CCC78E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = PPKSE537F6; - MARKETING_VERSION = 0.1; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = si.popov.daniil.MiniSpaceJourney; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; }; @@ -562,7 +580,7 @@ 8C3188B6234BBE5200CCC78E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; + defaultConfigurationName = Release; }; 8C3188B7234BBE5200CCC78E /* Build configuration list for PBXNativeTarget "MiniSpaceJourney WatchKit Extension" */ = { isa = XCConfigurationList; @@ -571,7 +589,7 @@ 8C3188B9234BBE5200CCC78E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; + defaultConfigurationName = Release; }; 8C3188BB234BBE5200CCC78E /* Build configuration list for PBXNativeTarget "MiniSpaceJourney WatchKit App" */ = { isa = XCConfigurationList; @@ -580,7 +598,7 @@ 8C3188BD234BBE5200CCC78E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; + defaultConfigurationName = Release; }; 8C3188BF234BBE5200CCC78E /* Build configuration list for PBXNativeTarget "MiniSpaceJourney" */ = { isa = XCConfigurationList; @@ -589,7 +607,7 @@ 8C3188C1234BBE5200CCC78E /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/README.md b/README.md index 3352171..3189f53 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,21 @@ -# Mini Space Journey +
-This is the copy of the Space Invandors and my first game in swift 5 expirience. +

Mini Space Journey 🚀

-## Version 0.0.1 +

+ + + +

-![preview](Static/0.0.1/preview.png) - -### Gameplay - -![Record-0.0.1](Static/0.0.1/record-0.0.1.gif) +

+ This is the copy of the Space Invandors and my first game in swift 5. +

-## Stack: - -Most of the logic done with `WatchKit`, `UIKite` and of course `SpriteKit` - -For `sqlite` I use this lib: https://github.com/stephencelis/SQLite.swift +

+![preview](Static/0.0.1/preview.png) -## Goal +## Gameplay -- [ ] 50 Github stars - standalone WacthOS game with free access on AppStore -- [ ] 100 Github stars - Score board with highest score across all users -- [ ] 150 Github stars - 3 different enviroments (8bit style, fancy vector, funny one) 1 month for free then i will add symbolic price for 3$ for people who would like to support me \ No newline at end of file +![Record-0.0.1](Static/0.0.1/record-0.0.1.gif) diff --git a/Static/0.0.1/preview.png b/Static/0.0.1/preview.png index 3d0ec9f..0640a92 100644 Binary files a/Static/0.0.1/preview.png and b/Static/0.0.1/preview.png differ diff --git a/Static/1.0.0/preview.png b/Static/1.0.0/preview.png new file mode 100644 index 0000000..0640a92 Binary files /dev/null and b/Static/1.0.0/preview.png differ diff --git a/Static/1.0.0/record-1.0.1.mov b/Static/1.0.0/record-1.0.1.mov new file mode 100644 index 0000000..d806a4c Binary files /dev/null and b/Static/1.0.0/record-1.0.1.mov differ