玉虚论道修改提交

tcx_xiyou_dev
wangzhenxing 2024-06-20 16:42:11 +08:00
parent fa6951eeb5
commit 5488167a03
12 changed files with 115 additions and 111 deletions

View File

@ -16813,7 +16813,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2630230425263427918
RectTransform:
m_ObjectHideFlags: 0
@ -33518,10 +33518,10 @@ RectTransform:
m_Father: {fileID: 115694237416065773}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 660, y: -50}
m_SizeDelta: {x: 100, y: 100}
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 &3607171404251934009
CanvasRenderer:
@ -33960,10 +33960,10 @@ RectTransform:
m_Father: {fileID: 115694237416065773}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 530, y: -50}
m_SizeDelta: {x: 100, y: 100}
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 &8308433149144992891
CanvasRenderer:
@ -35760,13 +35760,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3824337609566115805}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2630230425263427918}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 51, y: -3}
@ -44819,10 +44819,10 @@ RectTransform:
m_Father: {fileID: 115694237416065773}
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: 400, y: -50}
m_SizeDelta: {x: 100, y: 100}
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 &105454248851415610
CanvasRenderer:
@ -45106,10 +45106,10 @@ RectTransform:
m_Father: {fileID: 115694237416065773}
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: 270, y: -50}
m_SizeDelta: {x: 100, y: 100}
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 &1848064796532263474
CanvasRenderer:
@ -59498,10 +59498,10 @@ RectTransform:
m_Father: {fileID: 115694237416065773}
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: 140, y: -50}
m_SizeDelta: {x: 100, y: 100}
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 &4831524505693211873
CanvasRenderer:
@ -64728,13 +64728,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8671713735291657867}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: -0, z: 0.7071068, w: -0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2630230425263427918}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -62, y: -5}
@ -70888,6 +70888,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9150473775991467309}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero3
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -70993,11 +70998,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero3
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71153,6 +71153,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8529720924324740287}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero5
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71258,11 +71263,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero5
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71418,6 +71418,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9217593613593484662}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero4
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71523,11 +71528,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero4
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71683,6 +71683,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8666194580951687547}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero2
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -71788,11 +71793,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero2
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -71948,6 +71948,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5148286579852869320}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero6
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -72053,11 +72058,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero6
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
@ -72213,6 +72213,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224384744912223984}
m_Modifications:
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -72318,11 +72323,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Name
value: Hero1
objectReference: {fileID: 0}
- target: {fileID: 7379223515494313326, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y

View File

@ -2824,7 +2824,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: 113.2, y: 2}
m_AnchoredPosition: {x: 210, y: -8}
m_SizeDelta: {x: 536.7, y: 201.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5854636527671152782
@ -4368,8 +4368,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: 71.99423, y: 146.98822}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -1.6, y: 146.98822}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3048763726287909807
CanvasRenderer:
@ -5218,7 +5218,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: 133, y: 2}
m_AnchoredPosition: {x: 231, y: -8}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4281072079343303152
@ -10119,7 +10119,7 @@ ParticleSystem:
--- !u!199 &183811353441062434
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15983,7 +15983,7 @@ ParticleSystem:
--- !u!199 &3726496062862187039
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -22322,7 +22322,7 @@ ParticleSystem:
--- !u!199 &1828999986466696245
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -27613,7 +27613,7 @@ ParticleSystem:
--- !u!199 &7169494131298017607
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33244,7 +33244,7 @@ ParticleSystem:
--- !u!199 &4730220943101630174
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35177,8 +35177,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: 71.99423, y: 146.98822}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -1.6, y: 146.98822}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1916806291817143507
CanvasRenderer:
@ -40279,7 +40279,7 @@ ParticleSystem:
--- !u!199 &8377234745172345827
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -45040,7 +45040,7 @@ ParticleSystem:
--- !u!199 &2112434876054886735
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -45282,7 +45282,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: 133, y: 2}
m_AnchoredPosition: {x: 231, y: -6}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3049775422171072649
@ -52042,7 +52042,7 @@ ParticleSystem:
--- !u!199 &7853062081848821078
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -55491,7 +55491,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: 113.2, y: 2}
m_AnchoredPosition: {x: 210, y: -10}
m_SizeDelta: {x: 536.7, y: 201.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8041795885207246498
@ -60567,7 +60567,7 @@ ParticleSystem:
--- !u!199 &7967927306451800798
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -64782,8 +64782,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: 71.99423, y: 146.98822}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -2, y: 146.98822}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3381212482501412482
CanvasRenderer:
@ -70755,7 +70755,7 @@ ParticleSystem:
--- !u!199 &821857876895440949
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -70849,8 +70849,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: -89.9928, y: 146.98822}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -105, y: 146.98822}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8469427537097536125
CanvasRenderer:
@ -72110,8 +72110,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: -89.9928, y: 144.9884}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -106.6, y: 144.9884}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4728285534100354341
CanvasRenderer:
@ -72356,7 +72356,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: 113.2, y: 2}
m_AnchoredPosition: {x: 213, y: -8}
m_SizeDelta: {x: 536.7, y: 201.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6730938875403219798
@ -74132,7 +74132,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -74841,7 +74841,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: 133, y: 2}
m_AnchoredPosition: {x: 231, y: -8}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2600105019584610487
@ -76355,8 +76355,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: -89.9928, y: 146.98822}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: -107.1, y: 146.98822}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1730327879656587701
CanvasRenderer:

View File

@ -1400,7 +1400,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: 133, y: 2}
m_AnchoredPosition: {x: 229.2, y: -11.1}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3068064640055363956
@ -3440,8 +3440,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: 106, y: 16}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: 64.9, y: 16}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3148660110219532503
CanvasRenderer:
@ -11368,7 +11368,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: 133, y: 2}
m_AnchoredPosition: {x: 230, y: -10.3}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7681725073540855024
@ -12540,8 +12540,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 106, y: -113}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: 64.9, y: -113}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7126370081621653831
CanvasRenderer:
@ -17450,8 +17450,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 106, y: -112}
m_SizeDelta: {x: 218, y: 88}
m_AnchoredPosition: {x: 64.9, y: -112}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &169261111544373157
CanvasRenderer:
@ -17525,7 +17525,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: 133, y: 2}
m_AnchoredPosition: {x: 230, y: -12.8}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4281244358298141212

View File

@ -3183,7 +3183,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 8
m_Spacing: 30
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -3181,8 +3181,8 @@ CompShowType = {
--跨服玩法
JumpServer_Type={
HightLadder = 1,--跨服天梯
YuXuLunDao = 2, --玉虚论道 跨服竞技场
HightLadder = 2,--跨服天梯
YuXuLunDao = 1, --玉虚论道 跨服竞技场
QiJieShiLian = 3, --七界试炼
LingMaiMiJing = 4, --灵脉秘境
}

View File

@ -159,7 +159,7 @@ function this.InitActivityServerData(msg, isUpdate)
-- LogYellow(" 结束日期:"..TimeStampToDateStr4(v.endTime))
-- end
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
this.onlineOpen = true
this.onlineGetRewardState[m.missionId] = m.state

View File

@ -894,7 +894,9 @@ function this.SingleHeroDataShow(_go, _heroData)
if panelType == FORMATION_TYPE.WORLDARENA then
if this.opView.GetHeroTeam then
local index = this.opView.GetHeroTeam(heroData.dynamicId)
if index and index ~= this.curFormationIndex then
LogError("index==================="..index)
yxInfo:SetActive(true)
for i = 1, 3 do
teamList[i]:SetActive(false)
@ -911,7 +913,7 @@ function this.SingleHeroDataShow(_go, _heroData)
starSize = Vector2.New(60,57)
end
--
level=endLess[heroData.heroConfig.Id].Level
--level=endLess[heroData.heroConfig.Id].Level
end
if panelType == FORMATION_TYPE.GodsWayTower_two or panelType == FORMATION_TYPE.GodsWayTower_three then

View File

@ -256,6 +256,7 @@ end
--改变编队id
function this.ChangeTeamIndex(type)
--LogError("type============================"..type)
local one=currAllTeams[type+2000].teamHeroInfos
local two=currAllTeams[type+1+2000].teamHeroInfos
if one==nil then
@ -505,10 +506,10 @@ function this.HeroUpDownCheck(params, checkFail, CheckSuccess)
LogError("1111111111111111")
local ids=this.GetOtherTeamAllHeroStaticIds(this.GetFormationIndex())
LogError("ids len=="..#ids)
if BattleUtil.ChecklistIsContainValue(ids,params.heroData.heroConfig.Id) then
PopupTipPanel.ShowTip("不能上阵相同类型神将")
return
end
-- if BattleUtil.ChecklistIsContainValue(ids,params.heroData.heroConfig.Id) then
-- PopupTipPanel.ShowTip("不能上阵相同类型神将")
-- return
-- end
if CheckSuccess then
if params.position and params.position ~= 0 then
--改变英雄队伍id改变

View File

@ -206,7 +206,7 @@ function this:InitComponent()
--跨服
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
--跨服战斗功能屏蔽
this.btnJumpServer:SetActive(false)
this.btnJumpServer:SetActive(true)
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan")
--this.btnTianShuMiJuan:SetActive(false)

View File

@ -323,9 +323,9 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.ContinuityRecharge,RedPointType.RightUp2)
RPData:SetParent(RedPointType.yunmenghaoli,RedPointType.RightUp2)
--七界试炼
RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
--RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
--灵脉秘境
RPData:SetParent(RedPointType.LingMaiMiJing, RedPointType.JumpServer_MainCity)
--RPData:SetParent(RedPointType.LingMaiMiJing, RedPointType.JumpServer_MainCity)
--玉虚论道
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
-- 山河社稷图

View File

@ -569,8 +569,9 @@ function this.SetTeamInfo(_go,teamData,type)
if heroTid then
teamList[hero.position].hero:SetActive(true)
teamList[hero.position].starGrid.transform.localScale=Vector3.one*0.7
LogError("hero.star============="..hero.star.." hero.level====="..hero.level)
local star,starType = GetStarOrGodSoulLv(1,hero)
star=endLess[heroTid].Star
--star=endLess[heroTid].Star
local starScale = -15
local starSize = Vector2.New(32,32)
if starType == 3 then
@ -589,7 +590,7 @@ function this.SetTeamInfo(_go,teamData,type)
Util.SetParticleSortLayer(teamList[hero.position].starGrid,this.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
teamList[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
teamList[hero.position].levelText.text =endLess[heroTid].Level or hero.level
teamList[hero.position].levelText.text = hero.level --endLess[heroTid].Level or hero.level
teamList[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(this.spLoader, hero,teamList[hero.position].icon,heroConfig)
SetHeroFlyEffect(teamList[hero.position].hero,this.spLoader,star,this.sortingOrder+1,0.6,2)

View File

@ -221,7 +221,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
if heroTid then
self.teamList[index].heroList[hero.position].hero:SetActive(true)
local star,starType = GetStarOrGodSoulLv(1,hero)
star=endLess[heroTid].Star
--star=endLess[heroTid].Star
local starScale = -15
local starSize = Vector2.New(32,32)
if starType == 3 then
@ -234,7 +234,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
Util.SetParticleSortLayer(self.teamList[index].heroList[hero.position].starGrid,self.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
self.teamList[index].heroList[hero.position].levelText.text =endLess[heroTid].Level or hero.level
self.teamList[index].heroList[hero.position].levelText.text =hero.level --endLess[heroTid].Level or hero.level
self.teamList[index].heroList[hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, star))
SetHeroIcon(self.spLoader,hero, self.teamList[index].heroList[hero.position].icon,heroConfig)
SetHeroFlyEffect(self.teamList[index].heroList[hero.position].hero,self.spLoader,star,self.sortingOrder+1,0.8,2)
@ -246,8 +246,8 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
heroData.star=star
heroData.lv=endLess[heroTid].Level
--heroData.star=star
--heroData.lv=endLess[heroTid].Level
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)