需求主城或关卡停留过长添加聊天气泡

dev_chengFeng
zhangqiang 2020-08-31 20:52:50 +08:00
parent 69cc5d4e86
commit a6fa4453e6
7 changed files with 463 additions and 73 deletions

View File

@ -5014,7 +5014,7 @@ ParticleSystem:
--- !u!199 &689865173
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5114,9 +5114,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 117, y: -56}
m_SizeDelta: {x: 234, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &698392787
@ -5257,7 +5257,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -59, y: 18.7}
m_SizeDelta: {x: 0, y: 70}
m_SizeDelta: {x: 380, y: 70}
m_Pivot: {x: 1, y: 0}
--- !u!114 &708116011
MonoBehaviour:
@ -5735,10 +5735,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 158, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 158, y: -35}
m_SizeDelta: {x: 230, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747
CanvasRenderer:
@ -6030,10 +6030,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 300.5, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300.5, y: -35}
m_SizeDelta: {x: 55, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479
CanvasRenderer:
@ -6357,9 +6357,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 56, y: -496.3}
m_SizeDelta: {x: 112, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2110103218
@ -11439,7 +11439,7 @@ ParticleSystem:
--- !u!199 &53865032735354669
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -16290,7 +16290,7 @@ ParticleSystem:
--- !u!199 &53865032903479894
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21025,7 +21025,7 @@ ParticleSystem:
--- !u!199 &53865033217178009
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25638,7 +25638,7 @@ ParticleSystem:
--- !u!199 &53865033315684810
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30621,7 +30621,7 @@ ParticleSystem:
--- !u!199 &168585345683994493
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35546,7 +35546,7 @@ ParticleSystem:
--- !u!199 &168585346077619425
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -40429,7 +40429,7 @@ ParticleSystem:
--- !u!199 &168585346323668782
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -45191,7 +45191,7 @@ ParticleSystem:
--- !u!199 &168585346916632986
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -50539,7 +50539,7 @@ ParticleSystem:
--- !u!199 &4590674014730051834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51124,9 +51124,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -192.5}
m_SizeDelta: {x: 100, y: 185}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -56190,7 +56190,7 @@ ParticleSystem:
--- !u!199 &345244862577150605
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60960,7 +60960,7 @@ ParticleSystem:
--- !u!199 &6253376304308760710
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61537,9 +61537,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5551596210412472397
@ -67018,7 +67018,7 @@ ParticleSystem:
--- !u!199 &5385837242328192651
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -71934,7 +71934,7 @@ ParticleSystem:
--- !u!199 &4461638917069206421
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77085,7 +77085,7 @@ ParticleSystem:
--- !u!199 &6978629692603714544
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77997,8 +77997,8 @@ RectTransform:
m_Father: {fileID: 1043104976139942255}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@ -78150,6 +78150,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3606366132525143131
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 34727001724999567}
- component: {fileID: 8657241382370732984}
- component: {fileID: 586816564161492650}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &34727001724999567
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3606366132525143131}
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: 5073206815621103962}
m_RootOrder: 0
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_AnchoredPosition: {x: -12, y: 26}
m_SizeDelta: {x: 229.5, y: 64.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8657241382370732984
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3606366132525143131}
m_CullTransparentMesh: 0
--- !u!114 &586816564161492650
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3606366132525143131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 51
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6311\u6218\u5173\u5361\u5FEB\u901F\u5347\u7EA7"
LanguageIndex: 10239
--- !u!1 &3611879765937079427
GameObject:
m_ObjectHideFlags: 0
@ -78488,9 +78568,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 53, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791543136630995348
@ -78966,6 +79046,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4038013651766802645
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5073206815621103962}
- component: {fileID: 3643764194770386157}
- component: {fileID: 3583265932906361629}
m_Layer: 5
m_Name: battleUpLvTip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5073206815621103962
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4038013651766802645}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 0.7013334, y: 0.7013334, z: 1}
m_Children:
- {fileID: 34727001724999567}
m_Father: {fileID: 7718967529276036518}
m_RootOrder: 3
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_AnchoredPosition: {x: -57, y: 284.6}
m_SizeDelta: {x: 595.26, y: 346.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3643764194770386157
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4038013651766802645}
m_CullTransparentMesh: 0
--- !u!114 &3583265932906361629
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: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
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: 21300000, guid: 88785b6606f773e43bfb8d365c2689ab, type: 3}
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 &4055199587819886873
GameObject:
m_ObjectHideFlags: 0
@ -84108,7 +84263,7 @@ ParticleSystem:
--- !u!199 &4571234231691897658
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -84556,6 +84711,7 @@ RectTransform:
- {fileID: 4791475233915119706}
- {fileID: 3685741920651583255}
- {fileID: 3829532297210306968}
- {fileID: 5073206815621103962}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -84597,7 +84753,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.4499817, y: 0.46502018}
m_SizeDelta: {x: 0.89996, y: 0.93}
m_Pivot: {x: 0.5, y: 0.5}
@ -90074,7 +90230,7 @@ ParticleSystem:
--- !u!199 &6988990775388982249
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -90862,9 +91018,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 269.44, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5575929133019220475
@ -91003,7 +91159,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 55, y: -137}
m_SizeDelta: {x: 0, y: 74.5}
m_SizeDelta: {x: 322.44, y: 74.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5535357721351960960
MonoBehaviour:
@ -96057,7 +96213,7 @@ ParticleSystem:
--- !u!199 &7834467188416089451
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -101069,7 +101225,7 @@ ParticleSystem:
--- !u!199 &6133679773105218358
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -105963,7 +106119,7 @@ ParticleSystem:
--- !u!199 &6133679773792227019
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -110629,7 +110785,7 @@ ParticleSystem:
--- !u!199 &6133679774607836274
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -111040,9 +111196,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 101.75, y: -276.15}
m_SizeDelta: {x: 203.5, y: 308.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5423471315474658513
@ -112094,10 +112250,10 @@ RectTransform:
m_Father: {fileID: 708116007}
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: 354, y: 0}
m_SizeDelta: {x: 0, y: 69.49}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 354, y: -35}
m_SizeDelta: {x: 52, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6652503373365563749
CanvasRenderer:
@ -118535,7 +118691,7 @@ ParticleSystem:
--- !u!199 &7307487621506777566
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -123330,7 +123486,7 @@ ParticleSystem:
--- !u!199 &7307487621664921063
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -128362,7 +128518,7 @@ ParticleSystem:
--- !u!199 &6532744217531708957
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -128456,9 +128612,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 161.22, y: -53}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7914440216826683292
@ -133744,7 +133900,7 @@ ParticleSystem:
--- !u!199 &4325216380872068964
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -135690,12 +135846,12 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4430311761649459040, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
- target: {fileID: 6749042380532555018, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6749042380532555018, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
- target: {fileID: 4430311761649459040, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive
value: 0

View File

@ -15110,7 +15110,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -35}
m_AnchoredPosition: {x: 354, y: -35}
m_SizeDelta: {x: 52, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6609685172185307080
@ -75752,7 +75752,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -35}
m_AnchoredPosition: {x: 300.5, y: -35}
m_SizeDelta: {x: 55, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4888453323599395195
@ -76661,6 +76661,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5352445832565045888}
- {fileID: 7754725958776047094}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -78403,6 +78404,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6278373347935340855
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7754725958776047094}
- component: {fileID: 738290502969369036}
- component: {fileID: 1990200174122147187}
m_Layer: 5
m_Name: battleUpLvTip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7754725958776047094
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6278373347935340855}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 0.70133346, y: 0.70133346, z: 1}
m_Children:
- {fileID: 6887690500703810432}
m_Father: {fileID: 8831099743542526053}
m_RootOrder: 1
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_AnchoredPosition: {x: 482, y: 244}
m_SizeDelta: {x: 595.26, y: 346.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &738290502969369036
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6278373347935340855}
m_CullTransparentMesh: 0
--- !u!114 &1990200174122147187
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6278373347935340855}
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: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
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: 21300000, guid: 88785b6606f773e43bfb8d365c2689ab, type: 3}
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 &6293395449357706096
GameObject:
m_ObjectHideFlags: 0
@ -98282,6 +98358,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8629266279804438019
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6887690500703810432}
- component: {fileID: 7821381053125956396}
- component: {fileID: 3215204441076007175}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6887690500703810432
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8629266279804438019}
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: 7754725958776047094}
m_RootOrder: 0
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_AnchoredPosition: {x: -12, y: 26}
m_SizeDelta: {x: 229.5, y: 64.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7821381053125956396
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8629266279804438019}
m_CullTransparentMesh: 0
--- !u!114 &3215204441076007175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8629266279804438019}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 51
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6311\u6218\u5173\u5361\u5FEB\u901F\u5347\u7EA7"
LanguageIndex: 10239
--- !u!1 &8643855043295857006
GameObject:
m_ObjectHideFlags: 0
@ -99206,7 +99362,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -35}
m_AnchoredPosition: {x: 158, y: -35}
m_SizeDelta: {x: 230, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6388664606995184780

View File

@ -2388,4 +2388,5 @@
[12387] = "军团副本",
[12388] = "该神将在巅峰战阵容中已上阵",
[12389] = "包含4星或更高星级的神将",
[12390] = "挑战关卡快速升级",
}

View File

@ -37,6 +37,8 @@ GameEvent = {
-- 玩家头像框改变
OnHeadFrameChange = "Player.OnHeadFrameChange",
OnHeadChange = "Player.OnHeadChange",
--打关卡升级小提示
OnShowBattleUpLvTip = "Player.OnShowBattleUpLvTip",
},
Treasure={
--宝物强化/精炼提升

View File

@ -223,6 +223,8 @@ function FightPointPassMainPanel:InitComponent()
this.OpenSeverWelfareTimeText = Util.GetGameObject(this.OpenSeverWelfare, "time"):GetComponent("Text")
this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text")
this.OpenSeverWelfareRed = Util.GetGameObject(this.OpenSeverWelfare, "redpot")
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip"):GetComponent("Text").text = Language[12390]
end
@ -334,6 +336,7 @@ function FightPointPassMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--移除事件监听(用于子类重写)
@ -346,6 +349,7 @@ function FightPointPassMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--界面打开时调用(用于子类重写)
@ -418,6 +422,9 @@ function FightPointPassMainPanel:OnShow()
this.openFun:SetActive(false)
end --开服福利显示
this.UpdateOpenSeverWelfare()
PlayerManager.StarBattleUpLvTipTime(2)
this.battleUpLvTip:SetActive(false)
end
--寻宝显示
function this.UpdateFindTreasureMaterialNum()
@ -626,7 +633,7 @@ end
--界面关闭时调用(用于子类重写)
function FightPointPassMainPanel:OnClose()
PlayerManager.StopBattleUpLvTipTime()
hasLoad = false
invadeMonster:OnClose()
fightMap:Dispose()
@ -885,5 +892,8 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
end
end
end
function this.RefreshBattleUpLvTip()
this.battleUpLvTip:SetActive(true)
end
--开服福利显示 结束
return FightPointPassMainPanel

View File

@ -409,6 +409,8 @@ function this:InitComponent()
this.btnDynamicActivity = Util.GetGameObject(self.gameObject, "RightUp/dynamicActivity")
this.DynamicActivityRedPoint = Util.GetGameObject(this.btnDynamicActivity, "redPoint")
this.DynamicActivityTime = Util.GetGameObject(this.btnDynamicActivity, "time"):GetComponent("Text")--
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip"):GetComponent("Text").text = Language[12390]
end
function this:SetPosFunc(v2)
@ -952,6 +954,7 @@ function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--移除事件监听(用于子类重写)
@ -970,6 +973,7 @@ function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
@ -1090,6 +1094,8 @@ function this:OnShow()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
PlayerManager.IsGetFiveStarHero = false
end
PlayerManager.StarBattleUpLvTipTime(1)
this.battleUpLvTip:SetActive(false)
end
@ -1479,6 +1485,8 @@ end
--界面关闭时调用(用于子类重写)
function this:OnClose()
-- 关闭定时刷新数据
PlayerManager.StopBattleUpLvTipTime()
this.ChatTipView:StopCheck()
PatFaceManager.isLogin = false
--if patFaceCallList then
@ -1751,7 +1759,9 @@ end
this.sgItemView:OnOpen(false,{itemId,0},0.73)
this.sgName.text=ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name
end
function this.RefreshBattleUpLvTip()
this.battleUpLvTip:SetActive(true)
end
-- 刷新公会战图标显示
-- function this.RefreshGuildFightShow()
-- local isActive = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD)

