zhibo
parent
df726589cb
commit
2e0b4fbfc8
|
@ -2830,7 +2830,8 @@ EXPEDITON_POPUP_TYPE = {
|
|||
}
|
||||
|
||||
RankKingList = {
|
||||
[3] = {
|
||||
--[[
|
||||
[3] = {
|
||||
bgImage = "X1_paihangbang_ditu05",
|
||||
name = GetLanguageStrById(50205),
|
||||
Id = 36, --check
|
||||
|
@ -2838,6 +2839,7 @@ RankKingList = {
|
|||
activiteId = 0,
|
||||
isRankingMainPanelShow = true,
|
||||
nameImage = ""},
|
||||
]]
|
||||
[1] = {
|
||||
bgImage = "X1_paihangbang_ditu01",
|
||||
name = GetLanguageStrById(12164),
|
||||
|
@ -2922,7 +2924,7 @@ RankKingList = {
|
|||
rankType = RANK_TYPE.CELEBRATION_GUILD,
|
||||
activiteId = ActivityTypeDef.Celebration,
|
||||
isRankingMainPanelShow = false},
|
||||
[15] = {
|
||||
[3] = {
|
||||
bgImage = "",
|
||||
name = GetLanguageStrById(50274),
|
||||
Id = 42,
|
||||
|
|
|
@ -1458,7 +1458,7 @@ function TimeToH_M_S(t)
|
|||
local allMin = math.floor(t / 60)
|
||||
local _min = allMin % 60
|
||||
local _hour = math.floor(allMin / 60)
|
||||
return string.format("%02d",_hour), string.format("%02d",_min), string.format("%02d", _sec)
|
||||
return _hour, string.format("%02d",_min), string.format("%02d", _sec)
|
||||
end
|
||||
|
||||
--- 将一段时间转换为分秒
|
||||
|
@ -1889,7 +1889,6 @@ function GetMailConfigDesc(cfg, mailparam)--cfg插入内容,mailparam插入数
|
|||
ss[i] = GetLanguageStrById(s)
|
||||
end
|
||||
end
|
||||
|
||||
return string.format(GetLanguageStrById(cfg), unpack(ss))
|
||||
-- else
|
||||
-- string.format(GetLanguageStrById(cfg), mailparam)
|
||||
|
|
|
@ -2,7 +2,7 @@ GuildRedPacketManager = {}
|
|||
local this = GuildRedPacketManager
|
||||
|
||||
-- 默认未检查公会红包
|
||||
this.isCheck=false
|
||||
this.isCheck=true
|
||||
|
||||
function this.Initialize()
|
||||
|
||||
|
|
|
@ -239,10 +239,12 @@ function this.RefreshItem(go,data)
|
|||
end
|
||||
|
||||
function this.BtnClick(id)
|
||||
LogError("=====================================")
|
||||
if id == FUNCTION_OPEN_TYPE.laddersChallenge then
|
||||
local peakednessTime= LaddersArenaManager.GetLeftTime()-435600
|
||||
|
||||
LogError("=====================================")
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
LogError("=====================================")
|
||||
NetManager.WorldArenaUnLockRequest(function (msg)
|
||||
if msg.unLock and peakednessTime > 0 then
|
||||
local _, myRankInfo = ArenaManager.GetRankInfo()
|
||||
|
@ -293,9 +295,9 @@ function this.BtnClick(id)
|
|||
end
|
||||
end)
|
||||
else
|
||||
LogError("=====================================")
|
||||
PopupTipPanel.ShowTip(GetLanguageStrById(11503))
|
||||
end
|
||||
|
||||
else
|
||||
PopupTipPanel.ShowTip(GetLanguageStrById(11503))
|
||||
end
|
||||
|
|
|
@ -677,7 +677,7 @@ function this.ExecuteLoading()
|
|||
table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) return "GuildHelpGetAllRequest" end) -- 公会援助
|
||||
table.insert(requestList, function() this.LogTime(#requestList + 1) GuildBattleManager.InitData(LoadingPanel.OnStep) return "GuideBattlePanel.InitData" end) -- 公会战
|
||||
-- table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) return "TreasureOfHeavenScoreRequest" end) -- 天宫秘宝积分
|
||||
table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) return "RankFirstRequest" end) -- 排行榜数据
|
||||
--table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) return "RankFirstRequest" end) -- 排行榜数据
|
||||
table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.GetAllAdjutantInfo(LoadingPanel.OnStep) return "GetAllAdjutantInfo" end) -- 守护数据
|
||||
table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.VirtualBattleGetInfo(LoadingPanel.OnStep) return "VirtualBattleGetInfo" end) -- 爬塔数据
|
||||
table.insert(requestList, function() this.LogTime(#requestList + 1) NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) return "GetSituationInfoRequest" end) -- 阿登战役数据
|
||||
|
|
|
@ -7424,18 +7424,21 @@ end
|
|||
function NetManager.CampSimpleInfoGetReq(func)
|
||||
-- local data = CampWar_pb.CampSimpleInfoGetReq()
|
||||
-- local msg = data:SerializeToString()
|
||||
-- Log("___________________select")
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.CS_CampSimpleInfoGet, MessageTypeProto_pb.SC_CampSimpleInfoGet, nil, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = CampWar_pb.CampSimpleInfoGetAck()
|
||||
msg:ParseFromString(data)
|
||||
ChaosManager.addCamp = msg.camp
|
||||
ChaosManager.lastMatchTime = msg.lastMatchTime
|
||||
--Log("______________________ select Return ")
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
LogError("============================select1============================")
|
||||
if ActTimeCtrlManager.FunctionIsOpen(111) then
|
||||
LogError("============================select2============================")
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.CS_CampSimpleInfoGet, MessageTypeProto_pb.SC_CampSimpleInfoGet, nil, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = CampWar_pb.CampSimpleInfoGetAck()
|
||||
msg:ParseFromString(data)
|
||||
ChaosManager.addCamp = msg.camp
|
||||
ChaosManager.lastMatchTime = msg.lastMatchTime
|
||||
--Log("______________________ select Return ")
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
end
|
||||
--混乱之治设置阵营 请求
|
||||
function NetManager.CampSetReq(campId,func)
|
||||
|
|
|
@ -12,7 +12,7 @@ local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig
|
|||
local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local privilegeConfig = ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
|
||||
local orginLayer = 0
|
||||
this.isJump = false
|
||||
this.isJump = true
|
||||
local trigger = nil
|
||||
local RRotstionAngleY = 0 -- 旋转角度Y
|
||||
local RRotstionAngleX = 0 -- 旋转角度X
|
||||
|
@ -236,7 +236,7 @@ function RecruitPanel:OnShow(...)
|
|||
--SoundManager.PlayMusic(SoundConfig.BGM_Recruit)
|
||||
|
||||
--读取本地是否跳过
|
||||
this.isJump = PlayerPrefs.GetInt(PlayerManager.uid .. "DrawJump") == 1
|
||||
this.isJump = PlayerPrefs.GetInt(PlayerManager.uid .. "DrawJump",1) == 1
|
||||
this.btnJumpChoose:SetActive(this.isJump)
|
||||
|
||||
self:OnInitTrigger()
|
||||
|
@ -310,7 +310,7 @@ function RecruitPanel:OnDestroy()
|
|||
poolManager:UnLoadLive("live2d_npc_chouka", this.liveNode)
|
||||
end
|
||||
ClearRedPointObject(RedPointType.LineupRecommend, this.recommendRedpoint)
|
||||
this.isJump = false
|
||||
this.isJump = true
|
||||
|
||||
trigger.onBeginDrag = trigger.onBeginDrag - this.OnBeginDrag
|
||||
trigger.onDrag = trigger.onDrag - this.OnDrag
|
||||
|
|
Loading…
Reference in New Issue