Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail

TheStrongestSnail/Assets/Resources/JournalPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4d7d88e5b3da2d84eab98f9d8685014f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TheStrongestSnail/Assets/prefabs/woniukaPanel.prefab

@@ -535,8 +535,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u8717\u725B\u5361"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
-  m_sharedMaterial: {fileID: -1812086935684667758, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_sharedMaterial: {fileID: -4172574303371915638, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1143,8 +1143,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u7ACB\u5373\u8D2D\u4E70"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
-  m_sharedMaterial: {fileID: -1812086935684667758, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_sharedMaterial: {fileID: -4172574303371915638, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1354,8 +1354,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\uFFE599"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
-  m_sharedMaterial: {fileID: -1812086935684667758, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_sharedMaterial: {fileID: -4172574303371915638, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1847,8 +1847,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u8717\u725B\u5361"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
-  m_sharedMaterial: {fileID: -1812086935684667758, guid: f38743aa779ab8e4c8be350b2d8fe4d0, type: 2}
+  m_sharedMaterial: {fileID: -4172574303371915638, guid: ce6703600b5ae7446aa7b2e450658b26, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

TheStrongestSnail/Assets/res/AllUI/UI_3_2.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: f7b6325e0bc39a44fae0ca436148eec3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 136, y: 26, z: 170, w: 28}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WebGL
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TheStrongestSnail/Assets/res/Battle_Royale_UI/List.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3057ab2e2983ca439cc4f2f38eabd20
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TheStrongestSnail/Assets/res/Battle_Royale_UI/List/list_Bg.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7b6325e0bc39a44fae0ca436148eec3
+guid: 79e605de8f1e02646b123b53d90a7da8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    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: Android
     maxTextureSize: 2048