diff --git a/vrchat.jordo.easyquestswitch/Editor/EQS_HierarchyController.cs b/vrchat.jordo.easyquestswitch/Editor/EQS_HierarchyController.cs index 418f2c6..491e4c9 100644 --- a/vrchat.jordo.easyquestswitch/Editor/EQS_HierarchyController.cs +++ b/vrchat.jordo.easyquestswitch/Editor/EQS_HierarchyController.cs @@ -72,8 +72,8 @@ private static void OnHierarchyItemGUI(int id, Rect rect) if (data == null || data.Objects == null) return; var targetIndex = data.Objects.FindIndex(i => - (i.Target as Component)?.gameObject.GetHashCode() == instance.GetHashCode() || - (i.Target as GameObject)?.GetHashCode() == instance.GetHashCode()); + i.Target != null && ((i.Target as Component)?.gameObject.GetHashCode() == instance.GetHashCode() || + (i.Target as GameObject)?.GetHashCode() == instance.GetHashCode())); if (targetIndex == -1) { diff --git a/vrchat.jordo.easyquestswitch/Editor/EQS_Window.cs b/vrchat.jordo.easyquestswitch/Editor/EQS_Window.cs index f09f874..5807f78 100644 --- a/vrchat.jordo.easyquestswitch/Editor/EQS_Window.cs +++ b/vrchat.jordo.easyquestswitch/Editor/EQS_Window.cs @@ -1,18 +1,18 @@ -using UnityEngine; +using System; +using UnityEngine; using UnityEditor; using UnityEditorInternal; using UnityEditor.SceneManagement; using UnityEngine.SceneManagement; using EasyQuestSwitch.Fields; using System.IO; -using UnityEditor.Build; namespace EasyQuestSwitch { public class EQS_Window : EditorWindow { - private const string version = "1.3.1"; + private const string version = "1.4.0"; [MenuItem("Window/Easy Quest Switch")] public static void ShowWindow() @@ -47,6 +47,10 @@ private EQS_Data data { private bool revealEQSdata = false; private float sideOffset = 0f; private bool showHierarchyIcon = true; + private bool promptForPlatformChange = true; + + [NonSerialized] + private bool subscribedToEvents = false; private void CreatePlatformDependantHeader(BuildTarget buildTarget) { @@ -69,8 +73,12 @@ private void CreatePlatformDependantHeader(BuildTarget buildTarget) private void OnEnable() { serializedObject = null; - EditorSceneManager.activeSceneChangedInEditMode += OnSceneChanged; - Undo.undoRedoPerformed += OnUndoRedo; + if (!subscribedToEvents) + { + EditorSceneManager.activeSceneChangedInEditMode += OnSceneChanged; + Undo.undoRedoPerformed += OnUndoRedo; + subscribedToEvents = true; + } minSize = new Vector2(512, 400); CreatePlatformDependantHeader(EditorUserBuildSettings.activeBuildTarget); @@ -95,6 +103,7 @@ private void OnEnable() chosenListFormat = EditorPrefs.GetInt("EQS_ListFormat", 0); // 0 - Simple, 1 - Reorderable sideOffset = EditorPrefs.GetFloat("EQS_HierarchySideOffset", 0f); showHierarchyIcon = EditorPrefs.GetBool("EQS_ShowHierarchyIcon", true); + promptForPlatformChange = EditorPrefs.GetBool("EQS_PromptForPlatformChange", true); if (data != null) { @@ -103,6 +112,16 @@ private void OnEnable() } } + private void OnDestroy() + { + if (subscribedToEvents) + { + EditorSceneManager.activeSceneChangedInEditMode -= OnSceneChanged; + Undo.undoRedoPerformed -= OnUndoRedo; + subscribedToEvents = false; + } + } + private void CreateEQS() { GameObject sceneRefGO = new GameObject("EQS_DATA"); @@ -429,6 +448,21 @@ private void OnGUI() DestroyEQS(); } } + EditorGUILayout.Space(10); + using (var changeOtherSettings = new EditorGUI.ChangeCheckScope()) + { + using (new EditorGUILayout.HorizontalScope()) + { + EditorGUILayout.LabelField(EQS_Localization.Current.SettingsPromptForPlatformChange, EditorStyles.wordWrappedLabel); + promptForPlatformChange = EditorGUILayout.Toggle(GUIContent.none, promptForPlatformChange); + } + + if (changeOtherSettings.changed) + { + EditorPrefs.SetBool("EQS_PromptForPlatformChange", promptForPlatformChange); + } + } + EditorGUILayout.Space(10); using (var changeHierarchySettings = new EditorGUI.ChangeCheckScope()) { EditorGUILayout.LabelField(EQS_Localization.Current.SettingsHierarchy, EditorStyles.boldLabel); diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Data.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Data.cs index 9d87ec5..73eccba 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/EQS_Data.cs +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Data.cs @@ -115,7 +115,7 @@ public void OnChangedBuildTarget(BuildTarget newTarget) public void Awake() { - if (currentVersion > version) + if (Objects != null && currentVersion > version) { foreach (Data d in Objects) { @@ -133,16 +133,19 @@ public void Awake() public void OnSceneOpened() { - /*buildInfo.NewBuildTarget = EditorUserBuildSettings.activeBuildTarget; - if (buildInfo.CachedBuildTarget != buildInfo.NewBuildTarget && Objects != null) + buildInfo.NewBuildTarget = EditorUserBuildSettings.activeBuildTarget; + if (EditorPrefs.GetBool("EQS_PromptForPlatformChange", true)) { - string displayDialog = string.Format(EQS_Localization.Current.PopupTargetChanged, buildInfo.NewBuildTarget.ToString()); - if (EditorUtility.DisplayDialog("", displayDialog, EQS_Localization.Current.PopupAccept, EQS_Localization.Current.PopupDecline)) + if (buildInfo.CachedBuildTarget != buildInfo.NewBuildTarget && Objects != null) { - ApplyTarget(buildInfo.NewBuildTarget); - buildInfo.CachedBuildTarget = buildInfo.NewBuildTarget; + string displayDialog = string.Format(EQS_Localization.Current.PopupTargetChanged, buildInfo.NewBuildTarget.ToString()); + if (EditorUtility.DisplayDialog("", displayDialog, EQS_Localization.Current.PopupAccept, EQS_Localization.Current.PopupDecline)) + { + ApplyTarget(buildInfo.NewBuildTarget); + buildInfo.CachedBuildTarget = buildInfo.NewBuildTarget; + } } - }*/ + } } public void ApplyTarget(BuildTarget newTarget) @@ -169,6 +172,7 @@ public void ApplyTarget(BuildTarget newTarget) } } } + buildInfo.CachedBuildTarget = newTarget; Debug.LogFormat(EQS_Localization.Current.LogPrefix + EQS_Localization.Current.LogSwitchSuccess, newTarget); UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene()); } diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Localization.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Localization.cs index f25ed2d..22304b6 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/EQS_Localization.cs +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Localization.cs @@ -54,6 +54,7 @@ public class EQS_LocalizedLanguage public string SettingsHierarchy; public string SettingsHierarchyIconShow; public string SettingsHierarchyIconOffset; + public string SettingsPromptForPlatformChange; public string PopupDeleteWarning; public string PopupTargetChanged; diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery.meta b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery.meta new file mode 100644 index 0000000..567a4af --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7074053ce75e0d24aa5c3f881e6c0b10 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs new file mode 100644 index 0000000..8183bc4 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs @@ -0,0 +1,48 @@ +#if UNITY_EDITOR && BAKERY_INCLUDED +using UnityEditor; +using UnityEngine; +using EasyQuestSwitch.Fields; + +namespace EasyQuestSwitch.Types +{ + [AddComponentMenu("")] + public class Type_Bakery_DirectLight : Type_Behaviour + { + [System.NonSerialized] + private BakeryDirectLight type; + + public SharedColor color = new SharedColor(); + public SharedFloat intensity = new SharedFloat(); + public SharedFloat shadowSpread = new SharedFloat(); + public SharedInt shadowSamples = new SharedInt(); + public SharedFloat indirectIntensity = new SharedFloat(); + public SharedBool antiAlias = new SharedBool(); + + + public override void Setup(Object type) + { + base.Setup(type); + BakeryDirectLight component = (BakeryDirectLight)type; + color.Setup(component.color); + intensity.Setup(component.intensity); + shadowSpread.Setup(component.shadowSpread); + shadowSamples.Setup(component.samples); + indirectIntensity.Setup(component.indirectIntensity); + antiAlias.Setup(component.supersample); + + } + + public override void Process(Object type, BuildTarget buildTarget) + { + base.Process(type, buildTarget); + BakeryDirectLight component = (BakeryDirectLight)type; + component.color = color.Get(buildTarget); + component.intensity = intensity.Get(buildTarget); + component.shadowSpread = shadowSpread.Get(buildTarget); + component.samples = shadowSamples.Get(buildTarget); + component.indirectIntensity = indirectIntensity.Get(buildTarget); + component.supersample = antiAlias.Get(buildTarget); + } + } +} +#endif \ No newline at end of file diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs.meta b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs.meta new file mode 100644 index 0000000..316562b --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_DirectLight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 169027ec4efd6804cb1e31c4e35c54bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs new file mode 100644 index 0000000..4a051fd --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs @@ -0,0 +1,46 @@ +#if UNITY_EDITOR && BAKERY_INCLUDED +using UnityEditor; +using UnityEngine; +using EasyQuestSwitch.Fields; + +namespace EasyQuestSwitch.Types +{ + [AddComponentMenu("")] + public class Type_Bakery_LightMesh : Type_Behaviour + { + [System.NonSerialized] + private BakeryLightMesh type; + + public SharedFloat intensity = new SharedFloat(); + public SharedColor color = new SharedColor(); + public SharedInt samplesNear = new SharedInt(); + public SharedInt samplesFar = new SharedInt(); + public SharedBool selfShadow = new SharedBool(); + public SharedFloat indirectIntensity = new SharedFloat(); + + public override void Setup(Object type) + { + base.Setup(type); + BakeryLightMesh component = (BakeryLightMesh)type; + intensity.Setup(component.intensity); + color.Setup(component.color); + samplesNear.Setup(component.samples); + samplesFar.Setup(component.samples2); + selfShadow.Setup(component.selfShadow); + indirectIntensity.Setup(component.indirectIntensity); + } + + public override void Process(Object type, BuildTarget buildTarget) + { + base.Process(type, buildTarget); + BakeryLightMesh component = (BakeryLightMesh)type; + component.intensity = intensity.Get(buildTarget); + component.color = color.Get(buildTarget); + component.samples = samplesNear.Get(buildTarget); + component.samples2 = samplesFar.Get(buildTarget); + component.selfShadow = selfShadow.Get(buildTarget); + component.indirectIntensity = indirectIntensity.Get(buildTarget); + } + } +} +#endif diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs.meta b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs.meta new file mode 100644 index 0000000..d10afbe --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_LightMesh.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 539aad6f8a00f3049a0212ddb21e989b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs new file mode 100644 index 0000000..b5ad4c6 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs @@ -0,0 +1,54 @@ +#if UNITY_EDITOR && BAKERY_INCLUDED +using UnityEditor; +using UnityEngine; +using EasyQuestSwitch.Fields; + +namespace EasyQuestSwitch.Types +{ + [AddComponentMenu("")] + public class Type_Bakery_PointLight : Type_Behaviour + { + [System.NonSerialized] + private BakeryPointLight type; + + public SharedColor color = new SharedColor(); + public SharedFloat intensity = new SharedFloat(); + public SharedFloat shadowSpread = new SharedFloat(); + public SharedBool physicalFalloff = new SharedBool(); + public SharedFloat range = new SharedFloat(); + public SharedInt samples = new SharedInt(); + public SharedBool legacySampling = new SharedBool(); + public SharedFloat indirectIntensity = new SharedFloat(); + + + public override void Setup(Object type) + { + base.Setup(type); + BakeryPointLight component = (BakeryPointLight)type; + color.Setup(component.color); + intensity.Setup(component.intensity); + shadowSpread.Setup(component.shadowSpread); + physicalFalloff.Setup(component.realisticFalloff); + range.Setup(component.cutoff); + samples.Setup(component.samples); + legacySampling.Setup(component.legacySampling); + indirectIntensity.Setup(component.indirectIntensity); + + } + + public override void Process(Object type, BuildTarget buildTarget) + { + base.Process(type, buildTarget); + BakeryPointLight component = (BakeryPointLight)type; + component.color = color.Get(buildTarget); + component.intensity = intensity.Get(buildTarget); + component.shadowSpread = shadowSpread.Get(buildTarget); + component.realisticFalloff = physicalFalloff.Get(buildTarget); + component.cutoff = range.Get(buildTarget); + component.samples = samples.Get(buildTarget); + component.legacySampling = legacySampling.Get(buildTarget); + component.indirectIntensity = indirectIntensity.Get(buildTarget); + } + } +} +#endif diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs.meta b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs.meta new file mode 100644 index 0000000..980dfd0 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_PointLight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8d7fa15644fedb147b7db14f099f1128 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs new file mode 100644 index 0000000..585c328 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs @@ -0,0 +1,41 @@ +#if UNITY_EDITOR && BAKERY_INCLUDED +using UnityEditor; +using UnityEngine; +using EasyQuestSwitch.Fields; + +namespace EasyQuestSwitch.Types +{ + [AddComponentMenu("")] + public class Type_Bakery_SkyLight : Type_Behaviour + { + [System.NonSerialized] + private BakerySkyLight type; + + public SharedColor color = new SharedColor(); + public SharedFloat intensity = new SharedFloat(); + public SharedInt samples = new SharedInt(); + public SharedBool hemispherical = new SharedBool(); + + + public override void Setup(Object type) + { + base.Setup(type); + BakerySkyLight component = (BakerySkyLight)type; + color.Setup(component.color); + intensity.Setup(component.intensity); + samples.Setup(component.samples); + hemispherical.Setup(component.hemispherical); + } + + public override void Process(Object type, BuildTarget buildTarget) + { + base.Process(type, buildTarget); + BakerySkyLight component = (BakerySkyLight)type; + component.color = color.Get(buildTarget); + component.intensity = intensity.Get(buildTarget); + component.samples = samples.Get(buildTarget); + component.hemispherical = hemispherical.Get(buildTarget); + } + } +} +#endif diff --git a/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs.meta b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs.meta new file mode 100644 index 0000000..dbe3277 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/Runtime/EQS_Types/Bakery/Type_Bakery_SkyLight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4f602c3ba15f83c46b4334d8b40b44bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/cn.json b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/cn.json index e214c38..49e771e 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/cn.json +++ b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/cn.json @@ -21,6 +21,7 @@ "SettingsHierarchy": "层次结构选项", "SettingsHierarchyIconShow": "显示图标", "SettingsHierarchyIconOffset": "隐藏图标", + "SettingsPromptForPlatformChange": "是否打开场景更改时EQS弹出的应用变更提示 (与Bakery存在兼容性问题).", "PopupDeleteWarning": "这将从场景及其所有数据中删除EasyQuestSwitch，您确定吗？", "PopupTargetChanged": "自上次打开此场景以来，生成目标已更改，是否为{0}应用EQS变更？\n这可以在设置菜单中手动完成。", @@ -38,4 +39,4 @@ "LogSwitchFailure": "入口{0}（{1}）在切换过程中遇到错误：{2}。", "LogSwitchSuccess": "EasyQuestSwitch应用并生成{0}场景的更改。", "LogSwitchUnsupported": "切换到不受支持的生成目标。" -} \ No newline at end of file +} diff --git a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/en.json b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/en.json index bc2ef38..07c70d6 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/en.json +++ b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/en.json @@ -21,6 +21,7 @@ "SettingsHierarchy": "Hierarchy options", "SettingsHierarchyIconShow": "Show hierarchy icon", "SettingsHierarchyIconOffset": "Icon offset", + "SettingsPromptForPlatformChange": "Show prompt to apply EQS changes if a newly opened scene still uses setting from the opposite platform (Can cause issues with Bakery).", "PopupDeleteWarning": "This will delete EasyQuestSwitch from the scene and all its data, are you sure?", "PopupTargetChanged": "Your build target has changed since the last time you've opened this scene, apply EQS changes for {0}?\nThis can be done manually in the settings menu.", diff --git a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/es.json b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/es.json index 0e47f31..45eedb4 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/es.json +++ b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/es.json @@ -21,6 +21,7 @@ "SettingsHierarchy": "Ajustes de jerarquía", "SettingsHierarchyIconShow": "Mostrar icono en la jerarquía", "SettingsHierarchyIconOffset": "Ajuste de posición del icono", + "SettingsPromptForPlatformChange": "Mostrar mensaje para aplicar cambios de EQS si una escena recién abierta todavía usa la configuración de la plataforma opuesta (puede causar problemas con Bakery).", "PopupDeleteWarning": "Esto borrara EasyQuestSwitch de la escena y todos sus datos, ¿Estas seguro?", "PopupTargetChanged": "Tu plataforma de compilacion ha cambiado desde la última vez que abriste esta escena, aplicar cambios para {0}?\nEsto puede ser hecho manualmente en el menú de ajustes.", diff --git a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/fr.json b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/fr.json index d5cf21f..f7792b4 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/fr.json +++ b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/fr.json @@ -21,6 +21,7 @@ "SettingsHierarchy": "Options de hiérarchie", "SettingsHierarchyIconShow": "Montrer les icones", "SettingsHierarchyIconOffset": "Décalage des icones", + "SettingsPromptForPlatformChange": "Montrer une fenêtre de dialogue pour appliquer les changements d'EQS si une scène chargée à l'instant utilise encore des paramètres de la platforme opposée (Peut causer des problèmes avec Bakery).", "PopupDeleteWarning": "Ceci va supprimer Easy Quest Switch de la scène ainsi que toutes ses données, êtes-vous sûr?", "PopupTargetChanged": "Votre platforme cible a changée depuis la dernière fois que vous avez ouvert la scène, appliquer les changements EQS pour {0}?\nCela peut-être effectué manuellement dans le menu paramètres.", diff --git a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/jp.json b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/jp.json index a6416a8..f786654 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/jp.json +++ b/vrchat.jordo.easyquestswitch/Runtime/Resources/EQS_Localizations/jp.json @@ -21,6 +21,7 @@ "SettingsHierarchy": "ヒエラルキーの設定", "SettingsHierarchyIconShow": "アイコンの表示", "SettingsHierarchyIconOffset": "アイコンのオフセット", + "SettingsPromptForPlatformChange": "新しく開いたシーンが別プラットフォーム用の設定な際にEQSの設定を適用するか確認画面を表示する (Bakeryで不具合が発生する可能性)。", "PopupDeleteWarning": "シーンから「EasyQuestSwitch」が削除され、データもすべて削除されます。続行しますか？", "PopupTargetChanged": "前回のBuild実行時と違うPlatformへ変更されました。EQSを{0}用で適用してください。\nマニュアルで適用する場合は設定メニューから実行可能です。", diff --git a/vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef b/vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef deleted file mode 100644 index 359bb55..0000000 --- a/vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "vrchat.jordo.easyquestswitch", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "autoReferenced": true, - "overrideReferences": false, - "precompiledReferences": [], - "defineConstraints": [], - "optionalUnityReferences": [] -} \ No newline at end of file diff --git a/vrchat.jordo.easyquestswitch/package.json b/vrchat.jordo.easyquestswitch/package.json index 47e1fb3..513b804 100644 --- a/vrchat.jordo.easyquestswitch/package.json +++ b/vrchat.jordo.easyquestswitch/package.json @@ -1,7 +1,7 @@ { "name": "vrchat.jordo.easyquestswitch", "displayName": "EasyQuestSwitch", - "version": "1.3.1", + "version": "1.4.0", "unity" : "2019.4", "description": "EasyQuestSwitch is a Unity editor tool developed for VRChat world creators, it can automate changes to components within a scene as soon as the build platform is changed from PC to Android (for Oculus Quest) or vice versa.", "author" : { diff --git a/vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef b/vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef new file mode 100644 index 0000000..1679e99 --- /dev/null +++ b/vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef @@ -0,0 +1,16 @@ +{ + "name": "vrchat.jordo.easyquestswitch", + "rootNamespace": "", + "references": [ + "GUID:a1653399f63795746b1857281d1e400d" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef.meta b/vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef.meta similarity index 76% rename from vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef.meta rename to vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef.meta index 751e382..7585723 100644 --- a/vrchat.jordo.easyquestswitch/Runtime/vrchat.jordo.easyquestswitch.asmdef.meta +++ b/vrchat.jordo.easyquestswitch/vrchat.jordo.easyquestswitch.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d072839ead224a342acd9b4b74e9fb90 +guid: 8542fd60c7b23104fb2c3959b8c2b4d5 AssemblyDefinitionImporter: externalObjects: {} userData: