diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab index f40da8dfce..085fbe50a6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab @@ -2168,6 +2168,7 @@ RectTransform: - {fileID: 2052414450235245903} - {fileID: 7580112336254008438} - {fileID: 489892761836824456} + - {fileID: 605256611118539928} m_Father: {fileID: 1794217507149899798} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2776,6 +2777,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5347\u7EA7" LanguageIndex: 0 +--- !u!1 &8443486675262854970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 605256611118539928} + - component: {fileID: 5245693466825886926} + - component: {fileID: 8074869515864408119} + m_Layer: 5 + m_Name: hintTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &605256611118539928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8443486675262854970} + 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: 903558189483610408} + m_RootOrder: 20 + 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: -356} + m_SizeDelta: {x: 77.55, y: 48.29} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5245693466825886926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8443486675262854970} + m_CullTransparentMesh: 0 +--- !u!114 &8074869515864408119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8443486675262854970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7735849, g: 0.16420436, b: 0.1832475, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "5\u7EA7" + LanguageIndex: 0 --- !u!1 &8853127179332475563 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab index c1f8f2a90d..a62b4eb0ae 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab @@ -164,9 +164,9 @@ RectTransform: m_Father: {fileID: 5937658545183569819} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 97, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 97, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1587833946924890131 @@ -441,9 +441,9 @@ RectTransform: m_Father: {fileID: 1927155927552427306} 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: 100, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &392978044995497371 @@ -891,9 +891,9 @@ RectTransform: m_Father: {fileID: 3677504909529549046} 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: 366, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 366, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6798990154167911892 @@ -1293,6 +1293,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5047481799263831652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3218038706111854309} + - component: {fileID: 2010526384947612646} + - component: {fileID: 2355732761290068634} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3218038706111854309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5047481799263831652} + 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: 7374197698741745126} + 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: 3.3, y: 243} + m_SizeDelta: {x: 646.3, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2010526384947612646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5047481799263831652} + m_CullTransparentMesh: 0 +--- !u!114 &2355732761290068634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5047481799263831652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6431373, g: 0.4862745, b: 0.19215687, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6BCF\u4E2A\u6EE1\u7EA7\u7279\u8BAD\u795E\u5C06\u6FC0\u6D3B\uFF1A\u6240\u6709\u795E\u5C06\u793C\u7269\u5C5E\u6027+5%\uFF08\u6700\u9AD8200%\uFF09\u6240\u6709\u795E\u5C06\u793C\u7269\u683C\u5B50+1\uFF08\u6700\u591A\u5F00\u542F40\u4E2A\u795E\u5C06\u793C\u7269\u683C\u5B50\uFF09" --- !u!1 &5480051880412320941 GameObject: m_ObjectHideFlags: 0 @@ -1837,9 +1916,9 @@ RectTransform: m_Father: {fileID: 4237162652427188915} 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: 100, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4743152321498252533 @@ -2209,9 +2288,9 @@ RectTransform: m_Father: {fileID: 1927155927552427306} 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: 340, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 340, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4242016478810808559 @@ -2399,6 +2478,7 @@ RectTransform: - {fileID: 8757155620257076546} - {fileID: 1948378571384027056} - {fileID: 2556124757473444988} + - {fileID: 3218038706111854309} m_Father: {fileID: 4835946820273722355} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2477,9 +2557,9 @@ RectTransform: m_Father: {fileID: 3677504909529549046} 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: 295.5, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 295.5, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7486278546591685444 @@ -2651,9 +2731,9 @@ RectTransform: m_Father: {fileID: 3677504909529549046} 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: 103.5, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 103.5, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6477998336225723440 @@ -2958,7 +3038,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: 61} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 800, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8935431814318849300 @@ -3052,9 +3132,9 @@ RectTransform: m_Father: {fileID: 4237162652427188915} 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: 306.5, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 306.5, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1532833825933587511 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab index 9077095c83..ace14f3f33 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab @@ -45534,7 +45534,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7562369824696417792 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab index ff8a293eb7..fb0cdafa23 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab @@ -3173,7 +3173,7 @@ MonoBehaviour: m_StartAxis: 0 m_CellSize: {x: 300, y: 50} m_Spacing: {x: 0, y: 0} - m_Constraint: 1 + m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &4747428286953993912 MonoBehaviour: @@ -5190,7 +5190,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: -0.000030406325} + m_AnchoredPosition: {x: 0, y: -0.00000940907} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &22196219189311584 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab index ab8fa6e30d..bc3f2f9bf8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab @@ -15950,6 +15950,101 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2739088416859993172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6231241752958309031} + - component: {fileID: 2667832609600825983} + - component: {fileID: 4584168527664299266} + - component: {fileID: 8987787724653404842} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6231241752958309031 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2739088416859993172} + 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: 7827689223569368462} + m_RootOrder: 1 + 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: -36} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2667832609600825983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2739088416859993172} + m_CullTransparentMesh: 0 +--- !u!114 &4584168527664299266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2739088416859993172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u73CD\u5947\u5B9D\u9601" +--- !u!114 &8987787724653404842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2739088416859993172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3026750723975737811 GameObject: m_ObjectHideFlags: 0 @@ -16866,7 +16961,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.0012417, y: 32.49996} + m_AnchoredPosition: {x: -0.0012417, y: 32.500008} m_SizeDelta: {x: 156.9, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6093919403513127437 @@ -43370,6 +43465,145 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &7862207621653745486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7827689223569368462} + - component: {fileID: 3706562580933055000} + - component: {fileID: 1642542524190048763} + - component: {fileID: 1426390687196158838} + - component: {fileID: 7643616670806965} + m_Layer: 5 + m_Name: zqbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7827689223569368462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7862207621653745486} + 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: + - {fileID: 8010327024201783415} + - {fileID: 6231241752958309031} + m_Father: {fileID: 525861077396693718} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 402.4, y: 527} + m_SizeDelta: {x: 180, y: 174} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3706562580933055000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7862207621653745486} + m_CullTransparentMesh: 0 +--- !u!114 &1642542524190048763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7862207621653745486} + 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: a3cc16b83b5bd5448a051df62e723493, 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!114 &1426390687196158838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7862207621653745486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1642542524190048763} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &7643616670806965 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7862207621653745486} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7864531092850417578 GameObject: m_ObjectHideFlags: 0 @@ -43478,6 +43712,7 @@ RectTransform: - {fileID: 7506318511877815970} - {fileID: 8092685630608508347} - {fileID: 8367012454233286056} + - {fileID: 7827689223569368462} m_Father: {fileID: 3682111438792279610} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -53830,6 +54065,80 @@ MonoBehaviour: m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &9152562217627337061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8010327024201783415} + - component: {fileID: 3525361424969837336} + - component: {fileID: 867151180268555633} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8010327024201783415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152562217627337061} + 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: 7827689223569368462} + 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.6, y: 13.4} + m_SizeDelta: {x: 168.1, y: 137.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3525361424969837336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152562217627337061} + m_CullTransparentMesh: 0 +--- !u!114 &867151180268555633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152562217627337061} + 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: 915d573e7d842de4987ea30d7f4500f4, 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 &9194426986243419794 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab index fd2e557f74..c7cb1fd5d2 100644 --- a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab @@ -896,7 +896,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: 12.884998, y: -58.38} + m_AnchoredPosition: {x: 12.88501, y: -58.38} m_SizeDelta: {x: 119.77, y: 116.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &983025033 @@ -2926,6 +2926,7 @@ RectTransform: - {fileID: 6829092394564936211} - {fileID: 6674535297544090741} - {fileID: 6674535297833141102} + - {fileID: 419577565700805714} m_Father: {fileID: 7912912388875136582} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4176,6 +4177,123 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6637690421176299736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 419577565700805714} + - component: {fileID: 2160784463543351890} + - component: {fileID: 7021615147372475134} + - component: {fileID: 4041761180663081115} + m_Layer: 5 + m_Name: btn_help + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &419577565700805714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6637690421176299736} + 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: 31242521730910685} + m_RootOrder: 5 + 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: 160, y: 868} + m_SizeDelta: {x: 68, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2160784463543351890 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6637690421176299736} + m_CullTransparentMesh: 0 +--- !u!114 &7021615147372475134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6637690421176299736} + 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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!114 &4041761180663081115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6637690421176299736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7021615147372475134} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6674535295786682637 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5b329d6f84..5472f561c1 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -492,7 +492,7 @@ PanelType = { ShenZun = {16}, -- 东海寻仙 Talisman = {14}, -- 新法宝 Guild = {14, 16, 65}, -- 新法宝 - TimelimitCall={87,16,1011}, --限时召唤 + TimelimitCall={87,16}, --限时召唤 QianKunBox={1002,1003,16},--乾坤包囊 HeroReplace={14,16,92},--神将置换 LingShou={14,16,21},--灵兽 @@ -974,6 +974,7 @@ RedPointType = { TimeLimitWish = 10010, --奇珍宝阁红点 TimeLimitWishStore=10011, + WishEquipStore=10012, --心愿法宝抽卡商店 --灵兽 PokemonMainCity = 790,--灵兽主界面 Pokemon_UpLv = 791,--灵兽升级 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 65a4e9b454..61f2fa1248 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2045,12 +2045,12 @@ Language = { [12044] = GetLanguageStrById("神印"), [12045] = GetLanguageStrById("通用"), [12046] = GetLanguageStrById("[一般]"), - [12047] = GetLanguageStrById("[精良]"), - [12048] = GetLanguageStrById("[优秀]"), - [12049] = GetLanguageStrById("[史诗]"), - [12050] = GetLanguageStrById("[传说]"), - [12051] = GetLanguageStrById("[远古]"), - [12052] = GetLanguageStrById("[不朽]"), + [12047] = GetLanguageStrById("[普通]"), + [12048] = GetLanguageStrById("[良好]"), + [12049] = GetLanguageStrById("[优秀]"), + [12050] = GetLanguageStrById("[稀有]"), + [12051] = GetLanguageStrById("[史诗]"), + [12052] = GetLanguageStrById("[传说]"), [12053] = GetLanguageStrById("时"), [12054] = GetLanguageStrById("分"), [12055] = GetLanguageStrById("%s天 %02d:%02d:%02d"), diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index a090106d07..4cc2721c38 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2714,9 +2714,10 @@ function GetEquipSuitStr(Star,num) if qua==8 then qua=7 end + local suitConfig=ConfigManager.GetConfigData(ConfigName.EquipSuiteConfig,Star) -- return string.format(Language[12057],num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars) if qua>6 then - return string.format("%s件%s及以上装备激活",num,QualityNameDef[qua]) + return string.format("%s件%s及以上装备激活",num,suitConfig.Name) else return string.format(Language[12057],num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars) end @@ -2948,6 +2949,114 @@ function CheckFunctionOpen(_funId) end return true end +--客户端判断功能是否开启 +function CheckFunctionOpenClient(_funId) + local data = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,_funId) + if data.IsOpen==0 then + return false + end + -- 当前玩家等级 + local playerLv = PlayerManager.level + local tip="" + --开启规则 + --1关卡开启 + --2玩家等级开启 + --3鸿蒙阵神将等级 + --4购买礼包开启 + --6修行等级 + local openRule = data.OpenRules + if openRule then + if openRule[1] == 1 and not FightPointPassManager.IsFightPointPass(openRule[2]) then -- 关卡开启 + return false + elseif openRule[1] == 2 and playerLv < openRule[2] then -- 等级开启 + return false + elseif openRule[1] == 3 and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) < openRule[2] then -- 鸿蒙阵神将共鸣等级 + return false + elseif openRule[1] == 4 and not OperatingManager.IsBuyGift(openRule[2]) then + return false + elseif openRule[1] == 5 and GodsWayTowerManager.GetTowerFloorByType(1) < openRule[2] then + return false + elseif openRule[1] == 6 and PracticeManager.PracticeLevel 120 then - SysPanel.ShowTwo(Language[12235], function() + if Time.time - self.ReconnectTime > 60 then + --SysPanel.ShowTwo(Language[12235], function() Game.Logout() - end, Language[12117]) + --end, Language[12117]) end self.re_resendTimes = self.re_resendTimes + 1 @@ -318,15 +318,16 @@ function Network:Update() MyPCall(self.sendFunc) elseif self.resendTimes == self.maxResendTimes then RequestPanel.Hide() - SysPanel.ShowTwo(Language[12121], function() - Game.Logout() - end, function() - -- if self:IsSending() then - self:SetSending(false) - self.resendTimes = 0 - self.sendFuncQueue:Clear() - -- end - end, Language[12117]) + -- SysPanel.ShowTwo(Language[12121], function() + -- Game.Logout() + -- end, function() + -- -- if self:IsSending() then + -- self:SetSending(false) + -- self.resendTimes = 0 + -- self.sendFuncQueue:Clear() + -- -- end + -- end, Language[12117]) + Game.Logout() end self.resendTimes = self.resendTimes + 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index 1eb0c393d0..3cde6e064c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -34,7 +34,7 @@ function ArenaTypePanel:InitComponent() this.TopMatch_Lock_Title = Util.GetGameObject(this.TopMatch_Lock, "Season"):GetComponent("Text") this.TopMatch_Lock_Time = Util.GetGameObject(this.TopMatch_Lock, "Season/Time"):GetComponent("Text") this.TopMatch_Lock_Tip = Util.GetGameObject(this.TopMatch_Lock, "Tip"):GetComponent("Text") - + this.TopMatch_Lock_Tip.gameObject:SetActive(false) this.btnArenaRedpot = Util.GetGameObject(this.btnArena, "bg/redpot") -- 上部货币显示 -- this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft}) @@ -47,12 +47,12 @@ function ArenaTypePanel:BindEvent() end) Util.AddClick(this.btnTopMatch, function() - local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) - if not isOpen then - PopupTipPanel.ShowTip("巅峰赛暂未开放") - return - end - UIManager.OpenPanel(UIName.ArenaTopMatchPanel) + -- local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) + -- if not isOpen then + -- PopupTipPanel.ShowTip("巅峰赛暂未开放") + -- return + -- end + --UIManager.OpenPanel(UIName.ArenaTopMatchPanel) if state<1 then PopupTipPanel.ShowTip(tipStr) return @@ -107,6 +107,7 @@ function ArenaTypePanel:OnShow() end) end) --罗浮争锋 + --this.RefreshTopMatchShow() JumpServerManager.GetWorldArenaInfoRequest(function() this.RefreshTopMatchShow() -- 计时器 @@ -177,31 +178,39 @@ function this.RefreshTopMatchShow() this.TopMatch_Name.text = "罗浮争锋" --判断功能是否开启 - - if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then - state = -1 - tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder) - end - --判断世界等级是否够 - local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel - if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 - state = -2 - tipStr = string.format("世界等级到达%s后开启!",conFigWorldLevel) - end - --判断是否在赛季中 - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁 - state = -3 - tipStr = "赛季过渡中!" - end - if not JumpServerManager.GetHightLadderDataIsStart() then - state = -4 - tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek) - elseif not JumpServerManager.GetHightLadderDataIsGroup() then - state = -5 - tipStr = "未划分跨服分组,无法参与!" + if not CheckFunctionOpen(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then + state=-6 + tipStr = GetFunctionOpenTip(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) else - state = 1 - tipStr = "" + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then + state = -1 + tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder) + + end + + --判断世界等级是否够 + local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel + if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 + state = -2 + tipStr = string.format("世界等级到达%s后开启!",conFigWorldLevel) + + end + --判断是否在赛季中 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁 + state = -3 + tipStr = "赛季过渡中!" + end + if not JumpServerManager.GetHightLadderDataIsStart() then + state = -4 + tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek) + + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + state = -5 + tipStr = "未划分跨服分组,无法参与!" + else + state = 1 + tipStr = "" + end end if state<1 then this.TopMatch_Normal:SetActive(false) @@ -210,6 +219,7 @@ function this.RefreshTopMatchShow() this.TopMatch_LockBg:SetActive(true) this.TopMatch_Name.text = "未达到开启条件" this.TopMatch_Lock_Title.text = tipStr + this.TopMatch_Lock_Time.text = "" else local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) if serData then diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index 4ef80a9a66..d83958f670 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -330,7 +330,6 @@ function this.OnShowLayout3Data() this.chipFrame:SetActive(true) this.chipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(itemData.itemConfig.Quantity)) if itemData.itemConfig.PropertyName and itemData.itemConfig.PropertyName > 0 then - print(itemData.itemConfig.PropertyName,"~~~~~~S") this.propertyIma:SetActive(true) this.propertyIma:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(itemData.itemConfig.PropertyName)) else @@ -342,11 +341,13 @@ function this.OnShowLayout3Data() -- if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip - or itemData.itemConfig.ItemType==ItemType.EquipChip - or itemData.itemConfig.ItemType==ItemType.CommonChip + --or itemData.itemConfig.ItemType==ItemType.EquipChip + --or itemData.itemConfig.ItemType==ItemType.CommonChip then -- 神将碎片 compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit, gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())) - elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip then -- 坐骑碎片 + elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip + or itemData.itemConfig.ItemType==ItemType.EquipChip + or itemData.itemConfig.ItemType==ItemType.CommonChip then -- 坐骑碎片 compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit) end @@ -366,6 +367,10 @@ function this.OnShowLayout3Data() this.nameText.text=Language[10195] this.btnCompoundText.text=Language[10195] compoundMaxNum=itemData.num + -- elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip + -- or itemData.itemConfig.ItemType==ItemType.EquipChip + -- or itemData.itemConfig.ItemType==ItemType.CommonChip then + else itemResolveType=itemData.itemConfig.ItemBaseType this.nameText.text=Language[10196] diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 52f495f810..87a0a4f8d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -1134,9 +1134,11 @@ function this.GetBattleResult() local reward1= ConfigManager.GetConfigData(ConfigName.ChallengeStage,1001).Reward1 data[1] = "回合数: "..boutNum local j=#reward1 - for i = #reward1, 1 do + --LogError("j================================"..j) + for i = #reward1, 1,-1 do + LogError("boutNum==="..boutNum.." reward1[j][1]===="..reward1[j][1]) if boutNum<=reward1[j][1] then - data[1]= string.format("%s\n当前评价奖励加成%s",data[1],reward1[j][2]) + data[1]= string.format("%s\n当前评价奖励加成%s",data[1],(reward1[j][2]/100).."%") break end j=j-1 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index 94fcf454b3..37c97e084c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -231,8 +231,8 @@ function QianKunBoxBuyOnePanel:OnOpen(...) end, 0.5) time:Start() if isLimitUpHero then - -- this.detailImage:SetActive(false) - -- this.detailImage3:SetActive(false) + this.detailImage:SetActive(false) + this.detailImage3:SetActive(false) end end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index ff2d3b4d4e..edb65b2c41 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -261,8 +261,8 @@ function QianKunBoxBuyTenPanel:OnOpen(...) end callList:Pop()() if isLimitUpHero then - -- this.detailImage:SetActive(false) - -- this.detailImage3:SetActive(false) + this.detailImage:SetActive(false) + this.detailImage3:SetActive(false) end end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 21b3ecd93e..838f016dbc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -32,6 +32,7 @@ function TimeLimitUpHero:InitComponent() self.titleImg = Util.GetGameObject(self.gameObject,"title"):GetComponent("Image") self.btnActivity = Util.GetGameObject(self.gameObject,"btngroup/btnActivity") self.btnStore = Util.GetGameObject(self.gameObject,"btngroup/store") + self.btnStore:SetActive(false) self.btnActivity:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_shilian-jiangli_zh") self.btns = {} @@ -62,7 +63,7 @@ function TimeLimitUpHero:InitComponent() self.dragView=Util.GetGameObject(self.mask1,"dragView") self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero") self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") - self.lsth.gameObject:SetActive(false) + --self.lsth.gameObject:SetActive(false) self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red") self.zqbgEffect = Util.GetGameObject(self.gameObject,"btngroup/zqbg/Fx_Circle 1") BindRedPointObject(RedPointType.TimeLimitWishStore,self.zqbgRed) @@ -120,6 +121,12 @@ function TimeLimitUpHero:BindEvent() JumpManager.GoJump(40068) end) Util.AddOnceClick(self.lsth, function() + local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + local tip=GetFunctionOpenTipClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + if isOpen==false then + PopupTipPanel.ShowTip(tip) + return + end JumpManager.GoJump(40071) end) end @@ -294,6 +301,12 @@ function TimeLimitUpHero:RefreshGetHeroTimes() m.num.text= PrintWanNum2(itemNum) end local sureFunc=function() + local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + local tip=GetFunctionOpenTipClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + if isOpen==false then + PopupTipPanel.ShowTip(tip) + return + end local isFree = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)>= 1 and n == 1 if not isFree then local count=PrivilegeManager.GetPrivilegeRemainValue(Setting.DiamondMaxTimes) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua index 4914ab2d9a..5dab9bd3c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua @@ -179,6 +179,7 @@ function this:ShowSingleHero(go,data,index) Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.Name Util.GetGameObject(go, "heroName"):GetComponent("Text").text= itemConfig[data].Name local starGrid = Util.GetGameObject(go, "star") + Util.GetGameObject(go, "name").gameObject:SetActive(false) -- SetHeroStars(self.spLoader,starGrid, heroData.Star) self.maskList[self.curSelect][index] = Util.GetGameObject(go, "choosed") self.maskList[self.curSelect][index]:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua index eb176c2f65..20dd988c0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua @@ -252,9 +252,11 @@ function this.GetAllEquipData() --获取法灵数据 function this.GetEquipDataByDid(_did) - LogError("_did=========================".._did) + if this.allEquipData[_did] then return this.allEquipData[_did] + else + LogError("_did=========================".._did) end return nil end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua index fa755d8b2a..d2a38b64d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua @@ -60,10 +60,11 @@ function this:InitComponent() this.btnList={} this.tabBox = Util.GetGameObject(self.gameObject, "TabBox") this.box = Util.GetGameObject(self.gameObject, "TabBox/box") + this.hintTip= Util.GetGameObject(self.gameObject, "bg/hintTip"):GetComponent("Text") this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.SwitchView) - this.TabCtrl:SetTabIsLockCheck(this.IsTabLock) + --this.TabCtrl:SetTabIsLockCheck(this.IsTabLock) for i=1,8 do this.btnList[i]=Util.GetGameObject(this.box, "tab"..i) end @@ -109,9 +110,15 @@ function this.SwitchView(index) --ConfigManager.getcon config=ConfigManager.TryGetConfigDataByKey(ConfigName.PotentialNewConfig,"Type",type) local giftLv=GiftManager.GetHeroPotencyLvById(dynamicId) + if data[type] then lv=data[type].lv + this.hintTip.gameObject:SetActive(false) LogError("giftLv======================"..data[type].giftLv.." 本地计算giftLV"..giftLv.." lv=="..lv) + else + lv=0 + this.hintTip.text=PoTencyTypeName[_TabData[index].type].."潜能未开启" + this.hintTip.gameObject:SetActive(true) end this.professionIcon.sprite=this.spLoader:LoadSprite(config.Icon) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 4b1070936c..9d2c4d48cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -338,7 +338,7 @@ function this:UpdateHeroInfoData() local aaa={ id="", equipId=heroConFigData.EquipTalismana[2], - exp=0, + exp=50, } local data=FaLingManager.initSingleData(aaa) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua index 3cecd1174b..b14619640c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua @@ -106,8 +106,9 @@ function HarmonyPanel:OnOpen() -- NetManager.PlayerInfoRequest(LoadingPanel.OnStep) --格子 - - self.GradeText.text="鸿蒙阵等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, 330) + local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,101).Value + local t = string.split(specialConfig,"#") + self.GradeText.text="鸿蒙阵等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, t[2]) for i = 1, #contents do contents[i].view:OnOpen(self.sortingOrder) end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 55a5ed668e..8761fefe36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -412,7 +412,7 @@ end function this.GetHongMengUpData() for i = 1, #this.hongmengAdditions do if this.hongmengAdditions[i].additionType == 1 then - if this.hongmengAdditions[i].value < 330 then + if this.hongmengAdditions[i].value < 300 then LogBlue("服务器数据为"..this.hongmengAdditions[i].value) return nil end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua index 7ba5963c11..0797a3f66a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua @@ -80,7 +80,7 @@ function GongMingResultTips:OnOpen(flag) if flag then else - if HarmonyManager:HongMengTowerUpLimit()>=330 then + if HarmonyManager:HongMengTowerUpLimit()>=300 then -- body this.textTitle.text = Language[12193] else @@ -181,12 +181,12 @@ function GongMingResultTips:OnOpen(flag) end if herodata.star >= 6 then -- body - if herodata.talismanList > 0 then - -- body - Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.oritalismanList) - else + -- if herodata.talismanList > 0 then + -- -- body + -- Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.oritalismanList) + -- else Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format(Language[10086]) - end + --end else Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format(Language[10086]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index 2b50586fb2..0237a986f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -155,12 +155,12 @@ function HongMengUnLoadPanel:SetTextTwo(go,data) if data.star >= 6 then -- body - if data.oritalismanList > 0 then - -- body - Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.oritalismanList) - else + -- if data.oritalismanList > 0 then + -- -- body + -- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.oritalismanList) + -- else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) - end + --end else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) end @@ -258,18 +258,18 @@ function HongMengUnLoadPanel:SetText(go,_data) else -- print(data[i].value) if _data.star >= 6 then - if dataAdditon[i].value > 0 and _data.oritalismanList < dataAdditon[i].value then + -- if dataAdditon[i].value > 0 and _data.oritalismanList < dataAdditon[i].value then - Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",dataAdditon[i].value) - else - if _data.oritalismanList >= dataAdditon[i].value then - -- body - Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",_data.oritalismanList) - else + -- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",dataAdditon[i].value) + -- else + -- if _data.oritalismanList >= dataAdditon[i].value then + -- -- body + -- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",_data.oritalismanList) + -- else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) - end + --end - end + --end else Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format(Language[10086]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index 3258d5291a..42b866785c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -37,7 +37,7 @@ HeroData.__get__.lv = function(self) return endLv elseif HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager:IsEnvoy(self.dynamicId) then local data = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) - if data.heroTid >= 0 and data.value >= 330 then + if data.heroTid >= 0 and data.value >= 300 then local temp_lv = 0 if HeroManager.IsTenTalent(self._id) then temp_lv = data.value @@ -146,7 +146,7 @@ HeroData.__get__.breakId = function (self) elseif HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager:IsEnvoy(self.dynamicId) then local data = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) --print("self._id @@@"..HarmonyManager.hongmengAdditions[1].heroTid.."#####"..HarmonyManager.hongmengAdditions[1].value ) - if data.heroTid >= 0 and data.value >= 330 then + if data.heroTid >= 0 and data.value >= 300 then local temp_lv = 0 if HeroManager.IsTenTalent(self._id) then temp_lv = data.value diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 5387b95192..39f99d1593 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -239,11 +239,11 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) -- unlockIds=nil, -- isTraining=0, } -- end - LogError("heroData.id=="..heroData.dynamicId) - LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp) - LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp) - LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp) - LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv) + -- LogError("heroData.id=="..heroData.dynamicId) + -- LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp) + -- LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp) + -- LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp) + -- LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv) GodSoulManager.BindHeroDatas(_msgHeroData) end @@ -1360,17 +1360,24 @@ local function CalculateHeroUpEquipsProAddVal(_heroId) end end end - + --屏蔽装备套装加的属性 if equipSuit and #equipSuit > 0 then for i, v in ipairs(equipSuit) do local curSuitConfig = equipsuite[i] - local curProId = equipSuit[i][2][2] - local curProVal = equipSuit[i][2][3] - -- LogError("套装激活 curProId "..curProId .." "..curProVal) - if addAllProVal[curProId] then - addAllProVal[curProId] = addAllProVal[curProId] + curProVal - else - addAllProVal[curProId] = curProVal + local curProId + if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][2] then + curProId = equipSuit[i][2][2] + end + local curProVal + if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][3] then + curProVal = equipSuit[i][2][3] + end + if curProId and curProVal then + if addAllProVal[curProId] then + addAllProVal[curProId] = addAllProVal[curProId] + curProVal + else + addAllProVal[curProId] = curProVal + end end end end @@ -1585,10 +1592,12 @@ end --英雄身上宝器属性计算 local function CalculateEquipTreaSureAddVal(_heroId) local addAllProVal = {} - local minLv - local mainRefineLv + local minLv=0 + local mainRefineLv=0 local curHeroData = HeroManager.GetSingleHeroData(_heroId) + LogError("_heroId===========================".._heroId) if curHeroData then + LogError("#curHeroData.jewels > 0=="..#curHeroData.jewels) if #curHeroData.jewels > 0 then for i = 1, #curHeroData.jewels do local did = curHeroData.jewels[i] @@ -1596,6 +1605,9 @@ local function CalculateEquipTreaSureAddVal(_heroId) EquipTreasureManager.GetSingleTreasureByIdDyn(did) or ExpeditionManager.GetSingleTreasureByIdDyn(did) or MonsterCampManager.GetSingleTreasureByIdDyn(did) + if curEuipTreaSureData==nil then + LogError("curEuipTreaSureData==nil") + end if curEuipTreaSureData then local curEuipTreaSureConfig = jewelConfig[curEuipTreaSureData.id] for _, configInfo in ConfigPairs(jewelRankupConfig) do @@ -1644,8 +1656,10 @@ local function CalculateEquipTreaSureAddVal(_heroId) -- end -- end end + if #curHeroData.jewels > 1 then --取 强化 精炼 最小值 + LogError("curEuipTreaSureData.lv=="..curEuipTreaSureData.lv) if minLv then if curEuipTreaSureData.lv < minLv then minLv = curEuipTreaSureData.lv @@ -1696,6 +1710,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end -- if lvjewelResonanceConfig then + LogError("lvjewelResonanceConfig") for j = 1, #lvjewelResonanceConfig.Property do if addAllProVal[lvjewelResonanceConfig.Property[j][1]] then addAllProVal[lvjewelResonanceConfig.Property[j][1]] = @@ -1707,6 +1722,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end end if refineLvjewelResonanceConfig then + LogError("refineLvjewelResonanceConfig") for j = 1, #refineLvjewelResonanceConfig.Property do if addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] then addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] = @@ -2764,7 +2780,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star,star2) if star2 then aaa=star2 end - LogError("aaa=="..aaa) + --LogError("aaa=="..aaa) local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid) local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",aaa) if curHeroConfig.OpenSkillRules then @@ -4047,7 +4063,7 @@ end function this.GetSoulPrintLoopUIMaxData(_heroData) --local d = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 37).Value, "#") --local d =#EquipSignSetting - LogError("#EquipSignSetting==============="..#EquipSignSetting) + --LogError("#EquipSignSetting==============="..#EquipSignSetting) local _d = {} local maxLv = 0 for k, v in ConfigPairs(EquipSignSetting) do @@ -4180,9 +4196,9 @@ function this.CheckHeroIsCanAddGodPrint(index,herodata) elseif index==2 then isCan=herodata.heroConfig.Profession==2 elseif index==3 then - isCan=herodata.heroConfig.Profession==4 - elseif index==4 then isCan=herodata.heroConfig.Profession==3 + elseif index==4 then + isCan=herodata.heroConfig.Profession==4 elseif index==5 then isCan=herodata.heroConfig.Job==1 elseif index==6 then @@ -4245,7 +4261,7 @@ function this.GetHeroPotencyAddByType(_dyn,_type) if heroDatas[_dyn] and heroDatas[_dyn].potential and heroDatas[_dyn].potential[_type] then local poten=heroDatas[_dyn].potential[_type] local allLv=poten.lv+poten.giftLv - LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv) + --LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv) local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",allLv) if config then local pro=config.Attribute/10000 @@ -4974,7 +4990,7 @@ function this.GetHeroTrainingAddPro(_id) local trainingsetting=ConfigManager.GetAllConfigsDataByKey(ConfigName.TrainSetting,"PoolID",trainData.TrainSettingID) local datas={} for i=1,#trainingsetting do - LogError(trainingsetting[i].Level) + --LogError(trainingsetting[i].Level) if trainingsetting[i].Level< level then for j=1 ,#trainingsetting[i].AttackProperty do local tAttack=trainingsetting[i].AttackProperty[j] @@ -5001,7 +5017,7 @@ function this.GetHeroTrainingAddPro(_id) end end elseif trainingsetting[i].Level==level then - LogError("trainfinfo"..hero.HeroTraining.attackExp..trainingsetting[i].TrainExp1 ) + --LogError("trainfinfo"..hero.HeroTraining.attackExp..trainingsetting[i].TrainExp1 ) if hero.HeroTraining.attackExp>=trainingsetting[i].TrainExp1 then for j=1 ,#trainingsetting[i].AttackProperty do local tAttack=trainingsetting[i].AttackProperty[j] diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua index 262dd39dbd..f3abd1a6c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua @@ -191,23 +191,36 @@ Hero_Prop_Func = { --LogError("equip id============================ id=="..id.." value=="..value) if id~=0 and id~=nil then if addAllProVal[id] then - addAllProVal[id] = addAllProVal[id] + value + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = addAllProVal[id] + math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = addAllProVal[id] + value + end + else - addAllProVal[id] = value - end - if propertyConfig[id].Style == 1 then--摘星阁加持 - --摘星阁加成先注释 - --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - --英雄潜能加成 - --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) - addAllProVal[id] = math.floor(addAllProVal[id]*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = value + end + end + -- if propertyConfig[id].Style == 1 then--摘星阁加持 + -- --摘星阁加成先注释 + -- --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --英雄潜能加成 + -- --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) + -- addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + -- end end end end end + -- for k, v in pairs(addAllProVal) do + -- LogError("k==============="..k.." v=========="..v) + -- end --屏蔽装备套装属性 -- if equipSuit and #equipSuit > 0 then -- for i, v in ipairs(equipSuit) do @@ -271,7 +284,6 @@ Hero_Prop_Func = { end end end - end --精炼的属性 if @@ -300,8 +312,6 @@ Hero_Prop_Func = { end end end - - --神应属性 --屏蔽宝物树加成的属性 2023/08/09 -- if @@ -356,7 +366,6 @@ Hero_Prop_Func = { -- end -- end end - --math.min() --取 强化 精炼 共鸣属性 -- if #_heroData.treasureList > 1 then @@ -676,9 +685,9 @@ Hero_Prop_Func = { --礼物 [Hero_Prop_Type.Gift] =function(_heroData) local addPro=GiftManager.GetHeroGiftAddPro(_heroData.dId) - for key, value in pairs(addPro) do - LogError("gift key==="..key.." value=="..value) - end + -- for key, value in pairs(addPro) do + -- LogError("gift key==="..key.." value=="..value) + -- end return addPro end, [Hero_Prop_Type.GodSoul] = function(_heroData) @@ -704,7 +713,6 @@ Hero_Prop_Func = { local allAddPro={} local propList, conPropList, teamPropList, conTeamPropList, dePropList --LogError("计算英雄法相 属性 被动属性") - --LogError("hero id===========================================".._heroData.tId) allAddPro=FaXiangManager.CalculateAllFaXiangAddPro(_heroData) local skills=FaXiangManager.GetHeroAllFaXiangSkill(_heroData) --被动技能计算 diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua index ec5e472857..8ef57f13bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua @@ -21,6 +21,8 @@ function TrainBuildLvUpPanel:InitComponent() this.Content = Util.GetGameObject(this.gameObject,"Content") this.Obtain = Util.GetGameObject(this.Content,"Obtain") this.Cost = Util.GetGameObject(this.Content,"Cost") + this.tipInfo = Util.GetGameObject(this.gameObject,"tip"):GetComponent("Text") + this.tipInfo.text = "每个满级特训神将激活:所有神将礼物属性+5%(最高200%)所有神将礼物格子+1(最多开启40个神将礼物格子)" --Obtain this.limit = Util.GetGameObject(this.Obtain,"limit") this.gain = Util.GetGameObject(this.Obtain,"gain") @@ -185,7 +187,10 @@ end function TrainBuildLvUpPanel:OnClose() data=nil - + if self.timer then + self.timer:Stop() + self.timer = nil + end end function TrainBuildLvUpPanel:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua index a3fda8ee6d..1ec74a429e 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua @@ -59,8 +59,10 @@ function this.GetAllCanTrainHero() end return heros end - - +--检测英雄是否正在特训 +function this.CheckHeroIsTraining(_did) + return CheckListIsContainValue1(trainHeroId,_did) +end ---检测功能开启方法 function this.CheckBuildIsOpen(str) diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildPanel.lua index c1696812b9..b44ef4335b 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildPanel.lua @@ -226,53 +226,57 @@ function TrainBuildPanel:SetBuildsState() end end if data.heroId and data.heroId~="" then - --LogError("data.heroid====================="..data.heroId) local heroData=HeroManager.GetSingleHeroData(data.heroId) - curObj.Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) - local pos=data.dataSingle.Position - local max=0 - local curValue=0 - local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv) - if train then - local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv) - if pos==1 then - max=aaa.TrainExp1 - curValue=heroData.HeroTraining.attackExp - elseif pos==2 then - max=aaa.TrainExp2 - curValue=heroData.HeroTraining.defenseExp - elseif pos==3 then - max=aaa.TrainExp3 - curValue=heroData.HeroTraining.hpExp - end - end - --LogError("curvalue==========================="..curValue) - local endTime=data.heroStarTime+math.ceil((max-curValue)/data.dataSingle.Gain)*60 - curObj.trainLeftTime=endTime-GetTimeStamp() - --LogError("endtime=================================="..endTime.." trainLeftTime=="..curObj.trainLeftTime) - curObj.CanGet:SetActive(true) - PlayUIAnim(curObj.CanGet) - Util.AddOnceClick(curObj.CanGet,function () - if curObj.trainLeftTime>0 then - local sureFunc=function() + if heroData then + curObj.Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) + local pos=data.dataSingle.Position + local max=0 + local curValue=0 + local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv) + if train then + local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv) + if pos==1 then + max=aaa.TrainExp1 + curValue=heroData.HeroTraining.attackExp + elseif pos==2 then + max=aaa.TrainExp2 + curValue=heroData.HeroTraining.defenseExp + elseif pos==3 then + max=aaa.TrainExp3 + curValue=heroData.HeroTraining.hpExp + end + end + --LogError("curvalue==========================="..curValue) + local endTime=data.heroStarTime+math.ceil((max-curValue)/data.dataSingle.Gain)*60 + curObj.trainLeftTime=endTime-GetTimeStamp() + --LogError("endtime=================================="..endTime.." trainLeftTime=="..curObj.trainLeftTime) + curObj.CanGet:SetActive(true) + PlayUIAnim(curObj.CanGet) + Util.AddOnceClick(curObj.CanGet,function () + if curObj.trainLeftTime>0 then + local sureFunc=function() + NetManager.TrainingRequest(data.dataMain.Id,data.heroId,2,function () + self:OnShow() + end) + end + local args={} + args[1]="特训未完成是否提前结束?" + args[2]="结束" + args[3]="取消" + args[4]=sureFunc + UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) + else + LogError("data.heroid==============================="..data.heroId) NetManager.TrainingRequest(data.dataMain.Id,data.heroId,2,function () self:OnShow() end) end - local args={} - args[1]="特训未完成是否提前结束?" - args[2]="结束" - args[3]="取消" - args[4]=sureFunc - UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) - else - LogError("data.heroid==============================="..data.heroId) - NetManager.TrainingRequest(data.dataMain.Id,data.heroId,2,function () - self:OnShow() - end) - end - - end) + + end) + else + LogError("herodata=========================================nii") + end + else curObj.trainLeftTime=-1 end diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainSelectHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainSelectHeroPanel.lua index c0f06510e9..ccc04c9d21 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainSelectHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainSelectHeroPanel.lua @@ -134,40 +134,44 @@ function this:SetUpHero() local heroId = curHeroId choosed:SetActive(false) if heroId and heroId~="" then - go:SetActive(true) + local heroData = HeroManager.GetSingleHeroData(heroId) - frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.heroConfig.Natural)) - icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) - proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) - trainObj:SetActive(heroData.HeroTraining.trainingLv>0) - trainLv.text="特训等级"..heroData.HeroTraining.trainingLv - name.text=heroData.heroConfig.Name - lv.text=heroData.lv - SetHeroStars(self.spLoader,starGrid, heroData.star) - Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) - Util.AddOnceClick(go,function () - end) - local pos=buildData.dataSingle.Position - local max=0 - local curValue=0 - local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv) - if train then - local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv) - if pos==1 then - max=aaa.TrainExp1 - curValue=heroData.HeroTraining.attackExp - elseif pos==2 then - max=aaa.TrainExp2 - curValue=heroData.HeroTraining.defenseExp - elseif pos==3 then - max=aaa.TrainExp3 - curValue=heroData.HeroTraining.hpExp + if heroData then + go:SetActive(true) + frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.heroConfig.Natural)) + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon)) + proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) + trainObj:SetActive(heroData.HeroTraining.trainingLv>0) + trainLv.text="特训等级"..heroData.HeroTraining.trainingLv + name.text=heroData.heroConfig.Name + lv.text=heroData.lv + SetHeroStars(self.spLoader,starGrid, heroData.star) + Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) + Util.AddOnceClick(go,function () + end) + local pos=buildData.dataSingle.Position + local max=0 + local curValue=0 + local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv) + if train then + local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv) + if pos==1 then + max=aaa.TrainExp1 + curValue=heroData.HeroTraining.attackExp + elseif pos==2 then + max=aaa.TrainExp2 + curValue=heroData.HeroTraining.defenseExp + elseif pos==3 then + max=aaa.TrainExp3 + curValue=heroData.HeroTraining.hpExp + end end + LogError("curvalue==========================="..curValue.." max=="..max.." buildData.dataSingle.Gain=="..buildData.dataSingle.Gain) + local endTime=buildData.heroStarTime+math.ceil((max-curValue)/buildData.dataSingle.Gain)*60 + leftTime=endTime-GetTimeStamp() + this:SetTime(name) end - LogError("curvalue==========================="..curValue.." max=="..max.." buildData.dataSingle.Gain=="..buildData.dataSingle.Gain) - local endTime=buildData.heroStarTime+math.ceil((max-curValue)/buildData.dataSingle.Gain)*60 - leftTime=endTime-GetTimeStamp() - this:SetTime(name) + else go:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index b7cd104ed1..cbc5191fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -706,7 +706,7 @@ function this.ExecuteLoading() --[[[35] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼 --[[[35] =]]function() NetManager.GetChallengeCopyInfo(LoadingPanel.OnStep) end, --挑战副本 --[[[36] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将 - --[[[37] =]]--function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 + --[[[37] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 --[[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷 --[[[39] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据 --[[[40] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4dd82d0d41..15ead991ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -140,7 +140,7 @@ function this:InitComponent() --鸿蒙 this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng") - this.btnHongMeng:SetActive(false) + --this.btnHongMeng:SetActive(false) this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint") --新神尊特权 @@ -1372,6 +1372,7 @@ function this:OnShow() this.battleUpLvTip:SetActive(false) this.btnShenzun:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.NewShenzun)) this.btnHomeLand:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.TrainBuild)) + this.btnHongMeng:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.HongMengZhen)) this.btnPokemon:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.POKEMON)) this.btn_weapon:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index beeea9bb45..31ba9427dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -216,6 +216,13 @@ function GodsWayTowerPanel:OnShow() -- end curFloor=GodsWayTowerManager.GetTowerFloorByType(curType) this.moppingUpBtn:SetActive(curFloor~=0) + local curId=0 + if curType==1 then + curId=ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.godsWayTowerTreasure_two) + else + curId=ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.godsWayTowerTreasure_three) + end + this.btnHelpFight:SetActive(curId~=0) storeDataId,itemId,costNum = GodsWayTowerManager.GetCost(curType) if curType==1 then this.titleText.text = "伟大航路前段" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 30aa7ae240..01de5c2de6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -244,7 +244,8 @@ function this.PlayerInfoRequest(func) if msg.gemLotteryCountByDay then GemNewManager.gemLottery=msg.gemLotteryCountByDay end - + PlayerManager.startWeek=0--msg.isStart + LogError("PlayerManager.startWeek====================="..PlayerManager.startWeek) --GemManager.GetWearedGem(msg.lifeGridInfos) --数字游戏初始化 RatioNumberLevelManager.ChapterHandle() @@ -5850,7 +5851,7 @@ function NetManager.ChoiceWishHeroRequest(_type,func) LogError(" newlist [i]================"..msg.newList[i]) end end - + RecruitManager.newWishList = msg.newList--新增的心愿神将list --RecruitManager.openTime = msg.serverOpenTime--开服时间戳或是0(用于判断心愿神将是否加入卡池) if func then func(msg) @@ -7436,7 +7437,7 @@ function NetManager.PotentialBackLvRequest(_did,_func) _func() end HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gift) - HeroPropManager.SetDirtyByType(_Did,Hero_Prop_Type.Gift) + HeroPropManager.SetDirtyByType(_did,Hero_Prop_Type.Gift) --获取新战力 NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) @@ -7720,7 +7721,7 @@ function NetManager.TrainingUnlockSkillRequest(_heroid,_unlockId,pockemensId,mag if pockemensId then for i = 1, #pockemensId do - data.pokemonIds:append((pockemensId[i])) + data.pokemonIds:append(tostring(pockemensId[i])) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 12cb36f546..88d02ebef3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -696,6 +696,10 @@ end --检测心愿抽卡活动红点 function this.GetWishDrawRedPointStatus() + local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + if isOpen==false then + return false + end local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) if not activityId then return false @@ -925,6 +929,40 @@ function this.CheckTimeLimitHeroStoreRedPoint() end + +function this.CheckWishEquipStoreRedPoint() + local boughtNum = 0 + local limitNum = 0 + + local isOpen =CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish) + if isOpen==false then + return false + end + local activityId = ActivityGiftManager.IsActivityTypeOpen(20015) + if not activityId then + return false + end + local shopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift) + for i = 1, #shopData do + if rechargeConfig[shopData[i].goodsId].ShowType == DirectBuyType.XIANSHIMIBAO then + boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, shopData[i].goodsId) + limitNum = rechargeConfig[shopData[i].goodsId].Limit + local isCanBuy = limitNum - boughtNum >0 + if isCanBuy and rechargeConfig[shopData[i].goodsId].Price <= 0 then + return true + end + end + end + local red=DynamicActivityManager.CheckMingWangRed() + if red then + return true + end + return false + + +end + + --为限时神装写的(只有一个) function this.GetTimeLimitSkinInfoList() local giftList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 91286da73e..164a582a5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -50,6 +50,9 @@ local jumpDic = { openPanle.ShowGuideGo() end end, + [20015] = function(data) + this.JumpActivity(20015,data[1]) + end, [JumpType.Arena] = function(data)--竞技场 local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) -- local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index b824fbc3e3..b739498354 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -45,6 +45,7 @@ this.userMountList = {}--[id] = {mountId , overTime} --每日福利红包抢夺次数 this.dailyRedPack = 0 +this.startWeek = 0 this.RewardItemSingleShowPopupIsRoleUpStarLayout = false diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 3910cc1845..fef9dd9572 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -357,6 +357,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Gem_2,RedPointType.Gem) RPData:SetParent(RedPointType.playerGift,RedPointType.Practice_main) RPData:SetParent(RedPointType.TimeLimitWish,RedPointType.Recruit) + RPData:SetParent(RedPointType.WishEquipStore,RedPointType.Recruit) -- RPData:SetParent(RedPointType.TimeLimitWishStore,RedPointType.TimeLimitWish)--奇珍宝阁相关红点屏蔽 --战力冲刺 RPData:SetParent(RedPointType.PowerRiceGool,RedPointType.PowerRice) @@ -539,6 +540,7 @@ function this.RegisterRedCheckFunc() -- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.TimeLimitWishStore,OperatingManager.CheckTimeLimitHeroStoreRedPoint) + RPData:AddCheckFunc(RedPointType.WishEquipStore,OperatingManager.CheckWishEquipStoreRedPoint) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) -- RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiRi, OperatingManager.CheckDynamicActTaskRed) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua index 2428fd67d6..5702789a56 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua @@ -74,7 +74,7 @@ function this.GetShowPanelData() local star = pokemonBackData.star if star>5 then starType=3 - star=pokemonBackData.star+6 + star=pokemonBackData.star+5 starSize = Vector2.New(1.2,-30) starScale = 0 else diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index e52de70c46..429a5b9db0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -365,7 +365,7 @@ function this.UpdateHeroInfoData() local star = curPokemonData.star if star>5 then starType=3 - star=curPokemonData.star+6 + star=curPokemonData.star+5 starSize = Vector2.New(1,2.2) starScale = -10 else diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 0ae564b9c4..7a8b237fc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -263,7 +263,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) local starType=1 if star>5 then starType=3 - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) starScale = 0 end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua index 9e9ce4c9da..e92ac43a76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua @@ -90,7 +90,7 @@ function PokemonUpStarSuccessPanel:OnOpen(_curPokemonData) local star = curPokemonData.star if star>5 then starType=3 - star=curPokemonData.star+6 + star=curPokemonData.star+5 starSize = Vector2.New(1,2) --控制大小 starScale = -5 --控制距离 else diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua index f1ef542a3d..c6d78661b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua @@ -94,7 +94,7 @@ function this.OnShowData() local starSize=Vector2(50,50) local type=1 if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) type=3 end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index 6c5de9f1f5..81c48e214f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -134,7 +134,7 @@ function this.SingPokemonDataShow(_go,_itemData) local star=_itemData.star local type=1 if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) type=3 end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index e44aa39d24..2b0edc303a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -82,7 +82,7 @@ function this.SingleItemDataShow(_go,_itemData) local star=_itemData.star local type=1 if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) type=3 end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index 74e5017b30..9de88e4c82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -256,6 +256,7 @@ function FaLingSingleShowPopup:OnShow() local icon=Util.GetGameObject(go,"grid/icon"):GetComponent("Image") local name=Util.GetGameObject(go,"grid/Text"):GetComponent("Text") local lv=Util.GetGameObject(go,"grid/lv"):GetComponent("Text") + red:SetActive(false) LogError("self.equipData.bless len==="..#self.equipData.bless) if self.equipData.bless and self.equipData.bless[i] then itemObj:SetActive(true) @@ -289,7 +290,7 @@ function FaLingSingleShowPopup:OnShow() else itemObj:SetActive(false) add:SetActive(true) - red:SetActive(FaLingManager.CheckEquipBlessRedPoint(self.equipData.did)) + red:SetActive(FaLingManager.CheckEquipBlessRedPoint(self.equipData.did) and self.openType==2) end Util.AddClick(add,function() @@ -358,7 +359,7 @@ function FaLingSingleShowPopup:OnShow() local starType=1 local starSize=nil starType=3 - star=star+11 + star=star+10 starSize = Vector2.New(1,-13) --starScale = 0 SetHeroStars(self.spLoader,self.star, star,starType,starSize,starScale) @@ -389,12 +390,13 @@ function FaLingSingleShowPopup:OnShow() if lv>=lvList[i].Level and self.curHeroData and self.curHeroData.heroConfig.Profession==lvList[i].ShowSkill[2] then skillData.state=1 end - skillData.des=skillData.des.."(".. ProfessionType[lvList[i].ShowSkill[2]].."职业专属".. ")" + skillData.des=skillData.des.."(".. ProfessionType[lvList[i].ShowSkill[2]].."职业佩戴后生效".. ")" elseif type==2 then - if lv>=lvList[i].Level and self.curHeroData and self.curHeroData.staticId==lvList[i].ShowSkill[2] then + --LogError("lv=========="..lv.." lvList[i].Level=="..lvList[i].Level.." self.curHeroData.staticId=="..self.curHeroData.staticId.." lvList[i].ShowSkill[2]=="..lvList[i].ShowSkill[2]) + if lv>=lvList[i].Level and self.curHeroData and self.curHeroData.heroConfig.Id==lvList[i].ShowSkill[2] then skillData.state=1 end - skillData.des=skillData.des.."(".. heroConfig[lvList[i].ShowSkill[2]].ReadingName .."专属".. ")" + skillData.des=skillData.des.."(".. heroConfig[lvList[i].ShowSkill[2]].ReadingName .."佩戴后生效".. ")" end table.insert(skillList,skillData) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua index b1ea50a159..20c2606896 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -165,7 +165,7 @@ function FaLingStrongPopup:OnShow() local starType=1 local starSize=nil starType=3 - star=star+11 + star=star+10 starSize = Vector2.New(1,-13) --starScale = 0 SetHeroStars(self.spLoader,self.star, star,starType,starSize,starScale) @@ -236,12 +236,12 @@ function FaLingStrongPopup:OnShow() if lv>=lvList[i].Level and self.curHeroData and self.curHeroData.heroConfig.Profession==lvList[i].ShowSkill[2] then skillData.state=1 end - skillData.des=skillData.des.."(".. ProfessionType[lvList[i].ShowSkill[2]].."职业专属".. ")" + skillData.des=skillData.des.."(".. ProfessionType[lvList[i].ShowSkill[2]].."职业佩戴后生效".. ")" elseif type==2 then if lv>=lvList[i].Level and self.curHeroData and self.curHeroData.staticId==lvList[i].ShowSkill[2] then skillData.state=1 end - skillData.des=skillData.des.."(".. heroConfig[lvList[i].ShowSkill[2]].ReadingName .."专属".. ")" + skillData.des=skillData.des.."(".. heroConfig[lvList[i].ShowSkill[2]].ReadingName .."佩戴后生效".. ")" end table.insert(skillList,skillData) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 989f49fad7..a35cccea73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -481,7 +481,7 @@ function this.FormationAdapter(teamInfo) local type=1 local starScale = -10 if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(0.8,-25) starScale=-20 type=3 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 02ce6d6ba5..1d833003ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -101,9 +101,9 @@ function RewardItemSingleShowPopup:BindEvent() return end if itemConfigData.ItemType == ItemType.HeroDebris - or itemConfigData.ItemType==ItemType.likeabilityItemChip - or itemConfigData.ItemType==ItemType.EquipChip - or itemConfigData.ItemType==ItemType.CommonChip then + or itemConfigData.ItemType==ItemType.likeabilityItemChip then + --or itemConfigData.ItemType==ItemType.EquipChip + --or itemConfigData.ItemType==ItemType.CommonChip then local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount @@ -136,6 +136,39 @@ function RewardItemSingleShowPopup:BindEvent() else PopupTipPanel.ShowTip(Language[11509]) end + elseif itemConfigData.ItemType==ItemType.EquipChip or itemConfigData.ItemType==ItemType.CommonChip then + LogError("装备碎片合成========================公共碎片合成") + local endHeroNum2 = 10 + local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount + if sum >= 2 then + local _itemData = BagManager.bagDatas[itemSid] + if endHeroNum2 > 0 then + UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() + func() + end) + else + PopupTipPanel.ShowTip(Language[12157]) + end + elseif sum >= 1 and sum < 2 then + -- body + local compoundNum = 1 + local _itemData = BagManager.bagDatas[itemSid] + local item={} + item.itemId= _itemData.id + item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount + if endHeroNum2 > 0 then + NetManager.HeroComposeRequest(item,function (drop) + this.SendBackCompoundReCallBack(drop) + end) + if compoundNum<=0 then + PopupTipPanel.ShowTip(Language[10183]) + end + else + PopupTipPanel.ShowTip("合成物品超过最大数量限制") + end + else + PopupTipPanel.ShowTip(Language[11509]) + end elseif itemConfigData.ItemType == ItemType.Blueprint then if lanTuData and lanTuData[1] == true then local _itemData = BagManager.bagDatas[itemSid] @@ -539,7 +572,6 @@ function RewardItemSingleShowPopup:OnShow() for i = 1, #jumpSortData do if jumpSortData[i].id > 0 then -- type 大于 10000为活动 直接显示按钮,如果小于1000 为功能 开启才显示 - -- local t= ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) if JumpConfig[jumpSortData[i].id].Type >= 10000 or ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then local tempView = nil -- if not ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then break end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index e3062a0915..d8c601c664 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -548,11 +548,23 @@ function RewardTalismanSingleShowPopup2:SetPropertyShow1(_infos,_preList,_grid) for key, value in pairs(_infos) do local obj=_preList[index] local proper=propertyConfig[key] + local str="" if proper.Style==1 then obj.transform:GetComponent("Text").text = GetLanguageStrById(proper.Info).."+".. value.currValue else obj.transform:GetComponent("Text").text=GetLanguageStrById(proper.Info).."+"..value.currValue/100 .."%" end + if self.curHeroData then + if proper.Style==1 then + + local potencyAdd=HeroManager.GetHeroPotencyAddByTypeAndPotencyData(self.curHeroData.potential,self.position) + LogError("potencyAdd============"..potencyAdd) + str = str..GetLanguageStrById(proper.Info).."+".. value.currValue..string.format(" 潜能 +%s(%s%%)",math.floor(value.currValue*(potencyAdd)+0.5),potencyAdd*100) + else + + end + end + obj.transform:GetComponent("Text").text=str obj.gameObject:SetActive(true) index=index+1 end @@ -686,29 +698,32 @@ function RewardTalismanSingleShowPopup2:GongMingSetData(curTabIndex,proPreList,g end end end - if curJewelResonanceConfig and curJewelResonanceConfig.SortId < 1 then - go.gameObject:SetActive(false) - return - end - go.gameObject:SetActive(true) --- if curTabIndex == 1 then --- title.text = string.format("强化大师%s级",curJewelResonanceConfig.SortId) --- else --- title.text = string.format("精炼大师%s级",curJewelResonanceConfig.SortId) --- end - title.gameObject:SetActive(false) --- 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(self.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("%s",str) --- end --- end + go.gameObject:SetActive(false) + if curJewelResonanceConfig then + if curJewelResonanceConfig.SortId < 1 then + go.gameObject:SetActive(false) + return + end + go.gameObject:SetActive(true) + if curTabIndex == 1 then + title.text = string.format("强化大师%s级",curJewelResonanceConfig.SortId) + else + title.text = string.format("精炼大师%s级",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(self.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("%s",str) + end + end + end + return true end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 54a9ac0e65..e27fe22967 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -512,7 +512,7 @@ function this.EquipInfo() Util.AddOnceClick(btn,function() if did and data then -- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,data,nil,pos,0) - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,data,0,false,nil,curHeroData,5) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,data,0,false,nil,curHeroData,n+4) end end) end @@ -693,9 +693,12 @@ function this.GodPrintInfo() orginLayer=this.sortingOrder local frame=Util.GetGameObject(godPrintPreList[i],"Frame"):GetComponent("Image") + local lvTxt=Util.GetGameObject(godPrintPreList[i],"lv"):GetComponent("Text") local icon=Util.GetGameObject(godPrintPreList[i],"circleFrameBg/Icon"):GetComponent("Image") frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(equipConfig[v.equipId].Quality)) icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[v.equipId].ResourceID)) + lvTxt.gameObject:SetActive(equipConfig[v.equipId].Star>0) + lvTxt.text="+"..equipConfig[v.equipId].Star Util.GetGameObject(godPrintPreList[i],"circleFrameBg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[v.equipId].Quantity].circleBg2) Util.GetGameObject(godPrintPreList[i],"circleFrameBg/circleFrame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[v.equipId].Quantity].circle) Util.AddOnceClick(godPrintPreList[i],function() diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua index 55d2521648..a666eb6d96 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua @@ -52,6 +52,12 @@ function RecruitEquipPanelNew:InitComponent() self.wishOpen = Util.GetGameObject(self.wish,"upHeroGrid") self.wishPre = Util.GetGameObject(self.wish,"upHeroPre") + self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") + Util.GetGameObject(self.gameObject,"btngroup/zqbg/Text"):GetComponent("Text").text="珍奇宝阁" + self.lsth.gameObject:SetActive(ActivityGiftManager.IsActivityTypeOpen(20015)~=nil) + self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red") + BindRedPointObject(RedPointType.WishEquipStore,self.zqbgRed) + --self.zqbgEffect = Util.GetGameObject(self.gameObject,"btngroup/zqbg/Fx_Circle 1") -- self.tip = Util.GetGameObject(self.panel, "tip/text"):GetComponent("Text") self.tenTip = Util.GetGameObject(self.panel, "TenTip") self.tenTipText = Util.GetGameObject(self.tenTip, "scroll/Text"):GetComponent("Text") @@ -91,7 +97,21 @@ function RecruitEquipPanelNew:InitComponent() end end +function RecruitEquipPanelNew:OnFocus() + CheckRedPointStatus(RedPointType.WishEquipStore) +end + + function RecruitEquipPanelNew:BindEvent() + Util.AddOnceClick(self.lsth, function() + local isOpen =CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish) + local tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.EquipWish) + if isOpen==false then + PopupTipPanel.ShowTip(tip) + return + end + JumpManager.GoJump(40082) + end) --帮助按钮 Util.AddClick(self.helpBtn, function() UIManager.OpenPanel(UIName.HelpPopup,self.config.HelpId,self.helpPosition.x,self.helpPosition.y) @@ -128,6 +148,7 @@ function RecruitEquipPanelNew:OnSortingOrderChange(sortingOrder) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_box_normal, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_box_open, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) + --SetParticleSortLayer(self.zqbgEffect,self.sortingOrder+1) end --界面打开时调用(用于子类重写) @@ -159,6 +180,7 @@ function RecruitEquipPanelNew:OnShow(sortingOrder) local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end + CheckRedPointStatus(RedPointType.WishEquipStore) end local progresss=0 @@ -312,6 +334,7 @@ function RecruitEquipPanelNew:OnDestroy() self.timer:Stop() self.timer = nil end + ClearRedPointObject(RedPointType.WishEquipStore,self.zqbgRed) for i = 1,3 do if self.upHeroPreList[i] then SubUIManager.Close(self.upHeroPreList[i].item) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index 715c5e9e1c..3e1aaafe95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -409,13 +409,17 @@ function this:RefreshTabData() this.itemList[i].tipObj:SetActive(false) this.itemList[i].titleTxt.text=self.dicData[i].Sesc this.itemList[i].img.sprite = this.spLoader:LoadSprite(self.dicData[i].Icon[1]) - if self.dicData[i].ActId==2 then - local isOpen =CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish) - local tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.EquipWish) - this.itemList[i].tipObj:SetActive(not isOpen) - this.itemList[i].tipTxt.text=tip + local isOpen=true + local tip="" + if self.dicData[i].ActId==2 then + isOpen =CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish) + tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.EquipWish) + elseif self.dicData[i].ActId==121 then + isOpen=CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + tip=GetFunctionOpenTipClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) end - + this.itemList[i].tipObj:SetActive(not isOpen) + this.itemList[i].tipTxt.text=tip BindRedPointObject(self.dicData[i].RpType,this.itemList[i].redpot) redPointTypeList[self.dicData[i].RpType] = this.itemList[i].redpot end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 4251d7f7c0..e9e637dd07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -487,6 +487,9 @@ local bType={ --点将台红点状态 function this.GetAllRecruitBtnRedpoint(red) local index = {} + if red==RedPointType.Recruit_Friend and CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish)==false then + return false + end if red == RedPointType.Recruit_Normal then index = {1,2} elseif red == RedPointType.Recruit_Friend then diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index b4a0f7ccc4..a80ceebbe1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -85,7 +85,7 @@ function this.SortTypeClick(sortingOrder,_sortType,isTop,isAni) tabSortType=_sortType selectHeroData={} tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2) - this.selectText.text = "0/"..maxSelectNum + this.selectText.text = Language[11728].."0/"..maxSelectNum this.noSelectBtn.gameObject:SetActive(false) this.SortHeroDatas(tarHero) this.Empty:SetActive(#tarHero <= 0) @@ -131,7 +131,7 @@ function this.SingleHeroDataShow(go,_heroData) lockMask:SetActive(heroData.lockState == 1) choosed:SetActive(selectHeroData[heroData.dynamicId] ~= nil) local cardclickBtn = Util.GetGameObject(_go.transform, "icon") - this.selectText.text = LengthOfTable(selectHeroData).."/"..maxSelectNum + this.selectText.text = Language[11728]..LengthOfTable(selectHeroData).."/"..maxSelectNum local GongMingMask = Util.GetGameObject(_go.transform, "GongMingMask") GongMingMask:SetActive(false)--最后检测是否共鸣 Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv.."" @@ -155,10 +155,14 @@ function this.SingleHeroDataShow(go,_heroData) PopupTipPanel.ShowTip(Language[12184]) end) Util.AddOnceClick(cardclickBtn, function() + if heroData.isTrain==1 then + PopupTipPanel.ShowTip("神将正在特训中") + return + end if selectHeroData[heroData.dynamicId] then choosed:SetActive(false) selectHeroData[heroData.dynamicId] = nil - this.selectText.text = LengthOfTable(selectHeroData).."/"..maxSelectNum + this.selectText.text = Language[11728]..LengthOfTable(selectHeroData).."/"..maxSelectNum this.noSelectBtn.gameObject:SetActive(LengthOfTable(selectHeroData)>0) return end @@ -169,7 +173,7 @@ function this.SingleHeroDataShow(go,_heroData) LogGreen("heroData:"..heroData.dynamicId) selectHeroData[heroData.dynamicId]=heroData choosed:SetActive(true) - this.selectText.text = LengthOfTable(selectHeroData).."/"..maxSelectNum + this.selectText.text = Language[11728]..LengthOfTable(selectHeroData).."/"..maxSelectNum this.noSelectBtn.gameObject:SetActive(LengthOfTable(selectHeroData)>0) end) @@ -218,24 +222,28 @@ function this.SortHeroDatas(_heroDatas) if (a.isFormation == "" or (a.isFormation ~= "" and a.isFormations[1] == FormationTypeDef.EXPEDITION)) and (b.isFormation == "" or (b.isFormation ~= "" and b.isFormations[1] == FormationTypeDef.EXPEDITION)) then if a.lockState == b.lockState then if a.isHarmonyGongMing == b.isHarmonyGongMing then - if a.heroConfig.Natural ==b.heroConfig.Natural then - if a.star == b.star then - local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId) - local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId) - if aGodLv == bGodLv then - if a.lv == b.lv then - return a.heroConfig.Id > b.heroConfig.Id + if a.isTrain ==b.isTrain then + if a.heroConfig.Natural ==b.heroConfig.Natural then + if a.star == b.star then + local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId) + local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId) + if aGodLv == bGodLv then + if a.lv == b.lv then + return a.heroConfig.Id > b.heroConfig.Id + else + return a.lv < b.lv + end else - return a.lv < b.lv + return aGodLv < bGodLv end else - return aGodLv < bGodLv - end + return a.star < b.star + end else - return a.star < b.star - end + return a.heroConfig.Natural < b.heroConfig.Natural + end else - return a.heroConfig.Natural < b.heroConfig.Natural + return a.isTrain < b.isTrain end else return a.isHarmonyGongMing < b.isHarmonyGongMing diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua index d31cb494cb..6d7c246aaf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua @@ -281,7 +281,7 @@ function this.SingleHeroDataShow(go,_heroData,isGray) local type=1 local starSize=Vector2.New(32.5,32.5) if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) type=3 end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index a8f2d49798..357143b276 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -646,20 +646,21 @@ function this.CalculateWarForceBase(sId, lv, rlv, tlv,curTreasure) end end end + --注释神应属性 功能已屏蔽 --神应属性 - if - configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and - configInfo.Level == tlv - then - for j = 1, SacredTreeManager.CulAttri(curTreasure) do - if addAllProVal[configInfo.Property[j][1]] then - addAllProVal[configInfo.Property[j][1]] = - addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2] - else - addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2] - end - end - end + -- if + -- configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and + -- configInfo.Level == tlv + -- then + -- for j = 1, SacredTreeManager.CulAttri(curTreasure) do + -- if addAllProVal[configInfo.Property[j][1]] then + -- addAllProVal[configInfo.Property[j][1]] = + -- addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2] + -- else + -- addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2] + -- end + -- end + -- end end local powerEndVal = HeroPowerManager.CalPower(addAllProVal) return powerEndVal diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua index a2afdcd07b..75fd67110b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua @@ -143,7 +143,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local starType=1 local starSize=nil starType=3 - star=star+11 + star=star+10 starSize = Vector2.New(0.8,-20) local starScale = -20 SetHeroStars(this.spLoader,starGrid, star,starType,starSize,starScale) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua index 625e3799d7..eedc4df2c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua @@ -130,7 +130,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local starType=1 local starSize=nil starType=3 - star=star+11 + star=star+10 starSize = Vector2.New(0.8,-20) local starScale = -20 SetHeroStars(this.spLoader,starGrid, star,starType,starSize,starScale) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index a69c0e1bf4..f9b249a7e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -126,7 +126,7 @@ function RoleInfoPanel:InitComponent() this.potencyBtn=Util.GetGameObject(self.transform,"rightGrid/potencyBtn/Image") this.potencyImg=Util.GetGameObject(self.transform,"rightGrid/potencyBtn/Image"):GetComponent("Image") this.potencyImg.sprite=this.spLoader:LoadSprite("UI_hz_qianneng_42") - this.potencyRedPoint=Util.GetGameObject(Util.GetGameObject(self.transform,"rightGrid/potencyBtn"),"redPoint") + this.potencyRedPoint=Util.GetGameObject(self.transform,"rightGrid/potencyBtn/redPoint") this.PageList = {} this.GodSoulBtn=Util.GetGameObject(self.transform,"leftGrid/GodSoulBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index fec0ea3519..fc23712754 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -228,6 +228,10 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 PopupTipPanel.ShowTip(Language[12184]) end) Util.AddOnceClick(cardBtn, function() + if TrainBuildManager.CheckHeroIsTraining(heroData.dynamicId) then + PopupTipPanel.ShowTip("该神将正在特训") + return + end local isSelect = false local selectIndex = 0 for i = 1, #curSelectHeroList do @@ -377,7 +381,8 @@ function RoleUpStarListPanel:AutoSelectHero() curSelectHeroList = {} for i = 1, #heroDataList do if heroDataList[i].type == RoleUpStarMatType.item and LengthOfTable(curSelectHeroList) < curNeedRoleNum or heroDataList[i].type == RoleUpStarMatType.hero and LengthOfTable(curSelectHeroList) < curNeedRoleNum - and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 and (not HarmonyManager.IsChangeColor(heroDataList[i].dynamicId) and(not HarmonyManager:IsEnvoy(heroDataList[i].dynamicId))) then + and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 and (not HarmonyManager.IsChangeColor(heroDataList[i].dynamicId) and(not HarmonyManager:IsEnvoy(heroDataList[i].dynamicId))) + and TrainBuildManager.CheckHeroIsTraining(heroDataList[i].dynamicId)==false then -- curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i] table.insert(curSelectHeroList,heroDataList[i]) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua index dd8a53a9ce..4998317806 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua @@ -13,6 +13,7 @@ local selectSkillUnlockItems2={} function SpecailTrainingInfoPopup:InitComponent() self.spLoader = SpriteLoader.New() self.titleText = Util.GetGameObject(self.gameObject,"Panel/Title"):GetComponent("Text") + self.btn_help = Util.GetGameObject(self.gameObject,"Panel/btn_help") self.itemPre = Util.GetGameObject(self.gameObject,"Panel/Pre") self.GameObject = Util.GetGameObject(self.gameObject,"Panel/Scroll") self.BackBtn = Util.GetGameObject(self.gameObject, "BackBtn") @@ -35,6 +36,10 @@ function SpecailTrainingInfoPopup:BindEvent() Util.AddClick(self.BackBtn, function() self:ClosePanel() end) + + Util.AddClick(self.btn_help, function() + UIManager.OpenPanel(UIName.HelpPopup,145,0,0) + end) end function SpecailTrainingInfoPopup:AddListener() @@ -89,6 +94,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) local numPre= Util.GetGameObject(_go,"Content/attPre/numPre") local mySelfCondition= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/mySelfCondition"):GetComponent("Text") local trainingIcon= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/trainingIcon") + trainingIcon:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_map_time") local DesTip=Util.GetGameObject(_go,"DesTip") DesTip.gameObject:SetActive(tData.Level==#self.showList) -- local isOpen=self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level @@ -137,6 +143,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) end end local ActiveButton = Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/ActiveBtn") + ActiveButton:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_guanka_zouguodian_02") local TrainingSetting=ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",tData.TrainSettingID,"Level",tData.Level) local lastLevelTrainingSetting=ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",tData.TrainSettingID,"Level",(tData.Level-1)==0 and 1 or tData.Level-1) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua index 4063daebd7..3b6fd95b56 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua @@ -425,7 +425,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local star = heroData.pokemonData.star local starSize=Vector2.New(32.5,32.5) if star>5 then - star=star+6 + star=star+5 starSize = Vector2.New(1,-13) end SetHeroStars(this.spLoader, starGrid, star,1,starSize,-15) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 233728bd2a..46a2afa592 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -270,14 +270,14 @@ function this.SetLoopUI() local rules=v.OpenRules if rules[1]==1 then if PlayerManager.level= v.OpenRules[2] then + table.insert(_d, v.SlotPosition) + end + elseif v.OpenRules[1]==2 then + if curHeroData.star>=v.OpenRules[2] then + table.insert(_d, v.SlotPosition) + end + end + end end - for i = 1, loopCount do - if _data[i]==nil then - return i - end - if didLen == LengthOfTable(_data) then - return 0 + local wearList={} + if curHeroData.soulPrintList and #curHeroData.soulPrintList>0 then + for k, v in pairs(curHeroData.soulPrintList) do + table.insert(wearList,v.position) end end + for i=1,#_d do + if CheckListIsContainValue1(wearList,_d[i])==false then + return _d[i] + end + end + return 0 end function this.ShowRedPotDataAndSort(allData) local didMaxLen,didLen,didLv,maxLv = HeroManager.GetSoulPrintLoopUIMaxData(curHeroData) diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index a0ac2367f0..761d32bade 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -52,7 +52,12 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) self.curTitleName = curArtResourcesConfig.Name self.titleLive = poolManager:LoadAsset(self.curTitleName, PoolManager.AssetType.GameObject) - self.titleLive.transform:SetParent(self.transform) + if self.titleLive==nil then + LogError("self.curTitleName===================nil========"..self.curTitleName) + else + self.titleLive.transform:SetParent(self.transform) + end + if effectScale then self:SetEffectScale(effectScale) end