Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6ff00013f5
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9bcdfa4acb97d85458e2e51fbb2c7218
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 71a964da539cf43469c1ff91b50652b4
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: FlyUpAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 53 KiB |
File diff suppressed because it is too large
Load Diff
|
@ -17969,6 +17969,10 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 71
|
||||
resAbNameIndex: 36
|
||||
- resName: r_characterbg_lanjin
|
||||
extension: .png
|
||||
resPathIndex: 72
|
||||
resAbNameIndex: 36
|
||||
- resName: r_tongyong_tianfufeishengxiao1
|
||||
extension: .png
|
||||
resPathIndex: 72
|
||||
|
|
|
@ -511,12 +511,10 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)
|
|||
end
|
||||
SetParticleSortLayer(effect,_layer)
|
||||
--SetParticleSortLayer(effect2,_layer)
|
||||
if star then
|
||||
-- body
|
||||
end
|
||||
local img=Util.GetGameObject(par,"flyImg")
|
||||
if img==nil then
|
||||
if _star<=11 then
|
||||
LogError("aaaaaaaaaa")
|
||||
return
|
||||
end
|
||||
img = poolManager:LoadAsset("FlyUpImg", PoolManager.AssetType.GameObject)
|
||||
|
@ -525,15 +523,18 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)
|
|||
img.transform.localScale = Vector3.one
|
||||
img:GetComponent("RectTransform").sizeDelta = Vector2.New(126,110)
|
||||
img.transform.localPosition = Vector3.New(95,180,0)
|
||||
|
||||
else
|
||||
if _star<=11 then
|
||||
img.gameObject:SetActive(false)
|
||||
return
|
||||
end
|
||||
img:SetActive(false)
|
||||
end
|
||||
if _star<=11 then
|
||||
img:SetActive(false)
|
||||
LogError("11111111111111")
|
||||
return
|
||||
end
|
||||
img=img:GetComponent("Image")
|
||||
img.gameObject:SetActive(true)
|
||||
|
||||
LogError("222222222222")
|
||||
if _star==12 then
|
||||
img.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1")
|
||||
elseif _star==13 then
|
||||
|
@ -545,6 +546,7 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)
|
|||
-- long2:SetActive(true)
|
||||
img.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2")
|
||||
else
|
||||
LogError("333333")
|
||||
img.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
@ -1079,8 +1081,10 @@ function GetQuantityImageByquality(quality,star)
|
|||
return "r_characterbg_goden"
|
||||
elseif star >= 6 and star <=10 then
|
||||
return "r_characterbg_gules"
|
||||
elseif star > 10 then
|
||||
elseif star >= 10 then
|
||||
return "t_tongyong_topkaung"
|
||||
else
|
||||
return "r_characterbg_lanjin"
|
||||
end
|
||||
else
|
||||
if quality == 0 or quality == 1 then
|
||||
|
@ -1178,8 +1182,10 @@ function GetHeroQuantityImageByquality(quality,star)
|
|||
return "r_characterbg_goden"
|
||||
elseif star >= 6 and star <=10 then
|
||||
return "r_characterbg_gules"
|
||||
elseif star > 10 then
|
||||
elseif star == 11 then
|
||||
return "t_tongyong_topkaung"
|
||||
else
|
||||
return "r_characterbg_lanjin"
|
||||
end
|
||||
else
|
||||
if quality == 0 or quality == 1 then
|
||||
|
|
|
@ -190,7 +190,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
else
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
|
||||
end
|
||||
local flyImg=Util.GetGameObject(o,"flyImg"):GetComponent("Image")
|
||||
--local flyImg=Util.GetGameObject(o,"flyImg"):GetComponent("Image")
|
||||
SetHeroFormationFlyEffect(o,this.spLoader,Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai"),monsterId.star,sortingOrder + 1)
|
||||
name.text=GetLanguageStrById(heroConfig.ReadingName)
|
||||
SetTextVerTial(name.gameObject,Vector3.New(35,-7.45,0),nil,nil,8)
|
||||
|
|
|
@ -409,7 +409,7 @@ function this.FormationAdapter(teamInfo)
|
|||
this.Demons[hero.position].levelText.text = hero.level
|
||||
this.Demons[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
|
||||
SetHeroIcon(this.spLoader, hero,this.Demons[hero.position].icon,heroConfig)
|
||||
SetHeroFlyEffect(this.Demons[hero.position].hero,this.spLoader,hero.star,this.sortingOrder+1,0.9)
|
||||
SetHeroFlyEffect(this.Demons[hero.position].hero,this.spLoader,hero.star,this.sortingOrder+1,0.9,2)
|
||||
local heroData = {}
|
||||
if this._Config.formationType == FormationTypeDef.FORMATION_TSLX then
|
||||
Util.AddOnceClick(this.Demons[hero.position].frameBtn, function()
|
||||
|
|
|
@ -121,7 +121,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
starSize = Vector2.New(60,57)
|
||||
end
|
||||
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
|
||||
SetHeroFlyEffect(Util.GetGameObject(_go.transform, "GameObject"),this.spLoader,heroData.star,sort,1.1,2)
|
||||
SetHeroFlyEffect(Util.GetGameObject(_go.transform, "GameObject"),this.spLoader,heroData.star,sort,1,2,20)
|
||||
Util.SetParticleSortLayer(starGrid, sort + 1)
|
||||
local choosed =Util.GetGameObject(_go.transform, "choosed")
|
||||
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
|
||||
|
|
Loading…
Reference in New Issue