【界面优化】提交
parent
2b1c935d34
commit
68525db92e
|
@ -1178,7 +1178,7 @@ MonoBehaviour:
|
||||||
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 48
|
m_FontSize: 36
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
|
@ -1530,7 +1530,7 @@ MonoBehaviour:
|
||||||
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 48
|
m_FontSize: 36
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
|
|
|
@ -3410,7 +3410,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.5568628, g: 0.42352945, b: 0.07058824, a: 1}
|
m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -8286,8 +8286,8 @@ 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: -145.51004, y: -18.55}
|
m_AnchoredPosition: {x: -145.51004, y: -26.01}
|
||||||
m_SizeDelta: {x: 462.62, y: 52.5}
|
m_SizeDelta: {x: 462.62, y: 67.42}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &705801403844062499
|
--- !u!222 &705801403844062499
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -49028,7 +49028,7 @@ RectTransform:
|
||||||
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: 0, y: 160}
|
m_AnchoredPosition: {x: 0, y: 160}
|
||||||
m_SizeDelta: {x: 700, y: 141.7}
|
m_SizeDelta: {x: 750, y: 141.7}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1871382871495151358
|
--- !u!222 &1871382871495151358
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -10317,7 +10317,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1}
|
m_Color: {r: 0, g: 1, b: 0.4, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -59042,7 +59042,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 90, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 100.75}
|
m_SizeDelta: {x: 0, y: 100.75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8127154594001898220
|
--- !u!222 &8127154594001898220
|
||||||
|
@ -59100,7 +59100,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u83E9\u63D0\u591C"
|
m_Text:
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &8348793177209857894
|
--- !u!1 &8348793177209857894
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
@ -3771,6 +3771,7 @@ function this.UpdateSingleHeroWarPower(dynamicId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--查找英雄身上的装备List
|
||||||
function this.GetEquipedEquipList()
|
function this.GetEquipedEquipList()
|
||||||
local EquipedEquipList = {}
|
local EquipedEquipList = {}
|
||||||
for _, heroData in ipairs(this.heroDataLists) do
|
for _, heroData in ipairs(this.heroDataLists) do
|
||||||
|
@ -3782,6 +3783,17 @@ function this.GetEquipedEquipList()
|
||||||
return EquipedEquipList
|
return EquipedEquipList
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--通过装备id找英雄id
|
||||||
|
function this.GetHeroIdByEquipId(_id)
|
||||||
|
for _, heroData in ipairs(this.heroDataLists) do
|
||||||
|
for i = 1, #heroData.equipIdList do
|
||||||
|
if _id == tonumber(heroData.equipIdList[i]) then
|
||||||
|
return heroData.name
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function this.CheckIsUpTreasure(Did,index)
|
function this.CheckIsUpTreasure(Did,index)
|
||||||
if not Did then
|
if not Did then
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -54,7 +54,7 @@ function this:OnShow(_parent,...)
|
||||||
_Con_Recharge = tonumber(con[1])
|
_Con_Recharge = tonumber(con[1])
|
||||||
_Con_Star = tonumber(con[2])
|
_Con_Star = tonumber(con[2])
|
||||||
this.titleText.text=Language[11587]
|
this.titleText.text=Language[11587]
|
||||||
this.text1.text=string.format("消耗<color=#00FF66>%s点仙缘积分</color>开启一次仙缘汇聚箱,必定获得5星神将!",_CostItem)
|
this.text1.text=string.format("消耗<color=#00FF66>%s点仙缘积分\n</color>开启一次仙缘汇聚箱必得5星神将!",_CostItem)
|
||||||
this.text2.text=""--Language[11589] --后续改成读表
|
this.text2.text=""--Language[11589] --后续改成读表
|
||||||
this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star)
|
this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star)
|
||||||
--Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591]
|
--Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591]
|
||||||
|
|
|
@ -141,7 +141,9 @@ function this:ShowSingleData(item,sdata,index)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
Util.AddOnceClick(equiped,function ()
|
Util.AddOnceClick(equiped,function ()
|
||||||
PopupTipPanel.ShowTip(Language[12313])
|
MsgPanel.ShowTwo(string.format("<size=45><color=#00FF66>%s</color>穿戴该装备,是否前往卸下?</size>",HeroManager.GetHeroIdByEquipId(sdata.Id)),function() end,function()
|
||||||
|
JumpManager.GoJump(22001)
|
||||||
|
end,"取消","确定")
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue