From f13f1937c7ecd80ccb9e24118ae3d0618bc44944 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 26 Aug 2021 18:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93?= =?UTF-8?q?=E3=80=91=E5=85=B6=E4=BB=96=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PublicAtlas/ArtFont/bd_zhanli-wan.png | Bin 0 -> 4599 bytes .../ArtFont/bd_zhanli-wan.png.meta | 99 + .../PublicAtlas/ArtFont/bd_zhanli-yi.png | Bin 0 -> 5052 bytes .../PublicAtlas/ArtFont/bd_zhanli-yi.png.meta | 99 + .../WorldArenaOtherTeamPanel.prefab | 11645 ++++++++-------- .../ResConfigs/ResourcePathConfig.asset | 8 + .../WorldArena/WorldArenaOtherTeamPanel.lua | 32 +- 7 files changed, 6171 insertions(+), 5712 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png.meta create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-yi.png create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-yi.png.meta diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png new file mode 100644 index 0000000000000000000000000000000000000000..f94632b612323041009e4917bd6217dccf484189 GIT binary patch literal 4599 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png.meta new file mode 100644 index 0000000000..2e4ba596ec --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-wan.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 278c8704b563ad64682d6efb06806647 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2246ffb8bc8c4a8499486683c322c757 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-yi.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/bd_zhanli-yi.png new file mode 100644 index 0000000000000000000000000000000000000000..6e0de933c5799df121e5f7754367e56536e1fcac GIT binary patch literal 5052 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 SCKg}-0000= 10 and num < 100 then + img.transform.localPosition = Vector2.New(55.6,0) + elseif num >= 100 and num < 1000 then + img.transform.localPosition = Vector2.New(77.3,0) + elseif num >= 1000 and num < 10000 then + img.transform.localPosition = Vector2.New(103.4,0) + end + end + if data < 100000 then + warPower.text = data + img:SetActive(false) + elseif data >= 100000000 then + warPower.text = math.floor( data/100000000 ) + img:SetActive(true) + img:GetComponent("Image").sprite = self.spLoader:LoadSprite("bd_zhanli-yi") + setPos(math.floor( data/100000000 )) + else + warPower.text = math.floor( data/10000 ) + img:SetActive(true) + img:GetComponent("Image").sprite = self.spLoader:LoadSprite("bd_zhanli-wan") + setPos(math.floor( data/10000 )) + end +end + --玩家信息 function WorldArenaOtherTeamPanel:SetPlayerInfo(go,playerData) local head = Util.GetGameObject(go, "head") @@ -116,10 +145,9 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData) local go = Util.GetGameObject(_go,"Team ("..index..")") local data = teamData[index] local title = Util.GetGameObject(go,"Title"):GetComponent("Text") - local warPower = Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text") local teamList = Util.GetGameObject(go,"TeamList") title.text = string.format( "第%s队",NumToChinese[index]) - warPower.text = data.totalForce + self:SetImgPos(go,data.totalForce) for i, demon in ipairs(self.teamList[index].heroList) do Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))