[飞升]=========飞升优化修改

dev_chengFeng
wangzhenxing 2022-01-13 10:01:22 +08:00
parent cd1b81c03e
commit a16b592892
7 changed files with 45 additions and 43 deletions

View File

@ -164,8 +164,8 @@ 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: -130.5, y: -34.60001}
m_SizeDelta: {x: 561.5, y: 47.8}
m_AnchoredPosition: {x: -136, y: 45}
m_SizeDelta: {x: 508, y: 47.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1015799326
CanvasRenderer:
@ -197,18 +197,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 38
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 70
m_Alignment: 1
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6218\u6597\u7B2C\u4E00\u56DE\u5408\u5F00\u59CB\u524D\uFF0C\u81EA\u52A8\u83B7\u5F97\u81EA\u8EAB\u751F\u547D\u4E0A\u965020%\u7684\u5FA1\u7532"
m_Text: "\u6218\u6597\u7B2C\u4E00\u56DE\u5408\u5F00\u59CB\u524D\uFF0C\u81EA\u52A8\u83B7\u5F97\u81EA\u8EAB\u751F\u547D\u4E0A\u965020%\u7684\u5FA1\u7532\u6492\u4F9B\u5949\u7684\u662F\u5B98\u65B9\u7535\u8BDD\u5927\u4F7F\u9986\u72AF\u5F97\u4E0A\u5B89\u629A\u7684\u8428\u683C"
LanguageIndex: 11558
--- !u!1 &24498251168760438
GameObject:
@ -246,9 +246,9 @@ RectTransform:
m_Father: {fileID: 4181577197407190672}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -132.32501}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &59775116527345738
@ -31231,9 +31231,9 @@ RectTransform:
m_Father: {fileID: 4181577197407190672}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -77.275}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1677972187980916853
@ -31253,7 +31253,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2064064827705169927
RectTransform:
m_ObjectHideFlags: 0
@ -31270,7 +31270,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: -148, y: 16}
m_AnchoredPosition: {x: -148, y: 197}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4466674842209735440
@ -42152,7 +42152,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: 201.75, y: 35.169983}
m_AnchoredPosition: {x: 201.75, y: 35.16998}
m_SizeDelta: {x: 150.89, y: 181.69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7302987473867368606
@ -48152,9 +48152,9 @@ RectTransform:
m_Father: {fileID: 4181577197407190672}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -22.225}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3628259177020651515
@ -73569,9 +73569,9 @@ RectTransform:
m_Father: {fileID: 4181577197407190672}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -187.37502}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4804043998699155096
@ -128680,7 +128680,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4181577197407190672
RectTransform:
m_ObjectHideFlags: 0

View File

@ -14981,7 +14981,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &286725736
RectTransform:
m_ObjectHideFlags: 0
@ -15000,10 +15000,10 @@ RectTransform:
m_Father: {fileID: 877557727}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 265.735, y: -149}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &286725737
CanvasRenderer:
@ -79334,7 +79334,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -48.975037}
m_SizeDelta: {x: 400, y: 197.9}
m_SizeDelta: {x: 714.9, y: 197.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1206327824
CanvasRenderer:
@ -79366,7 +79366,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 34
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3

View File

@ -58663,8 +58663,8 @@ 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: 3}
m_SizeDelta: {x: 92, y: 52}
m_AnchoredPosition: {x: 59.8, y: 29}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9212708405695145277
CanvasRenderer:
@ -58694,7 +58694,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3}
m_Sprite: {fileID: 21300000, guid: 0c5a06f37c6ccfe488ddec26ead85809, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -383,7 +383,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 365, y: 0}
m_AnchoredPosition: {x: 362.5, y: 0}
m_SizeDelta: {x: 25, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4320833339301387177
@ -468,7 +468,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -3762.0005, y: -491.5051}
m_SizeDelta: {x: 750, y: 83}
m_SizeDelta: {x: 700, y: 83}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1489507525450056629
CanvasRenderer:
@ -777,7 +777,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 365, y: 0}
m_AnchoredPosition: {x: 362.5, y: 0}
m_SizeDelta: {x: 25, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7422676475438108378
@ -999,7 +999,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: -20
m_Left: -25
m_Right: 10
m_Top: 10
m_Bottom: 0
@ -1133,8 +1133,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: -3762, y: -428}
m_SizeDelta: {x: 750, y: 127}
m_AnchoredPosition: {x: -3641, y: -148}
m_SizeDelta: {x: 700, y: 127}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5840828537624518994
CanvasRenderer:

View File

@ -678,7 +678,7 @@ function this.UpdateSingleHeroSkillData(_heroDId)
end
heroData.passiveSkillList = {}
--被动技
local OpenPassiveSkillRules = heroData.star == this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
local OpenPassiveSkillRules = heroData.star >= this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == heroData.star then
@ -2733,7 +2733,7 @@ end
--更新英雄被动技能
function this.UpdatePassiveHeroSkill(heroData)
heroData.passiveSkillList = {} --被动技
local OpenPassiveSkillRules = heroData.star == this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
local OpenPassiveSkillRules = heroData.star >= this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then --突破
@ -2789,7 +2789,7 @@ function this.GetAllPassiveSkillIds(heroConfig, breakId, upStarId)
--只用于界面升星开放技能提示显示用
local compoundNum = 0
local compoundOPenNum = 0
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= this.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRulesw
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= this.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then --突破
@ -2844,7 +2844,7 @@ function this.GetHeroAllPassiveSkillIds(curHeroData)
end
--英雄天赋被动技
if curHeroData.heroConfig.OpenPassiveSkillRules then
local openPassiveSkillRules = curHeroData.star == this.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
local openPassiveSkillRules = curHeroData.star >= this.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
for i = 1, #openPassiveSkillRules do
local skillType = openPassiveSkillRules[i][1]
local skillRanUpId = openPassiveSkillRules[i][2]

View File

@ -154,7 +154,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
if value[2]==curHeroData.star+14 then
local aaa=ConfigManager.TryGetConfigData(ConfigName.PassiveSkillConfig,value[3])
if aaa then
this.skillInfoGrid.text=aaa.Desc
this.skillInfoGrid.text="激活飞升天赋:".." "..aaa.Desc
break
end

View File

@ -520,7 +520,9 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
end
SetHeroStars(self.spLoader, self.starGrid, star,starType,nil,-15)
if effectLayer > 0 then
SetHeroFlyEffect(self.heroShowGo,self.spLoader,tempHero.star,effectLayer+1,0.95,2)
if tempHero then
SetHeroFlyEffect(self.heroShowGo,self.spLoader,tempHero.star,effectLayer+1,0.95,2)
end
Util.SetParticleSortLayer(self.starGrid,effectLayer + 1)
self.UI_Effect_Kuang_JinSe:SetActive(heroConfigData.Star == 5)
self.UI_Effect_Kuang_HongSe:SetActive(heroConfigData.Star == 6)