Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
93dbd1648a
|
|
@ -88523,7 +88523,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 0.9
|
||||
m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$0.99"
|
||||
m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$1"
|
||||
--- !u!1 &1599836006760387995
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -94,4 +94,5 @@ SoundConfig = {
|
|||
Sound_tgxb_pq ="UI_tgxb_pq",
|
||||
Sound_dntg_qj ="UI_dntg_qj",
|
||||
Sound_dntg_cy ="UI_dntg_cy",
|
||||
Sound_all_switch ="UI_all_switch",
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -66,6 +66,8 @@ function BagPanel:BindEvent()
|
|||
for i = 0, 7 do
|
||||
Util.AddClick(tabs1[i], function()
|
||||
if this.isFristOpen == false then
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_all_switch)
|
||||
if i == sortIndex then
|
||||
sortIndex = 0
|
||||
this:OnClickAllBtn()
|
||||
|
|
|
|||
|
|
@ -507,7 +507,9 @@ function CarbonTypePanelV2:OnDestroy()
|
|||
SubUIManager.Close(this.BtView)
|
||||
end
|
||||
carbons = {}
|
||||
SubUIManager.Close(this.playerHead)
|
||||
if this.playerHead then
|
||||
SubUIManager.Close(this.playerHead)
|
||||
end
|
||||
SubUIManager.Close(this.UpView)
|
||||
this.playerHead = nil
|
||||
this.UpView = nil
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ function ExpeditionMainPanel:BindEvent()
|
|||
self:RefreshManagerData()
|
||||
end
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.UI_dntg_cy)
|
||||
SoundManager.PlaySound(SoundConfig.Sound_dntg_cy)
|
||||
--LogGreen("ExpeditionManager.expeditionLeve "..ExpeditionManager.expeditionLeve)
|
||||
end)
|
||||
Util.AddClick(self.UI_Effect_ChuanSongMen_JinSeBtn, function()
|
||||
|
|
@ -187,7 +187,7 @@ function ExpeditionMainPanel:OnShow()
|
|||
local endTime = 0
|
||||
endTime = ExpeditionManager.startTime + tonumber(ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonEnd) - GetTimeStamp() +
|
||||
ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonInterval * 60
|
||||
self:RemainTimeDown(self.timeTextGo,self.timeText,endTime)
|
||||
self:RemainTimeDown(self.timeTextGo,self.timeText,endTime-300)
|
||||
self:IsTreasureOpen()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ function this.RemainTimeDown()
|
|||
end
|
||||
end
|
||||
function this.RefreshPanelShowByState()
|
||||
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and (UIManager.IsOpen(UIName.ExpeditionMainPanel) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel)) then --not UIManager.IsOpen(UIName.BattlePanel) then
|
||||
if(ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel)) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
|
||||
PlayerManager.carbonType = 1
|
||||
if ExpeditionManager.ExpeditionState == 2 then
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ end
|
|||
function GuildTranscriptMainPopup:OnShow()
|
||||
isplayAnim = true
|
||||
if isplayAnim then
|
||||
this.SingleRankingInfoShow:ForeachItemGO(function (index, go)
|
||||
this.rankScrollView:ForeachItemGO(function (index, go)
|
||||
go.gameObject:SetActive(false)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -150,6 +150,10 @@ function this.GetRedPointState()
|
|||
if PlayerManager.familyId == 0 then return false end
|
||||
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM) > 0
|
||||
end
|
||||
function this.GuildChallengeFiveIndication()
|
||||
canSweep = 0
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||
end
|
||||
function this.GetCurBoss()
|
||||
return curBoss
|
||||
end
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ function this.tableTurnEffect(speed,itemId)
|
|||
local redNext = Util.GetGameObject(this.itemsList[index+1],"Red")
|
||||
redNext:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_zd)
|
||||
SoundManager.PlaySound(SoundConfig.Sound_zp)
|
||||
index = index + 1
|
||||
--检测最后的奖励
|
||||
if itemId and id == this.TrialGameConfig[this.list[index]].RewardID and num == this.TrialGameConfig[this.list[index]].Max then
|
||||
|
|
|
|||
|
|
@ -17,12 +17,14 @@ local curIndex
|
|||
local lerp = 0
|
||||
local maxIndex = 0
|
||||
local function update()
|
||||
lerp = math.clamp(lerp + Time.fixedDeltaTime * 15,0,1)
|
||||
local curValue = this.Slider.value * (1-lerp) + curIndex * lerp
|
||||
this.Slider.value = curValue
|
||||
local curTextValue = math.floor(((this.Slider.value * (1-lerp) + curIndex * lerp)/32)*100)
|
||||
curTextValue = curTextValue > 100 and 100 or curTextValue
|
||||
this.SliderText.text = curTextValue .."%"
|
||||
if this.Slider then
|
||||
lerp = math.clamp(lerp + Time.fixedDeltaTime * 15,0,1)
|
||||
local curValue = this.Slider.value * (1-lerp) + curIndex * lerp
|
||||
this.Slider.value = curValue
|
||||
local curTextValue = math.floor(((this.Slider.value * (1-lerp) + curIndex * lerp)/32)*100)
|
||||
curTextValue = curTextValue > 100 and 100 or curTextValue
|
||||
this.SliderText.text = curTextValue .."%"
|
||||
end
|
||||
end
|
||||
|
||||
function LoadingPanel.AddStep(func)
|
||||
|
|
|
|||
|
|
@ -114,6 +114,8 @@ function this.RegisterMessage(network)
|
|||
socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_INDICATION, this.GuildTranscriptIndication)
|
||||
--公户副本推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_BUY_BUFF_INDICATION, this.GuildChallengeBuyBuffIndication)
|
||||
--公户副本推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_FIVE_INDICATION, this.GuildChallengeFiveIndication)
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -784,5 +786,9 @@ function this.GuildChallengeBuyBuffIndication(buffer)
|
|||
-- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime)
|
||||
GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg)
|
||||
end
|
||||
function this.GuildChallengeFiveIndication(buffer)
|
||||
-- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ")
|
||||
GuildTranscriptManager.GuildChallengeFiveIndication()
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -23,6 +23,7 @@ end
|
|||
|
||||
this.EventTrigger = {}
|
||||
function this.onSdkPayResult(id)
|
||||
LogError("收到sdk支付成功回调,商品id = "..id)
|
||||
if this.EventTrigger[id] then
|
||||
this.EventTrigger[id](id)
|
||||
this.EventTrigger[id] = nil
|
||||
|
|
@ -34,10 +35,12 @@ function this.Pay(id, func)
|
|||
func = function()end
|
||||
end
|
||||
if this.EventTrigger[id] then
|
||||
LogError("重复发起购买商品的请求,商品id = "..id..", uid = "..PlayerManager.uid)
|
||||
PopupTipPanel.ShowTip("您有一个相同的订单正在处理,请稍后再试")
|
||||
return
|
||||
end
|
||||
this.EventTrigger[id] = func
|
||||
LogError("发起购买商品的请求,商品id = "..id)
|
||||
--直购商品
|
||||
if AppConst.isSDKLogin then
|
||||
PayManager.SdkPay({ Id = id })
|
||||
|
|
@ -106,7 +109,7 @@ function this.RequestPay(context)
|
|||
params.serverID = PlayerManager.serverInfo.server_id
|
||||
params.serverName = PlayerManager.serverInfo.name
|
||||
-- 角色相关
|
||||
params.roleID = tostring(PlayerManager.uid)
|
||||
params.roleID = tostring(PlayerManager.uid).."#"..tostring(context.Id)
|
||||
params.roleName = PlayerManager.nickName
|
||||
params.roleLevel = PlayerManager.level
|
||||
params.vip = tostring(VipManager.GetVipLevel())
|
||||
|
|
|
|||
|
|
@ -24,9 +24,10 @@ local jumpDic = {
|
|||
if PlayerManager.familyId == 0 then
|
||||
UIManager.OpenPanel(UIName.GuildFindPopup)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
-- 进入公会界面之前初始化一遍数据
|
||||
MyGuildManager.InitAllData(function()
|
||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
end)
|
||||
end
|
||||
else
|
||||
|
|
|
|||
|
|
@ -82,13 +82,10 @@ function this:showRewardTianGong()
|
|||
local indirect ={}
|
||||
local curScore = TreasureOfHeavenManger.curScore--当前分数
|
||||
|
||||
LogPink("sssss"..#rewardData)
|
||||
LogBlue("aaaaaa"..#rewardStateData)
|
||||
for i = 1, #rewardData do
|
||||
if curScore >= rewardData[i].Integral then
|
||||
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
|
||||
-- body
|
||||
LogRed("执行这里了么")
|
||||
local reward = rewardData[i]
|
||||
local k1 = reward.TreasureReward[1][1]
|
||||
local v1 = reward.TreasureReward[1][2]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function this.UpdateData(msg)
|
|||
if msg.resetTime then
|
||||
this.resetTime = msg.resetTime
|
||||
end
|
||||
if msg.treasureRewardState then
|
||||
if msg.treasureRewardState and #msg.treasureRewardState == 1 then
|
||||
if #this.rewardStateData>0 then
|
||||
for i = 1, #this.rewardStateData do
|
||||
if this.rewardStateData[i].id == msg.treasureRewardState.id then
|
||||
|
|
@ -25,8 +25,10 @@ function this.UpdateData(msg)
|
|||
else
|
||||
this.rewardStateData = msg.treasureRewardState
|
||||
end
|
||||
elseif msg.treasureRewardState and #msg.treasureRewardState > 1 then
|
||||
this.rewardStateData = msg.treasureRewardState
|
||||
end
|
||||
this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) == 0 and msg.isBuy or OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
||||
this.TreasrueState = msg.isBuy
|
||||
end
|
||||
|
||||
function this.SetTreasureState()
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ end
|
|||
function TreasureOfHeavenPanel:refresh()
|
||||
treasureState = TreasureOfHeavenManger.TreasrueState
|
||||
rewardData = TreasureOfHeavenManger.rewardStateData
|
||||
LogGreen("#rewardData长度:"..#rewardData)
|
||||
-- LogGreen("#rewardData长度:"..#rewardData)
|
||||
if #TreasureOfHeavenManger.rewardStateData <= 0 then
|
||||
TreasureOfHeavenPanel:topBar()
|
||||
TreasureOfHeavenPanel:showTaskList()
|
||||
|
|
@ -237,7 +237,7 @@ function TreasureOfHeavenPanel:ShowTime()
|
|||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
local t = TreasureOfHeavenManger.resetTime-300
|
||||
local t = TreasureOfHeavenManger.resetTime
|
||||
local time
|
||||
self.localTimer = Timer.New(function()
|
||||
time = t - GetTimeStamp()
|
||||
|
|
@ -245,8 +245,9 @@ function TreasureOfHeavenPanel:ShowTime()
|
|||
time = 0
|
||||
t = TreasureOfHeavenManger.resetTime
|
||||
treasureState = nil
|
||||
-- TreasureOfHeavenPanel:refresh()-不刷新了,直接踢出去
|
||||
ExpeditionManager.RefreshPanelShowByState()
|
||||
this.ScrollView:SetIndex(1)
|
||||
TreasureOfHeavenPanel:refresh()--不刷新了,直接踢出去
|
||||
-- ExpeditionManager.RefreshPanelShowByState()
|
||||
end
|
||||
this.time.text=TimeToDHMS(time)
|
||||
end,1,-1,true)
|
||||
|
|
|
|||
Loading…
Reference in New Issue