Merge branch 'master' of http://192.168.31.100:8088/test/art_test_main

2025-11-13 14:25:39 +08:00
parent 53c9a25cf6 35bce4443d
commit b73696b515
6 changed files with 3 additions and 19 deletions
--- a/Assets/Resources/ImageSource.meta
+++ b/Assets/Resources/ImageSource.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f254dea8c7362f44786a14b71df03218
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f54d1bd14bd3ca042bd867b519fee8cc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/YooAssetSettings.asset
+++ b/Assets/Resources/YooAssetSettings.asset
@@ -9,7 +9,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5bd1afdce9715f84eb4cbc901922afc2, type: 3}
+  m_Script: {fileID: 11500000, guid: ff0d1010ecfb76e45a07e36d7ed644a5, type: 3}
  m_Name: YooAssetSettings
  m_EditorClassIdentifier: 
  DefaultYooFolderName: xosmoRes
--- a/Assets/Resources/YooAssetSettings.asset.meta
+++ b/Assets/Resources/YooAssetSettings.asset.meta