From 1ce0e4b15ca69108d704f1b445413eef8b882b69 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 17:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E6=80=92=E6=B0=94=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/z_zhandou_nuqijia_2.png.meta | 110 ----------- Assets/ManagedResources/Fonts/ArtFont_3.meta | 8 + .../Fonts/ArtFont_3/ArtFont_3.fnt | 13 ++ .../Fonts/ArtFont_3/ArtFont_3.fnt.meta | 7 + .../Fonts/ArtFont_3/ArtFont_3_0.png | Bin 0 -> 14777 bytes .../ArtFont_3/ArtFont_3_0.png.meta} | 38 +--- .../ArtFont_3/ArtFont_3_cfont.fontsettings | 175 ++++++++++++++++++ .../ArtFont_3_cfont.fontsettings.meta | 8 + .../Fonts/ArtFont_3/ArtFont_3_mat.mat | 28 +++ .../Fonts/ArtFont_3/ArtFont_3_mat.mat.meta | 8 + .../Prefabs/UI/Battle/BuffFloatingText.prefab | 84 ++++++++- .../~Lua/Modules/Battle/View/RoleView.lua | 14 +- FontArt/ArtFont_3/ArtFont_3.fnt | 13 ++ FontArt/ArtFont_3/ArtFont_3_0.png | Bin 0 -> 14777 bytes FontArt/ArtFont_3/config.bmfc | 68 +++++++ .../ArtFont_3}/z_zhandou_nuqijia_1.png | Bin .../ArtFont_3}/z_zhandou_nuqijia_2.png | Bin FontArt/ArtFont_3/z_zhandou_nuqijia_3.png | Bin 0 -> 1772 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_4.png | Bin 0 -> 2100 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_5.png | Bin 0 -> 1720 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_6.png | Bin 0 -> 1888 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_7.png | Bin 0 -> 1647 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_8.png | Bin 0 -> 2052 bytes FontArt/ArtFont_3/z_zhandou_nuqijia_9.png | Bin 0 -> 1950 bytes 24 files changed, 430 insertions(+), 144 deletions(-) delete mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png.meta create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3.meta create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt.meta create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png rename Assets/ManagedResources/{Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png.meta => Fonts/ArtFont_3/ArtFont_3_0.png.meta} (68%) create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings.meta create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat create mode 100644 Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat.meta create mode 100644 FontArt/ArtFont_3/ArtFont_3.fnt create mode 100644 FontArt/ArtFont_3/ArtFont_3_0.png create mode 100644 FontArt/ArtFont_3/config.bmfc rename {Assets/ManagedResources/Atlas/BattleAtlas/ArtFont => FontArt/ArtFont_3}/z_zhandou_nuqijia_1.png (100%) rename {Assets/ManagedResources/Atlas/BattleAtlas/ArtFont => FontArt/ArtFont_3}/z_zhandou_nuqijia_2.png (100%) create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_3.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_4.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_5.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_6.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_7.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_8.png create mode 100644 FontArt/ArtFont_3/z_zhandou_nuqijia_9.png diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png.meta b/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png.meta deleted file mode 100644 index 16890ae028..0000000000 --- a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 50f1d144ca42aba46bd323ed6662da11 -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: 0 - 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: 014439fa262f6ae4fb4109db4bd7cc64 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_3.meta b/Assets/ManagedResources/Fonts/ArtFont_3.meta new file mode 100644 index 0000000000..558ede5be2 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 313f7d7232335a04b89e4da3544b67d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt new file mode 100644 index 0000000000..0fa09e87af --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt @@ -0,0 +1,13 @@ +info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=26 scaleW=256 scaleH=128 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="ArtFont_3_0.png" +chars count=9 +char id=49 x=80 y=58 width=23 height=56 xoffset=0 yoffset=0 xadvance=23 page=0 chnl=15 +char id=50 x=0 y=59 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=51 x=40 y=59 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=52 x=0 y=0 width=40 height=58 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=53 x=41 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=54 x=82 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=55 x=205 y=0 width=35 height=57 xoffset=0 yoffset=0 xadvance=35 page=0 chnl=15 +char id=56 x=123 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=57 x=164 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt.meta b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt.meta new file mode 100644 index 0000000000..51e7606ecd --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3.fnt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a57495a9f6f36b640a23f6d715ff6e44 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png new file mode 100644 index 0000000000000000000000000000000000000000..be74ef65935d6e1b3a5930057c8be394135f3edb GIT binary patch literal 14777 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png.meta b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png.meta similarity index 68% rename from Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png.meta rename to Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png.meta index 9575f83cb3..158a0936d3 100644 --- a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png.meta +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_0.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59aab39792d8b3a459528ed435a968f5 +guid: 11e745e545caffa4982518627f24d924 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -42,7 +42,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -59,37 +59,15 @@ TextureImporter: textureFormatSet: 0 platformSettings: - serializedVersion: 2 - buildTarget: Android + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: -1 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 + overridden: 0 androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 @@ -97,12 +75,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: c1dd517547b5e824b98c507d32affbc9 + spriteID: c421e83142af3044991d6bf42d3740ee vertices: [] indices: edges: [] weights: [] - spritePackingTag: BattleAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings new file mode 100644 index 0000000000..7cc5749dbb --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings @@ -0,0 +1,175 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!128 &12800000 +Font: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ArtFont_3_cfont + serializedVersion: 5 + m_LineSpacing: 0.1 + m_DefaultMaterial: {fileID: 2100000, guid: 93b9edfb5be089e468002da3aa24cb63, type: 2} + m_FontSize: 0 + m_Texture: {fileID: 0} + m_AsciiStartOffset: 0 + m_Tracking: 1 + m_CharacterSpacing: 0 + m_CharacterPadding: 1 + m_ConvertCase: 0 + m_CharacterRects: + - serializedVersion: 2 + index: 49 + uv: + serializedVersion: 2 + x: 0.3125 + y: 0.546875 + width: 0.08984375 + height: -0.4375 + vert: + serializedVersion: 2 + x: 0 + y: -28 + width: 23 + height: 56 + advance: 23 + flipped: 0 + - serializedVersion: 2 + index: 50 + uv: + serializedVersion: 2 + x: 0 + y: 0.5390625 + width: 0.15234375 + height: -0.4375 + vert: + serializedVersion: 2 + x: 0 + y: -28 + width: 39 + height: 56 + advance: 39 + flipped: 0 + - serializedVersion: 2 + index: 51 + uv: + serializedVersion: 2 + x: 0.15625 + y: 0.5390625 + width: 0.15234375 + height: -0.4375 + vert: + serializedVersion: 2 + x: 0 + y: -28 + width: 39 + height: 56 + advance: 39 + flipped: 0 + - serializedVersion: 2 + index: 52 + uv: + serializedVersion: 2 + x: 0 + y: 1 + width: 0.15625 + height: -0.453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 40 + height: 58 + advance: 40 + flipped: 0 + - serializedVersion: 2 + index: 53 + uv: + serializedVersion: 2 + x: 0.16015625 + y: 1 + width: 0.15625 + height: -0.4453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 40 + height: 57 + advance: 40 + flipped: 0 + - serializedVersion: 2 + index: 54 + uv: + serializedVersion: 2 + x: 0.3203125 + y: 1 + width: 0.15625 + height: -0.4453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 40 + height: 57 + advance: 40 + flipped: 0 + - serializedVersion: 2 + index: 55 + uv: + serializedVersion: 2 + x: 0.80078125 + y: 1 + width: 0.13671875 + height: -0.4453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 35 + height: 57 + advance: 35 + flipped: 0 + - serializedVersion: 2 + index: 56 + uv: + serializedVersion: 2 + x: 0.48046875 + y: 1 + width: 0.15625 + height: -0.4453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 40 + height: 57 + advance: 40 + flipped: 0 + - serializedVersion: 2 + index: 57 + uv: + serializedVersion: 2 + x: 0.640625 + y: 1 + width: 0.15625 + height: -0.4453125 + vert: + serializedVersion: 2 + x: 0 + y: -29 + width: 40 + height: 57 + advance: 40 + flipped: 0 + m_KerningValues: [] + m_PixelScale: 0.1 + m_FontData: + m_Ascent: 0 + m_Descent: 0 + m_DefaultStyle: 0 + m_FontNames: [] + m_FallbackFonts: [] + m_FontRenderingMode: 0 + m_UseLegacyBoundsCalculation: 0 + m_ShouldRoundAdvanceValue: 1 diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings.meta b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings.meta new file mode 100644 index 0000000000..427d59fbc5 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_cfont.fontsettings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f10e452c890a578499b9d184f1080ce3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 12800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat new file mode 100644 index 0000000000..b87013cc6f --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ArtFont_3_mat + m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 11e745e545caffa4982518627f24d924, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat.meta b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat.meta new file mode 100644 index 0000000000..d326d4afb2 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_3/ArtFont_3_mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93b9edfb5be089e468002da3aa24cb63 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BuffFloatingText.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BuffFloatingText.prefab index 92644e257e..fb102da904 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BuffFloatingText.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BuffFloatingText.prefab @@ -267,7 +267,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1243822207133751862 RectTransform: m_ObjectHideFlags: 0 @@ -355,13 +355,14 @@ RectTransform: m_Children: - {fileID: 4029957975442558083} - {fileID: 1243822207133751862} + - {fileID: 5962112315827021558} m_Father: {fileID: 224920244720778708} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 100} + m_SizeDelta: {x: 297, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7558021170133906201 MonoBehaviour: @@ -400,6 +401,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &6470606043473423351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5962112315827021558} + - component: {fileID: 4540464712585583005} + - component: {fileID: 4265741982511684221} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5962112315827021558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470606043473423351} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8075343171888407996} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 217, y: -50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4540464712585583005 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470606043473423351} + m_CullTransparentMesh: 0 +--- !u!114 &4265741982511684221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470606043473423351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: f10e452c890a578499b9d184f1080ce3, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 122 --- !u!1 &7705174194132033316 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index 44dd1c8691..53963859ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -399,7 +399,7 @@ function RoleView:TextBuffFloating(type, text) end -- -function RoleView:ImageBuffFloating(textImg, numImg) +function RoleView:ImageBuffFloating(textImg, numImg, numTxt) local go = loadAsset(buffFloatingEffect) local baseY = 0 @@ -430,6 +430,7 @@ function RoleView:ImageBuffFloating(textImg, numImg) local img1 = Util.GetGameObject(go, "anim/grid/Image1"):GetComponent("Image") local img2 = Util.GetGameObject(go, "anim/grid/Image2"):GetComponent("Image") + local txt3 = Util.GetGameObject(go, "anim/grid/Text"):GetComponent("Text") if textImg then img1.gameObject:SetActive(true) @@ -447,6 +448,13 @@ function RoleView:ImageBuffFloating(textImg, numImg) img2.gameObject:SetActive(false) end + if numTxt then + txt3.gameObject:SetActive(true) + txt3.text = numTxt + else + txt3.gameObject:SetActive(false) + end + self:AddDelayRecycleRes(buffFloatingEffect, go, 1.3) end @@ -1699,7 +1707,9 @@ end function RoleView:RoleRageChange(deltaRage) if deltaRage ~= 0 then if deltaRage > 0 then - self:ImageBuffFloating("z_zhandou_nuqijia", "z_zhandou_nuqijia_"..deltaRage) + -- self:ImageBuffFloating("z_zhandou_nuqijia", "z_zhandou_nuqijia_"..deltaRage) + + self:ImageBuffFloating("z_zhandou_nuqijia", nil, deltaRage) -- local go = loadAsset(rageEffect) diff --git a/FontArt/ArtFont_3/ArtFont_3.fnt b/FontArt/ArtFont_3/ArtFont_3.fnt new file mode 100644 index 0000000000..0fa09e87af --- /dev/null +++ b/FontArt/ArtFont_3/ArtFont_3.fnt @@ -0,0 +1,13 @@ +info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=26 scaleW=256 scaleH=128 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="ArtFont_3_0.png" +chars count=9 +char id=49 x=80 y=58 width=23 height=56 xoffset=0 yoffset=0 xadvance=23 page=0 chnl=15 +char id=50 x=0 y=59 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=51 x=40 y=59 width=39 height=56 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=52 x=0 y=0 width=40 height=58 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=53 x=41 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=54 x=82 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=55 x=205 y=0 width=35 height=57 xoffset=0 yoffset=0 xadvance=35 page=0 chnl=15 +char id=56 x=123 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 +char id=57 x=164 y=0 width=40 height=57 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15 diff --git a/FontArt/ArtFont_3/ArtFont_3_0.png b/FontArt/ArtFont_3/ArtFont_3_0.png new file mode 100644 index 0000000000000000000000000000000000000000..be74ef65935d6e1b3a5930057c8be394135f3edb GIT binary patch literal 14777 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 literal 0 HcmV?d00001 diff --git a/FontArt/ArtFont_3/config.bmfc b/FontArt/ArtFont_3/config.bmfc new file mode 100644 index 0000000000..f046445f85 --- /dev/null +++ b/FontArt/ArtFont_3/config.bmfc @@ -0,0 +1,68 @@ +# AngelCode Bitmap Font Generator configuration file +fileVersion=1 + +# font settings +fontName=Arial +fontFile= +charSet=0 +fontSize=32 +aa=1 +scaleH=100 +useSmoothing=1 +isBold=0 +isItalic=0 +useUnicode=1 +disableBoxChars=1 +outputInvalidCharGlyph=0 +dontIncludeKerningPairs=0 +useHinting=1 +renderFromOutline=0 +useClearType=1 +autoFitNumPages=0 +autoFitFontSizeMin=0 +autoFitFontSizeMax=0 + +# character alignment +paddingDown=0 +paddingUp=0 +paddingRight=0 +paddingLeft=0 +spacingHoriz=1 +spacingVert=1 +useFixedHeight=0 +forceZero=0 +widthPaddingFactor=0.00 + +# output file +outWidth=512 +outHeight=512 +outBitDepth=32 +fontDescFormat=0 +fourChnlPacked=0 +textureFormat=png +textureCompression=0 +alphaChnl=1 +redChnl=0 +greenChnl=0 +blueChnl=0 +invA=0 +invR=0 +invG=0 +invB=0 + +# outline +outlineThickness=0 + +# selected chars + + +# imported icon images +icon="z_zhandou_nuqijia_9.png",57,0,0,0 +icon="z_zhandou_nuqijia_1.png",49,0,0,0 +icon="z_zhandou_nuqijia_2.png",50,0,0,0 +icon="z_zhandou_nuqijia_3.png",51,0,0,0 +icon="z_zhandou_nuqijia_4.png",52,0,0,0 +icon="z_zhandou_nuqijia_5.png",53,0,0,0 +icon="z_zhandou_nuqijia_6.png",54,0,0,0 +icon="z_zhandou_nuqijia_7.png",55,0,0,0 +icon="z_zhandou_nuqijia_8.png",56,0,0,0 diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png b/FontArt/ArtFont_3/z_zhandou_nuqijia_1.png similarity index 100% rename from Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_1.png rename to FontArt/ArtFont_3/z_zhandou_nuqijia_1.png diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png b/FontArt/ArtFont_3/z_zhandou_nuqijia_2.png similarity index 100% rename from Assets/ManagedResources/Atlas/BattleAtlas/ArtFont/z_zhandou_nuqijia_2.png rename to FontArt/ArtFont_3/z_zhandou_nuqijia_2.png diff --git a/FontArt/ArtFont_3/z_zhandou_nuqijia_3.png b/FontArt/ArtFont_3/z_zhandou_nuqijia_3.png new file mode 100644 index 0000000000000000000000000000000000000000..877dc635afe65493f043ecd3374c33a3d09da9c4 GIT binary patch literal 1772 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 e?5q(*0R9IP*7&1-ZM{7J0000#>7Npq7j28 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 literal 0 HcmV?d00001 diff --git a/FontArt/ArtFont_3/z_zhandou_nuqijia_8.png b/FontArt/ArtFont_3/z_zhandou_nuqijia_8.png new file mode 100644 index 0000000000000000000000000000000000000000..ae6ed0f1bde9728d1f95d2ccc17c63aa0835ec4d GIT binary patch literal 2052 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 kJAfaPuawsuQVszA2b$ZIzt>