diff --git a/.gitignore b/.gitignore index 31c5633..241320f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /[Oo]bj/ /[Bb]uild/ /[Bb]uilds/ +/[Ll]ogs/ /Assets/AssetStoreTools* # Visual Studio 2015 cache directory @@ -34,4 +35,4 @@ sysinfo.txt *.unitypackage # Mac -.DS_Store \ No newline at end of file +.DS_Store diff --git a/Assets/Bezier/Editor/SVG/SVGParser.cs b/Assets/Bezier/Editor/SVG/SVGParser.cs index 2b8939d..de24a8c 100644 --- a/Assets/Bezier/Editor/SVG/SVGParser.cs +++ b/Assets/Bezier/Editor/SVG/SVGParser.cs @@ -24,7 +24,7 @@ public GameObject Parse(string svgStr, bool stripGroups = false) // Ignore links to external resources. XmlReaderSettings settings = new XmlReaderSettings(); settings.XmlResolver = null; - settings.ProhibitDtd = false; + settings.DtdProcessing = DtdProcessing.Parse; GameObject go = new GameObject("SVG"); RectTransform svgElement = go.AddComponent(); diff --git a/Assets/Klak/Wiring/Editor/Patcher/Graph.cs b/Assets/Klak/Wiring/Editor/Patcher/Graph.cs index 6d61bdc..dfd75d2 100644 --- a/Assets/Klak/Wiring/Editor/Patcher/Graph.cs +++ b/Assets/Klak/Wiring/Editor/Patcher/Graph.cs @@ -141,6 +141,12 @@ public override bool CanConnect(Graphs.Slot fromSlot, Graphs.Slot toSlot) { // If the outlet is bang, any inlet can be connected. if (fromSlot.dataType == null) return true; + + // TE: workaround for not being able to use System.Single as inlets with scripting runtime 4.0 + // System.Single is replaced with UnityEngine.WrapMode, check Node.cs:138 + if ((fromSlot.dataType == typeof(System.Single)) && toSlot.dataType == typeof(UnityEngine.WrapMode)) + return true; + // Apply simple type matching. return fromSlot.dataType == toSlot.dataType; } diff --git a/Assets/Klak/Wiring/Editor/Patcher/Node.cs b/Assets/Klak/Wiring/Editor/Patcher/Node.cs index 9081443..541ffd9 100644 --- a/Assets/Klak/Wiring/Editor/Patcher/Node.cs +++ b/Assets/Klak/Wiring/Editor/Patcher/Node.cs @@ -131,8 +131,16 @@ void PopulateSlots() var attrs = prop.GetCustomAttributes(typeof(Wiring.InletAttribute), true); if (attrs.Length == 0) continue; + var propType = prop.PropertyType; + + // TE: workaround for not being able to use System.Single as inlets with scripting runtime 4.0 + // System.Single is replaced with UnityEngine.WrapMode. Using WrapMode is arbitrary, just something + // that doesn't cause an assert deep in the graph system. + if (prop.PropertyType == typeof(System.Single)) + propType = typeof(UnityEngine.WrapMode); + // Register the setter method as an input slot. - var slot = AddInputSlot("set_" + prop.Name, prop.PropertyType); + var slot = AddInputSlot("set_" + prop.Name, propType); // Apply the standard nicifying rule. slot.title = ObjectNames.NicifyVariableName(prop.Name); diff --git a/Assets/Videolab/Videopak/Editor/BuildVideopaks.cs b/Assets/Videolab/Videopak/Editor/BuildVideopaks.cs index b30f38f..c09f7bf 100644 --- a/Assets/Videolab/Videopak/Editor/BuildVideopaks.cs +++ b/Assets/Videolab/Videopak/Editor/BuildVideopaks.cs @@ -2,40 +2,168 @@ using UnityEditor; using System.IO; -public class BuildVideopaks +public class BuildVideopakWindow : EditorWindow { - [MenuItem ("Assets/Build Videopaks")] - static void BuildAll() + private static VideopakSettings _settings; + int _selectedAssetBundle = 0; + string _outputLog = ""; + static string _lastOutputPath = ""; + + RuntimePlatform[] platforms = { RuntimePlatform.IPhonePlayer, RuntimePlatform.Android, RuntimePlatform.OSXPlayer }; + BuildTarget[] targets = { BuildTarget.iOS, BuildTarget.Android, BuildTarget.StandaloneOSX }; + string[] platformNames = { "iOS", "Android", "OSX" }; + + [MenuItem("Assets/Build Videopaks")] + public static void ShowWindow() + { + EditorWindow.GetWindow(typeof(BuildVideopakWindow)); + } + + public void InitSettings() + { + _settings = null; + + var allFound = AssetDatabase.FindAssets("t: VideopakSettings"); + if (allFound.Length > 0) + { + var path = AssetDatabase.GUIDToAssetPath(allFound[0]); + _settings = AssetDatabase.LoadAssetAtPath(path); + //Debug.Log("found object " + path + " " + _settings); + } + + if (_settings == null) + { + _settings = ScriptableObject.CreateInstance(); + _settings.pakName = "videopak"; + _settings.author = "user"; + AssetDatabase.CreateAsset(_settings, AssetDatabase.GenerateUniqueAssetPath("Assets/VideopakSettings.asset")); + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + } + } + + void BuildAssetBundle(string bundleName) { - string rootDir = EditorUtility.SaveFolderPanel("Select output directory", "", ""); + string targetFile = EditorUtility.SaveFilePanel("Select output file", _lastOutputPath, bundleName + ".zpak", "zpak"); - if (string.IsNullOrEmpty(rootDir)) + if (string.IsNullOrEmpty(targetFile)) return; - foreach (string bundleName in AssetDatabase.GetAllAssetBundleNames()) + _lastOutputPath = Path.GetDirectoryName(targetFile); + _outputLog = ""; + + AssetBundleBuild buildInfo = new AssetBundleBuild(); + buildInfo.assetBundleName = bundleName; + buildInfo.assetNames = AssetDatabase.GetAssetPathsFromAssetBundle(bundleName); + AssetBundleBuild[] buildMap = { buildInfo }; + + PakManifest manifest = new PakManifest(_settings.pakName, _settings.author); + manifest.version = 1; + manifest.unityVersion = Application.unityVersion; + + string tmpPath = Path.Combine(FileUtil.GetUniqueTempPathInProject(), bundleName); + Directory.CreateDirectory(tmpPath); + + if (_settings.icon != null) + { + // TODO: verify that it's actually a png + string iconPath = Path.Combine(Application.dataPath, "../", AssetDatabase.GetAssetPath(_settings.icon)); + File.Copy(iconPath, Path.Combine(tmpPath, "icon.png")); + } + + string jsonPath = Path.Combine(tmpPath, "videopak.json"); + string json = JsonUtility.ToJson(manifest, true); + File.WriteAllText(jsonPath, json); + + for (int i = 0; i < platforms.Length; i++) + { + _outputLog += string.Format("building {0}..\n", platformNames[i]); + + string platformStr = VideopakManager.GetPlatformString(platforms[i]); + string platformDir = Path.Combine(tmpPath, platformStr); + Directory.CreateDirectory(platformDir); + BuildPipeline.BuildAssetBundles(platformDir, buildMap, BuildAssetBundleOptions.None, targets[i]); + } + + _outputLog += string.Format("compressing..\n"); + + VideopakManager.CompressPak(tmpPath, targetFile); + + _outputLog += string.Format("build succeeded\n\n"); + } + + private bool ValidatePakName(string pakName) + { + if (string.IsNullOrEmpty(pakName)) + return false; + + return true; + } + + private bool ValidateIcon(Texture2D icon) + { + if (icon == null) + return true; + + string ext = Path.GetExtension(AssetDatabase.GetAssetPath(_settings.icon)); + + return (ext.ToLower() == ".png"); + } + + void OnGUI() + { + if (_settings == null) + InitSettings(); + + GUILayout.Label("Settings", EditorStyles.boldLabel); + + EditorGUILayout.Space(); + + var bundleNames = AssetDatabase.GetAllAssetBundleNames(); + _selectedAssetBundle = EditorGUILayout.Popup("Choose AssetBundle", _selectedAssetBundle, bundleNames); + + EditorGUI.BeginDisabledGroup(bundleNames.Length <= 0); + _settings.pakName = EditorGUILayout.TextField("Name", _settings.pakName); + _settings.author = EditorGUILayout.TextField("Author", _settings.author); + _settings.icon = EditorGUILayout.ObjectField("Icon", _settings.icon, typeof(Texture2D), false) as Texture2D; + + EditorUtility.SetDirty(_settings); + + EditorGUI.EndDisabledGroup(); + + EditorGUILayout.Space(); + + EditorGUILayout.BeginHorizontal(); + + if (GUILayout.Button("Build")) { - AssetBundleBuild buildInfo = new AssetBundleBuild(); - buildInfo.assetBundleName = bundleName; - buildInfo.assetNames = AssetDatabase.GetAssetPathsFromAssetBundle(bundleName); - AssetBundleBuild[] buildMap = new AssetBundleBuild[] { buildInfo }; - - string pakDir = rootDir + "/" + bundleName + "/"; - - string iosDir = pakDir + VideopakManager.GetPlatformString(RuntimePlatform.IPhonePlayer); - Directory.CreateDirectory(iosDir); - BuildPipeline.BuildAssetBundles(iosDir, buildMap, BuildAssetBundleOptions.None, BuildTarget.iOS); - - string androidDir = pakDir + VideopakManager.GetPlatformString(RuntimePlatform.Android); - Directory.CreateDirectory(androidDir); - BuildPipeline.BuildAssetBundles(androidDir, buildMap, BuildAssetBundleOptions.None, BuildTarget.Android); - - string osxDir = pakDir + VideopakManager.GetPlatformString(RuntimePlatform.OSXPlayer); - Directory.CreateDirectory(osxDir); - #if UNITY_2017_3_OR_NEWER - BuildPipeline.BuildAssetBundles(osxDir, buildMap, BuildAssetBundleOptions.None, BuildTarget.StandaloneOSX); - #else - BuildPipeline.BuildAssetBundles(osxDir, buildMap, BuildAssetBundleOptions.None, BuildTarget.StandaloneOSXUniversal); - #endif + + if (_selectedAssetBundle >= bundleNames.Length) + { + _outputLog = "No AssetBundle selected. Aborting.."; + } + else if (!ValidatePakName(_settings.pakName)) + { + _outputLog = "Invalid pak name. Aborting.."; + } + else if (!ValidateIcon(_settings.icon)) + { + _outputLog = "Icon is not a png file. Aborting.."; + } + else + { + BuildAssetBundle(bundleNames[_selectedAssetBundle]); + GUIUtility.ExitGUI(); + } } + + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.Space(); + + GUILayout.Label("Output:", EditorStyles.boldLabel); + EditorGUILayout.SelectableLabel(_outputLog, EditorStyles.textArea, GUILayout.ExpandHeight(true)); + + EditorGUILayout.Space(); } } diff --git a/Assets/Videolab/Videopak/Editor/VideopakSettings.cs b/Assets/Videolab/Videopak/Editor/VideopakSettings.cs new file mode 100644 index 0000000..38470bc --- /dev/null +++ b/Assets/Videolab/Videopak/Editor/VideopakSettings.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public class VideopakSettings : ScriptableObject +{ + [HideInInspector] + public string pakName; + [HideInInspector] + public string author; + [HideInInspector] + public Texture2D icon; +} diff --git a/Assets/Videolab/Videopak/Editor/VideopakSettings.cs.meta b/Assets/Videolab/Videopak/Editor/VideopakSettings.cs.meta new file mode 100644 index 0000000..a7061b1 --- /dev/null +++ b/Assets/Videolab/Videopak/Editor/VideopakSettings.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3f53bc1b26fd1481091485ca15744c78 +timeCreated: 1521637390 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Videolab/Videopak/VideopakManager.cs b/Assets/Videolab/Videopak/VideopakManager.cs index f4197a7..3e1402d 100644 --- a/Assets/Videolab/Videopak/VideopakManager.cs +++ b/Assets/Videolab/Videopak/VideopakManager.cs @@ -1,6 +1,17 @@ using UnityEngine; -using UnityEngine.SceneManagement; using System.IO; +using System.IO.Compression; + +public class PakManifest +{ + public PakManifest(string _name, string _author) { name = _name; author = _author; } + public string name; + public string token; + public string author; + public string unityVersion; + public int version; + public bool encryption; +} public class VideopakManager { @@ -31,56 +42,48 @@ public static string GetPlatformString(RuntimePlatform platform) return null; } - public static void LoadPak(string pakRoot) + public static void CompressPak(string dir, string zipPath) { - Unload(); - - string platform = GetPlatformString(Application.platform); - if (platform == null) - { - Debug.Log("[VideopakManager] Unsupported platform"); - return; - } - - string pakName = Path.GetFileName(pakRoot); - string path = pakRoot + "/" + platform + "/" + pakName; -#if !UNITY_ANDROID - if (!File.Exists(path)) - { - Debug.Log("[VideopakManager] Missing platform payload " + path); - return; - } -#endif + if (File.Exists(zipPath)) + File.Delete(zipPath); + ZipFile.CreateFromDirectory(dir, zipPath, System.IO.Compression.CompressionLevel.Fastest, true); + Debug.Log("Compress " + dir + " => " + zipPath); + } - AssetBundle bundle = AssetBundle.LoadFromFile(path); - if (bundle == null) - { - Debug.Log("[VideopakManager] Failed to load videopak " + path); - return; - } + public static void ExtractPak(string zipPath, string dir) + { + if (Directory.Exists(dir)) + Directory.Delete(dir, true); + Directory.CreateDirectory(dir); - var scenePaths = bundle.GetAllScenePaths(); - if (scenePaths.Length == 0) - { - Debug.Log("[VideopakManager] No scene to load"); - return; - } + ZipFile.ExtractToDirectory(zipPath, dir); - SceneManager.LoadScene(scenePaths[0], LoadSceneMode.Additive); + Debug.Log("Extract " + zipPath + " => " + dir); + } - Instance._bundle = bundle; + public static PakManifest ReadManifest(string jsonPath) + { + if (!File.Exists(jsonPath)) + return new PakManifest("unknown", "unknown"); + string json = File.ReadAllText(jsonPath); + return JsonUtility.FromJson(json); } - public static void Unload() + public static void WriteManifest(PakManifest manifest, string jsonPath) { - AssetBundle bundle = Instance._bundle; + string json = JsonUtility.ToJson(manifest, true); + File.WriteAllText(jsonPath, json); + } - if (bundle != null) + public static string FindPakFolder(string rootFolder) + { + var directories = Directory.GetDirectories(rootFolder); + foreach (var dir in directories) { - var scenePaths = bundle.GetAllScenePaths(); - SceneManager.UnloadScene(scenePaths[0]); - - bundle.Unload(true); + if (Path.GetFileName(dir).StartsWith("__", System.StringComparison.InvariantCultureIgnoreCase)) + continue; + return dir; } + return ""; } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 2bb1d51..2d466e6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.collab-proxy": "1.2.15", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index db6fed6..b46bcf9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 18 productGUID: ba00aac3463474a6e8056b67f8e1972a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,8 +52,8 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 0 allowedAutorotateToPortraitUpsideDown: 0 @@ -63,6 +63,8 @@ PlayerSettings: use32BitDisplayBuffer: 1 preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -96,22 +98,23 @@ PlayerSettings: xboxEnableGuest: 0 xboxEnablePIXSampling: 0 metalFramebufferOnly: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 vulkanEnableSetSRGBWrite: 0 - vulkanUseSWCommandBuffers: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -143,8 +146,12 @@ PlayerSettings: oculus: sharedDepthBuffer: 0 dashSupport: 0 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 protectGraphicsMemory: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 @@ -171,7 +178,7 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 8.0 + iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 9.0 @@ -229,6 +236,7 @@ PlayerSettings: metalEditorSupport: 0 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 1 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -236,8 +244,8 @@ PlayerSettings: tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 1 iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - vulkanEditorSupport: 0 clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: @@ -396,6 +404,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: 0x0005000C10000001 switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -410,6 +419,7 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 @@ -451,6 +461,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -470,6 +481,7 @@ PlayerSettings: ps4pnGameCustomData: 1 playerPrefsSupport: 0 enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -490,56 +502,11 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: WRK5RhRXdCdG5nG5azdNMK66MuCV6GXi - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 2 splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: @@ -555,14 +522,16 @@ PlayerSettings: webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 webGLLinkerTarget: 1 + webGLThreadsSupport: 0 scriptingDefineSymbols: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -580,6 +549,8 @@ PlayerSettings: metroMediumTileShowName: 0 metroLargeTileShowName: 0 metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} @@ -587,21 +558,11 @@ PlayerSettings: a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} + metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -627,16 +588,36 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 + XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: {} + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_PrivateKeyPath: + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: facebookSdkVersion: 7.9.1 - apiCompatibilityLevel: 2 + facebookAppId: + facebookCookies: 1 + facebookLogging: 1 + facebookStatus: 1 + facebookXfbml: 0 + facebookFrictionlessRequests: 1 + apiCompatibilityLevel: 6 cloudProjectId: 2c435fb4-5353-4f30-9b6d-d0e0a13bf5a7 + framebufferDepthMemorylessMode: 0 projectName: VideoLab organizationId: teenage-engineering cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 62410b5..7dbf3ee 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.15f1 +m_EditorVersion: 2018.4.29f1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..6e0eaca --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05