更新分支

2025-03-31 08:59:34 +08:00 · 2025-03-31 08:59:34 +08:00 · 1caf4f23b7
commit 1caf4f23b7
parent 707b530ead
6 changed files with 4 additions and 225 deletions
--- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas
+++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_AR_Commom.spriteatlas
@ -72,7 +72,6 @@ SpriteAtlas:
    variantMultiplier: 1
    packables:
    - {fileID: 21300000, guid: a5157f110b47f09469aea3f606175e81, type: 3}
-    - {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3}
    - {fileID: 21300000, guid: 6c7f504e0c814d34699687c824eadbff, type: 3}
    - {fileID: 21300000, guid: 4834283cd094d8d41956efbfb0fa4183, type: 3}
    - {fileID: 21300000, guid: 73934a3f9b0a04445a9721acc85643c5, type: 3}
@ -83,37 +82,10 @@ SpriteAtlas:
    bindAsDefault: 1
    isAtlasV2: 0
    cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - a5157f110b47f09469aea3f606175e81: 21300000
-    - ddbb7899c426fdc4b93a4a43fe952dac: 21300000
-    - d19a4f7a6fee3ab44abd9a2b780440b0: 21300000
-    - 4834283cd094d8d41956efbfb0fa4183: 21300000
-    - dc58c79c70155bb42aa361976cdcd4b1: 21300000
-    - 1cf3e30ee35631e468587e3815e7f985: 21300000
-    - 6c7f504e0c814d34699687c824eadbff: 21300000
-    - f27f923f75c193f4bbcafcbabf032afb: 21300000
-    - 73934a3f9b0a04445a9721acc85643c5: 21300000
+    packedSpriteRenderDataKeys: []
  m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
