fix var name
This commit is contained in:
parent
1bfa4d5b41
commit
7669aa0212
@ -33,43 +33,43 @@ namespace AsmdefHelper.CustomCreate.Editor {
|
|||||||
root.Add(labelFromUXML);
|
root.Add(labelFromUXML);
|
||||||
|
|
||||||
// UI取得
|
// UI取得
|
||||||
var PathTextField = root.Q<TextField>(className: "PathTextField");
|
var pathTextField = root.Q<TextField>(className: "PathTextField");
|
||||||
var NameTextField = root.Q<TextField>(className: "NameTextField");
|
var nameTextField = root.Q<TextField>(className: "NameTextField");
|
||||||
var AllowUnsafeToggle = root.Q<Toggle>(className: "AllowUnsafeToggle");
|
var allowUnsafeToggle = root.Q<Toggle>(className: "AllowUnsafeToggle");
|
||||||
var AutoReferencedToggle = root.Q<Toggle>(className: "AutoReferencedToggle");
|
var autoReferencedToggle = root.Q<Toggle>(className: "AutoReferencedToggle");
|
||||||
var NoEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
|
var noEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
|
||||||
var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
|
var overrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
|
||||||
var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
|
var rootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
|
||||||
var IsEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
|
var isEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
|
||||||
var CreateButton = root.Q<Button>(className: "CreateButton");
|
var createButton = root.Q<Button>(className: "CreateButton");
|
||||||
|
|
||||||
// PathとNameの初期値
|
// PathとNameの初期値
|
||||||
var asset = Selection.activeObject;
|
var asset = Selection.activeObject;
|
||||||
var assetPath = AssetDatabase.GetAssetPath(asset);
|
var assetPath = AssetDatabase.GetAssetPath(asset);
|
||||||
var directory = string.IsNullOrWhiteSpace(assetPath) ? "Assets/" : assetPath;
|
var directory = string.IsNullOrWhiteSpace(assetPath) ? "Assets/" : assetPath;
|
||||||
PathTextField.value = directory;
|
pathTextField.value = directory;
|
||||||
var defaultName = directory.Replace("Assets/", "").Replace('/', '.');
|
var defaultName = directory.Replace("Assets/", "").Replace('/', '.');
|
||||||
NameTextField.value = defaultName;
|
nameTextField.value = defaultName;
|
||||||
|
|
||||||
// RootNamespace が設定できるのは2020.2以降
|
// RootNamespace が設定できるのは2020.2以降
|
||||||
#if UNITY_2020_2_OR_NEWER
|
#if UNITY_2020_2_OR_NEWER
|
||||||
RootNamespaceTextField.value = defaultName;
|
rootNamespaceTextField.value = defaultName;
|
||||||
#else
|
#else
|
||||||
root.Q<Box>(className: "Box").Remove(RootNamespaceTextField);
|
root.Q<Box>(className: "Box").Remove(rootNamespaceTextField);
|
||||||
#endif
|
#endif
|
||||||
// .asmdefを作成して閉じる
|
// .asmdefを作成して閉じる
|
||||||
CreateButton.clickable.clicked += () => {
|
createButton.clickable.clicked += () => {
|
||||||
var asmdefName = NameTextField.value;
|
var asmdefName = nameTextField.value;
|
||||||
var asmdef = new AssemblyDefinitionJson {
|
var asmdef = new AssemblyDefinitionJson {
|
||||||
name = asmdefName,
|
name = asmdefName,
|
||||||
#if UNITY_2020_2_OR_NEWER
|
#if UNITY_2020_2_OR_NEWER
|
||||||
rootNamespace = RootNamespaceTextField.value,
|
rootNamespace = rootNamespaceTextField.value,
|
||||||
#endif
|
#endif
|
||||||
allowUnsafeCode = AllowUnsafeToggle.value,
|
allowUnsafeCode = allowUnsafeToggle.value,
|
||||||
autoReferenced = AutoReferencedToggle.value,
|
autoReferenced = autoReferencedToggle.value,
|
||||||
overrideReferences = OverrideReferencesToggle.value,
|
overrideReferences = overrideReferencesToggle.value,
|
||||||
noEngineReferences = NoEngineReferencesToggle.value,
|
noEngineReferences = noEngineReferencesToggle.value,
|
||||||
includePlatforms = IsEditorToggle.value ? new[] { "Editor" } : new string[0]
|
includePlatforms = isEditorToggle.value ? new[] { "Editor" } : new string[0]
|
||||||
};
|
};
|
||||||
var asmdefJson = JsonUtility.ToJson(asmdef, true);
|
var asmdefJson = JsonUtility.ToJson(asmdef, true);
|
||||||
var asmdefPath = $"{directory}/{asmdefName}.asmdef";
|
var asmdefPath = $"{directory}/{asmdefName}.asmdef";
|
||||||
|
@ -44,32 +44,32 @@ namespace AsmdefHelper.CustomCreate.Editor {
|
|||||||
root.Add(labelFromUXML);
|
root.Add(labelFromUXML);
|
||||||
|
|
||||||
// UI取得
|
// UI取得
|
||||||
var PathTextField = root.Q<TextField>(className: "PathTextField");
|
var pathTextField = root.Q<TextField>(className: "PathTextField");
|
||||||
var NameTextField = root.Q<TextField>(className: "NameTextField");
|
var nameTextField = root.Q<TextField>(className: "NameTextField");
|
||||||
var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
|
var rootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
|
||||||
var CreateButton = root.Q<Button>(className: "RenameButton");
|
var createButton = root.Q<Button>(className: "RenameButton");
|
||||||
|
|
||||||
// 既存のasmdef読み込み
|
// 既存のasmdef読み込み
|
||||||
var orgText = File.ReadAllText(renameAsmdefPath);
|
var orgText = File.ReadAllText(renameAsmdefPath);
|
||||||
var asmdef = JsonUtility.FromJson<AssemblyDefinitionJson>(orgText);
|
var asmdef = JsonUtility.FromJson<AssemblyDefinitionJson>(orgText);
|
||||||
|
|
||||||
// 既存パラメータの反映
|
// 既存パラメータの反映
|
||||||
PathTextField.value = asmdefDirectory;
|
pathTextField.value = asmdefDirectory;
|
||||||
NameTextField.value = asmdef.name;
|
nameTextField.value = asmdef.name;
|
||||||
|
|
||||||
// RootNamespace が設定できるのは2020.2以降
|
// RootNamespace が設定できるのは2020.2以降
|
||||||
#if UNITY_2020_2_OR_NEWER
|
#if UNITY_2020_2_OR_NEWER
|
||||||
RootNamespaceTextField.value = asmdef.rootNamespace;
|
rootNamespaceTextField.value = asmdef.rootNamespace;
|
||||||
#else
|
#else
|
||||||
root.Q<Box>(className: "Box").Remove(RootNamespaceTextField);
|
root.Q<Box>(className: "Box").Remove(rootNamespaceTextField);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// .asmdefのnameとファイル名を更新して閉じる
|
// .asmdefのnameとファイル名を更新して閉じる
|
||||||
CreateButton.clickable.clicked += () => {
|
createButton.clickable.clicked += () => {
|
||||||
var asmdefName = NameTextField.value;
|
var asmdefName = nameTextField.value;
|
||||||
asmdef.name = asmdefName;
|
asmdef.name = asmdefName;
|
||||||
#if UNITY_2020_2_OR_NEWER
|
#if UNITY_2020_2_OR_NEWER
|
||||||
asmdef.rootNamespace = RootNamespaceTextField.value;
|
asmdef.rootNamespace = rootNamespaceTextField.value;
|
||||||
#endif
|
#endif
|
||||||
var asmdefJson = JsonUtility.ToJson(asmdef, true);
|
var asmdefJson = JsonUtility.ToJson(asmdef, true);
|
||||||
var newAsmdefPath = $"{asmdefDirectory}/{asmdefName}.asmdef";
|
var newAsmdefPath = $"{asmdefDirectory}/{asmdefName}.asmdef";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user