【七界试炼】提交
parent
ad3ea41597
commit
9bac3f850e
File diff suppressed because it is too large
Load Diff
|
@ -845,7 +845,7 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E"
|
m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E"
|
||||||
|
@ -3697,7 +3697,7 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E"
|
m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E"
|
||||||
|
|
|
@ -3,7 +3,7 @@ local this = GeneralTreasureMangaer
|
||||||
|
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
this.TreasureList = {
|
this.TreasureList = {
|
||||||
[ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure},
|
[ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure,itemId = 1240},
|
||||||
}
|
}
|
||||||
this.InitConfigData()
|
this.InitConfigData()
|
||||||
end
|
end
|
||||||
|
@ -51,7 +51,7 @@ function this.GetTreasureData(ActType)
|
||||||
local curTypeData = this.TreasureList[ActType]
|
local curTypeData = this.TreasureList[ActType]
|
||||||
curTypeData.ActId = actInfo.activityId
|
curTypeData.ActId = actInfo.activityId
|
||||||
curTypeData.endTime = actInfo.endTime
|
curTypeData.endTime = actInfo.endTime
|
||||||
curTypeData.value = actInfo.value
|
curTypeData.value = BagManager.GetTotalItemNum(curTypeData.itemId)
|
||||||
curTypeData.treasureState = 0
|
curTypeData.treasureState = 0
|
||||||
for k,v in pairs(actInfo.mission) do
|
for k,v in pairs(actInfo.mission) do
|
||||||
if v.missionId == -1 then
|
if v.missionId == -1 then
|
||||||
|
|
|
@ -107,7 +107,7 @@ function QiJieTreasure:SetSingleData(index,_go,_data)
|
||||||
local obj = Util.GetGameObject(_go,"Pre ("..i..")")
|
local obj = Util.GetGameObject(_go,"Pre ("..i..")")
|
||||||
if _data[i] then
|
if _data[i] then
|
||||||
obj:SetActive(true)
|
obj:SetActive(true)
|
||||||
Util.GetGameObject(obj,"Name"):GetComponent("Text").text = _data[i].Name
|
Util.GetGameObject(obj,"Name"):GetComponent("Text").text = string.format( "<color=%s>%s</color>",QualityTextDef[_data[i].Quality+1],_data[i].Name)
|
||||||
local img = Util.GetGameObject(obj,"Image"):GetComponent("Image")
|
local img = Util.GetGameObject(obj,"Image"):GetComponent("Image")
|
||||||
local imgLight = Util.GetGameObject(obj,"light"):GetComponent("Image")
|
local imgLight = Util.GetGameObject(obj,"light"):GetComponent("Image")
|
||||||
local imgKuang = Util.GetGameObject(obj,"kuang"):GetComponent("Image")
|
local imgKuang = Util.GetGameObject(obj,"kuang"):GetComponent("Image")
|
||||||
|
|
|
@ -168,6 +168,13 @@ function this.FormatTreasureData(_tabNum)
|
||||||
for k,v in pairs(this.treasureList) do
|
for k,v in pairs(this.treasureList) do
|
||||||
table.insert(list,v)
|
table.insert(list,v)
|
||||||
end
|
end
|
||||||
|
table.sort(list,function (a,b)
|
||||||
|
if a.Quality == b.Quality then
|
||||||
|
return a.Id < b.Id
|
||||||
|
else
|
||||||
|
return a.Quality > b.Quality
|
||||||
|
end
|
||||||
|
end)
|
||||||
if _tabNum and _tabNum > 0 then
|
if _tabNum and _tabNum > 0 then
|
||||||
for i = #list, 1,-1 do
|
for i = #list, 1,-1 do
|
||||||
if list[i].Quality ~= _tabNum then
|
if list[i].Quality ~= _tabNum then
|
||||||
|
@ -219,7 +226,7 @@ function this.GetTreasureEffect(treasureList)
|
||||||
local moneyNum = 0
|
local moneyNum = 0
|
||||||
local attriList1 = {}
|
local attriList1 = {}
|
||||||
local attriList2 = {}
|
local attriList2 = {}
|
||||||
LogYellow(tostring(#treasureList))
|
-- LogYellow(tostring(#treasureList))
|
||||||
for i = 1, #treasureList do
|
for i = 1, #treasureList do
|
||||||
LogYellow(tostring(treasureList[i]))
|
LogYellow(tostring(treasureList[i]))
|
||||||
local tData = QijieHolyConfig[treasureList[i]]
|
local tData = QijieHolyConfig[treasureList[i]]
|
||||||
|
|
Loading…
Reference in New Issue