战斗怒气文字修改

dev_chengFeng
gaoxin 2020-08-27 17:26:55 +08:00
parent 624781367b
commit 1ce0e4b15c
24 changed files with 430 additions and 144 deletions

View File

@ -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:

View File

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

View File

@ -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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a57495a9f6f36b640a23f6d715ff6e44
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -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:

View File

@ -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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f10e452c890a578499b9d184f1080ce3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 12800000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -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}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 93b9edfb5be089e468002da3aa24cb63
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -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

View File

@ -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)

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -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

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB