四灵试炼修改提交

dev_chengFeng
jiaoyangna 2021-08-26 17:25:02 +08:00
parent 0c7e38a715
commit cd594275e0
22 changed files with 4585 additions and 3569 deletions

View File

@ -5165,7 +5165,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 3a71686756aace84bafe81a0e05f41b9, type: 3}
m_Sprite: {fileID: 21300000, guid: 6d28566506ce46b45896a39e6b796471, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5536,6 +5536,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1364913661323860918
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7964134028830033738}
- component: {fileID: 1100229203159589396}
- component: {fileID: 6143351293566133510}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7964134028830033738
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1364913661323860918}
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_Children: []
m_Father: {fileID: 7806638949382057690}
m_RootOrder: 0
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, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1100229203159589396
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1364913661323860918}
m_CullTransparentMesh: 0
--- !u!114 &6143351293566133510
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1364913661323860918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d1f7c79c4d2d0ce43af3940d4b914856, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1391376344071155124
GameObject:
m_ObjectHideFlags: 0
@ -5570,7 +5644,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, y: -157.2}
m_AnchoredPosition: {x: 0, y: -157.20001}
m_SizeDelta: {x: 949, y: 21}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3438168776075710342
@ -5601,7 +5675,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1f23e8333e087094583ea3aa66456821, type: 3}
m_Sprite: {fileID: 21300000, guid: 4bba68f30c9dfe441a88814caa88bce2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6600,6 +6674,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3511264293111374212}
- {fileID: 1755430064131033494}
- {fileID: 7705649098044602141}
- {fileID: 5075218065937803515}
- {fileID: 196186067740596525}
@ -7315,11 +7390,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 176440091997260688}
m_RootOrder: 3
m_RootOrder: 4
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: 497.2, y: 51.9}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -42.799988, y: 114.9}
m_SizeDelta: {x: 40, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534964552133398209
@ -7433,9 +7508,9 @@ RectTransform:
m_Father: {fileID: 176440091997260688}
m_RootOrder: 0
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.82501, y: 35.115}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.82501, y: 155.09}
m_SizeDelta: {x: 460.05, y: 70.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3297695668373979833
@ -7468,11 +7543,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 47
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 47
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -7588,7 +7663,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, y: 3.26}
m_AnchoredPosition: {x: 0, y: 3.2600002}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431587578776198
@ -8779,7 +8854,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, y: 3.26}
m_AnchoredPosition: {x: 0, y: 3.2600002}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431588489715947
@ -9152,7 +9227,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, y: 3.26}
m_AnchoredPosition: {x: 0, y: 3.2600002}
m_SizeDelta: {x: 19, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431588891443215
@ -9605,7 +9680,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, y: 3.26}
m_AnchoredPosition: {x: 0, y: 3.2600002}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431589232705760
@ -10213,7 +10288,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -17}
m_AnchoredPosition: {x: 0, y: -16.999998}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431589492206861
@ -10287,7 +10362,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -17}
m_AnchoredPosition: {x: 0, y: -16.999998}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431589526956111
@ -10361,7 +10436,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, y: 3.26}
m_AnchoredPosition: {x: 0, y: 3.2600002}
m_SizeDelta: {x: 15, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4749431589540208139
@ -10769,8 +10844,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.000011444, y: 209.47}
m_SizeDelta: {x: 1080, y: 40}
m_AnchoredPosition: {x: -0.000011444, y: 209.46997}
m_SizeDelta: {x: 1080, y: 103.6}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &2149029534862487200
CanvasRenderer:
@ -10800,7 +10875,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 28fe74f2d05b9b74da40d6edd3f34aed, type: 3}
m_Sprite: {fileID: 21300000, guid: 2292a65bc3418724cb27bd307c4977e7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -11051,12 +11126,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 176440091997260688}
m_RootOrder: 2
m_RootOrder: 3
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: 353.99997, y: 8.4}
m_SizeDelta: {x: 226, y: 29.6}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -186.00003, y: 71.4}
m_SizeDelta: {x: 226, y: 29.599998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6067264358511219413
CanvasRenderer:
@ -11560,7 +11635,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f2800a6565375d14dbdac9b001eb6431, type: 3}
m_Sprite: {fileID: 21300000, guid: 72ef16873cc3ebb44a849abe6e8ca84d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -11603,7 +11678,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 189.1}
m_AnchoredPosition: {x: 0, y: 189.09998}
m_SizeDelta: {x: 85, y: 33}
m_Pivot: {x: 1, y: 0}
--- !u!222 &5856396582051245831
@ -11677,7 +11752,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: 0, y: 189.2}
m_AnchoredPosition: {x: 0, y: 189.20001}
m_SizeDelta: {x: 85, y: 33}
m_Pivot: {x: 1, y: 0}
--- !u!222 &3839313431870817291
@ -12011,7 +12086,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: bb03f2f4d02287e44b6635c139fbf11d, type: 3}
m_Sprite: {fileID: 21300000, guid: 11eeb4943ada730428fc0911c1e3d2ef, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -12085,7 +12160,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f2800a6565375d14dbdac9b001eb6431, type: 3}
m_Sprite: {fileID: 21300000, guid: 72ef16873cc3ebb44a849abe6e8ca84d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -12604,7 +12679,7 @@ RectTransform:
- {fileID: 1257113198445388884}
- {fileID: 7916084515871155950}
m_Father: {fileID: 7806638949382057690}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -12857,7 +12932,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: 619, y: 2277}
m_AnchoredPosition: {x: 472.5, y: 2205}
m_SizeDelta: {x: 1080, y: 377}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1948123316515751128
@ -12960,6 +13035,7 @@ GameObject:
- component: {fileID: 7806638949382057688}
- component: {fileID: 7806638949382057689}
- component: {fileID: 5639887677019715418}
- component: {fileID: 2395169587407923545}
m_Layer: 5
m_Name: FourElementMonsterCampPanel
m_TagString: Untagged
@ -12978,6 +13054,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7964134028830033738}
- {fileID: 7806638948147681323}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -13033,6 +13110,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7806638949382057691}
m_CullTransparentMesh: 0
--- !u!114 &2395169587407923545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7806638949382057691}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
m_Name:
m_EditorClassIdentifier:
bgList:
- {fileID: 1364913661323860918}
--- !u!1 &7806638949837101823
GameObject:
m_ObjectHideFlags: 0
@ -13173,12 +13264,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 176440091997260688}
m_RootOrder: 1
m_RootOrder: 2
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: 348.1, y: 54.4}
m_SizeDelta: {x: 237.8, y: 41.5}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -191.9, y: 117.4}
m_SizeDelta: {x: 237.79999, y: 41.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8588098953417726032
CanvasRenderer:
@ -13330,7 +13421,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 195.9}
m_AnchoredPosition: {x: 0, y: 195.90002}
m_SizeDelta: {x: 949, y: 21}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &67043081579894057
@ -13361,7 +13452,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1f23e8333e087094583ea3aa66456821, type: 3}
m_Sprite: {fileID: 21300000, guid: 4bba68f30c9dfe441a88814caa88bce2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -13447,3 +13538,128 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1001 &6631951083775183093
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 176440091997260688}
m_Modifications:
- target: {fileID: 3714027585546754038, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_Name
value: moppingUpBtn
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.0000023842
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 62.655
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_SizeDelta.x
value: 325.92
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_SizeDelta.y
value: 126.69
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc217f2ca5f7b2b4eabb986d3dbcf091, type: 3}
--- !u!224 &1755430064131033494 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4924094690652684643, guid: fc217f2ca5f7b2b4eabb986d3dbcf091,
type: 3}
m_PrefabInstance: {fileID: 6631951083775183093}
m_PrefabAsset: {fileID: 0}

