Merge branch 'TCX_LongZhu' into SK_LongZhu

SK_LongZhu
PC-202302260912\Administrator 2025-09-09 17:32:07 +08:00
commit 4ef95da75d
9 changed files with 22 additions and 22 deletions

View File

@ -10590,7 +10590,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {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_SizeDelta: {x: 201, y: 181.69}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8454816023798566641 --- !u!222 &8454816023798566641
@ -21129,7 +21129,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &649844801553347507 --- !u!224 &649844801553347507
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -21178,7 +21178,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 36 m_FontSize: 36
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
@ -31621,7 +31621,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 492.4, y: 85}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5570695162331111546 --- !u!114 &5570695162331111546
@ -47497,7 +47497,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 373.11, y: 63.44}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4942687059910894160 --- !u!222 &4942687059910894160
@ -107837,7 +107837,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u98DE\u5347\u9884\u89C8" m_Text: "\u6781\u706B\u9884\u89C8"
LanguageIndex: 11558 LanguageIndex: 11558
--- !u!1 &7892693954949450801 --- !u!1 &7892693954949450801
GameObject: GameObject:
@ -119399,7 +119399,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 197.07, y: 55.44}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &690586987623888620 --- !u!222 &690586987623888620
@ -119443,7 +119443,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u98DE\u5347\u63D0\u5347" m_Text: "\u6781\u706B\u63D0\u5347"
LanguageIndex: 11558 LanguageIndex: 11558
--- !u!1 &8938390969820188448 --- !u!1 &8938390969820188448
GameObject: GameObject:

View File

@ -223,7 +223,7 @@ function TimeLimitUpHero:RefreshHeroData()
curConfig = bool and heroConfig[id] or itemConfig[id] curConfig = bool and heroConfig[id] or itemConfig[id]
self.mask1:SetActive(bool) self.mask1:SetActive(bool)
self.mask2:SetActive(not bool) self.mask2:SetActive(not bool)
LogError("id================================"..id) --LogError("id================================"..id)
if bool then--是神将 if bool then--是神将
self.heroIcon.sprite=self.spLoader:LoadSprite(artResourcesConfig[curConfig.Icon].Name) self.heroIcon.sprite=self.spLoader:LoadSprite(artResourcesConfig[curConfig.Icon].Name)
self.heroNameTxt.text=curConfig.ReadingName self.heroNameTxt.text=curConfig.ReadingName
@ -283,10 +283,10 @@ function TimeLimitUpHero:RefreshGetHeroTimes()
local type = 0 local type = 0
if n == 1 then if n == 1 then
type = Setting.CostItemSingle type = Setting.CostItemSingle
m.info.text = "1次" m.info.text = "单次召唤"
else else
type = Setting.CostItemMul type = Setting.CostItemMul
m.info.text = "10次" m.info.text = "十连召唤"
end end
local d = {} local d = {}
if isFree then if isFree then

View File

@ -34,7 +34,7 @@ function this:OnShow(_parent,_Data)
local curHeroData = args[1] local curHeroData = args[1]
if args[2] then if args[2] then
type=args[2] type=args[2]
self.title.text="飞升预览" self.title.text="极火预览"
else else
type=0 type=0
self.title.text="进阶预览" self.title.text="进阶预览"

View File

@ -396,7 +396,7 @@ function HandBookRoleInfoLayout:SkillInfo()
if skillList[i].isOpen then if skillList[i].isOpen then
LogError("skillList[i].needStar=="..skillList[i].needStar) LogError("skillList[i].needStar=="..skillList[i].needStar)
if skillList[i].needStar==13 then if skillList[i].needStar==13 then
sText.text="飞升2解锁" sText.text="极火2解锁"
else else
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁" sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
end end

View File

@ -108,9 +108,9 @@ function this:OnOpen(...)
LogError("urSkillData.needStar=="..curSkillData.needStar) LogError("urSkillData.needStar=="..curSkillData.needStar)
if curSkillData.needStar==15 then if curSkillData.needStar==15 then
--this.hintTxt.text=" ".."飞升3解锁" --this.hintTxt.text=" ".."飞升3解锁"
des1="<color=red>".."飞升5解锁".."</color>".."\n"..des1 des1="<color=red>".."极火5解锁".."</color>".."\n"..des1
elseif curSkillData.needStar==13 then elseif curSkillData.needStar==13 then
des1="<color=red>".."飞升3解锁".."</color>".."\n"..des1 des1="<color=red>".."极火3解锁".."</color>".."\n"..des1
else else
--this.hintTxt.text=" ".. --this.hintTxt.text=" "..
des1="<color=red>"..NumToSimplenessFont[curSkillData.needStar].."星解锁\n".."</color>"..des1 des1="<color=red>"..NumToSimplenessFont[curSkillData.needStar].."星解锁\n".."</color>"..des1

View File

@ -125,7 +125,7 @@ function RoleFlyUpLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h
else else
this.upStarBtn.gameObject:SetActive(false) this.upStarBtn.gameObject:SetActive(false)
this.tip.gameObject:SetActive(true) this.tip.gameObject:SetActive(true)
this.tip.text = "飞升需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel this.tip.text = "极火需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel
end end
end end
end end
@ -170,7 +170,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
--this.flyImage.sprite=this.spLoader:LoadSprite(str) --this.flyImage.sprite=this.spLoader:LoadSprite(str)
this.flyTxt.text=flyStr this.flyTxt.text=flyStr
local awaken=curHeroData.heroConfig.Awaken local awaken=curHeroData.heroConfig.Awaken
local str="激活飞升天赋: " local str="激活极火天赋: "
if awaken then if awaken then
for key, value in pairs(awaken) do for key, value in pairs(awaken) do
if value[2]==curHeroData.star+15 then if value[2]==curHeroData.star+15 then
@ -525,7 +525,7 @@ function RoleFlyUpLayout:StarUpClick()
-- 进阶音效 -- 进阶音效
PlaySoundWithoutClick(SoundConfig.Sound_Recruit3) PlaySoundWithoutClick(SoundConfig.Sound_Recruit3)
else else
PopupTipPanel.ShowTip("材料不足无法飞升") PopupTipPanel.ShowTip("材料不足无法极火")
end end
end end
--扣除升星 消耗的材料 更新英雄数据 --扣除升星 消耗的材料 更新英雄数据

View File

@ -672,7 +672,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki
if this.skillData[i].state == 0 then if this.skillData[i].state == 0 then
local str = NumToChinese[this.skillData[i].star].."" local str = NumToChinese[this.skillData[i].star]..""
if this.skillData[i].star > 10 then if this.skillData[i].star > 10 then
str = "飞升"..NumToChinese[this.skillData[i].star - 10] str = "极火"..NumToChinese[this.skillData[i].star - 10]
end end
this.skillList[i].skillName.text = str.."解锁" this.skillList[i].skillName.text = str.."解锁"
Util.SetGray(this.skillList[i].go,true) Util.SetGray(this.skillList[i].go,true)

View File

@ -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.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,
}, },
} }

View File

@ -301,9 +301,9 @@ function this.GetSoulLockTip()
if curHeroData.star < v.OpenRules[2] then if curHeroData.star < v.OpenRules[2] then
local str="" local str=""
if v.OpenRules[2]==14 then if v.OpenRules[2]==14 then
str="飞升四阶" str="极火四阶"
elseif v.OpenRules[2]==15 then elseif v.OpenRules[2]==15 then
str="飞升五阶" str="极火五阶"
end end
return string.format("%s解锁",str) return string.format("%s解锁",str)
end end