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

jiaoyangna 2020-10-26 17:41:06 +08:00
commit ce05f94695
3 changed files with 30 additions and 12 deletions

View File

@ -219,12 +219,16 @@ function this.OnPointerDown(Pointgo,data,i)--按下
PopupTipPanel.ShowTip("本活动需玩家等级达到五十级!") PopupTipPanel.ShowTip("本活动需玩家等级达到五十级!")
return return
end end
if PlayerManager.familyId == 0 then
PopupTipPanel.ShowTip("请先加入公会!")
return
end
curItemIndex = i curItemIndex = i
numCount = 1 numCount = 1
isPressed = true isPressed = true
end end
function this.OnPointerUp(Pointgo,data)--抬起 function this.OnPointerUp(Pointgo,data)--抬起
if PlayerManager.level < 50 then if PlayerManager.level < 50 or PlayerManager.familyId == 0 then
return return
end end
if isShortPress then if isShortPress then
@ -277,15 +281,23 @@ function this:LeftUpShow(_curRankType)
if _curRankType then if _curRankType then
curRankType = _curRankType curRankType = _curRankType
else else
if not curRankType then
curRankType = RANK_TYPE.GOLD_EXPER curRankType = RANK_TYPE.GOLD_EXPER
end end
end
this.myScoreText:SetActive(curRankType == RANK_TYPE.GOLD_EXPER) this.myScoreText:SetActive(curRankType == RANK_TYPE.GOLD_EXPER)
this.guildScoreText:SetActive(curRankType ~= RANK_TYPE.GOLD_EXPER) this.guildScoreText:SetActive(curRankType ~= RANK_TYPE.GOLD_EXPER)
DynamicActivityManager.SheJiGetRankData(curRankType,ActInfo.activityId,function(allRankData,myRankData) DynamicActivityManager.SheJiGetRankData(curRankType,ActInfo.activityId,function(allRankData,myRankData)
if curRankType == RANK_TYPE.GOLD_EXPER then
this.firstName.text = allRankData[1] and allRankData[1].userName or Language[11073] this.firstName.text = allRankData[1] and allRankData[1].userName or Language[11073]
this.secendName.text = allRankData[2] and allRankData[2].userName or Language[11073] this.secendName.text = allRankData[2] and allRankData[2].userName or Language[11073]
this.thirdName.text = allRankData[3] and allRankData[3].userName or Language[11073] this.thirdName.text = allRankData[3] and allRankData[3].userName or Language[11073]
else
this.firstName.text = allRankData[1] and allRankData[1].guildName or Language[11073]
this.secendName.text = allRankData[2] and allRankData[2].guildName or Language[11073]
this.thirdName.text = allRankData[3] and allRankData[3].guildName or Language[11073]
end
local t = myRankData.param1 > 0 and myRankData.param1 or 0 local t = myRankData.param1 > 0 and myRankData.param1 or 0
-- LogPink("t:"..t) -- LogPink("t:"..t)
-- LogPink("ActInfo.mission[1].progress :"..ActInfo.mission[1].progress ) -- LogPink("ActInfo.mission[1].progress :"..ActInfo.mission[1].progress )
@ -344,12 +356,12 @@ function this:TimeCountDown()
local t1 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[1]) local t1 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[1])
local t2 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[2]) local t2 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[2])
LogGreen("dao 12 dian:"..t1) -- LogGreen("dao 12 dian:"..t1)
LogGreen("dao 20 dian:"..t2) -- LogGreen("dao 20 dian:"..t2)
LogGreen("ActInfo.value:"..ActInfo.value) -- LogGreen("ActInfo.value:"..ActInfo.value)
LogGreen("GetTimeStamp():"..GetTimeStamp()) -- LogGreen("GetTimeStamp():"..GetTimeStamp())
LogGreen("GetTimeStamp() - ActInfo.value"..(GetTimeStamp() - ActInfo.value)) -- LogGreen("GetTimeStamp() - ActInfo.value"..(GetTimeStamp() - ActInfo.value))
LogGreen("giftTime:"..giftTime) -- LogGreen("giftTime:"..giftTime)
if ActInfo.value == 0 then if ActInfo.value == 0 then
if (t1 > 0 and t1 < 1800) or (t2 > 0 and t2 < 1800) then if (t1 > 0 and t1 < 1800) or (t2 > 0 and t2 < 1800) then

View File

@ -75,6 +75,11 @@ function PokemonMainPanel:BindEvent()
end) end)
Util.AddClick(this.btnWarAddPro, function() Util.AddClick(this.btnWarAddPro, function()
-- UIManager.OpenPanel(UIName.HelpPopup) -- UIManager.OpenPanel(UIName.HelpPopup)
local AllPokemonFormationDids = PokemonManager.GetAllPokemonFormationDids()
if LengthOfTable(AllPokemonFormationDids) <= 0 then
PopupTipPanel.ShowTip("当前无出战灵兽!")
return
end
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonUpZhenAddPro,{}) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonUpZhenAddPro,{})
end) end)
Util.AddClick(this.btnOut, function() Util.AddClick(this.btnOut, function()

View File

@ -144,8 +144,9 @@ function this.SingPokemonChipDataShow(_go,_itemData)
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonCompound) Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonCompound)
end,nil,nil,nil,true) end,nil,nil,nil,true)
end) end)
end else
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonCompound,_itemData) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonCompound,_itemData)
end
end) end)
end end
function this.PokemonDataSort(pokemonList) function this.PokemonDataSort(pokemonList)