Merge pull request #5 from MidraLab/fix/remove_koeiromap_dependency

Fix/remove koeiromap dependency
MidraLab · Aug 6, 2023 · 0664cce · 0664cce
2 parents f250e13 + 9a4346a
commit 0664cce
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 168 deletions.
diff --git a/Assets/EasyADV/Scripts/DataModel/CharacterVoiceSetting.cs b/Assets/EasyADV/Scripts/DataModel/CharacterVoiceSetting.cs
diff --git a/Assets/EasyADV/Scripts/DataModel/CharacterVoiceSetting.cs.meta b/Assets/EasyADV/Scripts/DataModel/CharacterVoiceSetting.cs.meta
diff --git a/Assets/EasyADV/Scripts/DataModel/ScenarioData.cs b/Assets/EasyADV/Scripts/DataModel/ScenarioData.cs
@@ -3,6 +3,9 @@
 
 namespace EasyADV.DataModel
 {
+    /// <summary>
+    ///    シナリオデータ
+    /// </summary>
     [Serializable]
     public class ScenarioData
     {
@@ -11,10 +14,12 @@ public class ScenarioData
         public string characterName;
         public string command;
         public string content;
-        public string description;
         public string sound;
     }
 
+    /// <summary>
+    ///   シナリオデータリスト
+    /// </summary>
     [Serializable]
     public class ScenarioDataList
     {

diff --git a/Assets/EasyADV/Scripts/EasyADV.asmdef b/Assets/EasyADV/Scripts/EasyADV.asmdef
@@ -4,7 +4,6 @@
     "references": [
         "GUID:007db7f7a4c8f944990d71603a110f82",
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
-        "GUID:cc04cd67926c76747844771fb8e474a5",
         "GUID:34cf00d3f10a8f34783a2f8b914a0219"
     ],
     "includePlatforms": [],

diff --git a/Assets/EasyADV/Scripts/Editor/EditScenario.cs b/Assets/EasyADV/Scripts/Editor/EditScenario.cs
@@ -18,7 +18,7 @@
 namespace EasyADV.Editor
 {
     [CustomEditor(typeof(UpdateScenarioFromGoogleSheet))]
-    public partial class EditScenario : UnityEditor.Editor
+    public class EditScenario : UnityEditor.Editor
     {
         private const string SheetName = ScenarioSheetData.MainSheet;
 
@@ -59,7 +59,6 @@ public override async void OnInspectorGUI()
                 var scenarioData = await DownloadScenarioData(SheetName);
                 CacheComponents();
                 DeleteAllCommand();
-                DeleteVoice(_isUpdateVoiceProperty);
                 UpdateCharacterInfo(scenarioData);
                 await UpdateConversationBlock(scenarioData, BlockName);
                 Debug.Log("Update Scenario");
@@ -150,28 +149,6 @@ private async UniTask AddBlock(ScenarioData scenarioData, Block block, int block
                         .FirstOrDefault(x => x.Key == scenarioData.characterName).Value;
                     commandSay.ItemId = blockIndex + 1;
 
-                    if (!string.IsNullOrEmpty(scenarioData.characterName))
-                    {
-                        var inputText = scenarioData.content.Replace("「", "").Replace("」", "");
-                        if (!IsSilentText(inputText))
-                        {
-                            if (_isUpdateVoiceProperty && _voiceStartIndex <= blockIndex)
-                            {
-                                commandSay.VoiceOverClip =
-                                    await GetVoiceClip(scenarioData.characterName, inputText, blockIndex,
-                                        _cancellationTokenSource.Token);
-                                await UniTask.Delay(TimeSpan.FromSeconds(1f),
-                                    cancellationToken: _cancellationTokenSource.Token);
-                            }
-                            else
-                            {
-                                var savePath = Path.Combine("Assets", _voiceFolderPath,
-                                    $"{blockIndex}.wav");
-                                commandSay.VoiceOverClip = AssetDatabase.LoadAssetAtPath<AudioClip>(savePath);
-                            }
-                        }
-                    }
-
                     block.CommandList.Add(commandSay);
                     break;
                 //このコマンドは要修正

diff --git a/Assets/EasyADV/Scripts/Editor/UpdateVoice.cs b/Assets/EasyADV/Scripts/Editor/UpdateVoice.cs
diff --git a/Assets/EasyADV/Scripts/Editor/UpdateVoice.cs.meta b/Assets/EasyADV/Scripts/Editor/UpdateVoice.cs.meta
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -16,7 +16,6 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "jp.amagamina.overwriter": "https://github.com/ina-amagami/unity-overwriter.git",
-    "jp.ayutaz.koeiromap-unity": "https://github.com/ayutaz/koeiromap-unity.git?path=Assets/KoeiromapUnity/Scripts",
     "jp.ayutaz.simplefoldericon": "1.3.3",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -278,15 +278,6 @@
       "dependencies": {},
       "hash": "24c16816637242c4aad552ffed8d4fafd283fbec"
     },
-    "jp.ayutaz.koeiromap-unity": {
-      "version": "https://github.com/ayutaz/koeiromap-unity.git?path=Assets/KoeiromapUnity/Scripts",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {
-        "com.cysharp.unitask": "2.3.3"
-      },
-      "hash": "ba10114a43a5d5450f801c7a35f01c13cb26ef19"
-    },
     "jp.ayutaz.simplefoldericon": {
       "version": "1.3.3",
       "depth": 0,

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ const soundFolder = "1pXyls5L5T_uWcw4lJyOtoCtXtm-8GynC"
 
 1. [EasyADV.unitypackage](https://github.com/MidraLab/easy-adv/releases)をダウンロードする
 2. [Fungus.unitypackage](https://github.com/MidraLab/fungus/releases)をダウンロードする
-3. Unityプロジェクトに1,2をimportする
+3. Unityプロジェクトに1,2,[UniTask](https://github.com/Cysharp/UniTask)を追加する
 4. `Tools/EasyADV/Setup`を実行して、開発環境をセットアップする。
 5. 以下のフォルダに画像、音声を配置する
     - `Asset/EasyADV/CharacterImage`