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

dev_chengFeng 观音菩萨法宝
luyao 2021-09-08 13:50:01 +08:00
commit b05a0b108d
13 changed files with 2556 additions and 1428 deletions

View File

@ -4834,8 +4834,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: -36.400013, y: -54.400032}
m_SizeDelta: {x: 64.4, y: 37.51}
m_AnchoredPosition: {x: -35.12, y: -50.382}
m_SizeDelta: {x: 61.84, y: 27.336}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222622639373068266
CanvasRenderer:
@ -4867,7 +4867,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -5105,7 +5105,7 @@ RectTransform:
- {fileID: 1799237812738150230}
- {fileID: 8592251680213530260}
- {fileID: 6193489970714018668}
- {fileID: 1449685011234502786}
- {fileID: 77698140496492338}
m_Father: {fileID: 224797861638971062}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -38625,7 +38625,7 @@ GameObject:
- component: {fileID: 1091151930144477597}
- component: {fileID: 6827508354133794526}
m_Layer: 5
m_Name: middleDownLv
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -38640,15 +38640,15 @@ RectTransform:
m_GameObject: {fileID: 1597479055163298302}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9009009, y: 0.9009009, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224550793111032812}
m_RootOrder: 12
m_Father: {fileID: 77698140496492338}
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: -1.62, y: -46.553}
m_SizeDelta: {x: 127.2, y: 33.125}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1091151930144477597
CanvasRenderer:
@ -38680,18 +38680,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontSize: 23
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 7
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: +88
m_Text: 100
--- !u!1 &2066763438172914823
GameObject:
m_ObjectHideFlags: 0
@ -39251,8 +39251,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: 32.199997, y: 47.13}
m_SizeDelta: {x: 61.8, y: 34.29}
m_AnchoredPosition: {x: 30.74999, y: 46.66}
m_SizeDelta: {x: 58.9, y: 33.35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6593720557690555738
CanvasRenderer:
@ -73230,6 +73230,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8462928044304368706
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 77698140496492338}
- component: {fileID: 8607507955740466777}
- component: {fileID: 3902196280474806982}
m_Layer: 5
m_Name: middleDownLv
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &77698140496492338
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8462928044304368706}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9009009, y: 0.9009009, z: 1}
m_Children:
- {fileID: 1449685011234502786}
m_Father: {fileID: 224550793111032812}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 11.9, y: -14.046}
m_SizeDelta: {x: 43.54, y: 43.54}
m_Pivot: {x: 1, y: 0}
--- !u!222 &8607507955740466777
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8462928044304368706}
m_CullTransparentMesh: 0
--- !u!114 &3902196280474806982
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8462928044304368706}
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: 1
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: 895a1069d68145244a20a7a3629262de, 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 &8498808654712098079
GameObject:
m_ObjectHideFlags: 0

View File

@ -1029,9 +1029,9 @@ RectTransform:
m_Father: {fileID: 4767352897535079369}
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: 719.8, y: -66.45}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 297.6, y: 132.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2198174024911992403
@ -1871,8 +1871,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.9, y: -43.6}
m_SizeDelta: {x: 126.46, y: 30}
m_AnchoredPosition: {x: 4.065, y: -43.6}
m_SizeDelta: {x: 120.13, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8379473156159221587
CanvasRenderer:
@ -1909,7 +1909,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -8115,7 +8115,7 @@ ParticleSystem:
--- !u!199 &4438878257103928366
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -8361,10 +8361,10 @@ RectTransform:
m_Father: {fileID: 2190152846101774229}
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: 438.5, y: -82.5}
m_SizeDelta: {x: 877, y: 5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 438.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5950788119725823789
CanvasRenderer:
@ -8693,10 +8693,10 @@ RectTransform:
m_Father: {fileID: 2190152846101774229}
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: 438.5, y: -87.5}
m_SizeDelta: {x: 620, y: 5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 620, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7280263267776010143
CanvasRenderer:
@ -9774,10 +9774,10 @@ RectTransform:
m_Father: {fileID: 277642948085985351}
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: 467.65, y: -765}
m_SizeDelta: {x: 877.3, y: 250}
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 &6781150477304309977
CanvasRenderer:
@ -10018,10 +10018,10 @@ RectTransform:
m_Father: {fileID: 4320458112962310301}
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: 216.3, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &3224279738133237298
CanvasRenderer:
@ -10261,9 +10261,9 @@ RectTransform:
m_Father: {fileID: 800725520187452421}
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: 80.95, y: -89.95}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 152, y: 152}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7234040720317302532
@ -10629,9 +10629,9 @@ RectTransform:
m_Father: {fileID: 800725520187452421}
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: 262.75, y: -89.95}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 181.6, y: 181.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8672316360936894560
@ -12588,10 +12588,10 @@ RectTransform:
m_Father: {fileID: 4320458112962310301}
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: 81.3, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &5753039415573080711
CanvasRenderer:
@ -17715,7 +17715,7 @@ ParticleSystem:
--- !u!199 &5360006036325542636
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -17808,10 +17808,10 @@ RectTransform:
m_Father: {fileID: 7603097860510337896}
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: 213.65, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &2099235981827177424
CanvasRenderer:
@ -18505,10 +18505,10 @@ RectTransform:
m_Father: {fileID: 7603097860510337896}
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: 483.65, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &657113344816791394
CanvasRenderer:
@ -18929,9 +18929,9 @@ RectTransform:
m_Father: {fileID: 4767352897535079369}
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: 289.84998, y: -66.45}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 562.3, y: 132.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5697136989062052279
@ -20081,10 +20081,10 @@ RectTransform:
m_Father: {fileID: 7603097860510337896}
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: 78.649994, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &8503794955063177387
CanvasRenderer:
@ -20999,10 +20999,10 @@ RectTransform:
m_Father: {fileID: 277642948085985351}
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: 467.65, y: -110}
m_SizeDelta: {x: 877.3, y: 180}
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 &3408779802112845678
CanvasRenderer:
@ -21970,7 +21970,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -467.5, y: 648.6}
m_SizeDelta: {x: 935, y: 990}
m_SizeDelta: {x: 935, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8743960904103029316
MonoBehaviour:
@ -22349,8 +22349,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.9, y: -43.59994}
m_SizeDelta: {x: 126.46, y: 30}
m_AnchoredPosition: {x: 4.065, y: -43.59994}
m_SizeDelta: {x: 120.13, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6144050316944884461
CanvasRenderer:
@ -22387,7 +22387,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -22775,10 +22775,10 @@ RectTransform:
m_Father: {fileID: 277642948085985351}
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: 467.65, y: -420}
m_SizeDelta: {x: 877.3, y: 400}
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 &6334925928787415273
CanvasRenderer:
@ -22842,10 +22842,10 @@ RectTransform:
m_Father: {fileID: 7603097860510337896}
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: 348.65, y: -66.45}
m_SizeDelta: {x: 130, y: 130}
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 &1202601738595703871
CanvasRenderer:
@ -23260,10 +23260,10 @@ RectTransform:
m_Father: {fileID: 277642948085985351}
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: 467.5, y: -955}
m_SizeDelta: {x: 877, y: 90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 467.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &214787711278037218
CanvasRenderer:

View File

@ -10445,7 +10445,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -11950,10 +11950,10 @@ RectTransform:
m_Father: {fileID: 7797228341887005295}
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: 608, y: -50}
m_SizeDelta: {x: 88, y: 88}
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 &7583128553425786306
CanvasRenderer:
@ -12205,10 +12205,10 @@ RectTransform:
m_Father: {fileID: 7797228341887005295}
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: 104, y: -50}
m_SizeDelta: {x: 88, y: 88}
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 &7583128553461871492
CanvasRenderer:
@ -12952,10 +12952,10 @@ RectTransform:
m_Father: {fileID: 7797228341887005295}
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: 440, y: -50}
m_SizeDelta: {x: 88, y: 88}
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 &7583128555069003081
CanvasRenderer:
@ -13108,10 +13108,10 @@ RectTransform:
m_Father: {fileID: 7797228341887005295}
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: 776, y: -50}
m_SizeDelta: {x: 88, y: 88}
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 &7583128555296664243
CanvasRenderer:
@ -13226,10 +13226,10 @@ RectTransform:
m_Father: {fileID: 7797228341887005295}
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: 272, y: -50}
m_SizeDelta: {x: 88, y: 88}
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 &7583128555409597101
CanvasRenderer:

View File

@ -150393,7 +150393,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -159984,7 +159984,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -164819,7 +164819,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1

View File

