Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2022-01-08 17:49:14 +08:00
commit bb343cdcc5
6 changed files with 109 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 96507c7d33a95834ab2e3cf8d31c85dd
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: c02fe6cb16feb0a4a8fc1aa9de52fb2f
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -63302,17 +63302,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8903392646292273362}
m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 491038039515440220}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45}
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: 60, y: -55.000015}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4972066190102128193
CanvasRenderer:
@ -63335,14 +63335,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1}
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_Sprite: {fileID: 21300000, guid: 3d49dff9e68d99042b98190141718524, type: 3}
m_Sprite: {fileID: 21300000, guid: 96507c7d33a95834ab2e3cf8d31c85dd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -84414,7 +84414,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3419202398703480616
RectTransform:
m_ObjectHideFlags: 0

View File

@ -359,8 +359,8 @@ function this.HeroItemAdapter(_go, _heroData)
local con = _showConfig[loopList[index]]
if con then
txt.text = con.text
txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0)
highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0)
txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5)
highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5)
end
end)
-- loopFadeText(txt, highlight:GetComponent("Image"), loopList, 0)

View File

@ -115,7 +115,7 @@ function TailsManSouPanel:BindEvent()
if star >= starNum then
color = "00FF00"
end
str = string.format("<color=#%s>%s星%s</color>",color,starNum,proStr)
str = string.format("<size=32><color=#%s>%s/%s星:%s</color></size>",color,star,starNum,proStr)
return str
end
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.TrumpStar)) do