Merge branch 'china/dev' into china/test
commit
c54977054c
|
|
@ -38,7 +38,16 @@ function this:OnShow(_parent)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
self.selectData = RecruitManager.GetWishTailsManSoulChips()
|
self.selectData = RecruitManager.GetWishTailsManSoulChips()
|
||||||
self.curData = TailsManSoulManager.GetTailsmanSoulDatas1(6)
|
local data1 = TailsManSoulManager.GetTailsmanSoulDatas1(6)
|
||||||
|
local data2 = TailsManSoulManager.GetTailsmanSoulDatas1(7)
|
||||||
|
self.curData = {}
|
||||||
|
for index, value in ipairs(data1) do
|
||||||
|
table.insert(self.curData,value)
|
||||||
|
end
|
||||||
|
for index, value in ipairs(data2) do
|
||||||
|
table.insert(self.curData,value)
|
||||||
|
end
|
||||||
|
|
||||||
this:RefreshData()
|
this:RefreshData()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue