【灵兽系统】 修改bug

zhangqiang 2020-10-28 11:48:36 +08:00
parent 83014b4f7d
commit e60d24f9a3
14 changed files with 117 additions and 96 deletions

View File

@ -719,7 +719,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.5} m_AnchoredPosition: {x: -162.9, y: 3.5}
m_SizeDelta: {x: 38, y: 28} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &797751979057340142 --- !u!222 &797751979057340142
CanvasRenderer: CanvasRenderer:
@ -749,7 +749,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1635,7 +1635,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -165, y: 7.5} m_AnchoredPosition: {x: -165, y: 7.5}
m_SizeDelta: {x: 38, y: 34} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &797336218532973764 --- !u!222 &797336218532973764
CanvasRenderer: CanvasRenderer:
@ -1665,7 +1665,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1708,10 +1708,10 @@ RectTransform:
m_Father: {fileID: 1974730884724144738} m_Father: {fileID: 1974730884724144738}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 75, y: -285}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798130740508122842 --- !u!222 &798130740508122842
CanvasRenderer: CanvasRenderer:
@ -1756,7 +1756,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 6.8} m_AnchoredPosition: {x: -162.9, y: 6.8}
m_SizeDelta: {x: 24, y: 34} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798257669748220544 --- !u!222 &798257669748220544
CanvasRenderer: CanvasRenderer:
@ -1786,7 +1786,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -2186,7 +2186,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.4} m_AnchoredPosition: {x: -162.9, y: 3.4}
m_SizeDelta: {x: 30, y: 38} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798224863221350350 --- !u!222 &798224863221350350
CanvasRenderer: CanvasRenderer:
@ -2216,7 +2216,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -3823,10 +3823,10 @@ RectTransform:
m_Father: {fileID: 1974730884724144738} m_Father: {fileID: 1974730884724144738}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 75, y: -105}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1976417882928787122 --- !u!222 &1976417882928787122
CanvasRenderer: CanvasRenderer:

View File

@ -7924,8 +7924,8 @@ MonoBehaviour:
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 1
m_VerticalOverflow: 0 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u699C\u5355\u4E3A\u7A7A" m_Text: "\u699C\u5355\u4E3A\u7A7A"
LanguageIndex: 10239 LanguageIndex: 10239

View File

@ -257,7 +257,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167, y: 2.7999992} m_AnchoredPosition: {x: -167, y: 2.7999992}
m_SizeDelta: {x: 30, y: 38} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222481059554260102 --- !u!222 &222481059554260102
CanvasRenderer: CanvasRenderer:
@ -287,7 +287,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -947,7 +947,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167, y: 2.7999992} m_AnchoredPosition: {x: -167, y: 2.7999992}
m_SizeDelta: {x: 38, y: 34} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222567242587202814 --- !u!222 &222567242587202814
CanvasRenderer: CanvasRenderer:
@ -977,7 +977,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1450,7 +1450,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167, y: 2.7999992} m_AnchoredPosition: {x: -167, y: 2.7999992}
m_SizeDelta: {x: 38, y: 28} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222862651648804964 --- !u!222 &222862651648804964
CanvasRenderer: CanvasRenderer:
@ -1480,7 +1480,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1989,7 +1989,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167, y: 2.7999992} m_AnchoredPosition: {x: -167, y: 2.7999992}
m_SizeDelta: {x: 30, y: 40} m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222675800132168886 --- !u!222 &222675800132168886
CanvasRenderer: CanvasRenderer:
@ -2019,7 +2019,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -3291,7 +3291,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167, y: 2.7999992} m_AnchoredPosition: {x: -167, y: 2.7999992}
m_SizeDelta: {x: 24, y: 34} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222364655859266858 --- !u!222 &222364655859266858
CanvasRenderer: CanvasRenderer:
@ -3321,7 +3321,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

View File

@ -1833,7 +1833,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -165.3, y: 3.1} m_AnchoredPosition: {x: -165.3, y: 3.1}
m_SizeDelta: {x: 33.13, y: 24.41} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &48855175827932511 --- !u!222 &48855175827932511
CanvasRenderer: CanvasRenderer:
@ -1863,7 +1863,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -3087,7 +3087,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -163.6, y: 3.1} m_AnchoredPosition: {x: -163.6, y: 3.1}
m_SizeDelta: {x: 20.51, y: 29.05} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4446688450659526956 --- !u!222 &4446688450659526956
CanvasRenderer: CanvasRenderer:
@ -3117,7 +3117,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -3842,7 +3842,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -165.3, y: 4.23} m_AnchoredPosition: {x: -165.3, y: 4.23}
m_SizeDelta: {x: 28.22, y: 35.75} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &436989753160709639 --- !u!222 &436989753160709639
CanvasRenderer: CanvasRenderer:
@ -3872,7 +3872,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -4683,9 +4683,9 @@ RectTransform:
m_Father: {fileID: 4624725292118211212} m_Father: {fileID: 4624725292118211212}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 155.29999, y: -50} m_AnchoredPosition: {x: 155.29999, y: 0}
m_SizeDelta: {x: 0, y: 100.75} m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2932693287766199764 --- !u!222 &2932693287766199764
@ -4927,10 +4927,10 @@ RectTransform:
m_Father: {fileID: 5965757037642302380} m_Father: {fileID: 5965757037642302380}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 75, y: -275}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6285193575067262387 --- !u!222 &6285193575067262387
CanvasRenderer: CanvasRenderer:
@ -4975,7 +4975,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -167.54, y: 3.1} m_AnchoredPosition: {x: -167.54, y: 3.1}
m_SizeDelta: {x: 33.53, y: 30} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3584701828980934667 --- !u!222 &3584701828980934667
CanvasRenderer: CanvasRenderer:
@ -5005,7 +5005,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -5519,10 +5519,10 @@ RectTransform:
m_Father: {fileID: 5965757037642302380} m_Father: {fileID: 5965757037642302380}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 75, y: -115}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8424932215199477144 --- !u!222 &8424932215199477144
CanvasRenderer: CanvasRenderer:

View File

@ -2683,7 +2683,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 19, y: 0} m_AnchoredPosition: {x: 19, y: 0}
m_SizeDelta: {x: 38, y: 28} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7986682960859058855 --- !u!222 &7986682960859058855
CanvasRenderer: CanvasRenderer:
@ -2713,7 +2713,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -7957,7 +7957,7 @@ ParticleSystem:
--- !u!199 &4438878257103928366 --- !u!199 &4438878257103928366
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -9713,7 +9713,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 19, y: 0} m_AnchoredPosition: {x: 19, y: 0}
m_SizeDelta: {x: 24, y: 34} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8787225431285198687 --- !u!222 &8787225431285198687
CanvasRenderer: CanvasRenderer:
@ -9743,7 +9743,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -11899,7 +11899,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 19, y: 0} m_AnchoredPosition: {x: 19, y: 0}
m_SizeDelta: {x: 30, y: 38} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8932703381685927677 --- !u!222 &8932703381685927677
CanvasRenderer: CanvasRenderer:
@ -11929,7 +11929,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -17476,7 +17476,7 @@ ParticleSystem:
--- !u!199 &5360006036325542636 --- !u!199 &5360006036325542636
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -20007,7 +20007,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 19, y: 0} m_AnchoredPosition: {x: 19, y: 0}
m_SizeDelta: {x: 38, y: 34} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5234115287811132633 --- !u!222 &5234115287811132633
CanvasRenderer: CanvasRenderer:
@ -20037,7 +20037,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

View File

@ -62407,7 +62407,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -165, y: 7.5} m_AnchoredPosition: {x: -165, y: 7.5}
m_SizeDelta: {x: 38, y: 34} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4698054813086648997 --- !u!222 &4698054813086648997
CanvasRenderer: CanvasRenderer:
@ -62437,7 +62437,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -64683,7 +64683,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.5} m_AnchoredPosition: {x: -162.9, y: 3.5}
m_SizeDelta: {x: 38, y: 28} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1899064678678648267 --- !u!222 &1899064678678648267
CanvasRenderer: CanvasRenderer:
@ -64713,7 +64713,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -67216,8 +67216,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.4} m_AnchoredPosition: {x: -164.8, y: 3.4}
m_SizeDelta: {x: 30, y: 38} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5404277517500071059 --- !u!222 &5404277517500071059
CanvasRenderer: CanvasRenderer:
@ -67247,7 +67247,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -67951,8 +67951,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.5} m_AnchoredPosition: {x: -164.8, y: 3.5}
m_SizeDelta: {x: 38, y: 28} m_SizeDelta: {x: 53, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5403804700344196531 --- !u!222 &5403804700344196531
CanvasRenderer: CanvasRenderer:
@ -67982,7 +67982,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9660e6c75a612964a93f5e3427660237, type: 3} m_Sprite: {fileID: 21300000, guid: 8dc56930a36d721459859b17d252448a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -68763,8 +68763,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -163.9, y: 7} m_AnchoredPosition: {x: -164.8, y: 2.8}
m_SizeDelta: {x: 30, y: 40} m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5404266243847186345 --- !u!222 &5404266243847186345
CanvasRenderer: CanvasRenderer:
@ -68794,7 +68794,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -70025,8 +70025,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -165, y: 7.5} m_AnchoredPosition: {x: -164.8, y: 7.5}
m_SizeDelta: {x: 38, y: 34} m_SizeDelta: {x: 63, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5403388939551625113 --- !u!222 &5403388939551625113
CanvasRenderer: CanvasRenderer:
@ -70056,7 +70056,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9d33140cb59bbbe4e91fe32051c139fd, type: 3} m_Sprite: {fileID: 21300000, guid: d8e1d4d4757a0d347996ab69bb6a9dc4, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -70681,8 +70681,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 6.8} m_AnchoredPosition: {x: -164.8, y: 6.8}
m_SizeDelta: {x: 24, y: 34} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5404319085793845725 --- !u!222 &5404319085793845725
CanvasRenderer: CanvasRenderer:
@ -70712,7 +70712,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -73950,7 +73950,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -163.9, y: 7} m_AnchoredPosition: {x: -163.9, y: 7}
m_SizeDelta: {x: 30, y: 40} m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7094696430322536921 --- !u!222 &7094696430322536921
CanvasRenderer: CanvasRenderer:
@ -73980,7 +73980,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3} m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -76248,7 +76248,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 6.8} m_AnchoredPosition: {x: -162.9, y: 6.8}
m_SizeDelta: {x: 24, y: 34} m_SizeDelta: {x: 68, y: 67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4912067356288216712 --- !u!222 &4912067356288216712
CanvasRenderer: CanvasRenderer:
@ -76278,7 +76278,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e210732dc67423e4697757b14a4f1f50, type: 3} m_Sprite: {fileID: 21300000, guid: c8d51ec1fe424c74cbc2608448f65b1e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -78113,7 +78113,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: -162.9, y: 3.4} m_AnchoredPosition: {x: -162.9, y: 3.4}
m_SizeDelta: {x: 30, y: 38} m_SizeDelta: {x: 64, y: 57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5394742500617632117 --- !u!222 &5394742500617632117
CanvasRenderer: CanvasRenderer:
@ -78143,7 +78143,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7bda2cc0686a7054ea94c954c07f64b0, type: 3} m_Sprite: {fileID: 21300000, guid: 1db160042df15474cb3005186d26c3ee, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

View File

@ -572,8 +572,8 @@ PropertyTypeIconDef = {
-- [5] = "r_hero_sudu", -- [5] = "r_hero_sudu",
[1] = "r_hero_jinengdian01", [1] = "r_hero_jinengdian01",
[2] = "r_hero_jinengdian02", [2] = "r_hero_jinengdian02",
[3] = "r_hero_jinengdian03", [3] = "r_hero_jinengdian04",
[4] = "r_hero_jinengdian04", [4] = "r_hero_jinengdian03",
[5] = "r_hero_jinengdian05", [5] = "r_hero_jinengdian05",
} }

View File

@ -12,7 +12,7 @@ function PokemonGetInfoPopup:InitComponent()
this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack") this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack")
this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot") this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot")
this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text") this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text")
this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/PokemonInfo/starGrid(Clone)") this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)")
--属性 --属性
for i = 0, 4 do for i = 0, 4 do

View File

@ -171,6 +171,8 @@ function PokemonInfoPanel:BindEvent()
--飘战力 --飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end) end)
this.OnShowData()
-- this.OnShowRedPoint()
end) end)
end end

View File

@ -185,7 +185,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
PokemonGoListRedPoin[liveIndex]:SetActive(upLvRed or upStarRed) PokemonGoListRedPoin[liveIndex]:SetActive(upLvRed or upStarRed)
upZhenInfo:SetActive(true) upZhenInfo:SetActive(true)
Util.GetGameObject(go, "upZhenInfo/titleImage/nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curData.id).Name Util.GetGameObject(go, "upZhenInfo/titleImage/nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curData.id).Name
Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = "等级"..curData.lv Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..""
local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive") local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")
for key, value in pairs(live2dList) do for key, value in pairs(live2dList) do
if key == liveIndex then if key == liveIndex then
@ -200,7 +200,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
local starSize = Vector2.New(65,65) local starSize = Vector2.New(65,65)
PokemonManager.SetHeroStars(Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), curData.star,1,starSize) PokemonManager.SetHeroStars(Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), curData.star,1,starSize)
-- Util.AddOnceClick( Util.GetGameObject(go, "upZhenInfo/upZhenClick"), function() -- Util.AddOnceClick( Util.GetGameObject(go, "upZhenInfo/upZhenClick"), function()
-- UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonDatas()) -- UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonUpZhenDatas())
-- end) -- end)
--英雄长按 --英雄长按
local heroClick=Util.GetGameObject(PokemonList[liveIndex],"DragView"..liveIndex) local heroClick=Util.GetGameObject(PokemonList[liveIndex],"DragView"..liveIndex)
@ -208,7 +208,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
-- end, 0.5) -- end, 0.5)
Util.AddOnceClick(heroClick, function() Util.AddOnceClick(heroClick, function()
if isClick then if isClick then
UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonDatas()) UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonUpZhenDatas())
end end
end) end)
end end

View File

