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

dev_chengFeng
jiaoyangna 2022-01-20 11:42:25 +08:00
commit 70d3d943a8
14 changed files with 3454 additions and 3958 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

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

View File

@ -35,7 +35,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2, y: 0}
m_AnchoredPosition: {x: -2, y: -0.000012561587}
m_SizeDelta: {x: 911.7, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8840374508037427462
@ -128,9 +128,9 @@ RectTransform:
m_Father: {fileID: 7357172877353762945}
m_RootOrder: 0
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: -295, y: -430}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -295, y: 550}
m_SizeDelta: {x: 338, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4898540815014938959
@ -283,9 +283,9 @@ RectTransform:
m_Father: {fileID: 7357172877353762945}
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: 24.199986, y: -630}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 24.199986, y: 350}
m_SizeDelta: {x: 996, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5276786805168625830
@ -358,10 +358,10 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
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: -3.6, y: 81.2}
m_SizeDelta: {x: 1076.6, y: 466}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7355087688229137717
CanvasRenderer:

View File

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

View File

@ -417,16 +417,20 @@ function GetStarOrGodSoulLv(index,data)
end
return data.star,index
end
function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY)
local effect=Util.GetGameObject(par, "c_long_touxiang_lizi(Clone)")
local img=Util.GetGameObject(par,"flyImg")
local y=0
if addY then
y=addY
end
if img==nil then
img = poolManager:LoadAsset("FlyUpImg", PoolManager.AssetType.GameObject) -- newObject("FlyUpImg")
img.transform:SetParent(par.transform)
img.name="flyImg"
--img:GetComponent("RectTransform").sizeDelta = Vector2.New(116,50)
img.transform.localScale = Vector3.one*_scale
img.transform.localPosition = Vector3.New(0,71*_scale,0)
img.transform.localPosition = Vector3.New(0,71*_scale+y,0)
else
if _star>11 then
img.gameObject:SetActive(true)
@ -452,17 +456,19 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
SetParticleSortLayer(effect,_layer)
effect:SetActive(true)
effect.transform:SetParent(par.transform)
effect:GetComponent("RectTransform").localPosition = Vector3.zero
effect:GetComponent("RectTransform").localPosition = Vector3.New(0,y,0)
effect:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)*_scale
effect.transform:SetAsFirstSibling()
local long1=Util.GetGameObject(effect, "longaniduan")
local long2=Util.GetGameObject(effect, "longaniduan (1)")
local bg1=Util.GetGameObject(effect, "baoguang (9)")
local bg2=Util.GetGameObject(effect, "baoguang (10)")
local bg3=Util.GetGameObject(effect, "c_ui_qinyan_duan")
long1:SetActive(false)
long2:SetActive(false)
bg1:SetActive(false)
bg2:SetActive(false)
bg3:SetActive(false)
if _star==12 then
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju1")
elseif _star==13 then
@ -472,6 +478,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
elseif _star==14 then
bg1:SetActive(true)
bg2:SetActive(true)
bg3:SetActive(true)
-- long1:SetActive(true)
-- long2:SetActive(true)
go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju2")
@ -504,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)
@ -518,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
@ -538,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
@ -733,7 +742,7 @@ function SetHeroBg(spLoader, bg,cardBg,star,quality,layer)
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1")
elseif star==13 then
shan:SetActive(true)
bgEffect:SetActive(true)
bgEffect:SetActive(false)
flyImg:GetComponent("Image").sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai2")
elseif star==14 then
shan:SetActive(true)
@ -750,8 +759,13 @@ function SetHeroBg(spLoader, bg,cardBg,star,quality,layer)
SetParticleSortLayer(bg,layer)
SetParticleSortLayer(long,layer)
else
flyImg.gameObject:SetActive(false)
fly:SetActive(false)
if flyImg then
flyImg.gameObject:SetActive(false)
end
if fly then
fly:SetActive(false)
end
end
end
@ -1067,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
@ -1166,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

View File

@ -148,12 +148,15 @@ function this.EnterMap()
CarbonManager.carbonType = CARBON_TYPE.ENDLESS
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
if not PlayerPrefs.HasKey("WuJin"..PlayerManager.uid) then
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid ,0)
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid, 0)
end
local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid)
MapManager.curMapId = EndLessMapManager.openMapId
if serData.endTime ~= note then
TaskManager.ResetEndlessMissionState()
-- 首次登录不清除数据
if note ~= 0 then
TaskManager.ResetEndlessMissionState()
end
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
else
MapManager.curCarbonType = CarBonTypeId.ENDLESS

View File

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

View File

@ -155,6 +155,7 @@ function this:Refresh(_data,_item)
starSize = Vector2.New(36.868,39.76)
end
SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale)
SetHeroFlyEffect(_item.heroList[pos].hero,this.spLoader,star,sortingOrder+1,0.5,2)
Util.SetParticleSortLayer( _item.heroList[pos].starGrid,sortingOrder + 1)
local demonId = heroData.id
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)

View File

@ -397,6 +397,7 @@ function this.RefreshFormation(_item,_data)
starSize = Vector2.New(36.868,39.76)
end
SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale)
SetHeroFlyEffect(_item.heroList[pos].hero,this.spLoader,star,sortingOrder+1,0.5,2)
Util.SetParticleSortLayer( _item.heroList[pos].starGrid,sortingOrder + 1)
local demonId = heroData.id
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)

View File

@ -61,6 +61,8 @@ function HandBookHeroAndEquipListPanel:InitComponent()
mat.material.shader=poolManager:LoadAsset("Add Lv1_1",poolManager.AssetType.Other)
elseif mat.material.shader.name=="UI Particles/Additive" then
mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other)
elseif mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then
mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other)
end
end
local meshs=self.heroprefab:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer))
@ -239,10 +241,14 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
for id, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
if not v.Hide or v.Hide == 0 then
if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then
table.insert(tenHeroList,v)
elseif v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then
-- if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then
-- table.insert(tenHeroList,v)
-- else
if v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then
table.insert(sexHeroList,v)
if v.MaxRank==14 then
table.insert(tenHeroList,v)
end
elseif v.Natural == 5 and (proId == 0 or v.PropertyName == proId) then
table.insert(fiveHeroList,v)
elseif v.Natural == 4 and (proId == 0 or v.PropertyName == proId) then
@ -291,10 +297,14 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
table.insert(tempData,v[n])
--LogBlue("v[n].id:"..v[n].Id)
end
local showStar=v[i].MaxRank
if k==6 then
showStar=11
end
if i%5 ==0 then
table.insert(heroScrolldatas,{type = 1,natural=k, star = v[i].MaxRank,index = math.floor(i/5), content = tempData})
table.insert(heroScrolldatas,{type = 1,natural=k, star = showStar,index = math.floor(i/5), content = tempData})
else
table.insert(heroScrolldatas,{type = 1,natural=k, star = v[i].MaxRank,index = math.floor(i/5) + 1, content = tempData})
table.insert(heroScrolldatas,{type = 1,natural=k, star = showStar,index = math.floor(i/5) + 1, content = tempData})
end
temp = i
end
@ -670,7 +680,9 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
if(param[3]) then
natural=param[3]
end
if (param[4]) then
star=param[4]
end
local rankUpConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star)
if rankUpConfig then
lv=rankUpConfig.OpenLevel
@ -693,6 +705,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
lv=1
end
end
heroData.curLv=lv
Util.GetGameObject(_go.transform, "card/choosed").gameObject:SetActive(false)
Util.GetGameObject(_go.transform, "card/flyImg").gameObject:SetActive(false)

View File

@ -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,1)
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()

View File

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