From 7d6b4fed803f6f451ebcfa0fc478651d5f9cd203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skjalg=20S=2E=20M=C3=A6hre?= Date: Mon, 11 Sep 2017 20:58:33 +0200 Subject: [PATCH] Fixed bug with grid-size export --- Assets/Stickers/Editor/StickersExport.cs | 3 +- Assets/Stickers/Resources/StickerPack.asset | 1 + ProjectSettings/ProjectSettings.asset | 180 +++++++++++++++++--- README.md | 3 +- 4 files changed, 162 insertions(+), 25 deletions(-) diff --git a/Assets/Stickers/Editor/StickersExport.cs b/Assets/Stickers/Editor/StickersExport.cs index 26692ae..afd44aa 100644 --- a/Assets/Stickers/Editor/StickersExport.cs +++ b/Assets/Stickers/Editor/StickersExport.cs @@ -137,7 +137,7 @@ private static void ExportStickers(StickerPack pack, string path) } var pathToContent = path + "/Stickers.xcassets/Contents.json"; - var contents = CreateContent(); + var contents = CreateStickerPackContent(pack.Size); contents.WriteToFile(pathToContent); var plist = CreatePList(pack.Title, PlayerSettings.bundleVersion, PlayerSettings.iOS.buildNumber); @@ -291,6 +291,7 @@ public static JsonDocument CreateStickerContent(Texture2D file) properties.SetString("filename", file.name + ".png"); return content; } + public static JsonDocument CreateStickerSequenceContent(Sticker stickerSequence) { var content = CreateContent(); diff --git a/Assets/Stickers/Resources/StickerPack.asset b/Assets/Stickers/Resources/StickerPack.asset index 4ab9142..8558c1f 100644 --- a/Assets/Stickers/Resources/StickerPack.asset +++ b/Assets/Stickers/Resources/StickerPack.asset @@ -36,6 +36,7 @@ MonoBehaviour: iPhoneSettings2: {fileID: 0} iPhoneSettings3: {fileID: 0} iPadSettings2: {fileID: 0} + size: 2 Stickers: - {fileID: 114534190145373984} - {fileID: 114602808068927756} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3c5dafb..27159f1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 10 + serializedVersion: 12 productGUID: 5685e460f8cef4b1cadad489b54df029 AndroidProfiler: 1 defaultScreenOrientation: 0 @@ -14,7 +14,7 @@ PlayerSettings: productName: StickersApp defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1} + m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 @@ -70,12 +70,14 @@ PlayerSettings: captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 + Force IOS Speakers When Recording: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games gpuSkinning: 0 graphicsJobs: 0 xboxPIXTextureCapture: 0 @@ -85,6 +87,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 0 allowFullscreenSwitch: 1 + graphicsJobMode: 0 macFullscreenMode: 2 d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 @@ -95,11 +98,11 @@ PlayerSettings: n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 - uiUse16BitDepthBuffer: 0 ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 + xboxOneDisableEsram: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 @@ -118,27 +121,46 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleIdentifier: no.agens.stickersapp bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 + xboxOneEnable7thCore: 0 + vrSettings: + cardboard: + depthFormat: 0 + enableTransitionView: 0 + daydream: + depthFormat: 0 + useSustainedPerformanceMode: 0 + hololens: + depthFormat: 1 protectGraphicsMemory: 0 + useHDRDisplay: 0 + targetPixelDensity: 0 + resolutionScalingMode: 0 + applicationIdentifier: + Android: no.agens.stickersapp + Standalone: unity.Agens.StickersApp + Tizen: no.agens.stickersapp + iOS: no.agens.stickersapp + tvOS: no.agens.stickersapp + buildNumber: + iOS: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 15 + AndroidMinSdkVersion: 16 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - apiCompatibilityLevel: 2 stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 1 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 - preloadShaders: 0 + keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 VertexChannelCompressionMask: serializedVersion: 2 @@ -191,6 +213,9 @@ PlayerSettings: iOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 + iOSRenderExtraFrameOnPause: 1 appleDeveloperTeamID: US7P5RSD3X iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -330,6 +355,7 @@ PlayerSettings: wiiUGamePadStartupScreen: {fileID: 0} wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: + playModeTestRunnerEnabled: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 1 logObjCUncaughtExceptions: 1 @@ -337,16 +363,116 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: - XboxTitleId: - XboxImageXexPath: - XboxSpaPath: - XboxGenerateSpa: 0 - XboxDeployKinectResources: 0 - XboxSplashScreen: {fileID: 0} - xboxEnableSpeech: 0 - xboxAdditionalTitleMemorySize: 0 - xboxDeployKinectHeadOrientation: 0 - xboxDeployKinectHeadPosition: 0 + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchScreenResolutionBehavior: 2 + switchUseCPUProfiler: 0 + switchApplicationID: 0x01004b9000490000 + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchTouchScreenUsage: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchApplicationAttribute: 0 + switchCardSpecSize: -1 + switchCardSpecClock: -1 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchDataLossConfirmation: 0 + switchSupportedNpadStyles: 3 + switchSocketConfigEnabled: 0 + switchTcpInitialSendBufferSize: 32 + switchTcpInitialReceiveBufferSize: 64 + switchTcpAutoSendBufferSizeMax: 256 + switchTcpAutoReceiveBufferSizeMax: 256 + switchUdpSendBufferSize: 9 + switchUdpReceiveBufferSize: 42 + switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -384,7 +510,6 @@ PlayerSettings: ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 ps4Passcode: 2qmWqBlQ9wQj99nsQzldVI5ZuGXbEWRK - ps4UseDebugIl2cppLibs: 0 ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -459,13 +584,14 @@ PlayerSettings: psp2UseLibLocation: 0 psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 - psp2UseDebugIl2cppLibs: 0 + psp2ScriptOptimizationLevel: 0 psmSplashimage: {fileID: 0} splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -491,6 +617,8 @@ PlayerSettings: iOS: 1 tvOS: 0 additionalIl2CppArgs: + scriptingRuntimeVersion: 0 + apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: WorkingOut @@ -525,7 +653,7 @@ PlayerSettings: tizenMicrophonePermissions: 0 tizenDeploymentTarget: tizenDeploymentTargetType: -219091460 - tizenMinOSVersion: 0 + tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 @@ -565,7 +693,11 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - vrEditorSettings: {} + xboxOneScriptCompiler: 0 + vrEditorSettings: + daydream: + daydreamIconForeground: {fileID: 0} + daydreamIconBackground: {fileID: 0} cloudServicesEnabled: Analytics: 0 Build: 0 @@ -576,7 +708,11 @@ PlayerSettings: Purchasing: 0 UNet: 1 Unity_Ads: 0 + facebookSdkVersion: 7.9.4 + apiCompatibilityLevel: 2 cloudProjectId: 79be374b-3845-4600-a370-b33760643316 projectName: StickersApp organizationId: agens cloudEnabled: 0 + enableNativePlatformBackendsForNewInputSystem: 0 + disableOldInputManagerSupport: 0 diff --git a/README.md b/README.md index 15f41ee..979e8e5 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ Tested with several Unity Versions * Unity 5.5.2f1 * Unity 5.6.0f3 * Unity 5.6.1f1 -* Unity 2017.1.b1 -* Unity 2017.1.b9 +* Unity 2017.1.1f1 ## Feedback