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

# Conflicts:yyhh # Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta # Assets/XR/Settings/OpenXR Package Settings.asset.meta
2026-06-30 10:48:53 +09:00
parent 161c6f625f dace938039
commit 8e8f8daf29
16 changed files with 469 additions and 20 deletions
--- a/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta
+++ b/Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: e4b6bdaab0b640143bac52cb0be33e54
+=======
+guid: 0e533587a03b84940b08e956a8615adf
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@@ -93,6 +97,22 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+<<<<<<< HEAD
+=======
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta
+++ b/Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 9e4b854b73fa4c049bae4e53eb60d8d2
+=======
+guid: e947b9df5e461fd48a18b65eae417346
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@@ -93,6 +97,22 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+<<<<<<< HEAD
+=======
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta
+++ b/Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 5d6edb11f11aef3408dc8c42214fcfa2
+=======
+guid: 4e0c1ffb4b7796341b9614ba8650b534
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@@ -93,6 +97,22 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+<<<<<<< HEAD
+=======
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
  spriteSheet:
    serializedVersion: 2
    sprites: []