zzy/bansonic_beta_main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui基本完毕，修了一大把的bug

Browse Source
This commit is contained in:
FloatGaming
2026-07-13 02:28:39 +08:00
parent 1e20d73e90
commit fd22501f71
958 changed files with 378289 additions and 41038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/scripts/Team/settileTeam/allyHeroSlotPrefab.prefab
+92 -244
View File
@@ -29,7 +29,7 @@ RectTransform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 3426810894855294520}
- {fileID: 4787860189400675959}
- {fileID: 4600183637760829555}
- {fileID: 6563389421309098651}
- {fileID: 7481797042088762975}
- {fileID: 1351079257240028571}
@@ -39,7 +39,7 @@ RectTransform:
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: 135.9, y: 0}
m_AnchoredPosition: {x: 135.9, y: -54}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &312614768471175586
@@ -142,7 +142,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 25}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4734727163133092417
CanvasRenderer:
@@ -217,7 +217,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 129.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1347893851219428802
CanvasRenderer:
@@ -249,11 +249,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 25
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 25
m_MinSize: 14
m_MaxSize: 28
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -296,7 +296,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 129.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8957605422153280152
CanvasRenderer:
@@ -328,11 +328,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 25
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 25
m_MinSize: 14
m_MaxSize: 28
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -340,81 +340,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 350234
--- !u!1 &1300686028162242880
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7276837415997336770}
- component: {fileID: 2417251892043802145}
- component: {fileID: 7331213209788149531}
m_Layer: 0
m_Name: bottom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7276837415997336770
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1300686028162242880}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4787860189400675959}
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: -3.1, y: 3.8}
m_SizeDelta: {x: 145.324, y: 141.255}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2417251892043802145
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1300686028162242880}
m_CullTransparentMesh: 1
--- !u!114 &7331213209788149531
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1300686028162242880}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.6367924, b: 0.64803755, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &1365303792903341059
GameObject:
m_ObjectHideFlags: 0
@@ -451,7 +376,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 25}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4210288393527682798
CanvasRenderer:
@@ -525,8 +450,8 @@ RectTransform:
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: -65, y: 0}
m_SizeDelta: {x: 90, y: 30}
m_AnchoredPosition: {x: -71.489944, y: 0}
m_SizeDelta: {x: 102.9798, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8683684367698790289
CanvasRenderer:
@@ -549,7 +474,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -558,7 +483,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -605,7 +530,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 129.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8186726174179685067
CanvasRenderer:
@@ -637,11 +562,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 25
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 25
m_MinSize: 14
m_MaxSize: 28
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -675,16 +600,16 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1803836327666263803}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalPosition: {x: 0, y: 0, z: -4.84}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4787860189400675959}
m_Father: {fileID: 4148755058004053777}
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: -3, y: 4.3}
m_SizeDelta: {x: 123.437, y: 123.437}
m_AnchoredPosition: {x: -213.69046, y: 54.585762}
m_SizeDelta: {x: 600, y: 165}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1406633831322811249
CanvasRenderer:
@@ -714,7 +639,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: eec334d03c52af847bfa12dc839ac536, type: 3}
m_Sprite: {fileID: 21300000, guid: f1d5deba8c5a71c439be778c5bd9a61b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -789,7 +714,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 4573847525859265706, guid: c0dab60f28c13404fbad49de3cf86dd0, type: 3}
m_Sprite: {fileID: 21300000, guid: 7b78ab1a3117c6243a284471316b0c65, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
@@ -898,7 +823,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 129.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4306892612456958120
CanvasRenderer:
@@ -930,11 +855,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 25
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 25
m_MinSize: 14
m_MaxSize: 28
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -1023,7 +948,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3426810894855294520
RectTransform:
m_ObjectHideFlags: 0
@@ -1117,7 +1042,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 25}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7316102496420409225
CanvasRenderer:
@@ -1356,7 +1281,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8962264, g: 0.4523407, b: 0.768059, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1408,7 +1333,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 107.4343, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1151234173233781149
CanvasRenderer:
@@ -1431,7 +1356,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1440,11 +1365,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 22
m_MaxSize: 24
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -1486,8 +1411,8 @@ RectTransform:
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: -65, y: 0}
m_SizeDelta: {x: 90, y: 30}
m_AnchoredPosition: {x: -71.489944, y: 0}
m_SizeDelta: {x: 102.9798, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8439903389052874367
CanvasRenderer:
@@ -1510,7 +1435,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1519,7 +1444,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -1629,8 +1554,8 @@ RectTransform:
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: -77.114, y: 0}
m_SizeDelta: {x: 95.773, y: 30}
m_AnchoredPosition: {x: -81.71184, y: 0}
m_SizeDelta: {x: 104.9686, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3533238549364255986
CanvasRenderer:
@@ -1662,7 +1587,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -1745,8 +1670,8 @@ RectTransform:
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: -77.114, y: 0}
m_SizeDelta: {x: 95.773, y: 30}
m_AnchoredPosition: {x: -81.71184, y: 0}
m_SizeDelta: {x: 104.9686, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1513130722049452815
CanvasRenderer:
@@ -1778,7 +1703,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -1936,7 +1861,7 @@ RectTransform:
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: -324.5, y: 45.2}
m_AnchoredPosition: {x: -217.4, y: 50.8}
m_SizeDelta: {x: 233, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4531879398774622215
@@ -1981,8 +1906,8 @@ RectTransform:
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: -326.8, y: 95.52118}
m_SizeDelta: {x: 290.97, y: 40}
m_AnchoredPosition: {x: -115.5, y: 95.52118}
m_SizeDelta: {x: 336.6112, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3659676079848674504
CanvasRenderer:
@@ -2005,7 +1930,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2060,8 +1985,8 @@ RectTransform:
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_AnchoredPosition: {x: 0, y: 1.6662}
m_SizeDelta: {x: 0, y: -3.3324}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7287820284985504367
CanvasRenderer:
@@ -2084,7 +2009,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 0.09803922, g: 0.32941177, b: 0.6, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2092,8 +2017,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: bd4be44636ad6c24a9b117a7108a75e9, type: 3}
m_FontSize: 20
m_Font: {fileID: 12800000, guid: d254d20d93651ae448ff13d10dff30ab, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -2316,7 +2241,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -293.1, y: -8.57}
m_AnchoredPosition: {x: -97.1, y: -14}
m_SizeDelta: {x: 200, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &685427306910703188
@@ -2443,8 +2368,8 @@ RectTransform:
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_SizeDelta: {x: 250, y: 100}
m_AnchoredPosition: {x: 0, y: 69.49}
m_SizeDelta: {x: 250, y: 165}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6539971250549974765
MonoBehaviour:
@@ -2470,83 +2395,6 @@ MonoBehaviour:
this_allyManaRestored: {fileID: 6381579454208282139}
displayDetailContributionButton: {fileID: 2479934731397186594}
detailContributionGO: {fileID: 7749677393578589965}
--- !u!1 &6682492808549074205
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4787860189400675959}
- component: {fileID: 2643565460332953122}
- component: {fileID: 7400641254697929517}
m_Layer: 0
m_Name: shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4787860189400675959
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6682492808549074205}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -4.402}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7276837415997336770}
- {fileID: 4600183637760829555}
m_Father: {fileID: 4148755058004053777}
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: -67.251, y: 53.9}
m_SizeDelta: {x: 147.235, y: 143.112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2643565460332953122
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6682492808549074205}
m_CullTransparentMesh: 1
--- !u!114 &7400641254697929517
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6682492808549074205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.4745098}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &6853683024340712328
GameObject:
m_ObjectHideFlags: 0
@@ -2580,7 +2428,7 @@ RectTransform:
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: -177.5, y: -5.2}
m_AnchoredPosition: {x: 71.38, y: -34.55}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7151601246212580972
@@ -2684,7 +2532,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380227020462892773}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0.0001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -2692,8 +2540,8 @@ RectTransform:
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: 0.17, y: -38.91}
m_SizeDelta: {x: 301.5, y: 22.17}
m_AnchoredPosition: {x: 57.903595, y: -43.9901}
m_SizeDelta: {x: 255.7965, y: 12.0376}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7024596005729876765
CanvasRenderer:
@@ -2723,8 +2571,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 3dc2408de993d094695786359ef267aa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -2768,7 +2616,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_SizeDelta: {x: 107.4343, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4931104231077369669
CanvasRenderer:
@@ -2791,7 +2639,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2800,11 +2648,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 22
m_MaxSize: 24
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@@ -2876,7 +2724,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7692321193941902280}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0.0001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -2885,8 +2733,8 @@ RectTransform:
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: 0.01, y: -38.91}
m_SizeDelta: {x: 301.5, y: 22.17}
m_AnchoredPosition: {x: 57.67989, y: -43.9901}
m_SizeDelta: {x: 255.7965, y: 12.0376}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4552223981125847129
CanvasRenderer:
@@ -2916,8 +2764,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 3dc2408de993d094695786359ef267aa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -2965,7 +2813,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7749677393578589965}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -5.087}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -2974,8 +2822,8 @@ RectTransform:
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: -670.5, y: 54.942}
m_SizeDelta: {x: 302.667, y: 182.657}
m_AnchoredPosition: {x: 243.65, y: 53.535202}
m_SizeDelta: {x: 302.667, y: 170.0029}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &810551395488659022
CanvasRenderer:
@@ -3005,7 +2853,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Sprite: {fileID: 21300000, guid: 45682aabe328fec4a8feb3e055f1dfb2, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3051,8 +2899,8 @@ RectTransform:
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: -30.02781, y: 51.42924}
m_SizeDelta: {x: 60.056, y: 42}
m_AnchoredPosition: {x: -50.136425, y: 53.8}
m_SizeDelta: {x: 94.3793, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &79757123884187993
CanvasRenderer:
@@ -3082,8 +2930,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3}
m_Type: 1
m_Sprite: {fileID: -566881566719626471, guid: aee8077d170e84b44afd422763951685, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3232,7 +3080,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8773585, g: 0.59571314, b: 0.09518514, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -3283,8 +3131,8 @@ RectTransform:
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: -77.114, y: 0}
m_SizeDelta: {x: 95.773, y: 30}
m_AnchoredPosition: {x: -81.71184, y: 0}
m_SizeDelta: {x: 104.9686, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &492154790085150397
CanvasRenderer:
@@ -3316,7 +3164,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -3514,7 +3362,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 25}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6314649216240834215
CanvasRenderer:
@@ -3663,8 +3511,8 @@ RectTransform:
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: -77.114, y: 0}
m_SizeDelta: {x: 95.773, y: 30}
m_AnchoredPosition: {x: -81.71184, y: 0}
m_SizeDelta: {x: 104.9686, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1247215313835421715
CanvasRenderer:
@@ -3696,7 +3544,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3}
m_FontSize: 22
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
Assets/scripts/Team/settileTeam/loadSettlementTeamPrefab.cs
+3 -3
View File
@@ -151,14 +151,14 @@ public class loadSettlementTeamPrefab : MonoBehaviour
}
}
// Populate profile and name: prefer AllyHero_SO.ally_hero_squareProfile when available
// Populate profile and name: prefer AllyHero_SO.ally_hero_settleDisplay when available
bool setProfile = false;
if (resolvedHeroSO != null && card.ally_profile != null)
{
if (resolvedHeroSO.ally_hero_squareProfile != null)
if (resolvedHeroSO.ally_hero_settleDisplay != null)
{
card.ally_profile.sprite = resolvedHeroSO.ally_hero_squareProfile;
card.ally_profile.sprite = resolvedHeroSO.ally_hero_settleDisplay;
card.ally_profile.color = new Color(1f, 1f, 1f, 1f);
if (card.ally_name != null)
{