物品掉落特效+跳过按钮

dev_chengFeng
ZhangBiao 2020-07-15 16:35:51 +08:00
parent 81f8a73de0
commit de9290e4a0
5 changed files with 148 additions and 16 deletions

View File

@ -259,8 +259,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 15.1, y: -229.5}
m_SizeDelta: {x: 847.3, y: 199.5}
m_AnchoredPosition: {x: 0, y: -229.5}
m_SizeDelta: {x: 708.6, y: 199.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7421059794357200082
MonoBehaviour:
@ -1939,7 +1939,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -423.62912, y: 0}
m_AnchoredPosition: {x: -354.31485, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7023217658545066466

View File

@ -31396,6 +31396,7 @@ GameObject:
- component: {fileID: 3965231938052073796}
- component: {fileID: 8728927548142084767}
- component: {fileID: -4368312698598460742}
- component: {fileID: 8054824519350919395}
m_Layer: 5
m_Name: BtnTimeScale
m_TagString: Untagged
@ -31482,7 +31483,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 3
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}
@ -31506,6 +31507,25 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &8054824519350919395
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: -3657267414114352705}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &-3611012580868435075
GameObject:
m_ObjectHideFlags: 0
@ -42498,6 +42518,7 @@ GameObject:
- component: {fileID: -5903772607965869559}
- component: {fileID: 3382971146446407333}
- component: {fileID: -8734374113593648173}
- component: {fileID: 6475750520088517110}
m_Layer: 5
m_Name: BtnExit
m_TagString: Untagged
@ -42581,7 +42602,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 3
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}
@ -42605,6 +42626,25 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &6475750520088517110
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: -724015095730800388}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &-290701875827116530
GameObject:
m_ObjectHideFlags: 0
@ -105837,6 +105877,8 @@ GameObject:
- component: {fileID: 2419542347520941798}
- component: {fileID: 1992467313994325108}
- component: {fileID: 1377869764117395179}
- component: {fileID: 8791789729877601104}
- component: {fileID: 2758256526845086611}
m_Layer: 5
m_Name: lock
m_TagString: Untagged
@ -105900,6 +105942,67 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8791789729877601104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5551026719691139111}
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: 3
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: 1377869764117395179}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &2758256526845086611
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5551026719691139111}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5595811839997475725
GameObject:
m_ObjectHideFlags: 0
@ -121022,6 +121125,7 @@ GameObject:
- component: {fileID: 6670039054794519703}
- component: {fileID: -3138441702078980220}
- component: {fileID: 2098704739613992631}
- component: {fileID: 1939908492439530785}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
@ -121105,7 +121209,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 3
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}
@ -121129,6 +121233,25 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &1939908492439530785
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6341671881354010706}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &6457466739081246565
GameObject:
m_ObjectHideFlags: 0

View File

@ -1084,12 +1084,12 @@ PRIVILEGE_TYPE = {
ADVENTURE_BOSS = 9, -- 外敌挑战次数
DoubleTimesFight = 501, --2倍速战斗
CarbonSweeps = 502, --副本扫荡
SkipFight = 505, --跳过战斗
UnlockPickUp=504,--一键领取
EXTRA_STAR_REWARD = 506, -- 额外星级奖励特权
ExitFight = 509,--退出战斗
MonsterCampJump = 510, -- 兽潮跳过战斗
ArenaJump = 511, -- 竞技场跳过战斗
SkipFight = 512, --跳过战斗
-- UnlockPickUp=504,--一键领取
-- EXTRA_STAR_REWARD = 506, -- 额外星级奖励特权
-- ExitFight = 509,--退出战斗
-- MonsterCampJump = 510, -- 兽潮跳过战斗
-- ArenaJump = 511, -- 竞技场跳过战斗
GoFindTreasure = 30, -- 高级迷宫寻宝每日任务刷新次数
HaoFindTreasure = 31, -- 豪华迷宫寻宝每日任务刷新次数
ADVENTURE_EXPLORE = 35, -- 挂机额外奖励

View File

@ -571,8 +571,8 @@ end
-- 是否解锁跳过功能
function this.IsUnlockBattlePass()
return false
-- return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight or PRIVILEGE_TYPE.ExitFight)
-- return false
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight)
end
-- 战斗暂停控制

View File

@ -33,6 +33,8 @@ function this:InitComponent()
this.BtnTimeScale = Util.GetGameObject(this.DownRoot, "option/BtnTimeScale")
this.BtnExit = Util.GetGameObject(this.DownRoot, "option/BtnExit")
this.Button = Util.GetGameObject(this.DownRoot, "option/Button")
this.ButtonLock = Util.GetGameObject(this.DownRoot, "option/Button/lock")
this.BtnGM = Util.GetGameObject(this.DownRoot, "option/Button")
@ -69,6 +71,10 @@ function this:BindEvent()
end
end)
Util.AddClick(this.ButtonLock, function ()
PopupTipPanel.ShowTip("30级或首充后解锁")
end)
local pauseTime = 31
Util.AddClick(this.BtnExit, function ()
if not BattleManager.IsUnlockBattlePass() then
@ -192,7 +198,7 @@ function this:OnOpen(_fightData, _fightType, _endFunc)
fightType = _fightType --判定战斗类型
isBack = _fightType == BATTLE_TYPE.BACK --判定是否是战斗回放
hadCounted = 0
LogPink(fightType)
-- LogPink(fightType)
this.BG:GetComponent("Image").sprite = Util.LoadSprite(BattleManager.GetBattleBg(fightType))
this.BtnGM:SetActive(AppConst.isOpenGM)
@ -273,7 +279,10 @@ function this.InitOption()
this.Option:SetActive(true)
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed())
Util.GetGameObject(this.BtnExit, "lock"):SetActive(not BattleManager.IsUnlockBattlePass())
local IsUnlockBattlePass = not BattleManager.IsUnlockBattlePass()
Util.GetGameObject(this.BtnExit, "lock"):SetActive(IsUnlockBattlePass)
Util.GetGameObject(this.Button, "lock"):SetActive(IsUnlockBattlePass)
this.Button:GetComponent("Button").interactable = not IsUnlockBattlePass
-- 初始化战斗时间,刷新前端显示
BattleManager.InitTimeScale()