View File

@ -384,4 +384,59 @@ function this.GetHeroDataByStar(star,staticid)
return false
end
local battleUpLvTipTime = Timer.New()
local curMianPanleLoginShowTipNum = 0
local curLevelPanleLoginShowTipNum = 0
local noShowBattleUpLvTipMaxLv = 100
function this.StarBattleUpLvTipTime(type)
local curSecound = 0
if PlayerManager.level >= noShowBattleUpLvTipMaxLv then
return
end
if not FightPointPassManager.IsShowFightRP() then
return
end
if GuideManager.IsInMainGuide() then
return
end
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
if type == 1 and curMianPanleLoginShowTipNum < 3 then--主界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("主界面停留 "..curSecound)
if curSecound >= 10 then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnShowBattleUpLvTip)
curMianPanleLoginShowTipNum = curMianPanleLoginShowTipNum + 1
end
end, 1, -1, true)
battleUpLvTipTime:Start()
elseif type == 2 and curLevelPanleLoginShowTipNum < 3 then--关卡界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("关卡界面停留 "..curSecound)
if curSecound >= 10 then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnShowBattleUpLvTip)
curLevelPanleLoginShowTipNum = curLevelPanleLoginShowTipNum + 1
end
end, 1, -1, true)
battleUpLvTipTime:Start()
end
end
function this.StopBattleUpLvTipTime()
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
end
return this