View File

@ -4522,7 +4522,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d1f4d20f8566d1a448cb49b4c9ec87a0, type: 3}
m_Sprite: {fileID: 21300000, guid: 57ba83093fdb6584aa9b65bef822c58d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4812,7 +4812,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d1f4d20f8566d1a448cb49b4c9ec87a0, type: 3}
m_Sprite: {fileID: 21300000, guid: 57ba83093fdb6584aa9b65bef822c58d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -908,20 +908,20 @@ RedPointType = {
Pokemon_ChipCompound = 796,--灵兽 碎片合成
HeartDemon = 797, --心魔试炼红点
PersonTrail = 798, --人杰试炼
BuddishTrail = 799,--佛禅试炼
DemonTrail = 800,--妖灵试炼
TaoistTrail = 801,--道玄试炼
PersonTrailHelp = 802, --人杰试炼
BuddishTrailHelp = 803,--佛禅试炼
DemonTrailHelp = 804,--妖灵试炼
TaoistTrailHelp = 805,--道玄试炼
--建木神树界面
Sacred = 900,--神树
Sacred_roleList = 903,--神树在rolelist中
Sacred_roleInfo = 902,--神树在装备中
PersonTrail = 904, --人杰试炼
BuddishTrail = 905,--佛禅试炼
DemonTrail = 906,--妖灵试炼
TaoistTrail = 907,--道玄试炼
PersonTrailHelp = 908, --人杰试炼
BuddishTrailHelp = 909,--佛禅试炼
DemonTrailHelp = 910,--妖灵试炼
TaoistTrailHelp = 911,--道玄试炼
--羁绊
Pokemon_Fetter = 794,--灵兽羁绊
@ -1810,6 +1810,10 @@ FormationTypeDef = {
FIGHT_LEVEL = 1701, --山河社稷图主关卡编队
FIGHT_ASSISTANTLEVEL = 1801, --山河社稷图副主关卡编队
FORMATION_TSLX = 1901, --踏碎凌霄编队 没有实际意义后端做特殊操作 其实就是主线编队
FourElement_PEOPLE = 2001,
FourElement_BUDDHIST = 2002,
FourElement_MAGIC = 2003,
FourElement_TAOIST = 2004,
}
--编队需要拉取主线
@ -2470,20 +2474,16 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5},
[20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6},
[21] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 7},
[22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8},
<<<<<<< HEAD
[23] = { bgImage = "r_zjm_paihangbang_banner01", name = "人杰试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 1,isRankingMainPanelShow = false},
[24] = { bgImage = "r_zjm_paihangbang_banner01", name = "佛禅试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 2,isRankingMainPanelShow = false},
[25] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false},
[26] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false},
=======
[22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8},
[23] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_PERSON,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 23},
[24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 24},
[25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 25},
[26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 26},
[27] = { bgImage = "r_zjm_paihangbang_banner01", name = "人杰试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 1,isRankingMainPanelShow = false},
[28] = { bgImage = "r_zjm_paihangbang_banner01", name = "佛禅试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 2,isRankingMainPanelShow = false},
[29] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false},
[30] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false},
>>>>>>> china/dev
}

View File

@ -373,7 +373,7 @@ function this.SingleItemDataShow(_go, _itemData)
Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
end
talismanStar:SetActive(true)
SetHeroStars(talismanStar, _itemData.itemConfig.HeroStar[1],1,Vector2.New(32.5,32.5),-15)
SetHeroStars(this.spLoader,talismanStar, _itemData.itemConfig.HeroStar[1],1,Vector2.New(32.5,32.5),-15)
end
end
local redPoint = Util.GetGameObject(_go.gameObject, "GameObject/redPoint")

View File

@ -84,7 +84,7 @@ function ExpeditionMonsterInfoPopup:OnOpen(popupType,...)
contentPrefabs[i].gameObject:SetActive(false)
end
this.BGImage1:SetActive(index == 1 or index == 2)
this.BGImage2:SetActive(index == 3 or index == 4 or index == 5 or index == 6)
this.BGImage2:SetActive(index == 3 or index == 4 or index == 5 or index == 6 or index == 7)
contentPrefabs[index].gameObject:SetActive(true)
contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参
end

View File

@ -34,7 +34,7 @@ end
--- btn1点击回调事件
function this.On_Btn1_Click()
-- this.root.SetOneKeyGo()
this.root.SetOneKeyCarBonGo()
this.root.SetOneKeyGo()
--以前的换成的一键上阵
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and MapManager.Mapping then

View File

@ -31,7 +31,7 @@ end
--- 获取需要显示的编队id
function this.GetFormationIndex()
return (curType + 1700)
return (curType + 2000)
end
--- 设置阵营

View File

@ -150,10 +150,11 @@ function this:RefreshItemData()
end
if not data or #data < 1 then
this.empty:SetActive(true)
this.ScrollView.gameObject:SetActive(false)
return
end
LogGreen(#data)
this.empty:SetActive(false)
this.ScrollView.gameObject:SetActive(true)
if curIndex == 1 then
this:SortHeros1(data)
else
@ -171,7 +172,6 @@ function this:RefreshItemData()
itemList[go] = SubUIManager.Open(SubUIConfig.FourTrailSingleHelpHero,go.transform)
end
itemList[go].gameObject:SetActive(true)
LogGreen(tostring(data[index]))
itemList[go]:OnShow(curIndex,data[index],curType,canHelpPower)
end)
this.ScrollView:SetIndex(1)

View File

@ -1249,7 +1249,6 @@ local function CalculateEquipTreaSureAddVal(_heroId)
end
end
end
end
if #curHeroData.jewels > 1 then
--取 强化 精炼 最小值

View File

@ -6,6 +6,7 @@ local this = FourElementMonsterCampPanel
this.grid = {}
this.singledataList = {}
this.singlePreList = {}
local curType = 0
local trailData = {}
@ -46,6 +47,7 @@ function FourElementMonsterCampPanel:InitComponent()
this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn")
this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank")
this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight")
this.btnHelpFightRed = Util.GetGameObject(this.btnHelpFight, "redPoint")
this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_zhuzhananniu_zh")
end
@ -83,7 +85,7 @@ function FourElementMonsterCampPanel:BindEvent()
end
end)
Util.AddClick(this.btnRank, function ()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[curType+14])
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[curType+26])
end)
Util.AddClick(this.btnHelpFight, function ()
local MyHeroData = HeroManager.GetHeroDataByProperty(curType,0)
@ -117,7 +119,7 @@ end
--界面打开时调用(用于子类重写)
function FourElementMonsterCampPanel:OnOpen(index)
curType = index
BindRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint"))
BindRedPointObject(redTrailType[curType],this.btnHelpFightRed)
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp })
end
@ -144,11 +146,12 @@ function FourElementMonsterCampPanel:OnShow()
PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves)
local propertyId = SacredTreeManager.GetUnLockNewProperty(waves)
if propertyId > 0 then
UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId)
local power = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
LogGreen("power:"..power.." MonsterCampManager.oldpower:"..MonsterCampManager.oldpower)
if power - MonsterCampManager.oldpower > 0 then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = MonsterCampManager.oldpower,newValue = power})
end
UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId)
end
end
end
@ -167,7 +170,8 @@ function this.InitMonsterShow()
this.scrollView:SetData(monsterInfo, function (index, go)
local tempData = this.SingleDataShow(go, monsterInfo[index])
this.singledataList[monsterInfo[index].wave] = tempData
end)
this.singlePreList[go] = this.singledataList[monsterInfo[index].wave]
end,true,true)
if MonsterCampManager.CurOffsetIndex < 0 then
this.scrollView:SetIndex((#monsterInfo-trailData.monsterWave-2))
else
@ -177,18 +181,20 @@ end
--界面关闭时调用(用于子类重写)
function FourElementMonsterCampPanel:OnClose()
ClearRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint"))
ClearRedPointObject(redTrailType[curType],this.btnHelpFightRed)
MonsterCampManager.CurOffsetIndex = -1
end
--界面销毁时调用(用于子类重写)
function FourElementMonsterCampPanel:OnDestroy()
this.spLoader:Destroy()
for k,v in pairs(this.singledataList) do
for k,v in pairs(this.singlePreList) do
v:OnDestroy()
end
this.singlePreList = {}
this.singledataList = {}
SubUIManager.Close(this.scrollView)
this.spLoader:Destroy()
end
return FourElementMonsterCampPanel

View File

@ -18,7 +18,7 @@ function MonsterCampMainPanel:InitComponent()
orginLayer = 0
this.spLoader = SpriteLoader.New()
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
this.waveNum = Util.GetGameObject(self.gameObject, "Bg/waveImg/wave"):GetComponent("Text")
this.waveNum = Util.GetGameObject(self.gameObject, "Bg/BgRoot/waveImg/wave"):GetComponent("Text")
this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave")
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)

View File

@ -119,7 +119,6 @@ function this.PlayerInfoRequest(func)
PlayerManager.userCreateTime = msg.userCreateTime
PatFaceManager.SetisFirstLogVal(msg.isDayFirst)
SoulPrintManager.soulEquipPool = msg.SoulEquipPool
Log("称号ID"..msg.player.designation.." 时装ID"..msg.player.decrotion.." 坐骑ID"..msg.player.ride)
PlayerManager.designation = msg.player.designation--称号
PlayerManager.skin = msg.player.decrotion--皮肤
PlayerManager.ride = msg.player.ride--坐骑

View File

@ -179,12 +179,13 @@ function RewardItemPopup:OnOpen(...)
if compShowType == CompShowType.fourElement then
this.ScrollView.gameObject:SetActive(false)
this.dropPrefab.gameObject:SetActive(false)
this.ScrollView2.gameObject:SetActive(false)
this.shenying.gameObject:SetActive(true)
this.ShengYingShow(args[8])
return
end
if not drop then
return
end
if compShowType == 3 then
this.GuildCarDelayShow()
@ -198,11 +199,10 @@ function RewardItemPopup:OnOpen(...)
elseif compShowType == 8 then--山河社稷图
this.FightLevelShow()
end
--如果没有掉落就return
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
--如果没有掉落就return
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
return
end
local starItemDataList=BagManager.GetItemListFromTempBag(drop)
-- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList))
@ -270,8 +270,7 @@ end
--一些元素的显隐
function this.SetComPShowState(type)
this.btnBack:GetComponent("Button").enabled = type ~= 2
this.ScrollView:SetActive(#itemDataList <= 25 )
this.ScrollView2:SetActive(#itemDataList > 25 )
this.ScrollView:SetActive(#itemDataList >= 1 )
this.lvAndExpGo:SetActive(type == 1)
this.btnMapBack:SetActive(type == 2)
this.guildCarDelay:SetActive(type == 3)
@ -618,4 +617,5 @@ function RewardItemPopup:OnDestroy()
itemListPrefab = {}
itemDataList = {}
end
return RewardItemPopup

View File

@ -385,15 +385,15 @@ function this.ShowEquipData(i)
this.SetPropertyShow1(refineInfo,this.RefinePropertyList[i],this.treasurePanel[i].RefineAttriGrid)
end
--(神应属性)
-- local treeInfo=EquipTreasureManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv)
-- this.treasurePanel[i].TreeAttriNum.text = string.format("[神应等级:%s/%s]",equipData[i].treeLv,equipData[i].maxTreeLv)
-- if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then
-- this.treasurePanel[i].TreeAttri:SetActive(false)
-- else
-- this.treasurePanel[i].TreeAttri:SetActive(true)
-- this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,500)
-- this.SetPropertyShow2(treeInfo,this.TreePropertyList[i],this.treasurePanel[i].TreeAttriGrid)
-- end
local treeInfo=SacredTreeManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv)
this.treasurePanel[i].TreeAttriNum.text = string.format("[神应等级:%s/%s]",equipData[i].treeLv,equipData[i].maxTreeLv)
if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then
this.treasurePanel[i].TreeAttri:SetActive(false)
else
this.treasurePanel[i].TreeAttri:SetActive(true)
this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,500)
this.SetPropertyShow2(treeInfo,this.TreePropertyList[i],this.treasurePanel[i].TreeAttriGrid)
end
if i == 1 then
this.treasurePanel[i].StrongRed:SetActive(HeroManager.CheckIsUpTreasure(equipData[i].idDyn,1))
this.treasurePanel[i].RefineRed:SetActive(HeroManager.CheckIsUpTreasure(equipData[i].idDyn,2))

View File

@ -39,6 +39,8 @@ function RoleListPanel:InitComponent()
this.fenJieBtn = Util.GetGameObject(self.gameObject, "fenJieBtn")
--this.fenJieBtn:SetActive(false)
this.formationBtn = Util.GetGameObject(self.gameObject, "formationBtn")
this.treeBtn = Util.GetGameObject(self.gameObject, "treeBtn")
this.treeRed = Util.GetGameObject(this.treeBtn, "redPoint")
if not this.playerInfoView then
this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform)

View File

@ -267,7 +267,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
noumenon:SetActive(false)
GongMingMask:SetActive(false)
name.text = SubString2(GetLanguageStrById(itemConfig.Name),8)
SetHeroStars(starGrid, itemConfig.HeroStar[1] or 6,1,nil,nil,Vector2.New(0,1))
SetHeroStars(this.spLoader,starGrid, itemConfig.HeroStar[1] or 6,1,nil,nil,Vector2.New(0,1))
Util.AddOnceClick(cardBtn, function()
local isSelect = false
local selectIndex = 0

View File

@ -84,7 +84,6 @@ function FourElementSingleWave:OnOpen()
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.trailData.fourElementType,self.data.wave)
end)
Util.AddOnceClick(self.fight, function()
LogGreen(self.data.wave)
local x = function()
MonsterCampManager.ExecuteFightBattle(self.data.wave,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(self.trailData.freeTimeId, 1)
@ -93,12 +92,10 @@ function FourElementSingleWave:OnOpen()
end,self.trailData.fourElementType)
end
if self.data.wave == self.trailData.monsterWave then
LogGreen(self.freeTimes..self.buyTimes)
if self.freeTimes <=0 and self.buyTimes <= 0 then
PopupTipPanel.ShowTip("今日已无扫荡次数!")
return
end
LogGreen(self.itemId.." "..self.costNum)
if self.freeTimes <= 0 then
if BagManager.GetItemCountById(self.itemId) < self.costNum then
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
@ -115,11 +112,12 @@ function FourElementSingleWave:OnOpen()
end
elseif self.data.wave == self.trailData.monsterWave + 1 then
if self.trailData.canFightTime > 0 then
if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 1700)) > 0 then
MonsterCampManager.ExecuteFightBattle(self.data.wave,0,nil,self.trailData.fourElementType)
else
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave)
end
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave)
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 2000)) > 0 then
-- MonsterCampManager.ExecuteFightBattle(self.data.wave,0,nil,self.trailData.fourElementType)
-- else
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave)
-- end
else
PopupTipPanel.ShowTip("今日已无可挑战层数!")
end
@ -211,6 +209,13 @@ end
--界面销毁时调用(用于子类重写)
function FourElementSingleWave:OnDestroy()
if self.rewardList then
for i = 1,#self.rewardList do
if self.rewardList[i] and self.rewardList[i].gameObject then
SubUIManager.Close(self.rewardList[i])
end
end
end
self.rewardList = {}
end
function FourElementSingleWave:NewItemView(config, gameObject, ...)

