This commit is contained in:
2025-05-16 14:11:27 +08:00
parent 0915763ef6
commit 7d4543eeab
9 changed files with 27 additions and 6 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta <<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta
guid: b0870ff3b9020364cb3dd8aba273bbba guid: 004d0a5c55f37834582101d1f97a7feb
======== ========
guid: 020615eb526a782489f42bb8f48c395a guid: 020615eb526a782489f42bb8f48c395a
folderAsset: yes folderAsset: yes
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/LICENSE.meta <<<<<<<< HEAD:Assets/Shapes/LICENSE.meta
guid: 454e38d7b411b7e41b3d3e0448c1f413 guid: 3cedab865549a294a838e0d3c1983677
======== ========
guid: 694cfa7c42f0b9547905f5db558699da guid: 694cfa7c42f0b9547905f5db558699da
folderAsset: yes folderAsset: yes
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/Quick Start Guide.pdf.meta <<<<<<<< HEAD:Assets/Shapes/Quick Start Guide.pdf.meta
guid: 2f301678843dc394a89cd9f5d29ff758 guid: 97c69f5935086634d9aefe3228688196
======== ========
guid: 23817f4f65de8da4f80b8816c4dc3d16 guid: 23817f4f65de8da4f80b8816c4dc3d16
folderAsset: yes folderAsset: yes
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta <<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta
guid: b0870ff3b9020364cb3dd8aba273bbba guid: dc4e3600651daa74c81a4b49f571c041
======== ========
guid: 020615eb526a782489f42bb8f48c395a guid: 020615eb526a782489f42bb8f48c395a
folderAsset: yes folderAsset: yes
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/LICENSE.meta <<<<<<<< HEAD:Assets/Shapes/LICENSE.meta
guid: 454e38d7b411b7e41b3d3e0448c1f413 guid: a1bcc8ef026e0fe498d88ff3bc1536ab
======== ========
guid: 694cfa7c42f0b9547905f5db558699da guid: 694cfa7c42f0b9547905f5db558699da
folderAsset: yes folderAsset: yes
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/Quick Start Guide.pdf.meta <<<<<<<< HEAD:Assets/Shapes/Quick Start Guide.pdf.meta
guid: 2f301678843dc394a89cd9f5d29ff758 guid: 0bbdf5638489a6c418530fa09d5742bb
======== ========
guid: 23817f4f65de8da4f80b8816c4dc3d16 guid: 23817f4f65de8da4f80b8816c4dc3d16
folderAsset: yes folderAsset: yes