【弹窗优化】提交

dev_chengFeng
ZhangBiao 2021-10-22 14:22:12 +08:00
parent 609b191785
commit 1f5f4f15c3
9 changed files with 272 additions and 36 deletions

View File

@ -1437,6 +1437,7 @@ GameObject:
- component: {fileID: 224290049623367000} - component: {fileID: 224290049623367000}
- component: {fileID: 222004061596605640} - component: {fileID: 222004061596605640}
- component: {fileID: 114170414937764150} - component: {fileID: 114170414937764150}
- component: {fileID: 273713920176821389}
m_Layer: 5 m_Layer: 5
m_Name: BgMask m_Name: BgMask
m_TagString: Untagged m_TagString: Untagged
@ -1500,6 +1501,48 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!114 &273713920176821389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1747102371081018}
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: 114170414937764150}
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 &1773793279236410 --- !u!1 &1773793279236410
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -9285,7 +9285,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u5267\u672C\u8F6E\u7ADE\u731C\u7ED3\u675F: 00:00:00" m_Text: "\u8DDD\u672C\u8F6E\u7ADE\u731C\u7ED3\u675F: 00:00:00"
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &2829053451524231572 --- !u!1 &2829053451524231572
GameObject: GameObject:

View File

@ -2850,8 +2850,9 @@ GameObject:
- component: {fileID: 5755000665593511065} - component: {fileID: 5755000665593511065}
- component: {fileID: 6235673036065627545} - component: {fileID: 6235673036065627545}
- component: {fileID: 3353217617678556903} - component: {fileID: 3353217617678556903}
- component: {fileID: 3355194751074999746}
m_Layer: 5 m_Layer: 5
m_Name: Image m_Name: mask
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -2913,6 +2914,48 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!114 &3355194751074999746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7355189807161810786}
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: 3353217617678556903}
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 &7455437713037113751 --- !u!1 &7455437713037113751
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 222402534377193540} - component: {fileID: 222402534377193540}
- component: {fileID: 223662482838932008} - component: {fileID: 223662482838932008}
- component: {fileID: 114110211023960964} - component: {fileID: 114110211023960964}
- component: {fileID: 114044212084387488}
m_Layer: 5 m_Layer: 5
m_Name: MsgPanel m_Name: MsgPanel
m_TagString: Untagged m_TagString: Untagged
@ -31,6 +30,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203} m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203}
m_Children: m_Children:
- {fileID: 5027593403251280600}
- {fileID: 224865610280439172} - {fileID: 224865610280439172}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -86,35 +86,6 @@ MonoBehaviour:
m_BlockingMask: m_BlockingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 4294967295
--- !u!114 &114044212084387488
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1060915096370618}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1273980818095728 --- !u!1 &1273980818095728
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -230,7 +201,7 @@ RectTransform:
- {fileID: 224337767367280232} - {fileID: 224337767367280232}
- {fileID: 2562817607428992190} - {fileID: 2562817607428992190}
m_Father: {fileID: 224787418950452670} m_Father: {fileID: 224787418950452670}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -1246,6 +1217,123 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null Culture=neutral, PublicKeyToken=null
m_IsOn: 1 m_IsOn: 1
--- !u!1 &7069358567379019646
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5027593403251280600}
- component: {fileID: 2450155753871095492}
- component: {fileID: 5781955028374586531}
- component: {fileID: 6220915392502842684}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5027593403251280600
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7069358567379019646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224787418950452670}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2450155753871095492
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7069358567379019646}
m_CullTransparentMesh: 0
--- !u!114 &5781955028374586531
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7069358567379019646}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &6220915392502842684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7069358567379019646}
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: 5781955028374586531}
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 &7445001602279713687 --- !u!1 &7445001602279713687
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -649,6 +649,7 @@ GameObject:
- component: {fileID: 224581507563997594} - component: {fileID: 224581507563997594}
- component: {fileID: 222718156425810420} - component: {fileID: 222718156425810420}
- component: {fileID: 114789322736460010} - component: {fileID: 114789322736460010}
- component: {fileID: 6147712288609510477}
m_Layer: 5 m_Layer: 5
m_Name: mask m_Name: mask
m_TagString: Untagged m_TagString: Untagged
@ -712,6 +713,48 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!114 &6147712288609510477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1440078559999222}
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: 114789322736460010}
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 &1480265952912594 --- !u!1 &1480265952912594
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -25,6 +25,7 @@ local healHero = {}--需要忽略的神将id
function FormationEditPopup:InitComponent() function FormationEditPopup:InitComponent()
this.spLoader = SpriteLoader.New() this.spLoader = SpriteLoader.New()
this.mask = Util.GetGameObject(this.gameObject, "BgMask")
this.BtnBack = Util.GetGameObject(this.gameObject, "bg/btnBack") this.BtnBack = Util.GetGameObject(this.gameObject, "bg/btnBack")
this.BtnSure = Util.GetGameObject(this.gameObject, "bg/btnSure") this.BtnSure = Util.GetGameObject(this.gameObject, "bg/btnSure")
this.allBtn=Util.GetGameObject(this.gameObject,"bg/allBtn") this.allBtn=Util.GetGameObject(this.gameObject,"bg/allBtn")
@ -71,6 +72,11 @@ function FormationEditPopup:BindEvent()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0) Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
self:ClosePanel() self:ClosePanel()
end) end)
Util.AddClick(this.mask, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
self:ClosePanel()
end)
--选定按钮 --选定按钮
Util.AddClick(this.BtnSure, function() Util.AddClick(this.BtnSure, function()

View File

@ -13,6 +13,7 @@ function HongMengUnLoadPanel:InitComponent()
this.spLoader = SpriteLoader.New() this.spLoader = SpriteLoader.New()
this.BtnBack = Util.GetGameObject(self.transform, "btnBack") this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
this.mask = Util.GetGameObject(self.transform, "mask")
this.BtnYes = Util.GetGameObject(self.transform, "YesBtn") this.BtnYes = Util.GetGameObject(self.transform, "YesBtn")
this.BtnNo = Util.GetGameObject(self.transform,"NoBtn") this.BtnNo = Util.GetGameObject(self.transform,"NoBtn")
@ -31,6 +32,9 @@ function HongMengUnLoadPanel:BindEvent()
Util.AddClick(this.BtnBack, function() Util.AddClick(this.BtnBack, function()
self:ClosePanel() self:ClosePanel()
end) end)
Util.AddClick(this.mask, function()
self:ClosePanel()
end)
Util.AddClick(this.BtnYes, function() Util.AddClick(this.BtnYes, function()
-- Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.UnLoadHongMengEnvoy,self.data) -- Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.UnLoadHongMengEnvoy,self.data)

View File

@ -8,6 +8,7 @@ local str3 = Language[11309]
function MsgPanel:InitComponent() function MsgPanel:InitComponent()
self.spLoader = SpriteLoader.New() self.spLoader = SpriteLoader.New()
MsgPanel.close = Util.GetGameObject (self.transform, "mask")
MsgPanel.btn_Left = Util.GetGameObject (self.transform, "buttom/op/btnLeft") MsgPanel.btn_Left = Util.GetGameObject (self.transform, "buttom/op/btnLeft")
MsgPanel.txt_BtnLeft = Util.GetGameObject (MsgPanel.btn_Left, "Text"):GetComponent("Text") MsgPanel.txt_BtnLeft = Util.GetGameObject (MsgPanel.btn_Left, "Text"):GetComponent("Text")
@ -23,6 +24,9 @@ end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
function MsgPanel:BindEvent() function MsgPanel:BindEvent()
Util.AddClick(MsgPanel.close, function ()
MsgPanel:ClosePanel()
end)
Util.AddClick(MsgPanel.btn_Left, MsgPanel.OnLeftBtnClick) Util.AddClick(MsgPanel.btn_Left, MsgPanel.OnLeftBtnClick)
Util.AddClick(MsgPanel.btn_Right, MsgPanel.OnRightBtnClick) Util.AddClick(MsgPanel.btn_Right, MsgPanel.OnRightBtnClick)
end end

View File

@ -10,9 +10,10 @@ local curHeroData = {}
function RoleUpStarListPanel:InitComponent() function RoleUpStarListPanel:InitComponent()
this.spLoader = SpriteLoader.New() this.spLoader = SpriteLoader.New()
this.BtnBack = Util.GetGameObject(self.transform, "btnBack") this.BtnBack = Util.GetGameObject(self.gameObject, "btnBack")
this.BtnSure = Util.GetGameObject(self.transform, "btnSure") this.mask = Util.GetGameObject(self.gameObject, "mask")
this.btnAutoSelect = Util.GetGameObject(self.transform, "btnAutoSelect") this.BtnSure = Util.GetGameObject(self.gameObject, "btnSure")
this.btnAutoSelect = Util.GetGameObject(self.gameObject, "btnAutoSelect")
this.cardPre = Util.GetGameObject(self.gameObject, "item") this.cardPre = Util.GetGameObject(self.gameObject, "item")
--this.grid = Util.GetGameObject(self.gameObject, "scroll/grid") --this.grid = Util.GetGameObject(self.gameObject, "scroll/grid")
this.desText = Util.GetGameObject(self.gameObject, "desText"):GetComponent("Text") this.desText = Util.GetGameObject(self.gameObject, "desText"):GetComponent("Text")
@ -40,6 +41,10 @@ function RoleUpStarListPanel:BindEvent()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel) PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel() self:ClosePanel()
end) end)
Util.AddClick(this.mask, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
Util.AddClick(this.BtnSure, function() Util.AddClick(this.BtnSure, function()
self:ClosePanel() self:ClosePanel()
openThisPanel:UpdateUpStarPosHeroData(curSelectHeroList) openThisPanel:UpdateUpStarPosHeroData(curSelectHeroList)