Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-09-03 14:42:41 +08:00
commit b7f59ef2fe
6 changed files with 118 additions and 70 deletions

View File

@ -136,7 +136,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 263, y: -32.8}
m_SizeDelta: {x: 221, y: 70}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2256811987525152314
CanvasRenderer:
@ -326,8 +326,8 @@ 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: 4.35, y: -1206.9}
m_SizeDelta: {x: 915.9, y: 1398.5}
m_AnchoredPosition: {x: 4.35, y: -1129.4}
m_SizeDelta: {x: 915.9, y: 1243.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5399186556472212939
CanvasRenderer:
@ -582,7 +582,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: 248.6, y: -102.1}
m_AnchoredPosition: {x: 248.6, y: -102.100006}
m_SizeDelta: {x: 407.5, y: 148}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4472731735553598297
@ -660,10 +660,10 @@ RectTransform:
m_Father: {fileID: 7783633391680431993}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 161.5, y: -50}
m_SizeDelta: {x: 323, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 161.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1351034079552654768
CanvasRenderer:
@ -756,7 +756,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 34.78, y: -1.6}
m_AnchoredPosition: {x: 34.78, y: -1.6000004}
m_SizeDelta: {x: 142.81, y: 44}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4824700586369134579
@ -838,7 +838,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -833.7}
m_SizeDelta: {x: 697, y: 100}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1971654865613040459
MonoBehaviour:
@ -910,10 +910,10 @@ RectTransform:
m_Father: {fileID: 906049199719874035}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40, y: -35}
m_SizeDelta: {x: 60, y: 60}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7335453166429728696
CanvasRenderer:
@ -1248,7 +1248,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.0007324219, y: -960}
m_AnchoredPosition: {x: -0.00048828125, y: -960}
m_SizeDelta: {x: 0, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5796909022957603520
@ -1291,10 +1291,10 @@ RectTransform:
m_Father: {fileID: 906049199719874035}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.5, y: -35}
m_SizeDelta: {x: 55, y: 42}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4651359224063894704
CanvasRenderer:
@ -1376,7 +1376,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: 0.0012589, y: -26.19}
m_AnchoredPosition: {x: 0.0012589, y: -26.190002}
m_SizeDelta: {x: 819.2, y: 41.2}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3977152365312893247
@ -1982,10 +1982,10 @@ RectTransform:
m_Father: {fileID: 906049199719874035}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 163, y: -35}
m_SizeDelta: {x: 76, y: 42}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &787326365672907703
CanvasRenderer:
@ -2065,10 +2065,10 @@ RectTransform:
m_Father: {fileID: 7783633391680431993}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 510, y: -50}
m_SizeDelta: {x: 374, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 510, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2009070379428583229
CanvasRenderer:
@ -2424,12 +2424,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 453.13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2449,7 +2449,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2459,7 +2459,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2496,6 +2496,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 34096667903366304}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -2590,12 +2595,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 55
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2615,7 +2620,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2625,7 +2630,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2662,6 +2667,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 1273557018881095601}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -2756,12 +2766,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 718.55005
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2781,7 +2791,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2791,7 +2801,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2828,6 +2838,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 1767756772196429038}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -2922,12 +2937,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 585.84
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2947,7 +2962,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2957,7 +2972,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -2994,6 +3009,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 4219484961250095739}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -3145,6 +3165,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 6079698517707254614}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -3239,12 +3264,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 320.42
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3264,7 +3289,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3274,7 +3299,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3311,6 +3336,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 6083692090863145194}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic
@ -3405,12 +3435,12 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.71
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11.285004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3430,7 +3460,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3440,7 +3470,7 @@ PrefabInstance:
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
@ -3477,6 +3507,11 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 8951759513183077380}
- target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -20.10991
objectReference: {fileID: 0}
- target: {fileID: 114849291644005080, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_TargetGraphic

View File

@ -262,7 +262,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 798.3333, y: 0}
m_AnchoredPosition: {x: 798.3334, y: 0}
m_SizeDelta: {x: 0, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3367264998638970422
@ -2377,10 +2377,10 @@ RectTransform:
m_Father: {fileID: 3512015996234104856}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.19995117, y: -14.5998535}
m_SizeDelta: {x: -145.59998, y: -566.80005}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.19970703, y: -14.599609}
m_SizeDelta: {x: 934.4, y: 1353.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2077485594265078656
CanvasRenderer:
@ -2425,7 +2425,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 444.20004, y: 0}
m_AnchoredPosition: {x: 444.3973, y: 0}
m_SizeDelta: {x: 0, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7129089383934625793
@ -2746,7 +2746,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 110.06668, y: 0}
m_AnchoredPosition: {x: 110.26398, y: 0}
m_SizeDelta: {x: 0, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4483062210050947174
@ -2993,9 +2993,9 @@ RectTransform:
m_Father: {fileID: 3401751871378385210}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -37.400024}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 437.3003, y: 642.3994}
m_SizeDelta: {x: 154, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7183669889968209727

View File

@ -7896,7 +7896,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -5.399994, y: 0.000015258789}
m_AnchoredPosition: {x: -5.400017, y: 0.000015258789}
m_SizeDelta: {x: -2.31, y: 2.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6142383359161775238
@ -9822,8 +9822,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: 362.49, y: -3.3000002}
m_SizeDelta: {x: 260, y: 85.18}
m_AnchoredPosition: {x: 339.6, y: -6}
m_SizeDelta: {x: 206.9, y: 85.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4083432037181998826
CanvasRenderer:

View File

@ -339,7 +339,7 @@ RectTransform:
m_GameObject: {fileID: 95045264735371009}
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_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_Children:
- {fileID: 2070310993920017823}
- {fileID: 6309065450508331899}

View File

@ -3143,8 +3143,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.000019312, y: 280}
m_SizeDelta: {x: 867.1, y: 559}
m_AnchoredPosition: {x: -2, y: 280}
m_SizeDelta: {x: 855, y: 559}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2584689189113158197
CanvasRenderer:

View File

@ -67,17 +67,30 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa
curHeroData = _curHeroData
heroDataList = heroData
this.HeroSortData(heroDataList)
local text = ""
for i, v in pairs(heroDataList) do
text = ""
for n,w in pairs(FormationManager.formationList) do
if HeroManager.heroResolveLicence[n] then
for m = 1, #w.teamHeroInfos do
if v.dynamicId==w.teamHeroInfos[m].heroId then
local isFormationStr = HeroManager.GetHeroFormationStr(n)
v.isFormation = isFormationStr
local isFormationStr = HeroManager.GetHeroFormationStr2(n)
if isFormationStr ~= "" then
if not text or text == "" then
text = isFormationStr
else
text = text .. ""..isFormationStr
end
end
end
end
end
end
if not text or text == "" then
v.isFormation = ""
else
v.isFormation = Language[12317]..text..Language[12318]
end
end
this.ScrollView:SetData(heroDataList, function (index, go)
this.OnShowSingleCardData(go, heroDataList[index])