Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2022-01-17 13:16:30 +08:00
commit e3196e3ca2
5 changed files with 406 additions and 406 deletions

View File

@ -10200,7 +10200,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -1169.8, y: -424}
m_AnchoredPosition: {x: -1169.8, y: -87}
m_SizeDelta: {x: 996.2, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2414119284287361633
@ -13528,132 +13528,212 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_ChildAlignment
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_Spacing
value: -14
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 431.13998
objectReference: {fileID: 0}
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 553.57996
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 318.19998
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 676.0199
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 96.625
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 183.625
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 275.97998
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74.875
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 149.32
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 35.5
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 92.5
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 149.5
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 206.5
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
@ -13688,136 +13768,36 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 35.5
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 149.32
objectReference: {fileID: 0}
- target: {fileID: 1552937397343116657, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 191.54
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 233.76
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 275.97998
objectReference: {fileID: 0}
- target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 318.19998
objectReference: {fileID: 0}
- target: {fileID: 5076453627374576286, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
@ -13838,22 +13818,152 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 431.13998
value: 92.5
objectReference: {fileID: 0}
- target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 206.5
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 233.76
objectReference: {fileID: 0}
- target: {fileID: 1552889887292315181, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 149.5
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.x
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_SizeDelta.y
value: 71
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 191.54
objectReference: {fileID: 0}
- target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 614.7999
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
@ -13878,102 +13988,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 553.57996
value: 140.125
objectReference: {fileID: 0}
- target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 614.7999
objectReference: {fileID: 0}
- target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 676.0199
objectReference: {fileID: 0}
- target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -11
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74.875
objectReference: {fileID: 0}
- target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 96.625
objectReference: {fileID: 0}
- target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
@ -13998,26 +14028,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 140.125
objectReference: {fileID: 0}
- target: {fileID: 67836317274450090, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 632629919765873551, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
@ -14038,92 +14048,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -44.71
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 7369835203180901237, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 183.625
objectReference: {fileID: 0}
- target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -44.71
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5251871090314339625, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627294551272884993, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627917913997089859, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627430950262272671, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1626450299968751741, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627087403431368471, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1626374441078482171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627785274346046325, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627007613516185809, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627016296001056047, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5589626010518342017, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7369835203180901237, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5477929200912148599, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2200092791510044952, guid: 36dd48caaba02124b8d95a5eddd29b90,
- target: {fileID: 5589626010518342017, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
@ -14138,6 +14078,66 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627294551272884993, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627430950262272671, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627016296001056047, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627007613516185809, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627087403431368471, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627785274346046325, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1627917913997089859, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1626450299968751741, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1626374441078482171, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_ChildAlignment
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_Spacing
value: -14
objectReference: {fileID: 0}
- target: {fileID: 2200092791510044952, guid: 36dd48caaba02124b8d95a5eddd29b90,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3}
--- !u!224 &7447251510531149251 stripped

View File

@ -1503,7 +1503,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: -0.000015259, y: 0.0000017881}
m_AnchoredPosition: {x: 0, y: 0.0000017881}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7774098811719839289

View File

@ -679,7 +679,7 @@ function this.SetFightBtnText()
this.fightLock:SetActive(false)
this.fightSaoGuang:SetActive(true)
-- 没在主线引导种就显示小手
this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide())
this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight)
if not isCounting then
if not isPass then

View File

@ -127,13 +127,14 @@ function this.SingleHeroDataShow(go,_heroData,_index)
icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name)
proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
else
name.text = SubString2(GetLanguageStrById(heroData.Name),8)
icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.ResourceID].Name)
proIcon.gameObject:SetActive(false)
starGrid:SetActive(false)
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quantity,heroData.Star))
end
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
this.choosedList[go] = choosed
this.choosedList[go]:SetActive( heroData.Id==currHeroId)

View File

@ -378,7 +378,7 @@ function this.GetSkillsData()
if curHeroData.heroConfig.OpenSkillRules then
for i = 1, #curHeroData.heroConfig.OpenSkillRules do
if not skillIdList[curHeroData.heroConfig.OpenSkillRules[i][2]] then
if curHeroData.heroConfig.OpenSkillRules[i][1] == curHeroData.star then
local heroSkill = {}
heroSkill.skillId = curHeroData.heroConfig.OpenSkillRules[i][2]
heroSkill.skillConfig = skillConfig[heroSkill.skillId]
@ -392,7 +392,6 @@ function this.GetSkillsData()
heroSkill.state = 0
end
heroSkill.quality = 0 --是否白金背景框
skillIdList[curHeroData.heroConfig.OpenSkillRules[i][2]] = curHeroData.heroConfig.OpenSkillRules[i][2]
table.insert(skillList, heroSkill)
end
end
@ -755,8 +754,8 @@ function this:UpdateHeroUpLvAndBreakData()
this.upLvBtnText.text=Language[11063]
if isHeroUpStar and curStarRankUpConfig and curHeroData.lv >= curStarRankUpConfig.OpenLevel then--当前突破全部完成
this.tipUpLv.text=Language[11804]
this.tipUpLv.gameObject:SetActive(true)
this.itemGrid.gameObject:SetActive(false)
this.tipUpLv.gameObject:SetActive(false)
this.itemGrid.gameObject:SetActive(true)
else
this.itemGrid.gameObject:SetActive(true)
this.tipUpLv.gameObject:SetActive(false)