diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab index aefd11e6d1..d0b9e26769 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab @@ -10590,7 +10590,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: 533.30005, y: 338.10895} + m_AnchoredPosition: {x: 533.30005, y: 358} m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8454816023798566641 @@ -21129,7 +21129,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &649844801553347507 RectTransform: m_ObjectHideFlags: 0 @@ -21178,7 +21178,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -31621,7 +31621,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: 453.4, y: 288.9} + m_AnchoredPosition: {x: 453.4, y: 258} m_SizeDelta: {x: 492.4, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5570695162331111546 @@ -47497,7 +47497,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: 505.67, y: 286.03} + m_AnchoredPosition: {x: 505.67, y: 255.12997} m_SizeDelta: {x: 373.11, y: 63.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4942687059910894160 @@ -107837,7 +107837,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u98DE\u5347\u9884\u89C8" + m_Text: "\u6781\u706B\u9884\u89C8" LanguageIndex: 11558 --- !u!1 &7892693954949450801 GameObject: @@ -119399,7 +119399,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: -195, y: 406.6203} + m_AnchoredPosition: {x: -121, y: 406.6203} m_SizeDelta: {x: 197.07, y: 55.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &690586987623888620 @@ -119443,7 +119443,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u98DE\u5347\u63D0\u5347" + m_Text: "\u6781\u706B\u63D0\u5347" LanguageIndex: 11558 --- !u!1 &8938390969820188448 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index d7f2402024..6d09ad515a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -223,7 +223,7 @@ function TimeLimitUpHero:RefreshHeroData() curConfig = bool and heroConfig[id] or itemConfig[id] self.mask1:SetActive(bool) self.mask2:SetActive(not bool) - LogError("id================================"..id) + --LogError("id================================"..id) if bool then--是神将 self.heroIcon.sprite=self.spLoader:LoadSprite(artResourcesConfig[curConfig.Icon].Name) self.heroNameTxt.text=curConfig.ReadingName @@ -283,10 +283,10 @@ function TimeLimitUpHero:RefreshGetHeroTimes() local type = 0 if n == 1 then type = Setting.CostItemSingle - m.info.text = "1次" + m.info.text = "单次召唤" else type = Setting.CostItemMul - m.info.text = "10次" + m.info.text = "十连召唤" end local d = {} if isFree then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua index af4d7eb85e..b8fe821197 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua @@ -34,7 +34,7 @@ function this:OnShow(_parent,_Data) local curHeroData = args[1] if args[2] then type=args[2] - self.title.text="飞升预览" + self.title.text="极火预览" else type=0 self.title.text="进阶预览" diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index da2dfabe33..0c1f098117 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -396,7 +396,7 @@ function HandBookRoleInfoLayout:SkillInfo() if skillList[i].isOpen then LogError("skillList[i].needStar=="..skillList[i].needStar) if skillList[i].needStar==13 then - sText.text="飞升2解锁" + sText.text="极火2解锁" else sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁" end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index dbfa720a70..373b1f2fc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -108,9 +108,9 @@ function this:OnOpen(...) LogError("urSkillData.needStar=="..curSkillData.needStar) if curSkillData.needStar==15 then --this.hintTxt.text=" ".."飞升3解锁" - des1="".."飞升5解锁".."".."\n"..des1 + des1="".."极火5解锁".."".."\n"..des1 elseif curSkillData.needStar==13 then - des1="".."飞升3解锁".."".."\n"..des1 + des1="".."极火3解锁".."".."\n"..des1 else --this.hintTxt.text=" ".. des1=""..NumToSimplenessFont[curSkillData.needStar].."星解锁\n"..""..des1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua index 7777b92b92..5e80dfbe58 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua @@ -125,7 +125,7 @@ function RoleFlyUpLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h else this.upStarBtn.gameObject:SetActive(false) this.tip.gameObject:SetActive(true) - this.tip.text = "飞升需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel + this.tip.text = "极火需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel end end end @@ -170,7 +170,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() --this.flyImage.sprite=this.spLoader:LoadSprite(str) this.flyTxt.text=flyStr local awaken=curHeroData.heroConfig.Awaken - local str="激活飞升天赋: " + local str="激活极火天赋: " if awaken then for key, value in pairs(awaken) do if value[2]==curHeroData.star+15 then @@ -525,7 +525,7 @@ function RoleFlyUpLayout:StarUpClick() -- 进阶音效 PlaySoundWithoutClick(SoundConfig.Sound_Recruit3) else - PopupTipPanel.ShowTip("材料不足无法飞升") + PopupTipPanel.ShowTip("材料不足无法极火") end end --扣除升星 消耗的材料 更新英雄数据 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 837761ee37..005435af65 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -672,7 +672,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki if this.skillData[i].state == 0 then local str = NumToChinese[this.skillData[i].star].."星" if this.skillData[i].star > 10 then - str = "飞升"..NumToChinese[this.skillData[i].star - 10] + str = "极火"..NumToChinese[this.skillData[i].star - 10] end this.skillList[i].skillName.text = str.."解锁" Util.SetGray(this.skillList[i].go,true) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 6a06293e09..52960de67f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -18,7 +18,7 @@ local tabs = { }, [RoleInfoPanelIndex.pifu] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = Language[11816],rpType = -1, }, - [RoleInfoPanelIndex.feiSheng] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = "飞升",rpType = -1, + [RoleInfoPanelIndex.feiSheng] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = "极火",rpType = -1, }, } diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index fc8be243be..e60c1321e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -301,9 +301,9 @@ function this.GetSoulLockTip() if curHeroData.star < v.OpenRules[2] then local str="" if v.OpenRules[2]==14 then - str="飞升四阶" + str="极火四阶" elseif v.OpenRules[2]==15 then - str="飞升五阶" + str="极火五阶" end return string.format("%s解锁",str) end