diff --git a/Assets/Scenes/Main.cs b/Assets/Scenes/Main.cs index 387a621..12d85e7 100644 --- a/Assets/Scenes/Main.cs +++ b/Assets/Scenes/Main.cs @@ -42,16 +42,8 @@ public class Main : MonoBehaviour #region Init private void loadCommonAssets() { - DirectoryInfo TheFolder = new DirectoryInfo(Application.streamingAssetsPath + "/common"); - foreach (FileInfo NextFile in TheFolder.GetFiles()) - { - if (!NextFile.FullName.EndsWith(".meta")) - { - AssetBundle.LoadFromFile(NextFile.FullName); - // Debug.Log(NextFile.FullName); - } - } - + var lines = CSVReader.ReadCSV(Application.streamingAssetsPath + "/data/common.csv"); + foreach (var line in lines) AssetBundle.LoadFromFile(basePath + line[0]); } private void loadCharaCSV() diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index b8bd859..dde7d46 100644 Binary files a/Assets/Scenes/MainScene.unity and b/Assets/Scenes/MainScene.unity differ diff --git a/Assets/StreamingAssets/common.meta b/Assets/StreamingAssets/common.meta deleted file mode 100644 index 5eb8c44..0000000 --- a/Assets/StreamingAssets/common.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: b7dc3840faf63cc43890e86b74f8fee5 -folderAsset: yes -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_body_fa b/Assets/StreamingAssets/common/co_body_fa deleted file mode 100644 index 2aa2e42..0000000 Binary files a/Assets/StreamingAssets/common/co_body_fa and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_body_fa.meta b/Assets/StreamingAssets/common/co_body_fa.meta deleted file mode 100644 index 99e3b90..0000000 --- a/Assets/StreamingAssets/common/co_body_fa.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be8ac0f21d429eb419073f7e6e156d10 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_body_ri b/Assets/StreamingAssets/common/co_body_ri deleted file mode 100644 index 90ec6f8..0000000 Binary files a/Assets/StreamingAssets/common/co_body_ri and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_body_ri.meta b/Assets/StreamingAssets/common/co_body_ri.meta deleted file mode 100644 index 0871a09..0000000 --- a/Assets/StreamingAssets/common/co_body_ri.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 908bb0a853c051741ae5ea6c355282e2 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_body_sp b/Assets/StreamingAssets/common/co_body_sp deleted file mode 100644 index a59b994..0000000 Binary files a/Assets/StreamingAssets/common/co_body_sp and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_body_sp.meta b/Assets/StreamingAssets/common/co_body_sp.meta deleted file mode 100644 index 05e616f..0000000 --- a/Assets/StreamingAssets/common/co_body_sp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c32ca021aaa20cd40bd2d19ba005ad2d -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_card_body_di b/Assets/StreamingAssets/common/co_card_body_di deleted file mode 100644 index 86e1e4c..0000000 Binary files a/Assets/StreamingAssets/common/co_card_body_di and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_env_a b/Assets/StreamingAssets/common/co_env_a deleted file mode 100644 index f87aa04..0000000 Binary files a/Assets/StreamingAssets/common/co_env_a and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_env_a.meta b/Assets/StreamingAssets/common/co_env_a.meta deleted file mode 100644 index d6bfbc8..0000000 --- a/Assets/StreamingAssets/common/co_env_a.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9d1d10611c216c46bc99fa767ce38b8 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_env_b b/Assets/StreamingAssets/common/co_env_b deleted file mode 100644 index cdb4775..0000000 Binary files a/Assets/StreamingAssets/common/co_env_b and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_env_b.meta b/Assets/StreamingAssets/common/co_env_b.meta deleted file mode 100644 index c21c7c8..0000000 --- a/Assets/StreamingAssets/common/co_env_b.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fed57f76ec072744817c081c8b68f9a -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_neko_body_no b/Assets/StreamingAssets/common/co_neko_body_no deleted file mode 100644 index d3d2077..0000000 Binary files a/Assets/StreamingAssets/common/co_neko_body_no and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_neko_body_no.meta b/Assets/StreamingAssets/common/co_neko_body_no.meta deleted file mode 100644 index 9d3db4c..0000000 --- a/Assets/StreamingAssets/common/co_neko_body_no.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb9d765b09c797240b8c7bc741b335b8 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_neko_body_sp b/Assets/StreamingAssets/common/co_neko_body_sp deleted file mode 100644 index 56d5c43..0000000 Binary files a/Assets/StreamingAssets/common/co_neko_body_sp and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_neko_body_sp.meta b/Assets/StreamingAssets/common/co_neko_body_sp.meta deleted file mode 100644 index 66c8ea1..0000000 --- a/Assets/StreamingAssets/common/co_neko_body_sp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fe390433025575c4e981cb927b0e6443 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/co_outline_di b/Assets/StreamingAssets/common/co_outline_di deleted file mode 100644 index 7fd199e..0000000 Binary files a/Assets/StreamingAssets/common/co_outline_di and /dev/null differ diff --git a/Assets/StreamingAssets/common/co_outline_di.meta b/Assets/StreamingAssets/common/co_outline_di.meta deleted file mode 100644 index 849b063..0000000 --- a/Assets/StreamingAssets/common/co_outline_di.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0131bba369a295d45a9eb98022b7521d -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/common/preloadshaders b/Assets/StreamingAssets/common/preloadshaders deleted file mode 100644 index 39e14a1..0000000 Binary files a/Assets/StreamingAssets/common/preloadshaders and /dev/null differ diff --git a/Assets/StreamingAssets/common/preloadshaders.meta b/Assets/StreamingAssets/common/preloadshaders.meta deleted file mode 100644 index 84c3b80..0000000 --- a/Assets/StreamingAssets/common/preloadshaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ee969345a11d71041ac041279eeeddb4 -timeCreated: 1712049659 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/data/common.csv b/Assets/StreamingAssets/data/common.csv new file mode 100644 index 0000000..f75a1e7 --- /dev/null +++ b/Assets/StreamingAssets/data/common.csv @@ -0,0 +1,10 @@ +co_body_fa +co_body_ri +co_body_sp +co_card_body_di +co_env_a +co_env_b +co_neko_body_no +co_neko_body_sp +co_outline_di +preloadshaders \ No newline at end of file diff --git a/Assets/StreamingAssets/common/co_card_body_di.meta b/Assets/StreamingAssets/data/common.csv.meta similarity index 64% rename from Assets/StreamingAssets/common/co_card_body_di.meta rename to Assets/StreamingAssets/data/common.csv.meta index 0a94f58..3bc4dbc 100644 --- a/Assets/StreamingAssets/common/co_card_body_di.meta +++ b/Assets/StreamingAssets/data/common.csv.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 58981f137659e33429268f942bd0c08f -timeCreated: 1712049659 +guid: eee5e45065b02374da6182f61b0551ab +timeCreated: 1713275113 licenseType: Free DefaultImporter: userData: