[飞升]============特效显示修改提交

dev_chengFeng
wangzhenxing 2022-01-07 10:08:55 +08:00
parent d2b10ebb38
commit e5c176cd9f
9 changed files with 2256 additions and 586 deletions

View File

@ -36,8 +36,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -40}
m_SizeDelta: {x: 610, y: 141.08}
m_AnchoredPosition: {x: 110, y: -30}
m_SizeDelta: {x: 610, y: 163.6}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2225956
CanvasRenderer:
@ -1031,7 +1031,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Top: 30
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 20
@ -34381,7 +34381,7 @@ RectTransform:
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: -98}
m_AnchoredPosition: {x: 0, y: -98}
m_SizeDelta: {x: 850, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2565284727439721118
@ -37122,7 +37122,7 @@ RectTransform:
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: -98}
m_AnchoredPosition: {x: 0, y: -98}
m_SizeDelta: {x: 850, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2546930136023970917

View File

@ -910,7 +910,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:

View File

@ -480,6 +480,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
effect:SetActive(false)
end
end
return effect
end
function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer)

View File

@ -809,7 +809,15 @@ function this.SingleHeroDataShow(_go, _heroData)
starSize = Vector2.New(60,57)
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
SetHeroFlyEffect(go,this.spLoader,star,this.sortingOrder,1)
local effect=SetHeroFlyEffect(go,this.spLoader,star,this.sortingOrder,1)
if effect then
local meshs2=effect:GetComponentsInChildren(typeof(UnityEngine.SkinnedMeshRenderer))
for key, value in pairs(meshs2:ToTable()) do
if value.material.shader.name=="YXZ/Effect/TransparentRim" then
value.material.shader=poolManager:LoadAsset("YXZ_Effect_TransparentRim_1",poolManager.AssetType.Other)
end
end
end
Util.SetParticleSortLayer(go, this.sortingOrder + 1)
--血量显示
local curHeroHpVal = FormationManager.GetFormationHeroHp(this.curFormationIndex,_heroData.dynamicId)

View File

@ -47,6 +47,25 @@ function HandBookHeroAndEquipListPanel:InitComponent()
self.starNum = Util.GetGameObject(self.transform, "starNum")
self.heroprefab = Util.GetGameObject(self.transform, "heroprefab")
local particles=self.heroprefab:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
for key, value in pairs(particles:ToTable()) do
local mat=value:GetComponent(typeof(UnityEngine.Renderer))
if mat.material.shader.name=="CGwell FX/Additive Lv1" then
mat.material.shader=poolManager:LoadAsset("Add Lv1_1",poolManager.AssetType.Other)
end
end
local meshs=self.heroprefab:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer))
for key, value in pairs(meshs:ToTable()) do
if value.material.shader.name=="Custom/S_03_UV_alpha_add" then
value.material.shader=poolManager:LoadAsset("S_03_uv_alpha_add_1",poolManager.AssetType.Other)
end
end
local meshs2=self.heroprefab:GetComponentsInChildren(typeof(UnityEngine.SkinnedMeshRenderer))
for key, value in pairs(meshs2:ToTable()) do
if value.material.shader.name=="YXZ/Effect/TransparentRim" then
value.material.shader=poolManager:LoadAsset("YXZ_Effect_TransparentRim_1",poolManager.AssetType.Other)
end
end
self.scrollRoot = Util.GetGameObject(self.transform, "heroScroll")
local rootHight = self.scrollRoot.transform.rect.height
local sv = SubUIManager.Open(SubUIConfig.ScrollFitterView, self.scrollRoot.transform,

View File

@ -17,10 +17,30 @@ function RoleListPanel:InitComponent()
this.spLoader = SpriteLoader.New()
this.BtnBack = Util.GetGameObject(self.transform, "rightUp/btnBack")
this.cardPre = poolManager:LoadAsset("card", PoolManager.AssetType.GameObject)
this.cardPre = poolManager:LoadAsset("card", PoolManager.AssetType.GameObject)
LogError("222222222")
UIManager.DoLanguageCheck(this.spLoader, this.cardPre)
this.cardPre.transform:SetParent(self.transform)
this.cardPre:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
local particles=this.cardPre:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
for key, value in pairs(particles:ToTable()) do
local mat=value:GetComponent(typeof(UnityEngine.Renderer))
if mat.material.shader.name=="CGwell FX/Additive Lv1" then
mat.material.shader=poolManager:LoadAsset("Add Lv1_1",poolManager.AssetType.Other)
end
end
local meshs=this.cardPre:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer))
for key, value in pairs(meshs:ToTable()) do
if value.material.shader.name=="Custom/S_03_UV_alpha_add" then
value.material.shader=poolManager:LoadAsset("S_03_uv_alpha_add_1",poolManager.AssetType.Other)
end
end
local meshs2=this.cardPre:GetComponentsInChildren(typeof(UnityEngine.SkinnedMeshRenderer))
for key, value in pairs(meshs2:ToTable()) do
if value.material.shader.name=="YXZ/Effect/TransparentRim" then
value.material.shader=poolManager:LoadAsset("YXZ_Effect_TransparentRim_1",poolManager.AssetType.Other)
end
end
this.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
for i = 0, 6 do
tabs[i] = Util.GetGameObject(self.transform, "Tabs/grid/Btn" .. i)
@ -47,11 +67,11 @@ function RoleListPanel:InitComponent()
if not this.playerInfoView then
this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform)
this.playerInfoView.gameObject:AddComponent(typeof(UnityEngine.Canvas)).overrideSorting=true
--this.playerInfoView.overrideSorting=true
--this.playerInfoView.overrideSorting=true
end
this.BtView =SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
this.UpView.gameObject:AddComponent(typeof(UnityEngine.Canvas)).overrideSorting=true
--this.UpView.gameObject:AddComponent(typeof(UnityEngine.Canvas)).overrideSorting=true
--this.UpView.overrideSorting=true
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "scroll").transform,
@ -60,6 +80,8 @@ function RoleListPanel:InitComponent()
this.ScrollView.moveTween.Strength = 1
this.maxk = Util.GetGameObject(self.gameObject, "maxk")
end
--绑定事件(用于子类重写)
@ -144,14 +166,14 @@ function this:OnSortingOrderChange()
orginLayer = self.sortingOrder
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
-- 头像层级
-- -- 头像层级
if this.playerInfoView then
this.playerInfoView:SetLayer(self.sortingOrder+2)
SetParticleSortLayer(this.playerInfoView,self.sortingOrder+2)
end
if this.UpView then
SetParticleSortLayer(this.UpView,self.sortingOrder+2)
end
-- if this.UpView then
-- SetParticleSortLayer(this.UpView,self.sortingOrder+2)
-- end
end

View File

@ -407,7 +407,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
end)
end
self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale)
self.gameObject:GetComponent("RectTransform").localScale = Vector3.New(self.scale, self.scale,1)
end
function ItemView:SetEffectLayer(effectLayer)
@ -519,7 +519,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
star,starType = tempHero.GetStar(1)
end
SetHeroStars(self.spLoader, self.starGrid, star,starType,nil,-15)
SetHeroFlyEffect(self.heroShowGo,self.spLoader,star,effectLayer+1,1)
SetHeroFlyEffect(self.heroShowGo,self.spLoader,star,effectLayer+1,0.95,2)
if effectLayer > 0 then
Util.SetParticleSortLayer(self.starGrid,effectLayer + 1)
self.UI_Effect_Kuang_JinSe:SetActive(heroConfigData.Star == 5)
@ -807,7 +807,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.num:GetComponent("Text").color = Color.New(1, 1, 1, 1)
end
end
self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale)
self.gameObject:GetComponent("RectTransform").localScale = Vector3.New(self.scale, self.scale,1)
end
function ItemView:OnBtnCkickEvent(itemSId)
local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId)