Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-20 10:02:21 +08:00
commit 055c5f6926
20 changed files with 10 additions and 3 deletions

View File

@ -5936,8 +5936,8 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: ' 0/100'
--- !u!1 &5188230602053005288

View File

@ -2237,4 +2237,5 @@
[12236] = "出售装备",
[12237] = "1星",
[12238] = "没有得到equipData",
[12239] = "召唤 次必得红色魂印",
}

View File

@ -1031,7 +1031,7 @@ function this:OnShow()
-- 刷新拍脸
local patFaceAllData = PatFaceManager.GetPatFaceAllDataTabs()
if patFaceAllData and #patFaceAllData <= 0 and not UIManager.IsOpen(UIName.PatFacePanel) then
if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then
if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 and ActTimeCtrlManager.IsQualifiled(38) and FirstRechargeManager.GetFirstRechargeExist() then
FirstRechargeManager.PlayerPrefsSetStrItemId(1)
UIManager.OpenPanel(UIName.FirstRechargePanel,nil,function()
AdventureManager.GetIsMaxTime()

View File

@ -32,6 +32,7 @@ function QianKunBox:InitComponent(gameObject)
self.bottomBar = Util.GetGameObject(self.mainPanel,"bg/bottomBar")
--midDown
self.midDown = Util.GetGameObject(gameObject,"midDown")
self.midDowntips1 = Util.GetGameObject(self.midDown,"tips/tips1"):GetComponent("Text")
self.leftUptips1 = Util.GetGameObject(self.midDown,"tips/tips1/times"):GetComponent("Text")
self.leftUpTime = Util.GetGameObject(self.midDown,"tips/tips2/time"):GetComponent("Text")
self.btnHelp= Util.GetGameObject(gameObject,"btnHelp")
@ -221,6 +222,7 @@ function QianKunBox:refreshMagicNum()
-- LogYellow("ID:"..actData.activityId.." value"..actData.value)
self.leftUptips1.text = lotterySpecialConfig[20].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000).."次内必得金色魂印"
self.midDowntips1.text = Language[12239]
end
function QianKunBox:OnSortingOrderChange(_sortingOrder)

View File

@ -212,6 +212,9 @@ function this.UpdatePanelData()
RecruitManager.RecruitRequest(m.type, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10)
if m.type == 11 then
RecruitManager.isTenRecruit = 1
end
end,v.privilegeId)
end
end)

View File

@ -2236,3 +2236,4 @@
12236,出售装备
12237,1星
12238,没有得到equipData
12239,уы╩╫ ╢н╠ь╣ц╨Ли╚╩Йс║

1 10001 没有ActivityTypeDef为%s任务Id为%s的数据
2236 12236 出售装备
2237 12237 1星
2238 12238 没有得到equipData
2239 12239 召唤 次必得红色魂印

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.