root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

dev_chengFeng
jiaoyangna 2021-12-21 17:21:26 +08:00
parent 89fdc69afd 0a8bdbe4b6
commit edbf25dc59
6 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
View File

@ -4810,10 +4810,10 @@ RectTransform:
m_Father: {fileID: 8503549196898394800}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &535413429869230351
GameObject:
@ -20000,9 +20000,9 @@ RectTransform:
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 39.5, y: 635}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 39.5, y: -377}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &4961706857348061968
@ -37369,9 +37369,9 @@ RectTransform:
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -171.5, y: 635}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -171.5, y: -377}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1358751446755459863

2
Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
View File

@ -857,7 +857,7 @@ end
-- 是否解锁跳过功能
function this.IsUnlockBattlePass()
-- return false
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过"
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值6元后解锁跳过"
end
-- 战斗暂停控制

17
Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
View File

@ -262,11 +262,12 @@ end
function this.CheckNextGuideListen(nextId)
if GuideConfig[nextId] then
local type = GuideConfig[nextId].Type
if openDic[type] then
-- 主线引导保存下一步id
if type == GuideType.Force and openDic[type] then
openDic[type] = nextId
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) )
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
end
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) )
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
end
end
@ -795,6 +796,16 @@ function this.RefreshTriggerListen(id, openType, openArgs)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
-- 十连结果界面触发
elseif openType == 37 then
local trigger
trigger = function(panelType)
if panelType == UIName.TenRecruitPanel then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger)
this.ShowGuide(id)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
end
end

9
Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
View File

@ -84,10 +84,17 @@ local function _CompareCondition(type, condition, value)
elseif type == 3 then -- vip等级解锁
value = value or VipManager.GetVipLevel()
return value >= condition
elseif type == 4 then -- 特殊类型
elseif type == 4 then -- 充值解锁（无论多少金额）
return true
elseif type == 5 then -- 特殊类型
return true
elseif type == 6 then -- 总好感度等级解锁
local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1)
value = value or tlv
return value >= condition
elseif type == 7 then -- 充值金额解锁
value = value or VipManager.GetChargedNum()
return value >= condition
end
end

22
Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua
View File

@ -69,7 +69,14 @@ function EveryDayGiftNew:InitComponent()
end
function EveryDayGiftNew:BindEvent()
Util.AddOnceClick(self.btn2,function ()
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用！")
return
end
end
PayManager.Pay(onKeyPackId, function(id)
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
@ -263,7 +270,7 @@ function EveryDayGiftNew:RefreshReward(Data)
NotEnoughPopup:Show(Data.data.costId)
end
else
PopupTipPanel.ShowTip(Language[11701])
PopupTipPanel.ShowTip(string.format("名望等级不足，请升至%s级后才可购买！",DynamicActivityManager.Index-1))
end
end
end)
@ -386,13 +393,6 @@ end
--刷新一键购买显示
function EveryDayGiftNew:RefreshOneKeyShow()
Util.SetGray(self.btn2,false)
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
Util.SetGray(self.btn2,true)
self.btn2:GetComponent("Button").interactable = false
return
end
end
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
if actData then
@ -403,6 +403,12 @@ function EveryDayGiftNew:RefreshOneKeyShow()
Util.SetGray(self.btn2,false)
self.btn2:GetComponent("Button").interactable = true
self.btn2Text.text = string.format("60元七天特惠")
for i = 1, #self.shopData do
if self.shopData[i].data.boughtNum > 0 then
Util.SetGray(self.btn2,true)
break
end
end
end
end

2
Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua
View File

@ -186,7 +186,7 @@ function RechargeViewNew:RefreshReward(Data)
NotEnoughPopup:Show(Data.data.costId)
end
else
PopupTipPanel.ShowTip(Language[11701])
PopupTipPanel.ShowTip(string.format("名望等级不足，请升至%s级后才可购买！",DynamicActivityManager.Index-1))
end
end
end)