Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-12-17 13:29:24 +08:00
commit 2f489fecad
6 changed files with 133 additions and 20 deletions

View File

@ -75023,6 +75023,7 @@ GameObject:
- component: {fileID: 5073206815621103962} - component: {fileID: 5073206815621103962}
- component: {fileID: 3643764194770386157} - component: {fileID: 3643764194770386157}
- component: {fileID: 3583265932906361629} - component: {fileID: 3583265932906361629}
- component: {fileID: 187038464}
m_Layer: 5 m_Layer: 5
m_Name: battleUpLvTip m_Name: battleUpLvTip
m_TagString: Untagged m_TagString: Untagged
@ -75087,6 +75088,48 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!114 &187038464
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4038013651766802645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3583265932906361629}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &4055199587819886873 --- !u!1 &4055199587819886873
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -145962,15 +146005,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3}
--- !u!224 &830511510176938944 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1533186584701823329 stripped --- !u!1 &1533186584701823329 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3} type: 3}
m_PrefabInstance: {fileID: 8971074634032498639} m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!224 &830511510176938944 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}

View File

@ -231,7 +231,7 @@ function FightPointPassMainPanel:InitComponent()
this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text") this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text")
this.OpenSeverWelfareRed = Util.GetGameObject(this.OpenSeverWelfare, "redpot") this.OpenSeverWelfareRed = Util.GetGameObject(this.OpenSeverWelfare, "redpot")
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip") this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[10610] this.battleUpLvTipTxt = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text")
--山河社稷图 --山河社稷图
this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel") this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel")
this.btnFightLevel:SetActive(false) this.btnFightLevel:SetActive(false)
@ -486,7 +486,6 @@ function FightPointPassMainPanel:OnShow()
this.UpdateOpenSeverWelfare() this.UpdateOpenSeverWelfare()
PlayerManager.StarBattleUpLvTipTime(2) PlayerManager.StarBattleUpLvTipTime(2)
this.battleUpLvTip:SetActive(false)
Util.GetGameObject(this.btnXiaoYao,"curValue/num"):GetComponent("Text").text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39)) Util.GetGameObject(this.btnXiaoYao,"curValue/num"):GetComponent("Text").text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39))
-- 刷新一次编队战斗力 -- 刷新一次编队战斗力
@ -497,6 +496,9 @@ function FightPointPassMainPanel:OnShow()
this.refreshVipTask() this.refreshVipTask()
-- 刷新解锁信息显示 -- 刷新解锁信息显示
this.RefreshOpenTips() this.RefreshOpenTips()
--
this.battleUpLvTip:SetActive(false)
this.RefreshBattleUpLvTip(true)
end end
@ -1042,8 +1044,72 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
end end
end end
end end
function this.RefreshBattleUpLvTip() function this.RefreshBattleUpLvTip(isShowUIOpen)
--
Util.AddOnceClick(this.battleUpLvTip, function() end)
this.battleUpLvTip:GetComponent("Image").raycastTarget = false
-- 么解锁章节不显示
if not FightPointPassManager.IsChapterClossState() then
return
end
-- 判断状态
local curFightId = FightPointPassManager.GetCurFightId()
local isOk, tip, btnTxt, lockState = FightPointPassManager.CheckFightOpenRule(curFightId)
-- 可以挑战显示 挑战关卡快速升级
if not isShowUIOpen and isOk then
this.battleUpLvTipTxt.text = Language[10610]
this.battleUpLvTip:SetActive(true) this.battleUpLvTip:SetActive(true)
return
end
-- 没有解锁条件不显示
local openRule = fightLevelConfig[curFightId].OpenRule
if not openRule then
return
end
-- 没有数据不显示
if not lockState then
return
end
--
for index, state in ipairs(lockState) do
if not state and openRule[index] then
local ruleType = openRule[index][1]
if ruleType then
if ruleType == 1 then
-- 山河社稷图
this.battleUpLvTipTxt.text = "立即前往>>"
this.battleUpLvTip:SetActive(true)
this.battleUpLvTip:GetComponent("Image").raycastTarget = true
Util.AddOnceClick(this.battleUpLvTip, function()
JumpManager.GoJump(36023)
end)
elseif ruleType == 2 then
-- 心魔试炼
this.battleUpLvTipTxt.text = "立即前往>>"
this.battleUpLvTip:SetActive(true)
this.battleUpLvTip:GetComponent("Image").raycastTarget = true
Util.AddOnceClick(this.battleUpLvTip, function()
JumpManager.GoJump(1011)
end)
elseif ruleType == 4 then
-- 获取神将
this.battleUpLvTipTxt.text = "立即前往>>"
this.battleUpLvTip:SetActive(true)
this.battleUpLvTip:GetComponent("Image").raycastTarget = true
Util.AddOnceClick(this.battleUpLvTip, function()
JumpManager.GoJump(22001)
end)
end
end
end
end
end end
function this.UpdateWordLv() function this.UpdateWordLv()

