Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化

dev_chengFeng
jiaoyangna 2020-12-28 11:53:29 +08:00
commit 9fc20a2663
4 changed files with 8 additions and 4 deletions

View File

@ -2046,7 +2046,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u8BF7\u9009\u62E9\u8FDB\u884C\u6311\u6218\u7684\u730E\u5996\u5E08"
m_Text: "\u8BF7\u9009\u62E9\u8FDB\u884C\u6311\u6218\u7684\u795E\u5C06"
LanguageIndex: 0
--- !u!1 &6347993739599404022
GameObject:

View File

@ -277,7 +277,11 @@ function DynamicActivityPanel:OnShow()
this.tabList:SetActive(true)
this.bottomBar:SetActive(true)
this.mask:SetActive(false)
if _CurPageIndex then
if _CurPageIndex and _CurPageIndex == 1 then
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
_CurPageIndex = GlobalActConfig[id].ShowArt
this.PageTabCtrl:ChangeTab(_CurPageIndex)
elseif _CurPageIndex then
this.PageTabCtrl:ChangeTab(_CurPageIndex)
end
end

View File

@ -753,7 +753,7 @@ function GiftView:SpecialTime(t)
if _min>=1 then
return string.format(Language[11752], _min), _min
else
return "0"
return "1"
end
end
end

View File

@ -59,7 +59,7 @@ end
--绑定事件(用于子类重写)
function SingleRecruitPanel:BindEvent()
Util.AddClick(self.sureBtn, function()
-- isFirst=true
isFirst=true
self:ClosePanel()
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)