Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/res/the_main_interface_of_the_eco_tree_is_during_the_day_slices/frame_panneltxttip.png.meta

@@ -1,111 +0,0 @@
-fileFormatVersion: 2
-guid: 9e8baafc99e6d244dab8f411de62fc5e
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

meng_yao/UserSettings/EditorUserSettings.asset

@@ -6,34 +6,34 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedSceneGuid-0:
-      value: 0557010207535d09090b5c7a12765944404e41297d7a2360797e496ab4b0356e
+      value: 0002045455050c0c5e0a0a2441710e444e4f4a79282b736379704532b3b73039
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5600055606515c595f0b5d7447215b44424f4e787c2d70367f7d4962b1b36d6d
+      value: 5707510552000c5a5b5a0d7211275c444e164c7d2a29736074711965b5b36539
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5b04515e5405080b5f5c082045225944434f40287e2b763575714561b4e2643a
+      value: 5152565201035b0e5c0f5b7713730944424e4f73292b7e34747f4a6ae7b5303d
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 500101525d530c0f090c547546270644424f41787c2a7031292d1e62b7b73039
+      value: 0557010207535d09090b5c7a12765944404e41297d7a2360797e496ab4b0356e
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5000015f5501080d585f0d7414260d4417151d787d7a27367e7a4832b6b86d3b
+      value: 0107025300510f5f5d5d5c7347730a44474e402f287825357c2b4c67e3b9303b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5703550556575f020c0b557211270c44464f1c282a2e7e697b711861b4b9646b
-      flags: 0
-    RecentlyUsedSceneGuid-6:
       value: 0206015604505b0d55585c2645740e4440161a732a70736428781e62b1b6366e
       flags: 0
+    RecentlyUsedSceneGuid-6:
+      value: 0253025303505c5e0c0a5c74137a5d441216402b7b7b23662b2a1b35e0e26d3c
+      flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5457000556510f5f5d5a5a7647215d4413151c29752b22657c794d66b4e46c6d
+      value: 0754005406040c080f5f5a7044730944134e1b7e757b713578711864e6e56c69
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5402015f55005f5d0b0f082412760b44444e4f7e787f206674284b31b7e3356e
+      value: 530306550401590a545e097a45215d444f154e2f297e2362757b196ab3b8653e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 530306550401590a545e097a45215d444f154e2f297e2362757b196ab3b8653e
+      value: 0252060754000c035c5a097544770b44174e1e7e287023667c7a4f32b5e23661
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650