@ -90,6 +90,16 @@ function this.GetPokemonDatas()
return list return list
end end
--获取所有灵兽数据 --获取所有灵兽数据
function this.GetPokemonUpZhenDatas()
local formationUpZhens = {}
for i = 1, #pokemonFormation do
if pokemons[pokemonFormation[i].pokemonId] then
table.insert(formationUpZhens, pokemons[pokemonFormation[i].pokemonId])
end
end
return formationUpZhens
end
--获取所有灵兽数据
function this.GetPokemonResolveDatas() function this.GetPokemonResolveDatas()
local curAllPokemonList = {} local curAllPokemonList = {}
local list=this.GetAllPokemonFormationDids() local list=this.GetAllPokemonFormationDids()
@ -111,14 +121,19 @@ for i = 1,#ids do
this.RemoveSinglePokemonData(id) this.RemoveSinglePokemonData(id)
end end
end end
--获取当前可上阵的所有灵兽数据 --获取当前可上阵的所有灵兽数据 curUpZhenPokemonData 如果不为空就时替换上阵操作
function this.GetCanUpZhenPokemonDatas() function this.GetCanUpZhenPokemonDatas(curUpZhenPokemonData)
local upZhenSidList = this.GetAllPokemonFormationSids() local upZhenSidList = this.GetAllPokemonFormationSids()
local curAllPokemonList = {} local curAllPokemonList = {}
for key, value in pairs(pokemons) do for key, value in pairs(pokemons) do
if not upZhenSidList[value.id] then if not upZhenSidList[value.id] then
table.insert(curAllPokemonList,value) table.insert(curAllPokemonList,value)
end end
if curUpZhenPokemonData then
if value.id == curUpZhenPokemonData.id and value.dynamicId ~= curUpZhenPokemonData.dynamicId then
table.insert(curAllPokemonList,value)
end
end
end end
return curAllPokemonList return curAllPokemonList
end end

View File

@ -141,9 +141,9 @@ function PokemonUpStarSuccessPanel:OnOpen(_curPokemonData)
local curUpStarConfig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId) local curUpStarConfig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
local nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId) local nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId)
this.skillImg1.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon)) this.skillImg1.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon))
this.skillLvTxt2.text = nextSkillId%10 this.skillLvTxt2.text = nextSkillConFig.Level
this.skillImg.sprite = Util.LoadSprite(GetResourcePath(curUpStarConfig.Icon)) this.skillImg.sprite = Util.LoadSprite(GetResourcePath(curUpStarConfig.Icon))
this.skillLvTxt1.text = curSkillId%10 this.skillLvTxt1.text = curUpStarConfig.Level
end end
function PokemonUpStarSuccessPanel:GetEquipSkillData(skillId) function PokemonUpStarSuccessPanel:GetEquipSkillData(skillId)

View File

@ -131,7 +131,7 @@ function this.SingPokemonDataShow(_go,_itemData)
local starSize = Vector2.New(50,50) local starSize = Vector2.New(50,50)
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5)) SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas())
end) end)
end end
function this.SingPokemonChipDataShow(_go,_itemData) function this.SingPokemonChipDataShow(_go,_itemData)

View File

@ -40,7 +40,11 @@ function this:OnShow(_parent,_curUpZhenPokemonData,_upZhenIndex)
parent = _parent parent = _parent
curUpZhenPokemonData = _curUpZhenPokemonData curUpZhenPokemonData = _curUpZhenPokemonData
upZhenIndex = _upZhenIndex upZhenIndex = _upZhenIndex
polemonList = PokemonManager.GetCanUpZhenPokemonDatas() if curUpZhenPokemonData then
polemonList = PokemonManager.GetCanUpZhenPokemonDatas(curUpZhenPokemonData)
else
polemonList = PokemonManager.GetCanUpZhenPokemonDatas()
end
table.sort(polemonList, function(a,b) table.sort(polemonList, function(a,b)
if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then
if a.star == b.star then if a.star == b.star then
@ -96,7 +100,7 @@ function this.SingleItemDataShow(_go,_itemData)
FormationManager.CheckHeroIdExist() FormationManager.CheckHeroIdExist()
local pokemonInfoPanem = UIManager.GetOpenPanel(UIName.PokemonInfoPanel) local pokemonInfoPanem = UIManager.GetOpenPanel(UIName.PokemonInfoPanel)
if pokemonInfoPanem then if pokemonInfoPanem then
pokemonInfoPanem.RefreshShow(_itemData,PokemonManager.GetPokemonDatas()) pokemonInfoPanem.RefreshShow(_itemData,PokemonManager.GetPokemonUpZhenDatas())
end end
parent:ClosePanel() parent:ClosePanel()
end) end)
@ -132,7 +136,7 @@ function this.SingleItemDataShow(_go,_itemData)
end end
end) end)
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas())
end) end)
end end