Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

# Conflicts: # ProjectSettings/EditorBuildSettings.asset
2026-06-26 19:01:29 +09:00
parent 5951fb6894 8fb96948e4
commit 57af169c29
59 changed files with 6683 additions and 136 deletions
--- a/Toolkit/3.4.1/Starter
+++ b/Toolkit/3.4.1/Starter
--- a/Actions.inputactions.meta
+++ b/Actions.inputactions.meta
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: c348712bda248c246b8c49b3db54643f
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
-  generateWrapperCode: 0
-  wrapperCodePath: 
-  wrapperClassName: 
-  wrapperCodeNamespace: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 170222
-  packageName: XR Interaction ToolKit Starter Kit
-  packageVersion: 1.6.250208
-  assetPath: Assets/Samples/XR Interaction Toolkit/3.4.1/Starter Assets/XRI Default
-    Input Actions.inputactions
-  uploadId: 731461