-  - {fileID: 21300000, guid: a5157f110b47f09469aea3f606175e81, type: 3}
-  - {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3}
-  - {fileID: 21300000, guid: d19a4f7a6fee3ab44abd9a2b780440b0, type: 3}
-  - {fileID: 21300000, guid: 4834283cd094d8d41956efbfb0fa4183, type: 3}
-  - {fileID: 21300000, guid: dc58c79c70155bb42aa361976cdcd4b1, type: 3}
-  - {fileID: 21300000, guid: 1cf3e30ee35631e468587e3815e7f985, type: 3}
-  - {fileID: 21300000, guid: 6c7f504e0c814d34699687c824eadbff, type: 3}
-  - {fileID: 21300000, guid: f27f923f75c193f4bbcafcbabf032afb, type: 3}
-  - {fileID: 21300000, guid: 73934a3f9b0a04445a9721acc85643c5, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - Dot-32
-  - UICommom_Return
-  - UIIcon_home
-  - UIIcon_arrow
-  - UIIcon_love
-  - UIIcon_delete
-  - UIIcon_Search
-  - UI_BackButton
-  - UIIcon_check
+  m_PackedSprites: []
+  m_PackedSpriteNamesToIndex: []
  m_RenderDataMap: {}
  m_Tag: UIRaw_Atlas_AR_Commom
  m_IsVariant: 0
--- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec.spriteatlas
+++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec.spriteatlas
@ -1,87 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!687078895 &4343727234628468602
-SpriteAtlas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UIRaw_Atlas_YL_PetInfoRec
-  m_EditorData:
-    serializedVersion: 2
-    textureSettings:
-      serializedVersion: 2
-      anisoLevel: 0
-      compressionQuality: 0
-      maxTextureSize: 0
-      textureCompression: 0
-      filterMode: 1
-      generateMipMaps: 0
-      readable: 0
-      crunchedCompression: 0
-      sRGB: 1
-    platformSettings:
-    - serializedVersion: 4
-      m_BuildTarget: iPhone
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 49
-      m_TextureCompression: 1
-      m_CompressionQuality: 100
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    - serializedVersion: 4
-      m_BuildTarget: Android
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 50
-      m_TextureCompression: 1
-      m_CompressionQuality: 100
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    - serializedVersion: 4
-      m_BuildTarget: WebGL
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 50
-      m_TextureCompression: 1
-      m_CompressionQuality: 50
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    packingSettings:
-      serializedVersion: 2
-      padding: 2
-      blockOffset: 1
-      allowAlphaSplitting: 0
-      enableRotation: 1
-      enableTightPacking: 0
-      enableAlphaDilation: 0
-    secondaryTextureSettings: {}
-    variantMultiplier: 1
-    packables:
-    - {fileID: 21300000, guid: 48e99b00e747f6247a529ac49dd4bde7, type: 3}
-    bindAsDefault: 1
-    isAtlasV2: 0
-    cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 48e99b00e747f6247a529ac49dd4bde7: 21300000
-  m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
-  - {fileID: 21300000, guid: 48e99b00e747f6247a529ac49dd4bde7, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - "AR\u5BFB\u5BA0-\u5F55\u5165\u4FE1\u606FEffect"
-  m_RenderDataMap: {}
-  m_Tag: UIRaw_Atlas_YL_PetInfoRec
-  m_IsVariant: 0
--- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec.spriteatlas.meta
+++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec.spriteatlas.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f7bb8cb373826f841bb3a6669f9e0bf3
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 4343727234628468602
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec_Background.spriteatlas
+++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec_Background.spriteatlas
@ -1,91 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!687078895 &4343727234628468602
-SpriteAtlas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UIRaw_Atlas_YL_PetInfoRec_Background
-  m_EditorData:
-    serializedVersion: 2
-    textureSettings:
-      serializedVersion: 2
-      anisoLevel: 0
-      compressionQuality: 0
-      maxTextureSize: 0
-      textureCompression: 0
-      filterMode: 1
-      generateMipMaps: 0
-      readable: 0
-      crunchedCompression: 0
-      sRGB: 1
-    platformSettings:
-    - serializedVersion: 4
-      m_BuildTarget: iPhone
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 49
-      m_TextureCompression: 1
-      m_CompressionQuality: 100
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    - serializedVersion: 4
-      m_BuildTarget: Android
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 50
-      m_TextureCompression: 1
-      m_CompressionQuality: 100
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    - serializedVersion: 4
-      m_BuildTarget: WebGL
-      m_MaxTextureSize: 2048
-      m_ResizeAlgorithm: 0
-      m_TextureFormat: 50
-      m_TextureCompression: 1
-      m_CompressionQuality: 50
-      m_CrunchedCompression: 0
-      m_AllowsAlphaSplitting: 0
-      m_Overridden: 1
-      m_IgnorePlatformSupport: 0
-      m_AndroidETC2FallbackOverride: 0
-      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
-    packingSettings:
-      serializedVersion: 2
-      padding: 2
-      blockOffset: 1
-      allowAlphaSplitting: 0
-      enableRotation: 1
-      enableTightPacking: 0
-      enableAlphaDilation: 0
-    secondaryTextureSettings: {}
-    variantMultiplier: 1
-    packables:
-    - {fileID: 21300000, guid: 87764fe3d939b694283de209e2ee0961, type: 3}
-    - {fileID: 21300000, guid: 3d75dee5dd379884b997bff687287385, type: 3}
-    bindAsDefault: 1
-    isAtlasV2: 0
-    cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 87764fe3d939b694283de209e2ee0961: 21300000
-    - 3d75dee5dd379884b997bff687287385: 21300000
-  m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
-  - {fileID: 21300000, guid: 87764fe3d939b694283de209e2ee0961, type: 3}
-  - {fileID: 21300000, guid: 3d75dee5dd379884b997bff687287385, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - Background
-  - Background2x
-  m_RenderDataMap: {}
-  m_Tag: UIRaw_Atlas_YL_PetInfoRec_Background
-  m_IsVariant: 0
--- a/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec_Background.spriteatlas.meta
+++ b/EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetInfoRec_Background.spriteatlas.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 939e68cf0a2a9304092e641d1ef60c26
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 4343727234628468602
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/EintooAR/ProjectSettings/GvhProjectSettings.xml
+++ b/EintooAR/ProjectSettings/GvhProjectSettings.xml
@ -3,4 +3,5 @@
  <projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="a7d83c3a40764383a2ef6a99caee1414" />
  <projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
  <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
 </projectSettings>