From acba506782dd8c034db2a7c692b76f5c8a422146 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 31 Jul 2020 18:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=E6=B7=BB=E5=8A=A06=E6=98=9F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/x_xb_shuzi_06.png | Bin 0 -> 3223 bytes .../ArtFont/x_xb_shuzi_06.png.meta | 110 ++++++++++++++++++ .../FindTreasureDispatchPanel.lua | 21 ++-- 3 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png create mode 100644 Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png.meta diff --git a/Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png b/Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png new file mode 100644 index 0000000000000000000000000000000000000000..357ae8c13026e968a3faa4b3a35c557d9ec34f0e GIT binary patch literal 3223 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 JD7V=w{tqp?dtv|p literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png.meta b/Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png.meta new file mode 100644 index 0000000000..ff797c3f28 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FindTreasureAtlas/ArtFont/x_xb_shuzi_06.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 72c1840c0fe85b647bd18cbb3c6af183 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4876735731250874fb216924451e0530 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FindTreasureAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index cc250aec54..8625b0212a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -4,6 +4,7 @@ [3] = "x_xb_shuzi_03", [4] = "x_xb_shuzi_04", [5] = "x_xb_shuzi_05", + [6] = "x_xb_shuzi_06", } require("Base/BasePanel") FindTreasureDispatchPanel = Inherit(BasePanel) @@ -467,19 +468,19 @@ function FindTreasureDispatchPanel:SortHeroDatas2(_heroDatas) end function FindTreasureDispatchPanel:GetHeroStarImage(star,type) if type == 1 then - if star < 6 then + -- if star < 6 then return star - elseif star > 5 then - return star%5 - end + -- elseif star > 5 then + -- return star%5 + -- end else - if star < 6 then + -- if star < 6 then return "ui_1xing" - elseif star > 5 and star < 11 then - return "ui_1yue" - elseif star > 10 then - return "ui_1un" - end + -- elseif star > 5 and star < 11 then + -- return "ui_1yue" + -- elseif star > 10 then + -- return "ui_1un" + -- end end end function FindTreasureDispatchPanel:TimeStampToDateString(second)