Merge branch 'dev'

chigirits · Sep 14, 2020 · c732754 · c732754
2 parents d477f90 + a23f7cb
commit c732754
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,8 +27,8 @@ jobs:
           package-path: build/MeshHoleShrinker-${{ env.RELEASE_VERSION }}.unitypackage
           include-files: metaList
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v1.0.0
-        with:
-          name: unitypackage
-          path: build/MeshHoleShrinker-${{ env.RELEASE_VERSION }}.unitypackage
+      - name: Release
+        uses: fnkr/github-action-ghr@v1
+        env:
+          GHR_PATH: build/MeshHoleShrinker-${{ env.RELEASE_VERSION }}.unitypackage
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Assets.meta b/Assets.meta
diff --git a/Assets/Chigiri.meta b/Assets/Chigiri.meta
diff --git a/Assets/Chigiri/MeshHoleShrinker.meta b/Assets/Chigiri/MeshHoleShrinker.meta
diff --git a/Editor.meta → Assets/Chigiri/MeshHoleShrinker/Editor.meta b/Editor.meta → Assets/Chigiri/MeshHoleShrinker/Editor.meta
diff --git a/...or/Chigiri.MeshHoleShrinker.Editor.asmdef → ...or/Chigiri.MeshHoleShrinker.Editor.asmdef b/...or/Chigiri.MeshHoleShrinker.Editor.asmdef → ...or/Chigiri.MeshHoleShrinker.Editor.asmdef
diff --git a/...igiri.MeshHoleShrinker.Editor.asmdef.meta → ...igiri.MeshHoleShrinker.Editor.asmdef.meta b/...igiri.MeshHoleShrinker.Editor.asmdef.meta → ...igiri.MeshHoleShrinker.Editor.asmdef.meta
diff --git a/Editor/MeshHoleShrinkerEditor.cs → ...Shrinker/Editor/MeshHoleShrinkerEditor.cs b/Editor/MeshHoleShrinkerEditor.cs → ...Shrinker/Editor/MeshHoleShrinkerEditor.cs
diff --git a/Editor/MeshHoleShrinkerEditor.cs.meta → ...ker/Editor/MeshHoleShrinkerEditor.cs.meta b/Editor/MeshHoleShrinkerEditor.cs.meta → ...ker/Editor/MeshHoleShrinkerEditor.cs.meta
diff --git a/Materials.meta → ...s/Chigiri/MeshHoleShrinker/Materials.meta b/Materials.meta → ...s/Chigiri/MeshHoleShrinker/Materials.meta
diff --git a/Materials/MeshHoleShrinker.UI.mat → ...hrinker/Materials/MeshHoleShrinker.UI.mat b/Materials/MeshHoleShrinker.UI.mat → ...hrinker/Materials/MeshHoleShrinker.UI.mat
diff --git a/Materials/MeshHoleShrinker.UI.mat.meta → ...er/Materials/MeshHoleShrinker.UI.mat.meta b/Materials/MeshHoleShrinker.UI.mat.meta → ...er/Materials/MeshHoleShrinker.UI.mat.meta
diff --git a/Prefabs.meta → Assets/Chigiri/MeshHoleShrinker/Prefabs.meta b/Prefabs.meta → Assets/Chigiri/MeshHoleShrinker/Prefabs.meta
diff --git a/Prefabs/Internal.meta → ...ri/MeshHoleShrinker/Prefabs/Internal.meta b/Prefabs/Internal.meta → ...ri/MeshHoleShrinker/Prefabs/Internal.meta
diff --git a/Prefabs/Internal/MeshSnapshot.prefab → ...nker/Prefabs/Internal/MeshSnapshot.prefab b/Prefabs/Internal/MeshSnapshot.prefab → ...nker/Prefabs/Internal/MeshSnapshot.prefab
diff --git a/Prefabs/Internal/MeshSnapshot.prefab.meta → ...Prefabs/Internal/MeshSnapshot.prefab.meta b/Prefabs/Internal/MeshSnapshot.prefab.meta → ...Prefabs/Internal/MeshSnapshot.prefab.meta
diff --git a/Prefabs/MeshHoleShrinker.prefab → ...eShrinker/Prefabs/MeshHoleShrinker.prefab b/Prefabs/MeshHoleShrinker.prefab → ...eShrinker/Prefabs/MeshHoleShrinker.prefab
diff --git a/Prefabs/MeshHoleShrinker.prefab.meta → ...nker/Prefabs/MeshHoleShrinker.prefab.meta b/Prefabs/MeshHoleShrinker.prefab.meta → ...nker/Prefabs/MeshHoleShrinker.prefab.meta
diff --git a/Prefabs/Presets.meta → ...iri/MeshHoleShrinker/Prefabs/Presets.meta b/Prefabs/Presets.meta → ...iri/MeshHoleShrinker/Prefabs/Presets.meta
diff --git a/...esets/MeshHoleShrinker-Almond-1.01.prefab → ...esets/MeshHoleShrinker-Almond-1.01.prefab b/...esets/MeshHoleShrinker-Almond-1.01.prefab → ...esets/MeshHoleShrinker-Almond-1.01.prefab
diff --git a/.../MeshHoleShrinker-Almond-1.01.prefab.meta → .../MeshHoleShrinker-Almond-1.01.prefab.meta b/.../MeshHoleShrinker-Almond-1.01.prefab.meta → .../MeshHoleShrinker-Almond-1.01.prefab.meta
diff --git a/...Presets/MeshHoleShrinker-Maple-1.1.prefab → ...Presets/MeshHoleShrinker-Maple-1.1.prefab b/...Presets/MeshHoleShrinker-Maple-1.1.prefab → ...Presets/MeshHoleShrinker-Maple-1.1.prefab
diff --git a/...ts/MeshHoleShrinker-Maple-1.1.prefab.meta → ...ts/MeshHoleShrinker-Maple-1.1.prefab.meta b/...ts/MeshHoleShrinker-Maple-1.1.prefab.meta → ...ts/MeshHoleShrinker-Maple-1.1.prefab.meta
diff --git a/...sets/MeshHoleShrinker-Mimino-1.0.1.prefab → ...sets/MeshHoleShrinker-Mimino-1.0.1.prefab b/...sets/MeshHoleShrinker-Mimino-1.0.1.prefab → ...sets/MeshHoleShrinker-Mimino-1.0.1.prefab
diff --git a/...MeshHoleShrinker-Mimino-1.0.1.prefab.meta → ...MeshHoleShrinker-Mimino-1.0.1.prefab.meta b/...MeshHoleShrinker-Mimino-1.0.1.prefab.meta → ...MeshHoleShrinker-Mimino-1.0.1.prefab.meta
diff --git a/Scripts.meta → Assets/Chigiri/MeshHoleShrinker/Scripts.meta b/Scripts.meta → Assets/Chigiri/MeshHoleShrinker/Scripts.meta
diff --git a/Scripts/Chigiri.MeshHoleShrinker.asmdef → ...r/Scripts/Chigiri.MeshHoleShrinker.asmdef b/Scripts/Chigiri.MeshHoleShrinker.asmdef → ...r/Scripts/Chigiri.MeshHoleShrinker.asmdef
diff --git a/Scripts/Chigiri.MeshHoleShrinker.asmdef.meta → ...ipts/Chigiri.MeshHoleShrinker.asmdef.meta b/Scripts/Chigiri.MeshHoleShrinker.asmdef.meta → ...ipts/Chigiri.MeshHoleShrinker.asmdef.meta
diff --git a/Scripts/MeshHoleShrinker.cs → ...hHoleShrinker/Scripts/MeshHoleShrinker.cs b/Scripts/MeshHoleShrinker.cs → ...hHoleShrinker/Scripts/MeshHoleShrinker.cs
diff --git a/Scripts/MeshHoleShrinker.cs.meta → ...Shrinker/Scripts/MeshHoleShrinker.cs.meta b/Scripts/MeshHoleShrinker.cs.meta → ...Shrinker/Scripts/MeshHoleShrinker.cs.meta
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 
 Unity上でアバター頭部を他の素体に接合するとき、接合部にすきまが開いてしまうのを防ぐなどの用途に有用です。
 
+![demo](https://repository-images.githubusercontent.com/295406109/a2eb0680-f6d5-11ea-9672-da464eeef28f)
+
 ## 動作環境
 
 Unity 2018.4 以降
@@ -23,11 +25,13 @@ Unity 2018.4 以降
    "com.github.chigirits.MeshHoleShrinker": "https://github.com/chigirits/MeshHoleShrinker.git",
    ```
 
+こちらの方法でインポートした場合、以下の説明文中で示される本パッケージのプレハブやプリセットは `Assets/Chigiri/MeshHoleShrinker/...` 下ではなく `Packages/MeshHoleShrinker/Assets/Chigiri/MeshHoleShrinker/...` 下から選択してください。
+
 ## 使い方
 
 1. シーンにアバターを配置し、頭部以外を非表示にする
-2. 同シーンに `Prefabs/MeshHoleShrinker` を配置（一部後述の販売モデルはプリセットを利用できます）
-3. `MeshHoleShrinker` の `Target` に、アバター頭部の `SkinnedMeshRenderer` を指定
+2. プロジェクトタブから `Assets/Chigiri/MeshHoleShrinker/Prefabs/MeshHoleShrinker` を探し、同シーンに配置（後述の一部販売モデルはプリセットを利用できます）
+3. `MeshHoleShrinker` の `Target` に、アバター頭部の `SkinnedMeshRenderer`（一般的には `Body` オブジェクト）を指定
 4. `New Shape Key Name` に追加するシェイプキーの名前を指定
 
    ![usage-01](https://user-images.githubusercontent.com/61717977/93084783-88ae2a00-f6cf-11ea-8c92-a8433986f283.png)
@@ -50,7 +54,7 @@ Unity 2018.4 以降
 
 ### プリセットについて
 
-以下の販売モデルは、あらかじめ位置合わせ済みのプリセットを `Prefabs/Presets/` 下に用意しています。モデルのプレハブを未加工のまま原点に配置した状態で適用してください。
+以下の販売モデルは、あらかじめ位置合わせ済みのプリセットを `Assets/Chigiri/MeshHoleShrinker/Prefabs/Presets/` 下に用意しています。モデルのプレハブを未加工のまま原点に配置した状態で適用してください。
 
 - [みみの](https://booth.pm/ja/items/1336133)
 - [アーモンド](https://booth.pm/ja/items/2012982)