diff --git a/.gitignore b/.gitignore index c0a4674..15b1397 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ /[Bb]uild/ /[Bb]uilds/ /Assets/AssetStoreTools* +/Build* +/DungeonDrifter* # Visual Studio 2015 cache directory /.vs/ diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index f14439a..bc96d30 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -874,12 +874,22 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4079161515917916, guid: 3d1911457c1e44f53b6b4044334db52f, type: 2} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f, type: 2} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 114874769993434856, guid: 3d1911457c1e44f53b6b4044334db52f, + type: 2} + propertyPath: decelerationTime + value: 1.2346 + objectReference: {fileID: 0} + - target: {fileID: 114874769993434856, guid: 3d1911457c1e44f53b6b4044334db52f, + type: 2} + propertyPath: accelerationTime + value: 2.115 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3d1911457c1e44f53b6b4044334db52f, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Editor.meta b/Assets/Scripts/Editor.meta new file mode 100644 index 0000000..0c84b25 --- /dev/null +++ b/Assets/Scripts/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d436636dbd1f742f1b6162aed378db8e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/BuildScript.cs b/Assets/Scripts/Editor/BuildScript.cs new file mode 100644 index 0000000..872c8fe --- /dev/null +++ b/Assets/Scripts/Editor/BuildScript.cs @@ -0,0 +1,49 @@ +using UnityEditor; +using UnityEngine; +using System; +using System.IO; +using System.IO.Compression; +using System.Collections; +using System.Text; + + +public class BuildSrcipt +{ + static string[] scenes = { "Assets/Scenes/CodeDEV.unity", "Assets/Scenes/TitleScene.unity" }; + static string name = "DungeonDrifter"; + + [MenuItem("Build/Build WebGL")] + static void BuildWebGL() + { + BuildPlatform("Web", BuildTarget.WebGL); + } + + [MenuItem("Build/Build Windows")] + static void BuildWindows() + { + BuildPlatform("Windows", BuildTarget.StandaloneWindows64); + } + + [MenuItem("Build/Build Linux")] + static void BuildLinux() + { + //System.Diagnostics.Process.Start("mkdir /home/piegames/Documents/GitHub/Bildschirmflausch.LD41/teghsfdt"); + //Debug.Log("fdsghjk"); + BuildPlatform("Linux", BuildTarget.StandaloneLinux64); + } + + [MenuItem("Build/Build All")] + public static void BuildAll() + { + BuildLinux(); + BuildWindows(); + BuildWebGL(); + } + + public static void BuildPlatform(String platformName, BuildTarget target) { + Directory.Delete("./" + name + "_" + platformName, true); + File.Delete("./Build/DungeonDrifter_" + platformName + ".zip"); + BuildPipeline.BuildPlayer(scenes, "./" + name + "_" + platformName + "/" + name, target, BuildOptions.None); + //System.Diagnostics.Process.Start("zip -r Build/DungeonDrifter_" + platformName + ".zip " + platformName + "_" + platformName); + } +} diff --git a/Assets/Scripts/Editor/BuildScript.cs.meta b/Assets/Scripts/Editor/BuildScript.cs.meta new file mode 100644 index 0000000..b116ff9 --- /dev/null +++ b/Assets/Scripts/Editor/BuildScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f4d60d6c3548540a9b16f0b576036aba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/textures/Logo/CatCoinLogo.png b/Assets/graphics/textures/Logo/CatCoinLogo.png new file mode 100644 index 0000000..6704732 Binary files /dev/null and b/Assets/graphics/textures/Logo/CatCoinLogo.png differ diff --git a/Assets/graphics/textures/Logo/CatCoinLogo.png.meta b/Assets/graphics/textures/Logo/CatCoinLogo.png.meta new file mode 100644 index 0000000..151746c --- /dev/null +++ b/Assets/graphics/textures/Logo/CatCoinLogo.png.meta @@ -0,0 +1,84 @@ +fileFormatVersion: 2 +guid: b13cb48b952d04041a1cec126d0ff50c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 5 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: acf37f635c5b3384ea6414a7a3b00f24 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7a3dfe8..98b9ae8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -251,8 +251,107 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: b13cb48b952d04041a1cec126d0ff50c, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 diff --git a/build.log b/build.log new file mode 100644 index 0000000..6f871df --- /dev/null +++ b/build.log @@ -0,0 +1,23 @@ +Desktop is 1920 x 1080 @ 60 Hz +GLX Extensions: GLX_ARB_create_context GLX_ARB_create_context_profile GLX_ARB_create_context_robustness GLX_ARB_fbconfig_float GLX_ARB_framebuffer_sRGB GLX_ARB_get_proc_address GLX_ARB_multisample GLX_EXT_buffer_age GLX_EXT_create_context_es2_profile GLX_EXT_create_context_es_profile GLX_EXT_fbconfig_packed_float GLX_EXT_framebuffer_sRGB GLX_EXT_import_context GLX_EXT_texture_from_pixmap GLX_EXT_visual_info GLX_EXT_visual_rating GLX_INTEL_swap_event GLX_MESA_copy_sub_buffer GLX_MESA_multithread_makecurrent GLX_MESA_query_renderer GLX_MESA_swap_control GLX_OML_swap_method GLX_OML_sync_control GLX_SGIS_multisample GLX_SGIX_fbconfig GLX_SGIX_pbuffer GLX_SGIX_visual_select_group GLX_SGI_make_current_read GLX_SGI_swap_control GLX_SGI_video_sync +[Package Manager] Server::Start -- Port 54942 was selected + +LICENSE SYSTEM [2018425 1:52:11] Next license update check is after 2018-04-25T15:47:16 + + + COMMAND LINE ARGUMENTS: +/opt/UnityBeta/Editor/Unity +-quit +-logfile +build.log +-buildTarget +./WebGL +/home/piegames/Documents/GitHub/Bildschirmflausch.LD41 +Loading GUID <-> Path mappings...0.000068 seconds +Loading Asset Database...0.006397 seconds +Audio: FMOD Profiler initialized on port 54900 +AssetDatabase consistency checks...0.022087 seconds +Build target platform name './WebGL' is not valid. Supported targets: Android, Linux, Linux64, LinuxUniversal, N3DS, OSXUniversal, PS4, PSM, PSP2, Switch, Tizen, Web, WebGL, WebStreamed, WiiU, Win, Win64, WindowsStoreApps, XboxOne, iOS, tvOS + +(Filename: /home/builduser/buildslave/unity/build/Editor/Src/Application/Application.cpp Line: 813) + diff --git a/package.sh b/package.sh new file mode 100755 index 0000000..6b2f705 --- /dev/null +++ b/package.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +#unity-editor-beta -executeMethod Editor.BuildScript.BuildAll +#unity-editor-beta -quit -batchmode -buildLinux64Player ./DungeonDrifter_Linux/DungeonDrifter +#unity-editor-beta -quit -batchmode -buildWindows64Player ./DungeonDrifter_Windows/DungeonDrifter + +zip -r Build/DungeonDrifter_Windows.zip DungeonDrifter_Windows +zip -r Build/DungeonDrifter_Linux.zip DungeonDrifter_Linux +zip -r Build/DungeonDrifter_Web.zip DungeonDrifter_Web