Merge branch 'china/dev' into china/test

dev_chengFeng
zhangshanxue 2022-02-08 14:12:43 +08:00
commit c54977054c
1 changed files with 10 additions and 1 deletions

View File

@ -38,7 +38,16 @@ function this:OnShow(_parent)
parent=_parent
sortingOrder = _parent.sortingOrder
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()
end