View File

@ -17,14 +17,14 @@ end
--初始化组件(用于子类重写)
function FourTrailSingleHelpHero:InitComponent()
self.spLoader = SpriteLoader.New()
local go = Util.GetGameObject(self.gameObject, "GameObject")
self.hero = Util.GetGameObject(go, "HeroPre")
self.frame = Util.GetGameObject(self.hero, "frame"):GetComponent("Image")
self.icon = Util.GetGameObject(go, "icon"):GetComponent("Image")
self.lv = Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
self.proIcon = Util.GetGameObject(go, "proIcon"):GetComponent("Image")
self.starGrid = Util.GetGameObject(go, "star")
self.icon = Util.GetGameObject(self.hero, "icon"):GetComponent("Image")
self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
self.proIcon = Util.GetGameObject(self.hero, "proIcon"):GetComponent("Image")
self.starGrid = Util.GetGameObject(self.hero, "star")
self.name = Util.GetGameObject(go,"name"):GetComponent("Text")
self.num = Util.GetGameObject(go,"power/Text"):GetComponent("Text")
self.tip = Util.GetGameObject(go,"tip"):GetComponent("Text")
@ -59,7 +59,7 @@ function FourTrailSingleHelpHero:OnShow(curType,...)
self.icon:GetComponent("Image").sprite = Util.LoadSprite(heroData.icon)
self.lv:GetComponent("Text").text = heroData.lv
self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
SetHeroStars(self.starGrid , heroData.star)
SetHeroStars(self.spLoader,self.starGrid , heroData.star)
self.name.text = itemConfig[heroData.heroConfig.Id].Name
local allAddProVal = HeroManager.CalculateHeroAllProValList(1, heroData, false)
--LogGreen(heroData.dynamicId.." allAddProVal[HeroProType.WarPower]:"..allAddProVal[HeroProType.WarPower])

View File

@ -256,7 +256,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
end
self.starGrid:SetActive(true)
local star = _itemData.configData.HeroStar[1]
SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
SetHeroStars(self.spLoader,self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
else
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
@ -637,7 +637,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
end
self.starGrid:SetActive(true)
local star = _reward[4] or itemConfig[itemSId].HeroStar[1]
SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
SetHeroStars(self.spLoader,self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)

View File

@ -154,7 +154,7 @@ function MonsterCampSingleWave:OnOpen()
-- end
-- elseif self.data.Id == self.trailData.monsterWave + 1 then
-- if self.trailData.canFightTime > 0 then
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 1700)) > 0 then
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 2000)) > 0 then
-- MonsterCampManager.ExecuteFightBattle(self.data.Id,0,nil,self.trailData.fourElementType)
-- else
-- -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.Id)