【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-19 17:23:06 +08:00
parent 9f356783e1
commit 95f71667fe
5 changed files with 36 additions and 10 deletions

View File

@ -22928,7 +22928,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0.9764706, b: 0.84313726, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -24493,7 +24493,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0.97647065, b: 0.8431373, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -45799,7 +45799,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u786E \u8BA4"
m_Text: "\u53D6 \u6D88"
--- !u!1 &8285515439540922374
GameObject:
m_ObjectHideFlags: 0

View File

@ -19777,7 +19777,7 @@ MonoBehaviour:
extension: .png
resPathIndex: 92
resAbNameIndex: 47
- resName: l_lmmj_beijingtu
- resName: l_lmmj_beijingtu01
extension: .png
resPathIndex: 93
resAbNameIndex: 47
@ -23969,6 +23969,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: l_lmmj_lingmaishangdianzi
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: l_lmmj_rukouzi
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: q_qjsl_qijieshangdian
extension: .png
resPathIndex: 147
@ -24213,10 +24221,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_fabaojuling
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_haogandu
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_lingmaimijing
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_qijieshilian
extension: .png
resPathIndex: 147
@ -24225,6 +24241,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_shenwaihuashen
extension: .png
resPathIndex: 147
resAbNameIndex: 77
- resName: r_zjm_sixiangxinfa
extension: .png
resPathIndex: 147
@ -29505,6 +29525,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 196
resAbNameIndex: 816
- resName: l_lmmj_beijingtu
extension: .png
resPathIndex: 196
resAbNameIndex: 816
- resName: l_mrlb_bg
extension: .jpg
resPathIndex: 196

View File

@ -83,7 +83,7 @@ local _ViewConfig = {
tip = "灵脉秘境阵容:",
isAddFriend = false,
btnType = {
{name = "切磋", func = 8},
{name = "切磋", func = 9},
{name = "挑战", func = 8},
{name = "调整编队", func = 8},
}
@ -217,6 +217,7 @@ function PlayerInfoPopup:OnOpen(playerId, viewType,serverName,_otherdata)
[6] = this.JumpServerBattle,
[7] = this.JumpServerBattle_NORMAL,
[8] = this.LingMaiFormaion,
[9] = this.LingMaiQieCuo,
}
end
@ -559,10 +560,6 @@ function this.LingMaiFormaion()
this:ClosePanel()
Log("调整编队")
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data)
elseif this.data.Id > LingMaiMiJingManager.myPlaceId then
this:ClosePanel()
Log("切磋")
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data,true)
else
LingMaiMiJingManager.CheckPrivilage(function ()
this:ClosePanel()
@ -571,6 +568,11 @@ function this.LingMaiFormaion()
end)
end
end
--灵脉秘境
function this.LingMaiQieCuo()
this:ClosePanel()
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data,true)
end
--界面关闭时调用(用于子类重写)
function PlayerInfoPopup:OnClose()

View File

@ -621,7 +621,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
end
arenaScore:SetActive(true)
local score = data.rankInfo.param1 >= 0 and data.rankInfo.param1 or 0
arenaScore:GetComponent("Text").text = " 灵气: ".. score
arenaScore:GetComponent("Text").text = "灵气: ".. score
end
end
return RankingSingleListPanel