Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
08b9873d25
File diff suppressed because it is too large
Load Diff
|
@ -51,7 +51,7 @@ function QianKunBox:InitComponent()
|
|||
self.icons[i].icon = Util.GetGameObject(self.icons[i].go,"icon"):GetComponent("Image")
|
||||
self.icons[i].kuang = Util.GetGameObject(self.icons[i].go,"kuang"):GetComponent("Image")
|
||||
if i<4 then
|
||||
self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_Effect_jinkuang_Yuan")
|
||||
self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_effect_RecruitPanel_box_open")
|
||||
self.icons[i].add=Util.GetGameObject(self.icons[i].go,"Image")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -102,7 +102,7 @@ function this:OnShow(_parent,...)
|
|||
local dic={}
|
||||
--乾坤宝盒特殊处理
|
||||
if activityType == ActivityTypeDef.QianKunBox then
|
||||
this.secondTitle.text="心愿神印"
|
||||
this.secondTitle.text="心愿魂印"
|
||||
local souls=RecruitManager.GetWishEquipData()
|
||||
local newList={}
|
||||
for i = 1, #souls do
|
||||
|
|
Loading…
Reference in New Issue