Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu

TCX_LongZhu
DESKTOP-RH64908\Administrator 2025-09-09 20:12:35 +08:00
commit 5914766d46
13 changed files with 370 additions and 190 deletions

View File

@ -2067,7 +2067,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: 6ff20609e8c68014394e6b730e1c7948, type: 3}
m_Sprite: {fileID: 21300000, guid: 179ba29a4451da245a7d6cfcaae39cc2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4299,10 +4299,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6441804786815422722
CanvasRenderer:
@ -5628,6 +5628,7 @@ GameObject:
- component: {fileID: 1740931807}
- component: {fileID: 1740931806}
- component: {fileID: 1740931805}
- component: {fileID: 784437563245950726}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
@ -5717,6 +5718,21 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &784437563245950726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1740931803}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1797568285
GameObject:
m_ObjectHideFlags: 0
@ -6386,6 +6402,7 @@ GameObject:
- component: {fileID: 2003013918}
- component: {fileID: 2003013917}
- component: {fileID: 2003013916}
- component: {fileID: 3815856271075947687}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
@ -6475,6 +6492,21 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &3815856271075947687
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2003013914}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &2014766672
GameObject:
m_ObjectHideFlags: 0
@ -7094,7 +7126,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2140040536
RectTransform:
m_ObjectHideFlags: 0
@ -7622,10 +7654,10 @@ RectTransform:
m_Father: {fileID: 5596053903948610984}
m_RootOrder: 4
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: 760, y: -120}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2980853436230393831
CanvasRenderer:
@ -11926,10 +11958,10 @@ RectTransform:
m_Father: {fileID: 5596053903948610984}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100, y: -120}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4329534855784721111
CanvasRenderer:
@ -12732,7 +12764,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7653855264894605139
RectTransform:
m_ObjectHideFlags: 0
@ -35587,10 +35619,10 @@ RectTransform:
m_Father: {fileID: 5596053903948610984}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -120}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5416947283401139823
CanvasRenderer:
@ -36976,10 +37008,10 @@ RectTransform:
m_Father: {fileID: 5596053903948610984}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 320, y: -120}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1075456802991939877
CanvasRenderer:
@ -49002,10 +49034,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 590, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2280464345083763535
CanvasRenderer:
@ -55525,10 +55557,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6714569458965818143
CanvasRenderer:

View File

@ -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
@ -78972,7 +78972,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u98DE \u5347"
m_Text: "\u6781 \u706B"
LanguageIndex: 11561
--- !u!1 &5013195387048489343
GameObject:
@ -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:

View File

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

View File

@ -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="进阶预览"

View File

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

View File

@ -639,6 +639,7 @@ function RewardItemPopup:OnClose()
end
compShowType = 0
--[[
if func and not isPopGetSSR then
if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then
func(isBackBattle)
@ -646,6 +647,7 @@ function RewardItemPopup:OnClose()
func(isBackBattle)
end
end
]]
-- 展示完以后结束章节解锁状态
FightPointPassManager.isOpenNewChapter = false

View File

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

View File

@ -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
--扣除升星 消耗的材料 更新英雄数据

View File

@ -105,7 +105,7 @@ function RoleFlyUpSuccessPanel:OnOpen(...)
this.UI_Effect_choukaSSR:SetActive(curHeroData.heroConfig.Quality == 5)
this.UI_Effect_choukaSR:SetActive(curHeroData.heroConfig.Quality == 4)
this.UI_Effect_choukaR:SetActive(curHeroData.heroConfig.Quality == 3)
this.LiveName = curHeroData.live
this.LiveName = curHeroData.painting
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0))
@ -128,7 +128,7 @@ function RoleFlyUpSuccessPanel:OnOpen(...)
this.flyImage.sprite=this.spLoader:LoadSprite(flyImg)
this.heroName.text=GetLanguageStrById(curHeroData.heroConfig.ReadingName)
--定位描述相关
this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
--this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
-- this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft")

View File

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

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