View File

@ -305,6 +305,7 @@ function this.CheckFightOpenRule(fightId)
local tips = {} local tips = {}
local btnTxts = {} local btnTxts = {}
for index, rule in ipairs(openRule) do for index, rule in ipairs(openRule) do
states[index] = true
if not rule[1] or rule[1] == 0 then if not rule[1] or rule[1] == 0 then
LogRed("当前没有限制条件1") LogRed("当前没有限制条件1")
states[index] = true states[index] = true
@ -374,7 +375,7 @@ function this.CheckFightOpenRule(fightId)
local tip = "" local tip = ""
local btnTxt = "" local btnTxt = ""
local isOk = true local isOk = true
for index, state in pairs(states) do for index, state in ipairs(states) do
if not state then if not state then
isOk = false isOk = false
-- 提示文字 -- 提示文字
@ -391,7 +392,7 @@ function this.CheckFightOpenRule(fightId)
end end
end end
end end
return isOk, tip.."解锁", btnTxt return isOk, tip.."解锁", btnTxt, states
end end
LogRed("当前没有限制条件2") LogRed("当前没有限制条件2")
return true return true

View File

@ -737,6 +737,7 @@ function this.PaySuccess(buffer)
PopupTipPanel.ShowTip(tip) PopupTipPanel.ShowTip(tip)
--FirstRechargeManager.RefreshAccumRechargeValue(msg.goodsId) --FirstRechargeManager.RefreshAccumRechargeValue(msg.goodsId)
-- 延时0.5秒刷新。避免sdk支付时商店次数未刷新界面刷新的问题 -- 延时0.5秒刷新。避免sdk支付时商店次数未刷新界面刷新的问题
DynamicActivityManager.curLevel = 0
DynamicActivityManager.Index = 0 DynamicActivityManager.Index = 0
Timer.New(function() Timer.New(function()
Game.GlobalEvent:DispatchEvent(GameEvent.MoneyPay.OnPayResultSuccess, msg.goodsId) Game.GlobalEvent:DispatchEvent(GameEvent.MoneyPay.OnPayResultSuccess, msg.goodsId)

View File

@ -153,9 +153,9 @@ function EveryDayGiftNew:SetGrowGift()
if DynamicActivityManager.curLevel == 0 then if DynamicActivityManager.curLevel == 0 then
for i = 1, #growData do for i = 1, #growData do
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
DynamicActivityManager.Index = i DynamicActivityManager.curLevel = i
if DynamicActivityManager.Index == 0 then if DynamicActivityManager.Index == 0 then
DynamicActivityManager.curLevel = DynamicActivityManager.Index DynamicActivityManager.Index = DynamicActivityManager.curLevel
end end
break break
end end
@ -169,9 +169,9 @@ function EveryDayGiftNew:SetGrowGift()
end end
end end
-- LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index)) -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
--如果有当前声望数据,就显示,没有就显示上一档位 --如果有当前声望数据,就显示,没有就显示上一档位
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1]
self:RefreshReward(data) self:RefreshReward(data)
Util.AddOnceClick(self.btnLeft,function () Util.AddOnceClick(self.btnLeft,function ()
@ -438,6 +438,8 @@ function EveryDayGiftNew:OnDestroy()
self.localTimer:Stop() self.localTimer:Stop()
self.localTimer = nil self.localTimer = nil
end end
DynamicActivityManager.curLevel = 0
DynamicActivityManager.Index = 0
end end
--特权商城专属 --特权商城专属

View File

@ -77,9 +77,9 @@ function RechargeViewNew:SetGrowGift()
if DynamicActivityManager.curLevel == 0 then if DynamicActivityManager.curLevel == 0 then
for i = 1, #growData do for i = 1, #growData do
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
DynamicActivityManager.Index = i DynamicActivityManager.curLevel = i
if DynamicActivityManager.Index == 0 then if DynamicActivityManager.Index == 0 then
DynamicActivityManager.curLevel = DynamicActivityManager.Index DynamicActivityManager.Index = DynamicActivityManager.curLevel
end end
break break
end end
@ -93,9 +93,9 @@ function RechargeViewNew:SetGrowGift()
end end
end end
-- LogRed("当前声望Index:"..tostring(DynamicActivityManager.Index)) -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
--如果有当前声望数据,就显示,没有就显示上一档位 --如果有当前声望数据,就显示,没有就显示上一档位
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1]
self:RefreshReward(data) self:RefreshReward(data)
Util.AddOnceClick(self.btnLeft,function () Util.AddOnceClick(self.btnLeft,function ()