@ -8,6 +8,23 @@ local min = math.min
--local BattleEventName = BattleEventName
BattleUtil.Passivity = require("Modules/Battle/Logic/Base/Passivity")
local function table_removebyvalue(array, value, removeall)
local c, i, max = 0, 1, #array
while i <= max do
if array[i] == value then
table.remove(array, i)
c = c + 1
i = i - 1
max = max - 1
if not removeall then
break
end
end
i = i + 1
end
return c
end
local function clamp(v, minValue, maxValue)
if v < minValue then
return minValue
@ -208,7 +225,7 @@ function BattleUtil.RemoveNoDeadRole(arr)
for i = 1, #arr do
local role=arr[i]
if BattleLogic.BuffMgr:HasBuff(role,BuffName.NoDead) then
table.removebyvalue(arr,role)
table_removebyvalue(arr,role)
end
end
end

View File

@ -596,7 +596,7 @@ function this.InitUpdateEquipData(_equipData, heroData)
if(heroData.jewels) then
for i = 1, #heroData.jewels do
if heroData.jewels[i] and heroData.jewels[i] == _equipData.id then
this.InitSingleTreasureData(_equipData)
this.InitSingleTreasureData(_equipData,heroData)
end
end
end
@ -606,7 +606,7 @@ end
local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
local allTreasures = {}
--初始化单个宝物的数据
function this.InitSingleTreasureData(_singleData)
function this.InitSingleTreasureData(_singleData,heroData)
if _singleData==nil then
return
end
@ -619,7 +619,7 @@ function this.InitSingleTreasureData(_singleData)
single.refineLv=_singleData.rebuildLevel
single.maxLv=currJewel.Max[1]
single.maxRefineLv=currJewel.Max[2]
single.upHeroDid=""
single.upHeroDid=heroData.dynamicId
local quantity=currJewel.Level
single.quantity=quantity
single.frame=GetQuantityImageByquality(quantity)

View File

@ -3728,7 +3728,7 @@ function this.CheckIsUpTreasure(Did,index)
if not Did then
return false
end
local curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(Did)
local curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(Did) or ExpeditionManager.GetSingleTreasureByIdDyn(Did) or GoodFriendManager.GetSingleTreasureByIdDyn(Did)
local isMax,isMatEnough,items
local indexType = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint
if index == 1 then

View File

@ -382,7 +382,6 @@ function this.EquipInfo()
local pos= jewelConfig[data.id].Location
local o=Util.GetGameObject(this.babyGrid,"Pre"..pos)
LogRed("!!!")
local btn=Util.GetGameObject(o,"Frame")
btn.gameObject:SetActive(true)
local frame=Util.GetGameObject(o,"Frame"):GetComponent("Image")
@ -407,7 +406,8 @@ function this.EquipInfo()
lvObj:SetActive(false)
end
Util.AddOnceClick(btn,function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,0, data.idDyn,data.id, data.lv, data.refineLv)
--UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,0, data.idDyn,data.id, data.lv, data.refineLv)
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,data,nil,pos,0)
end)
end
end

View File

@ -509,7 +509,7 @@ end
--计算战斗力
function this.CalculateWarForce(Did)
local curTreasure = allTreasures[Did]
local curTreasure = allTreasures[Did] or ExpeditionManager.GetSingleTreasureByIdDyn(Did) or GoodFriendManager.GetSingleTreasureByIdDyn(Did)
if curTreasure then
return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv)
end

View File

@ -13,21 +13,29 @@ local equipIdList
local equipDataList
local position
local isGongMing = false
local isShowBtn
--初始化组件(用于子类重写)
function RoleEquipTreasureChangePopup:InitComponent()
equipData = {}
this.spLoader = SpriteLoader.New()
this.btnBack= Util.GetGameObject(self.transform, "btnBack")
this.GameObject=Util.GetGameObject(self.transform, "GameObject")
this.BasePropertyList = {}
this.RefinePropertyList = {}
this.TreePropertyList = {}
this.TreePropertyList2 = {}
this.strongPropertyList = {}
this.RefineMonsterPropertyList = {}
for i = 1, 2 do
this.BasePropertyList[i] = {}
this.RefinePropertyList[i] = {}
this.TreePropertyList[i] = {}
this.TreePropertyList2[i] = {}
this.strongPropertyList[i] = {}
this.RefineMonsterPropertyList[i] = {}
end
this.preList = {}
this.treasurePanel = {}
for i = 1, 2 do
if not this.treasurePanel[i] then
@ -35,14 +43,12 @@ function RoleEquipTreasureChangePopup:InitComponent()
--信息
this.treasurePanel[i].bg = Util.GetGameObject(self.transform, "GameObject/bg"..i)
this.treasurePanel[i].desc = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/Text"):GetComponent("Text")
this.treasurePanel[i].EquipProImg = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/proImg"):GetComponent("Image")
this.treasurePanel[i].EquipName = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/name/text"):GetComponent("Text")
this.treasurePanel[i].EquipFrame = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/frame"):GetComponent("Image")
this.treasurePanel[i].EquipIcon = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/icon"):GetComponent("Image")
this.treasurePanel[i].EquipTypeText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/equipTypeText"):GetComponent("Text")
this.treasurePanel[i].powerUPorDown = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/powerUPorDown")
this.treasurePanel[i].qualityText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/qualityText"):GetComponent("Text")
this.treasurePanel[i].powerNum = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/powerNum"):GetComponent("Text")
this.treasurePanel[i].pos = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/pos")
--按钮
this.treasurePanel[i].EquipBtns = Util.GetGameObject(self.transform, "GameObject/bg"..i.."/btns")
this.treasurePanel[i].EquipBtnStrong = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnStrong")
@ -53,12 +59,6 @@ function RoleEquipTreasureChangePopup:InitComponent()
--红点
this.treasurePanel[i].StrongRed = Util.GetGameObject(this.treasurePanel[i].EquipBtnStrong, "red")
this.treasurePanel[i].RefineRed = Util.GetGameObject(this.treasurePanel[i].EquipBtnRefine, "red")
--属性
this.treasurePanel[i].EquipLvText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/lvTxt"):GetComponent("Text")
this.treasurePanel[i].EquipRefineLvTxt = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/starTxt"):GetComponent("Text")
this.treasurePanel[i].EquipTreeLvTxt = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/treeImg/treeTxt"):GetComponent("Text")
this.treasurePanel[i].treeImg = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/treeImg")
this.treasurePanel[i].treeImg:SetActive(false)
--属性信息
this.treasurePanel[i].bgScroll = Util.GetGameObject(this.treasurePanel[i].bg, "Scroll")
--基础
@ -69,11 +69,21 @@ function RoleEquipTreasureChangePopup:InitComponent()
this.treasurePanel[i].RefineAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/refineAttri")
this.treasurePanel[i].RefineAttriNum = Util.GetGameObject(this.treasurePanel[i].RefineAttri, "name/attriNum"):GetComponent("Text")
this.treasurePanel[i].RefineAttriGrid = Util.GetGameObject(this.treasurePanel[i].RefineAttri, "grid")
--神应
this.treasurePanel[i].TreeAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/treeAttri")
-- --神应
-- this.treasurePanel[i].TreeAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/treeAttri")
-- this.treasurePanel[i].TreeAttriNum = Util.GetGameObject(this.treasurePanel[i].TreeAttri, "name/attriNum"):GetComponent("Text")
-- this.treasurePanel[i].TreeAttriGrid = Util.GetGameObject(this.treasurePanel[i].TreeAttri, "grid")
this.treasurePanel[i].TreeAttri:SetActive(false)
-- this.treasurePanel[i].TreeAttri:SetActive(false)
--强化共鸣
this.treasurePanel[i].strongAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/strongAttri")
this.treasurePanel[i].strongAttriNum = Util.GetGameObject(this.treasurePanel[i].strongAttri, "name/attriName"):GetComponent("Text")
this.treasurePanel[i].strongAttriGrid = Util.GetGameObject(this.treasurePanel[i].strongAttri, "grid")
this.treasurePanel[i].strongAttri:SetActive(false)
--精炼共鸣
this.treasurePanel[i].refineMasterAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/refineMasterAttri")
this.treasurePanel[i].refineMasterAttriNum = Util.GetGameObject(this.treasurePanel[i].refineMasterAttri, "name/attriName"):GetComponent("Text")
this.treasurePanel[i].refineMasterAttriGrid = Util.GetGameObject(this.treasurePanel[i].refineMasterAttri, "grid")
this.treasurePanel[i].refineMasterAttri:SetActive(false)
end
end
@ -81,6 +91,7 @@ function RoleEquipTreasureChangePopup:InitComponent()
this.propertyPre=Util.GetGameObject(self.transform, "GameObject/bg1/PropertyTxt")
this.curEquipSign=Util.GetGameObject(self.transform, "GameObject/bg1/Text")
this.TextPre = Util.GetGameObject(self.transform, "GameObject/bg1/TextPre")
this.line = Util.GetGameObject(self.transform, "GameObject/bg1/line")
this.space = Util.GetGameObject(self.transform, "GameObject/bg1/space")
end
--绑定事件(用于子类重写)
@ -187,16 +198,16 @@ end
--界面打开时调用(用于子类重写)
function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_curEquipData,_nextEquipData,_position)
function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_curEquipData,_nextEquipData,_position,_isShowBtn)
openThisPanel = _openThisPanel
type = _type--1 穿戴 2 卸下 3 替换 4显示信息
curHeroData = _curHeroData
equipData[1] = _curEquipData--lv
equipData[2] = _nextEquipData--refinelv
position = _position--treelv
isShowBtn = _isShowBtn
end
function RoleEquipTreasureChangePopup:OnShow()
Log("openType:"..tostring(type))
--初始化
for i = 1, 2 do
this.treasurePanel[i].bg:SetActive(false)
@ -209,7 +220,12 @@ function RoleEquipTreasureChangePopup:OnShow()
end
this.space:SetActive(false)
this.treasurePanel[1].BaseAttri:SetActive(true)
if not this.preList then
this.preList = {}
end
for k,v in pairs(this.preList) do
v.gameObject:SetActive(false)
end
if type==3 then
this.ShowEquipData(1)
this.ShowEquipData(2)
@ -239,6 +255,14 @@ function RoleEquipTreasureChangePopup:OnShow()
isGongMing = HarmonyManager.IsInfo(equipData[1].upHeroDid)
Util.SetGray(this.treasurePanel[1].EquipBtnStrong, isGongMing)
end
if isShowBtn and isShowBtn == 0 then
for k,v in ipairs(this.treasurePanel) do
v.EquipBtns.gameObject:SetActive(false)
end
end
ForceRebuildLayout(this.GameObject.transform)
end
function this.resetData()
@ -286,7 +310,7 @@ function this.ShowEquipData(i)
if type == 5 then
if i == 1 then
if not equipData[i].idDyn then
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv)--, equipData[1].treeLv)
else
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
end
@ -295,14 +319,14 @@ function this.ShowEquipData(i)
end
elseif type == 3 then
if not equipData[i].idDyn then
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv)--, equipData[1].treeLv)
else
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
end
Power[2] = EquipTreasureManager.CalculateWarForce(equipData[2].idDyn)
else
if not equipData[i].idDyn then
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv)--, equipData[1].treeLv)
else
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
end
@ -315,20 +339,20 @@ function this.ShowEquipData(i)
if type==3 and equipData[2] ~= nil and i == 1 then
if(Power[1] > Power[2]) then
this.treasurePanel[1].powerUPorDown:SetActive(true)
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[1])
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = this.spLoader:LoadSprite(PowerChangeIconDef[1])
elseif(Power[1] < Power[2] )then
this.treasurePanel[1].powerUPorDown:SetActive(true)
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[2])
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = this.spLoader:LoadSprite(PowerChangeIconDef[2])
else
this.treasurePanel[1].powerUPorDown:SetActive(false)
end
elseif type==3 and equipData[1] ~= nil and i == 2 then
if Power[2] > Power[1] then
this.treasurePanel[2].powerUPorDown:SetActive(true)
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[1])
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = this.spLoader:LoadSprite(PowerChangeIconDef[1])
elseif Power[2] < Power[1] then
this.treasurePanel[2].powerUPorDown:SetActive(true)
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[2])
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = this.spLoader:LoadSprite(PowerChangeIconDef[2])
else
this.treasurePanel[2].powerUPorDown:SetActive(false)
end
@ -339,41 +363,20 @@ function this.ShowEquipData(i)
this.treasurePanel[i].qualityText.text = GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level))
this.treasurePanel[i].EquipName.text=GetStringByEquipQua(itemConfigData.Quantity,GetLanguageStrById(itemConfigData.Name))
this.treasurePanel[i].EquipTypeText.text = string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location])
this.treasurePanel[i].EquipFrame.sprite = Util.LoadSprite(equipData[i].frame)
this.treasurePanel[i].EquipIcon.sprite = Util.LoadSprite(equipData[i].icon)
this.treasurePanel[i].EquipProImg.sprite = Util.LoadSprite(equipData[i].proIcon)
--强化等级
local lv = equipData[i].lv
if lv == 0 then
this.treasurePanel[i].EquipLvText.gameObject:SetActive(false)
else
this.treasurePanel[i].EquipLvText.gameObject:SetActive(true)
this.treasurePanel[i].EquipLvText.text = lv
if not this.preList[i] then
this.preList[i] = SubUIManager.Open(SubUIConfig.ItemView,this.treasurePanel[i].pos.transform)
end
--精良等级
local refine=equipData[i].refineLv
if refine == 0 then
this.treasurePanel[i].EquipRefineLvTxt.gameObject:SetActive(false)
else
this.treasurePanel[i].EquipRefineLvTxt.gameObject:SetActive(true)
this.treasurePanel[i].EquipRefineLvTxt.text="+"..refine
end
--神应等级
-- local treeLv = equipData[i].treeLv
-- if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then
-- this.treasurePanel[i].treeImg:SetActive(false)
-- else
-- this.treasurePanel[i].treeImg:SetActive(true)
-- this.treasurePanel[i].EquipTreeLvTxt.text = treeLv
-- end
this.preList[i].gameObject:SetActive(true)
this.preList[i]:OnOpen(false,{equipConfigData.Id,0},1,false, false,false, 0,equipData[i].idDyn)
--(基础属性)
this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,100)
local baseInfo = EquipTreasureManager.GetCurLvPropertyValue(1,equipData[i].levelPool,equipData[i].lv)
this.treasurePanel[i].BaseAttriNum.text = string.format("[强化等级:%s/%s]",equipData[i].lv,equipData[i].maxLv)
this.SetPropertyShow1(baseInfo,this.BasePropertyList[i],this.treasurePanel[i].BaseAttriGrid)
--(精炼属性)
local refineInfo = EquipTreasureManager.GetCurLvPropertyValue(2,equipData[i].refinePool,equipData[i].refineLv,true)
this.treasurePanel[i].RefineAttriNum.text = string.format("[精炼等级:%s/%s]",equipData[i].refineLv,equipData[i].maxRefineLv)
@ -384,47 +387,157 @@ function this.ShowEquipData(i)
this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,250)
this.SetPropertyShow1(refineInfo,this.RefinePropertyList[i],this.treasurePanel[i].RefineAttriGrid)
end
if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" then
this.treasurePanel[i].strongAttri.gameObject:SetActive(false)
this.treasurePanel[i].refineMasterAttri:SetActive(false)
else
--强化共鸣
this.GongMingSetData(1,this.strongPropertyList[i],this.treasurePanel[i].strongAttriGrid,this.treasurePanel[i].strongAttriNum,this.treasurePanel[i].strongAttri,i)
--精炼共鸣
this.GongMingSetData(2,this.RefineMonsterPropertyList[i],this.treasurePanel[i].refineMasterAttriGrid,this.treasurePanel[i].refineMasterAttriNum,this.treasurePanel[i].refineMasterAttri,i)
end
--(神应属性)
-- local treeInfo=EquipTreasureManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv)
-- local treeInfo=SacredTreeManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv or 0)
-- 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
-- if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or (equipData[i].treeLv < 1 and SacredTreeManager.CulAttri(equipData[1]) < 1) 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)
-- local vec = this.treasurePanel[index].bgScroll:GetComponent("RectTransform").sizeDelta
-- vec.y = vec.y + 100
-- this.treasurePanel[index].bgScroll:GetComponent("RectTransform").sizeDelta = vec
-- this.SetPropertyShow2(treeInfo,this.TreePropertyList[i],this.treasurePanel[i].TreeAttriGrid,this.TreePropertyList2[i])
-- 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))
end
end
function this.GongMingSetData(curTabIndex,proPreList,grid,title,go,index)
--获取穿戴宝物强化/精炼的最小等级
local minLv--最小等级
local maxlv --最大等级
if #curHeroData.jewels < 2 then
go.gameObject:SetActive(false)
return
end
go.gameObject:SetActive(true)
for i = 1, #curHeroData.jewels do
local curEquipTreasureData = EquipTreasureManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i]) or ExpeditionManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i]) or GoodFriendManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i])
if curTabIndex == 1 then
if minLv then
if curEquipTreasureData.lv < minLv then
minLv = curEquipTreasureData.lv
end
else
minLv = curEquipTreasureData.lv
end
if maxlv then
if curEquipTreasureData.maxLv < maxlv then
maxlv = curEquipTreasureData.maxLv
end
else
maxlv = curEquipTreasureData.maxLv
end
elseif curTabIndex == 2 then
if minLv then
if curEquipTreasureData.refineLv < minLv then
minLv = curEquipTreasureData.refineLv
end
else
minLv = curEquipTreasureData.refineLv
end
if maxlv then
if curEquipTreasureData.maxRefineLv < maxlv then
maxlv = curEquipTreasureData.maxRefineLv
end
else
maxlv = curEquipTreasureData.maxRefineLv
end
end
end
local curJewelResonanceConfig = nil
local allCurTypeJewelResonanceConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.JewelResonanceConfig,"Type",curTabIndex)
table.sort(allCurTypeJewelResonanceConfig,function(a,b)
return a.SortId<b.SortId
end)
for i = 1, #allCurTypeJewelResonanceConfig do
--获取当前强化/精炼 大师等级数据
if allCurTypeJewelResonanceConfig[i].Level <= minLv then
if curJewelResonanceConfig then
if curJewelResonanceConfig.SortId < allCurTypeJewelResonanceConfig[i].SortId then
curJewelResonanceConfig = allCurTypeJewelResonanceConfig[i]
end
else
curJewelResonanceConfig = allCurTypeJewelResonanceConfig[i]
end
end
end
if curJewelResonanceConfig.SortId < 1 then
go.gameObject:SetActive(false)
return
end
local vec = this.treasurePanel[index].bgScroll:GetComponent("RectTransform").sizeDelta
vec.y = vec.y + 100
this.treasurePanel[index].bgScroll:GetComponent("RectTransform").sizeDelta = vec
go.gameObject:SetActive(true)
if curTabIndex == 1 then
title.text = string.format("<color=#FE2F33>强化大师%s级</color>",curJewelResonanceConfig.SortId)
else
title.text = string.format("<color=#FE2F33>精炼大师%s级</color>",curJewelResonanceConfig.SortId)
end
for i = 1, math.max(#curJewelResonanceConfig.Property,#proPreList) do
if not curJewelResonanceConfig.Property[i] then
proPreList[i].gameObject:SetActive(false)
else
if not proPreList[i] then
proPreList[i] = newObjToParent(this.TextPre,grid.transform)
end
proPreList[i].gameObject:SetActive(true)
local str = GetLanguageStrById(propertyConfig[curJewelResonanceConfig.Property[i][1]].Info).."+"..GetPropertyFormatStr(propertyConfig[curJewelResonanceConfig.Property[i][1]].Style,curJewelResonanceConfig.Property[i][2])
proPreList[i].transform:GetComponent("Text").text = string.format("<color=#66FF00>%s</color>",str)
end
end
end
--神应专用
function this.SetPropertyShow2(_infos,_preList,_grid)
local curTree = SacredTreeManager.CulAttri()
function this.SetPropertyShow2(_infos,_preList,_grid,_preList2)
local curTree = SacredTreeManager.CulAttri(equipData[1])
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0).PropertyUnlcokLevelForClient
local dataCount=LengthOfTable(_infos)
local preCount=#_preList
for i = 1, dataCount-preCount do
local go = newObject(this.TextPre)
local t = math.floor((i+1)/2)
local trans = Util.GetGameObject(_grid.transform,"line ("..t..")")
go.transform:SetParent(trans.transform)
local preCount=#_preList ---行数
for i = 1, math.ceil(dataCount/2) - preCount do
local go = newObject(this.line)
go.transform:SetParent(_grid.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go.gameObject:SetActive(false)
table.insert(_preList,go)
end
preCount = #_preList2
for i = 1, dataCount - preCount do
local go = newObject(this.TextPre)
table.insert(_preList2,go)
go.transform:SetParent(_preList[math.ceil(#_preList2/2)].transform)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go.gameObject:SetActive(false)
end
local index=1
for key, value in pairs(attriConfig) do
local obj=_preList[index]
local obj = _preList2[index]
_preList[math.ceil(index/2)].gameObject:SetActive(true)
local proper=propertyConfig[value[1]]
local string
if proper.Style==1 then
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue--value.currValue
else
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue/100 .."%"
local string = ""
if _infos[value[1]] then
if proper.Style==1 then
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue--value.currValue
else
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue/100 .."%"
end
end
if index <= curTree then
string = "<color=#66FF00>"..string.."</color>"
@ -436,8 +549,13 @@ function this.SetPropertyShow2(_infos,_preList,_grid)
obj.gameObject:SetActive(true)
index=index+1
end
for i = 1, #_preList2 do
if i >= index then
_preList2[i]:SetActive(false)
end
end
for i = 1, #_preList do
if i>=index then
if i > math.ceil(index/2) then
_preList[i]:SetActive(false)
end
end
@ -487,6 +605,11 @@ function RoleEquipTreasureChangePopup:OnDestroy()
equipIdList=nil
equipDataList=nil
position=0
this.spLoader:Destroy()
for k,v in pairs(this.preList) do
SubUIManager.Close(v)
end
this.preList = {}
end
return RoleEquipTreasureChangePopup

View File

@ -180,8 +180,8 @@ function this.RequestBuyShopItem(shopType, shopItemId, num, func,isShowReward)
if msg.drop.itemlist and #msg.drop.itemlist > 0 or
msg.drop.equipId and #msg.drop.equipId > 0 or
msg.drop.Hero and #msg.drop.Hero > 0 or
msg.drop.soulEquip and #msg.drop.soulEquip > 0-- or
-- msg.drop.especialEquipId and #msg.drop.especialEquipId > 0
msg.drop.soulEquip and #msg.drop.soulEquip > 0 or
msg.drop.pokemon ~= nil and #msg.drop.pokemon > 0 --msg.drop.especialEquipId and #msg.drop.especialEquipId > 0
then
if isShowReward and isShowReward == 0 then
else

View File

@ -28,8 +28,10 @@ function ItemView:InitComponent()
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
self.name = Util.GetGameObject(self.gameObject, "name")
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
self.resetLvText = self.resetLv:GetComponent("Text")
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv"):GetComponent("Text")
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
self.middleDownLvText = Util.GetGameObject(self.middleDownLv, "Text"):GetComponent("Text")
self.item = Util.GetGameObject(self.gameObject, "item")
self.innateImage=Util.GetGameObject(self.gameObject, "item/innateImage")
self.innateText=Util.GetGameObject(self.gameObject, "item/innateImage/Text"):GetComponent("Text")
@ -256,7 +258,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)
@ -304,7 +306,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.starGrid:SetActive(true)
SetHeroStars(self.spLoader, self.starGrid, _itemData.backData.rebuildLevel,1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,_itemData.backData.id,_itemData.backData.equipId,_itemData.backData.exp,_itemData.backData.rebuildLevel)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,_itemData.backData.id,_itemData.backData.equipId,_itemData.backData.exp,_itemData.backData.rebuildLevel,0)
end)
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5)
@ -322,7 +324,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
-- UIManager.OpenPanel(UIName.RewardSoulPrintSingleShowPopup,0, _itemData.backData.id, function()
-- end)
--UIManager.OpenPanel(UIName.SoulPrintPopUp,0,nil,_itemData.backData.id,nil,nil)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.backData.id,_itemData.backData.equipId, 0,0)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.backData.id,_itemData.backData.equipId, 0,0,0)
end)
elseif _itemData.itemType == 6 then
self.num:SetActive(false)
@ -542,7 +544,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.starGrid:SetActive(true)
SetHeroStars(self.spLoader, self.starGrid, TalismanManager.AllTalismanStartStar[itemSId],1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.HunYin then
-- self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7)
@ -575,11 +577,22 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
if not self.Did then
self.rightUplv.gameObject:SetActive(false)
self.middleDownLv.gameObject:SetActive(false)
self.resetLv.gameObject:SetActive(false)
else
local data = EquipTreasureManager.GetSingleTreasureByIdDyn(self.Did)
-- if not data then
-- data = MonsterCampManager.GetSingleTreasureByIdDyn(self.Did)
-- end
if not data then
data = ExpeditionManager.GetSingleTreasureByIdDyn(self.Did)
end
if not data then
data = GoodFriendManager.GetSingleTreasureByIdDyn(self.Did)
end
if not data then
self.rightUplv.gameObject:SetActive(false)
self.middleDownLv.gameObject:SetActive(false)
self.resetLv.gameObject:SetActive(false)
else
if data.lv > 0 then
self.rightUplv.gameObject:SetActive(true)
@ -588,15 +601,26 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.rightUplv.gameObject:SetActive(false)
end
if data.refineLv > 0 then
self.middleDownLv.gameObject:SetActive(true)
self.middleDownLv.text =string.format("<color=#32CFF4>+%s</color>", data.refineLv)
self.resetLv.gameObject:SetActive(true)
self.resetLvText.text =string.format("<color=#32CFF4>+%s</color>", data.refineLv)
else
self.middleDownLv.gameObject:SetActive(false)
self.resetLv.gameObject:SetActive(false)
end
self.middleDownLv.gameObject:SetActive(false)
-- if data.treeLv > 0 and data.upHeroDid ~= "" and tostring(data.upHeroDid) ~= tostring(0) then
-- self.middleDownLv.gameObject:SetActive(true)
-- local lv = data.treeLv
-- if data.treeLv > data.maxTreeLv then
-- lv = data.maxTreeLv
-- end
-- self.middleDownLvText.text =string.format("<color=#FFFFFF>%s</color>", lv)
-- else
-- self.middleDownLv.gameObject:SetActive(false)
-- end
end
end
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.LingShou then
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
@ -637,7 +661,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)