英雄合成提交

dev_chengFeng
jiaoyangna 2021-02-25 15:46:27 +08:00
parent 4c88ab3c39
commit d2dbaec760
1 changed files with 62 additions and 62 deletions

View File

@ -612,8 +612,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: -2.1, y: -0.7} m_AnchoredPosition: {x: 3.3, y: -0.7}
m_SizeDelta: {x: 157.13, y: 65.07} m_SizeDelta: {x: 224.7, y: 65.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8959010406455042723 --- !u!222 &8959010406455042723
CanvasRenderer: CanvasRenderer:
@ -647,14 +647,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45 m_FontSize: 45
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 3 m_MinSize: 30
m_MaxSize: 50 m_MaxSize: 45
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u4FDD \u5B58" m_Text: "\u4FDD \u5B58"
LanguageIndex: 10154 LanguageIndex: 10154
@ -692,8 +692,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: -2.1, y: -0.7} m_AnchoredPosition: {x: 3.3, y: -0.7}
m_SizeDelta: {x: 157.13, y: 65.07} m_SizeDelta: {x: 231.8, y: 65.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &705223605821546011 --- !u!222 &705223605821546011
CanvasRenderer: CanvasRenderer:
@ -727,14 +727,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45 m_FontSize: 45
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 3 m_MinSize: 30
m_MaxSize: 50 m_MaxSize: 45
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u53D6 \u6D88" m_Text: "\u53D6 \u6D88"
LanguageIndex: 10154 LanguageIndex: 10154
@ -3461,8 +3461,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: -2.1, y: -0.7} m_AnchoredPosition: {x: 2.4, y: -0.7}
m_SizeDelta: {x: 157.13, y: 65.07} m_SizeDelta: {x: 198, y: 65.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2800373821544653964 --- !u!222 &2800373821544653964
CanvasRenderer: CanvasRenderer:
@ -3496,14 +3496,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45 m_FontSize: 45
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 3 m_MinSize: 30
m_MaxSize: 50 m_MaxSize: 45
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u7F6E \u6362" m_Text: "\u7F6E \u6362"
LanguageIndex: 10154 LanguageIndex: 10154
@ -4839,9 +4839,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 50 m_FontSize: 50
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 2 m_MinSize: 30
m_MaxSize: 52 m_MaxSize: 50
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -5774,7 +5774,7 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 320, y: -50} m_AnchoredPosition: {x: 252.605, y: -50}
m_SizeDelta: {x: 295.63, y: 84.151} m_SizeDelta: {x: 295.63, y: 84.151}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6409632249533919607 --- !u!222 &6409632249533919607
@ -10781,14 +10781,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45 m_FontSize: 45
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 3 m_MinSize: 30
m_MaxSize: 50 m_MaxSize: 45
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u5408 \u6210" m_Text: "\u5408 \u6210"
LanguageIndex: 10154 LanguageIndex: 10154
@ -14200,7 +14200,7 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 760, y: -50} m_AnchoredPosition: {x: 827.39496, y: -50}
m_SizeDelta: {x: 295.63, y: 84.151} m_SizeDelta: {x: 295.63, y: 84.151}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &84778641384471247 --- !u!222 &84778641384471247
@ -14419,7 +14419,17 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
@ -14444,21 +14454,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &4004229281899235646 stripped --- !u!224 &4004229281899235646 stripped
@ -14589,7 +14589,12 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
@ -14614,12 +14619,7 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
@ -14749,7 +14749,17 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
@ -14774,21 +14784,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 3.2600002 value: 3.2600002
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &7450908413297485914 stripped --- !u!224 &7450908413297485914 stripped