Merge pull request #28 from esnya/alpha

MultiImageManager
esnya · Sep 18, 2023 · 93b650b · 93b650b
2 parents 4298377 + aceeac4
commit 93b650b
Show file tree

Hide file tree

Showing 166 changed files with 3,598 additions and 1,827 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 *.prefab filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text
+*.asset filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,14 +1,73 @@
 name: Release
 on: push
+
+env:
+  packageName: "com.nekometer.esnya.inari-udon"
+
+permissions:
+  contents: write
+
 jobs:
-  release:
+  semantic-release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
-      - run: npm ci
+      - run: npm i -g semantic-release semantic-release-gitmoji @semantic-release/github @semantic-release/git @semantic-release/npm foreach-cli
+
+      - id: prev_version
+        uses: notiz-dev/github-action-json-property@7c8cf5cc36eb85d8d287a8086a39dac59628eb31
+        with:
+            path: "Packages/${{env.packageName}}/package.json"
+            prop_path: "version"
+
       - run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - id: version
+        uses: notiz-dev/github-action-json-property@7c8cf5cc36eb85d8d287a8086a39dac59628eb31
+        with:
+            path: "Packages/${{env.packageName}}/package.json"
+            prop_path: "version"
+    outputs:
+      prev_version: ${{ steps.prev_version.outputs.prop }}
+      next_version: ${{ steps.version.outputs.prop }}
+
+  vcc-release:
+    runs-on: ubuntu-latest
+    needs: semantic-release
+    if: needs.semantic-release.outputs.prev_version != needs.semantic-release.outputs.next_version
+    steps:
+      - uses: actions/checkout@v3
+      - run: echo "version=${{ needs.semantic-release.outputs.next_version }}" >> $GITHUB_ENV
+
+      - run: |
+          echo "zipFile=${{ env.packageName }}-${{ env.version }}".zip >> $GITHUB_ENV
+          echo "unityPackage=${{ env.packageName }}-${{ env.version }}.unitypackage" >> $GITHUB_ENV
+      - uses: thedoctor0/zip-release@09336613be18a8208dfa66bd57efafd9e2685657
+        with:
+          type: "zip"
+          directory: "Packages/${{env.packageName}}/"
+          filename: "../../${{env.zipFile}}" # make the zip file two directories up, since we start two directories in above
+
+      - run: find "Packages/${{env.packageName}}/" -name \*.meta >> metaList
+      - uses: pCYSl5EDgo/create-unitypackage@cfcd3cf0391a5ef1306342794866a9897c32af0b
+        with:
+          package-path: ${{ env.unityPackage }}
+          include-files: metaList
+
+      - uses: svenstaro/upload-release-action@v2
+        with:
+          tag: v${{ env.version }}
+          file: ${{ env.zipFile }}
+      - uses: svenstaro/upload-release-action@v2
+        with:
+          tag: v${{ env.version }}
+          file: ${{ env.unityPackage }}
+      - uses: svenstaro/upload-release-action@v2
+        with:
+          tag: v${{ env.version }}
+          file: Packages/${{ env.packageName }}/package.json
diff --git a/.gitscripts/filter-usharp-prefab.js b/.gitscripts/filter-usharp-prefab.js
@@ -8,7 +8,7 @@ const pattern = new RegExp(
     "      value:.*\n",
     `      objectReference: ${guidPattern}\n`,
     "|",
-    `  serializedProgramAsset: ${guidPattern}\n`,
+    `  serialized(Udon)?ProgramAsset: ${guidPattern}\n`,
     "|",
     "    SerializedFormat: [02]\n",
   ].join(""),

diff --git a/.releaserc.yml b/.releaserc.yml
@@ -1,5 +1,5 @@
 plugins:
   - semantic-release-gitmoji
-  - "@semantic-release/npm"
   - "@semantic-release/github"
   - "@semantic-release/git"
+  - "@semantic-release/npm"
diff --git a/Packages/com.nekometer.esnya.inari-udon/Animation/ClockAnimationStarter.asset b/Packages/com.nekometer.esnya.inari-udon/Animation/ClockAnimationStarter.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: ClockAnimationStarter
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 3004b02a10fd90648b77fc996a25384b,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: e27c5ce695d98634f86297dcadc518ed, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: 5362715584337160637
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/AnimatorDriver.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/AnimatorDriver.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: AnimatorDriver
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 4f60789262c7df94e84199078e9ae70d,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: 11b39549bff594a4191da9755a1b2f3e, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: -7097426269772317907
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/ClockDriver.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/ClockDriver.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: ClockDriver
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 9c952a33676ffc34b8fe418759d83458,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: cf8f512e402be0e43b920fba655d6cfb, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: -7036336433044299112
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/FloatMultiValueDriver.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/FloatMultiValueDriver.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: FloatMultiValueDriver
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: e2941259a7422e345bb8f7796e26a25c,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: 5c107f53da8cb3c4db379e0d9d4be473, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: -7763768694432413336
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/FloatValueDriver.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/FloatValueDriver.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: FloatValueDriver
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: b40b353ac8ca819499bf812de8f32b2f,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: e83d32324f7f9164eb8e0c2686614638, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: -8770997759555053113
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/RotationDriver.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/RotationDriver.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: RotationDriver
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 304da05984e73be4bb24bde2e5c7e06b,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: 9549df89ccfe8b54a98b2c97c4116435, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: -1993940154987378890
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/Driver/SyncedSpinner.asset b/Packages/com.nekometer.esnya.inari-udon/Driver/SyncedSpinner.asset
@@ -12,8 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: SyncedSpinner
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: d462d6962aeaf7a4d95518c2f3f7766d,
-    type: 2}
   udonAssembly: 
   assemblyError: 
   sourceCsScript: {fileID: 11500000, guid: 7f360fad73504c540a26f2e336fcec4a, type: 3}
@@ -23,7 +21,6 @@ MonoBehaviour:
   hasInteractEvent: 0
   scriptID: 6807221213241967799
   serializationData:
-    SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects: []
     SerializedBytesString: 

diff --git a/Packages/com.nekometer.esnya.inari-udon/DynamicLoaders/MultiImageDisplay_P.prefab b/Packages/com.nekometer.esnya.inari-udon/DynamicLoaders/MultiImageDisplay_P.prefab
@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 8576674997620115003}
   - component: {fileID: 8576674997620115002}
   m_Layer: 0
-  m_Name: DynamicSinage_A0_P (1)
+  m_Name: MultiImageDisplay_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		*.prefab filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text
		*.asset filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text