From 4f4542d53aad8105a0202e4fd7a5dd679feb8f02 Mon Sep 17 00:00:00 2001 From: guowei Date: Fri, 18 Dec 2020 13:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Harmony/HongMengEnvoyPanel.prefab | 152 +++++++++++++++++- .../Prefabs/UI/Harmony/HongMengPanel.prefab | 77 ++++++++- .../~Lua/Common/GlobalDefine.lua | 6 + .../~Lua/Message/HeroInfoProto.proto | 16 +- .../~Lua/Message/HeroInfoProto_pb.lua | 51 ++---- .../Modules/Harmony/EnvoyItem/EnvoyItem.lua | 30 ++-- .../Harmony/Manager/HarmonyManager.lua | 117 ++++++++++++-- .../Harmony/Panel/GongMingResultPanel.lua | 24 ++- .../Harmony/Panel/GongMingResultTips.lua | 5 +- .../Harmony/Panel/HongMengEnvoyPanel.lua | 82 +++++++++- .../Harmony/Panel/HongMengUnLoadPanel.lua | 19 ++- .../Modules/Harmony/View/HarmonyScrllow.lua | 28 ++-- .../~Lua/Modules/Hero/HeroData.lua | 15 +- .../~Lua/Modules/Hero/HeroManager.lua | 19 +++ .../~Lua/Modules/Main/MainPanel.lua | 35 ++-- .../~Lua/Modules/Net/NetManager.lua | 25 +-- .../~Lua/Modules/Player/RedpotManager.lua | 10 ++ 17 files changed, 588 insertions(+), 123 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index 54832614a3..b99637126c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -2813,7 +2813,7 @@ RectTransform: m_Children: - {fileID: 1171266045051997201} m_Father: {fileID: 7500597393201060646} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3281,6 +3281,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5562217807601403981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 116730074134975029} + - component: {fileID: 120718745389804567} + - component: {fileID: 4967816487438709335} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &116730074134975029 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562217807601403981} + 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: 7500597393201060646} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 59.337513, y: 81.57} + m_SizeDelta: {x: 28.58, y: 29.93} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &120718745389804567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562217807601403981} + m_CullTransparentMesh: 0 +--- !u!114 &4967816487438709335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562217807601403981} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &5635014062522739605 GameObject: m_ObjectHideFlags: 0 @@ -3619,6 +3693,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2846174910922235225} + - {fileID: 1676212431931269004} m_Father: {fileID: 798015173237835578} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4870,6 +4945,7 @@ RectTransform: m_Children: - {fileID: 6552755735290683073} - {fileID: 2071167856795826159} + - {fileID: 116730074134975029} - {fileID: 5791217967281911789} m_Father: {fileID: 5065347911416600412} m_RootOrder: 0 @@ -5076,3 +5152,77 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &9153674012725092824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1676212431931269004} + - component: {fileID: 5908450450420189543} + - component: {fileID: 5896568159397495798} + m_Layer: 5 + m_Name: RedPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1676212431931269004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9153674012725092824} + 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: 6143607442243393965} + 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: 89.79, y: 22.97} + m_SizeDelta: {x: 30.39, y: 28.98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5908450450420189543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9153674012725092824} + m_CullTransparentMesh: 0 +--- !u!114 &5896568159397495798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9153674012725092824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab index a7fb701d9b..14ef1450dc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab @@ -950,6 +950,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4294327751025253158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4786996032328988713} + - component: {fileID: 2299644301843414526} + - component: {fileID: 5613380379379007251} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4786996032328988713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294327751025253158} + 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: 4820278137490232995} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 48.827637, y: 68.72} + m_SizeDelta: {x: 41.9, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2299644301843414526 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294327751025253158} + m_CullTransparentMesh: 0 +--- !u!114 &5613380379379007251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294327751025253158} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &4820278136040519468 GameObject: m_ObjectHideFlags: 0 @@ -2504,7 +2578,7 @@ RectTransform: m_Children: - {fileID: 7526989165898050967} m_Father: {fileID: 4820278137490232995} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2760,6 +2834,7 @@ RectTransform: m_Children: - {fileID: 4820278137383554477} - {fileID: 4820278136533335174} + - {fileID: 4786996032328988713} - {fileID: 4820278137255292101} m_Father: {fileID: 4820278136653324842} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c2e8e05e74..c6633f5680 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -840,6 +840,11 @@ RedPointType = { Pokemon_Recruit = 795,--灵兽 御兽斋免费 Pokemon_ChipCompound = 796,--灵兽 碎片合成 + --鸿蒙阵 + HongMeng = 801, -- 鸿蒙阵界面 + HongMeng_Evory = 8011, -- 鸿蒙使者格子 + HongMeng_UpTower = 8012, -- 升级鸿蒙塔 按钮 + HongMeng_OpenBox = 8013, -- 格子开启 } RedPointStatus = { @@ -1300,6 +1305,7 @@ FUNCTION_OPEN_TYPE = { POKEMON=79,--灵兽山 XiaoYaoYou = 80, -- 逍遥游 RoleAwake = 81, -- 神将觉醒 + HongMengZhen = 83, -- 鸿蒙阵 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto b/Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto index 72fceac10b..6ee65b368a 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto @@ -287,15 +287,13 @@ import "CommonProto.proto"; message OpenResonanceRequest { optional int32 gridId = 1; // 格子id } - message OpenResonanceResponse { - - } + // 共鸣 message ResonanceRequest{ optional string heroId = 1; // 需要共鸣的神将id optional int32 gridId = 2; // 格子id - optional int32 type = 3; // 1:共鸣 2:卸下共鸣神将 + optional int32 type = 3; // 1:共鸣 2:卸下共鸣神将 3:卸下鸿蒙使者 4:上阵鸿蒙使者 } message ResonanceResponse{ optional int32 leftTime = 1; // 如果是卸下,返回倒计时 单位 秒 @@ -304,13 +302,5 @@ import "CommonProto.proto"; // 花费妖晶清除共鸣冷却时间 message CleanResonanceTimeRequest{ optional int32 gridId = 2; // 格子id + optional int32 type = 1; // 1:清除共鸣区cd 2:清除鸿蒙使者cd } - message CleanResonanceTimeResponse{ - optional int32 gridId = 2; // 格子id - } - - // 升级鸿蒙碑 - message UpgradeHongmengTabletResponse{ - - } - diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index b1a40484d9..7670d638b0 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -165,7 +165,6 @@ GETSKININDICATION = protobuf.Descriptor(); GETSKININDICATION_SKININFO_FIELD = protobuf.FieldDescriptor(); OPENRESONANCEREQUEST = protobuf.Descriptor(); OPENRESONANCEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor(); -OPENRESONANCERESPONSE = protobuf.Descriptor(); RESONANCEREQUEST = protobuf.Descriptor(); RESONANCEREQUEST_HEROID_FIELD = protobuf.FieldDescriptor(); RESONANCEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor(); @@ -174,9 +173,7 @@ RESONANCERESPONSE = protobuf.Descriptor(); RESONANCERESPONSE_LEFTTIME_FIELD = protobuf.FieldDescriptor(); CLEANRESONANCETIMEREQUEST = protobuf.Descriptor(); CLEANRESONANCETIMEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor(); -CLEANRESONANCETIMERESPONSE = protobuf.Descriptor(); -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD = protobuf.FieldDescriptor(); -UPGRADEHONGMENGTABLETRESPONSE = protobuf.Descriptor(); +CLEANRESONANCETIMEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index" GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.GetHeroListInfoRequest.index" @@ -1635,13 +1632,6 @@ OPENRESONANCEREQUEST.enum_types = {} OPENRESONANCEREQUEST.fields = {OPENRESONANCEREQUEST_GRIDID_FIELD} OPENRESONANCEREQUEST.is_extendable = false OPENRESONANCEREQUEST.extensions = {} -OPENRESONANCERESPONSE.name = "OpenResonanceResponse" -OPENRESONANCERESPONSE.full_name = ".com.ljsd.jieling.protocols.OpenResonanceResponse" -OPENRESONANCERESPONSE.nested_types = {} -OPENRESONANCERESPONSE.enum_types = {} -OPENRESONANCERESPONSE.fields = {} -OPENRESONANCERESPONSE.is_extendable = false -OPENRESONANCERESPONSE.extensions = {} RESONANCEREQUEST_HEROID_FIELD.name = "heroId" RESONANCEREQUEST_HEROID_FIELD.full_name = ".com.ljsd.jieling.protocols.ResonanceRequest.heroId" RESONANCEREQUEST_HEROID_FIELD.number = 1 @@ -1706,43 +1696,28 @@ CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.default_value = 0 CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.type = 5 CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.cpp_type = 1 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.name = "type" +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.full_name = ".com.ljsd.jieling.protocols.CleanResonanceTimeRequest.type" +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.number = 1 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.index = 1 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.label = 1 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.has_default_value = false +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.default_value = 0 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.type = 5 +CLEANRESONANCETIMEREQUEST_TYPE_FIELD.cpp_type = 1 + CLEANRESONANCETIMEREQUEST.name = "CleanResonanceTimeRequest" CLEANRESONANCETIMEREQUEST.full_name = ".com.ljsd.jieling.protocols.CleanResonanceTimeRequest" CLEANRESONANCETIMEREQUEST.nested_types = {} CLEANRESONANCETIMEREQUEST.enum_types = {} -CLEANRESONANCETIMEREQUEST.fields = {CLEANRESONANCETIMEREQUEST_GRIDID_FIELD} +CLEANRESONANCETIMEREQUEST.fields = {CLEANRESONANCETIMEREQUEST_GRIDID_FIELD, CLEANRESONANCETIMEREQUEST_TYPE_FIELD} CLEANRESONANCETIMEREQUEST.is_extendable = false CLEANRESONANCETIMEREQUEST.extensions = {} -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.name = "gridId" -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.full_name = ".com.ljsd.jieling.protocols.CleanResonanceTimeResponse.gridId" -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.number = 2 -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.index = 0 -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.label = 1 -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.has_default_value = false -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.default_value = 0 -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.type = 5 -CLEANRESONANCETIMERESPONSE_GRIDID_FIELD.cpp_type = 1 - -CLEANRESONANCETIMERESPONSE.name = "CleanResonanceTimeResponse" -CLEANRESONANCETIMERESPONSE.full_name = ".com.ljsd.jieling.protocols.CleanResonanceTimeResponse" -CLEANRESONANCETIMERESPONSE.nested_types = {} -CLEANRESONANCETIMERESPONSE.enum_types = {} -CLEANRESONANCETIMERESPONSE.fields = {CLEANRESONANCETIMERESPONSE_GRIDID_FIELD} -CLEANRESONANCETIMERESPONSE.is_extendable = false -CLEANRESONANCETIMERESPONSE.extensions = {} -UPGRADEHONGMENGTABLETRESPONSE.name = "UpgradeHongmengTabletResponse" -UPGRADEHONGMENGTABLETRESPONSE.full_name = ".com.ljsd.jieling.protocols.UpgradeHongmengTabletResponse" -UPGRADEHONGMENGTABLETRESPONSE.nested_types = {} -UPGRADEHONGMENGTABLETRESPONSE.enum_types = {} -UPGRADEHONGMENGTABLETRESPONSE.fields = {} -UPGRADEHONGMENGTABLETRESPONSE.is_extendable = false -UPGRADEHONGMENGTABLETRESPONSE.extensions = {} CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST) CancelHeroChangeResponse = protobuf.Message(CANCELHEROCHANGERESPONSE) ChangeSkinRequest = protobuf.Message(CHANGESKINREQUEST) CleanResonanceTimeRequest = protobuf.Message(CLEANRESONANCETIMEREQUEST) -CleanResonanceTimeResponse = protobuf.Message(CLEANRESONANCETIMERESPONSE) ComplexEquipRequest = protobuf.Message(COMPLEXEQUIPREQUEST) ComplexEquipResponse = protobuf.Message(COMPLEXEQUIPRESPONSE) ComplexJewelEquipRequest = protobuf.Message(COMPLEXJEWELEQUIPREQUEST) @@ -1776,7 +1751,6 @@ HeroReturnResponse = protobuf.Message(HERORETURNRESPONSE) MergeSoulRequest = protobuf.Message(MERGESOULREQUEST) MergeSoulResponse = protobuf.Message(MERGESOULRESPONSE) OpenResonanceRequest = protobuf.Message(OPENRESONANCEREQUEST) -OpenResonanceResponse = protobuf.Message(OPENRESONANCERESPONSE) OptHeroSoul = protobuf.Message(OPTHEROSOUL) PokemonAdvancedRequest = protobuf.Message(POKEMONADVANCEDREQUEST) PokemonBackRequest = protobuf.Message(POKEMONBACKREQUEST) @@ -1804,5 +1778,4 @@ UpHeroLevelResponse = protobuf.Message(UPHEROLEVELRESPONSE) UpHeroStarRequest = protobuf.Message(UPHEROSTARREQUEST) UpQuickSoulEquipRequest = protobuf.Message(UPQUICKSOULEQUIPREQUEST) UpSoulEquipResponse = protobuf.Message(UPSOULEQUIPRESPONSE) -UpgradeHongmengTabletResponse = protobuf.Message(UPGRADEHONGMENGTABLETRESPONSE) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index b5f8305cf8..8764fdb6f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -17,7 +17,7 @@ function EnvoyItem:InitComponent(parent,data) self.lock = Util.GetGameObject(self.gameObject,"Box/Empty/lock") self.Empty = Util.GetGameObject(self.gameObject,"Box/Empty") self.timer_text = Util.GetGameObject(self.gameObject,"Box/Empty/Image/Text"):GetComponent("Text") - + self.RedPoint = Util.GetGameObject(self.gameObject,"Box/Empty/redPoint") end @@ -50,7 +50,8 @@ function EnvoyItem:OnOpen() -- body UIManager.OpenPanel(UIName.HongMengEnvoyUnloadPanel,self.data) else - if self.data.time > 0 then + + if self.data.time - GetTimeStamp() > 0 then local content = "" local money = (self.data.time - GetTimeStamp()) * 432 content =string.format("是否花费%d妖晶直接恢复",money) @@ -64,19 +65,17 @@ function EnvoyItem:OnOpen() return end --向服务器 发消息 - NetManager.UnlockGrid(self.data.Id,function (msg) + NetManager.UnlockGrid(self.data.gridId,2,function (msg) -- body for i = 1, #HarmonyManager.hongmengGuards do -- body - if HarmonyManager.hongmengGuards[i].gridId ==msg.gridId then + if HarmonyManager.hongmengGuards[i].gridId ==self.data.gridId then HarmonyManager.hongmengGuards[i].time = 0 end end + self.timer_text.text = "" + self.data.time = 0 - - if msg.gridId == boxData.Id then - self.timer_text.text = "" - end end,"取消","确认") end) -- body @@ -96,12 +95,21 @@ end function EnvoyItem:SetItem(go,data) self.data = data + LogGreen("HeroId",data.heroId) + CheckRedPointStatus(RedPointType.HongMeng_Evory) if data.heroId ~= "" then -- body local heroSingleData = HeroManager.GetSingleHeroData(data.heroId) self.Empty:SetActive(false) + self.RedPoint:SetActive(false) Util.GetGameObject(go.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroSingleData.heroConfig.Quality,heroSingleData.star)) - + if HeroManager.IsTenTalent(heroSingleData.star) then + -- body + Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengTablet) + else + Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv) + end + Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengTablet) Util.GetGameObject(go.transform, "GameObject/icon"):GetComponent("Image").sprite = Util.LoadSprite(heroSingleData.icon) @@ -111,7 +119,9 @@ function EnvoyItem:SetItem(go,data) SetHeroStars(starGrid, heroSingleData.star,1,nil,nil,Vector2.New(0,1)) else self.Empty:SetActive(true) + self.RedPoint:SetActive(true) + end - + end return EnvoyItem \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 8d1c10ce17..cc9106bc3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -127,7 +127,9 @@ function this:SetInitList() local count = 0; --LogBlue("this.GuardList长度:"..LengthOfTable(this.GuardList)) for key, value in pairs(this.GuardList) do - table.insert(list,value) + if value.heroId ~= "" then + table.insert(list,value) + end end @@ -172,10 +174,14 @@ function this:SetTowerInit() local heroDataList = HeroManager.GetAllHeroDatas(1) local list = {} local count = 0; - this.GuardList = HeroManager.GetAllHeroDatas(330) + --this.GuardList = HeroManager.GetAllHeroDatas(330) -- LogBlue("this.GuardList长度:"..LengthOfTable(this.GuardList)) - for key, value in pairs(this.GuardList) do - table.insert(list,value) + for key, value in pairs(this.hongmengGuards) do + if value.heroId ~= "" then + local data = HeroManager.GetSingleHeroData(value.heroId) + table.insert(list,data) + end + end @@ -212,6 +218,7 @@ function this:SetTowerInit() end end this.ChooseDataList = tempTable + LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList) end --判断鸿蒙 使者/守卫 是否够6位 function this:IsEnvoyCount() @@ -309,11 +316,6 @@ function this:GetUnLoadData() return SelectId end - - - - - --获取加成 function this:GetAdditions() @@ -394,6 +396,59 @@ function this.HarmonyUpdateEquipData(idlist, heroDid) end end + +function this:EquipMin(EquipList) + -- body + local smallStar = 999 + for i = 1, #EquipList do + if smallStar > equipConfig[EquipList[i].id].Star then + smallStar = equipConfig[EquipList[i].id].Star + end + end + local list = ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipConfig,"Star",smallStar) + + --local Equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,smallStar) + + this.hongmengAdditions[1].value = this.hongmengTablet + + this.hongmengAdditions[2].value = smallStar + + + --this.hongmengAdditions[] + return list + +end +function this:HunMin(hunList) + -- body + local smallHun =999 + for i = 1, #hunList do + -- body + if smallHun > EquipTreasureManager.GetSingleTreasureByIdDyn(hunList[i]).lv then + -- body + smallHun = EquipTreasureManager.GetSingleTreasureByIdDyn(hunList[i]).lv + end + end + this.hongmengAdditions[3].value = smallHun +end + +function this:SoulMin(LingList) + -- body + local smallLing = 999 + for i = 1, #LingList do + -- body + if smallLing > EquipTreasureManager.GetSingleTreasureByIdDyn(LingList[i]).lv then + -- body + smallLing = EquipTreasureManager.GetSingleTreasureByIdDyn(LingList[i]).lv + end + end + this.hongmengAdditions[4].value = smallLing +end + +function this:WeaponMin(weapon_Lv) + this.hongmengAdditions[4].value = weapon_Lv + -- body +end + --判断神将的装备是否共鸣 function this:IsShowGongMingEqiup(id) for i = 1, #this.hongmengHeroInfos do @@ -419,4 +474,48 @@ function this.GetMainProList(equipConfig) end return propList end + + +function this.RefreshOpenBoxPoint() + this.tab = ConfigManager.GetConfig(ConfigName.Hongmeng) + local money = BagManager.GetTotalItemNum(UpViewRechargeType.Gold) + if money > this.tab[#this.hongmengHeroInfos].PropPrice[2] or money > this.tab[#this.hongmengHeroInfos].MoneyPrice[2] then + return true + else + return false + end +end + +function this.RefreshEnvoyPoint() + -- body + for i = 1, #this.hongmengGuards do + -- body + if this.hongmengGuards[i].heroId ~= "" then + -- body + return true + end + end + return false +end + +function this.RefreshUpTowerPoint() + -- body + local sum = this:HongMengTowerUpLimit() + if this.hongmengTablet > 330 + sum * 5 then + -- body + return false + else + local data = this:GetHongMengUpData() + --print(data.LevelUp[1][2].." "..data.LevelUp[2][2]) + if BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= data.LevelUp[1][2] then + -- body + if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= data.LevelUp[2][2] then + return true + end + + end + return false + end +end + return HarmonyManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua index 4fa66418d8..62f86d0fad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua @@ -52,7 +52,7 @@ function GongMingResultTips:OnOpen(flag) --共鸣后 if flag then -- body - Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.lv) + Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.oriLv) Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = "无" Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无" Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无" @@ -74,8 +74,13 @@ function GongMingResultTips:OnOpen(flag) -- end -- end -- Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList) - - Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = HarmonyManager.hongmengTablet + if HeroManager.IsTenTalent(herodata.star) then + -- body + Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = HarmonyManager.hongmengTablet + else + Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = herodata.lv + end + Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = "无" Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = "无" Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text = "无" @@ -112,7 +117,8 @@ function GongMingResultTips:OnOpen(flag) -- end else - Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.lv) + + Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.oriLv) Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = "无" if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]) then -- body @@ -134,8 +140,14 @@ function GongMingResultTips:OnOpen(flag) local data = HarmonyManager:GetAdditions() for i = 1, #data do - if data[i].additionType == 1 then - Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",data[i].value) + if data[i].additionType == 1 then + if HarmonyManager.hongmengTablet >= 330 then + -- body + Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.lv) + else + Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",data[i].value) + end + elseif data[i].additionType == 2 then if data[i].value == -1 then Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format("无") diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index b9ecff36fe..8f54dfbf38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -61,13 +61,16 @@ function GongMingResultTips:OnOpen(equipSId) -- body Util.GetGameObject(this.TextAll,"textEqiue"):GetComponent("Text").text = string.format("无") else - Util.GetGameObject(this.TextAll,"textEqiue"):GetComponent("Text").text = string.format("装备%d品(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) + local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value) + + Util.GetGameObject(this.TextAll,"textEqiue"):GetComponent("Text").text = string.format("%s%d品(%s)",GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) end -- body ReadingName elseif data[i].additionType == 3 then if data[i].heroTid~=0 then -- body + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) else Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 85934899b9..c8d2675765 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -32,6 +32,7 @@ function HongMengEnvoyPanel:InitComponent() self.TextGrowthAmulet = Util.GetGameObject(self.gameObject, "GameObject/TextGame/TextHuFu"):GetComponent("Text") self.UpBtn = Util.GetGameObject(self.gameObject, "UpBtn") + self.UpBtnRedPoint = Util.GetGameObject(self.gameObject,"UpBtn/RedPoint") local parent = Util.GetGameObject(self.gameObject, "Panel/HongMeng") local ItemPfb = Util.GetGameObject(self.gameObject, "Panel/HarmonyPanel/item") @@ -131,7 +132,8 @@ function HongMengEnvoyPanel:BindEvent() local sum = HarmonyManager:HongMengTowerUpLimit() self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengTablet, 330 + sum * 5) - + --检测红点 + CheckRedPointStatus(RedPointType.HongMeng_UpTower) for i = 1, #self.EnvoyItemList do self.EnvoyItemList[i]:UpdateFun() end @@ -146,6 +148,8 @@ function HongMengEnvoyPanel:BindEvent() end end ) + + BindRedPointObject(RedPointType.HongMeng_UpTower,self.UpBtnRedPoint) end function HongMengEnvoyPanel:RunTimerFun() @@ -158,9 +162,10 @@ function HongMengEnvoyPanel:RunTimerFun() end local time_content = TimeToFelaxible(HarmonyManager.hongmengGuards[key].time - GetTimeStamp()) value.timer_text.text = string.format("%s\n后恢复", time_content) - else - HarmonyManager.hongmengGuards[key].time = 0 + elseif HarmonyManager.hongmengGuards[key].time == 0 then + -- body value.timer_text.text = "" + end end end @@ -183,9 +188,15 @@ function HongMengEnvoyPanel:IsUpBtnGray() self.UnShowText:SetActive(false) end end +function HongMengEnvoyPanel:RefeshRedPoint() + -- body + +end function HongMengEnvoyPanel:UpdateShow(list) + for i = 1, #list do -- bodys + LogBlue("执行刷新"..list[i].heroId) self.EnvoyItemList[i]:SetItemData(list[i]) self.EnvoyItemList[i]:SetItem(self.EnvoyItemList[i].gameObject, list[i]) end @@ -206,7 +217,7 @@ function HongMengEnvoyPanel:UpdateShow(list) HeroCount = HeroCount + 1 end end - --self:ReFeshTextFun({HeroCount,Box}) + self:ReFeshTextFun({HeroCount,Box}) end function HongMengEnvoyPanel:UpdateFun(data) @@ -217,14 +228,72 @@ function HongMengEnvoyPanel:UpdateFun(data) if value.heroId ~= "" then -- body value.heroId = "" - value.time = data.time + value.time = data.time + GetTimeStamp() + print("卸载成功",key,"data",data.time,"value",value.time) else value.heroId = data.heroId value.time = 0 end end end + local equip_count = 1 + local equip_list = {} + local hun_count = 1 + local hun_list = {} + + local ling_count = 1 + local ling_list = {} + + local weapon_Lv = 999 + for i = 1, #HarmonyManager.hongmengGuards do + -- body + if HarmonyManager.hongmengGuards[i].heroId~= "" then + -- body + local herodata = HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId) + for i = 1, #herodata.equipIdList do + -- body + equip_list[equip_count] = herodata.equipIdList[i] + equip_count = equip_count + 1 + end + if herodata.jewels then + -- body + if herodata.jewels[1] then + -- body + hun_list[hun_count] = herodata.jewels[1] + hun_count = hun_count + 1 + end + if herodata.jewels[2] then + -- body + ling_list[ling_count] = herodata.jewels[2] + ling_count = ling_count + 1 + end + end + if weapon_Lv > herodata.talismanList then + -- body + weapon_Lv = herodata.talismanList + end + end + end + + if equip_count == 24 then + -- body + HarmonyManager:EquipMin(equip_list) + end + + if hun_count == 6 then + -- body + HarmonyManager:HunMin(hun_list) + end + + if ling_count == 6 then + -- body + HarmonyManager:SoulMin(ling_list) + end + if weapon_Lv ~= 999 then + -- body + HarmonyManager:WeaponMin(weapon_Lv) + end --LogGreen( " HarmonyManager.EnvoyList "..#HarmonyManager.EnvoyList) self:UpdateShow(HarmonyManager.hongmengGuards) -- HeroManager.UpdateSingleHeroDatas(data.dynamicId,1,data.star,data.breakId,data.upStarId) @@ -255,6 +324,7 @@ function HongMengEnvoyPanel:RemoveListener() end Game.GlobalEvent:RemoveEvent(GameEvent.HongMeng.UnLoadHongMengEnvoy, self.UpdateFun, self) Game.GlobalEvent:RemoveEvent(GameEvent.HongMeng.OnlyRefeshText, self.ReFeshTextFun, self) + Game.GlobalEvent:RemoveEvent(GameEvent.HongMeng.UpHongMengEnvoy, self.UpdateFun, self) end --界面打开时调用(用于子类重写) @@ -321,6 +391,8 @@ end --界面销毁时调用(用于子类重写) function HongMengEnvoyPanel:OnDestroy() SubUIManager.Close(self.UpView) + + ClearRedPointObject(RedPointType.HongMeng_UpTower,self.UpBtnRedPoint) end return HongMengEnvoyPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index 0819ac1c4d..18f899b273 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -74,7 +74,13 @@ function HongMengUnLoadPanel:SetItem(go,data,index) Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(data.heroConfig.Quality,data.star)) if index == 0 then -- body - Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengAdditions[1].value) + if HarmonyManager.hongmengTablet>=330 then + -- body + Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",data.lv) + else + Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengAdditions[1].value) + end + else Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",data.oriLv) end @@ -86,7 +92,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index) SetHeroStars(starGrid, data.star,1,nil,nil,Vector2.New(0,1)) end function HongMengUnLoadPanel:SetTextTwo(go,data) - Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",data.lv) + Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",data.oriLv) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = "无" if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]) then -- body @@ -105,15 +111,18 @@ function HongMengUnLoadPanel:SetTextTwo(go,data) Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList) end -function HongMengUnLoadPanel:SetText(go,data) +function HongMengUnLoadPanel:SetText(go,_data) - local data = HarmonyManager:GetAdditions() for i = 1, #data do if data[i].additionType == 1 then + if HarmonyManager.hongmengTablet>=330 then + Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",_data.lv) + else + Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",data[i].value) + end - Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",data[i].value) elseif data[i].additionType == 2 then if data[i].value == -1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index 5d0c4fa432..f180aaf61e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -137,7 +137,8 @@ function this.SingleBoxDataShow(go,boxData,index) local lock = Util.GetGameObject(go.transform,"Box/Empty/lock"); local Empty = Util.GetGameObject(go.transform,"Box/Empty") local TimerText = Util.GetGameObject(go.transform,"Box/Empty/Image/Text"):GetComponent("Text") - + local redPoint = Util.GetGameObject(go.transform,"Box/Empty/redPoint") + Empty:SetActive(true) mask:SetActive(true) lock:SetActive(true) @@ -165,11 +166,20 @@ function this.SingleBoxDataShow(go,boxData,index) Empty:SetActive(true) mask:SetActive(false) lock:SetActive(false) - end + redPoint:SetActive(false) + end end elseif index == Box + 1 then mask:SetActive(false) Util.SetGray(lock,false) + + if HarmonyManager.RefreshOpenBoxPoint() then + -- body + CheckRedPointStatus(RedPointType.HongMeng_OpenBox) + redPoint:SetActive(true) + else + + end end Util.AddOnceClick(go,function() @@ -203,19 +213,19 @@ function this.SingleBoxDataShow(go,boxData,index) return end --向服务器 发消息 - NetManager.UnlockGrid(boxData.Id,function (msg) + NetManager.UnlockGrid(boxData.Id,1,function () -- body + for i = 1, #HarmonyManager.hongmengHeroInfos do -- body - if HarmonyManager.hongmengHeroInfos[i].gridId ==msg.gridId then + if HarmonyManager.hongmengHeroInfos[i].gridId ==boxData.Id then HarmonyManager.hongmengHeroInfos[i].time = 0 + print("清除数据") end end - - if msg.gridId == boxData.Id then - TimerText.text = "" - end + TimerText.text = "" + end,"取消","确认") @@ -261,7 +271,7 @@ function this:AddBoxFun(boxData) return end --向服务器请求消息 - NetManager.HongMengRequset(boxData.Id,function(msg) + NetManager.HongMengRequset(boxData.Id,function() -- Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.RereshNumText,boxData.Id) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index c64fbc4e8a..15a43ff400 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -5,18 +5,27 @@ HeroData.onCreate = function(self,_msgHeroData, isFindHandBook) self._lv = _msgHeroData.level self._equipIdList = _msgHeroData.equipIdList self._especialEquipLevel = self.especialEquipLevel + self.star = _msgHeroData.star -- self._breakId = _msgHeroData. end --等级 HeroData.__get__.lv = function(self) -- print(this._lv, " - 属性访问器:get lv") local temp_lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) + local endLv = 0 if temp_lv > 0 and HarmonyManager.IsInfo(self.dynamicId) then - local curlvEen = HeroManager.heroLvEnd[self.id] - --print(curlvEen," "..self.heroConfig.ReadingName) - local endLv = temp_lv > curlvEen and curlvEen or temp_lv + --LogGreen(tostring(HeroManager.IsElevenStar(self.star))) + if HeroManager.IsTenTalent(self.star) then + -- body + endLv = HarmonyManager.hongmengTablet + else + local curlvEen = HeroManager.heroLvEnd[self.id] + print(curlvEen," "..self.heroConfig.ReadingName) + endLv = temp_lv > curlvEen and curlvEen or temp_lv + end + return endLv elseif HarmonyManager.hongmengTablet>= 330 and HarmonyManager:IsEnvoy(self.dynamicId) then diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 2894dcaaf6..16d42085cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3395,4 +3395,23 @@ function this.GetAllHerosByStar(curStar) end return heros end +--判断是否是十一星神将 +function this.IsElevenStar(v) + -- body + if v == this.awakeNextStarIndex then + return true + else + return false + end + +end +--判断是否是十天赋神将 +function this.IsTenTalent(v) + -- body + if v == this.awakeNextStarIndex or v ==this.awakeStarIndex then + return true + else + return false + end +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2360672b4f..fd6490aef2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -236,6 +236,7 @@ function this:InitComponent() this.btnEndLess:SetActive(false) --鸿蒙 this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng") + this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint") -- 设置 --this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting") --this.setRed = Util.GetGameObject(this.btnSet, "redPoint") @@ -282,6 +283,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:AddFuncItem(this.btnWaiDi, 0), [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换 [FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换 + --[FUNCTION_OPEN_TYPE.HongMengZhen] = this:AddFuncItem(this.btnHongMeng,0) -- 鸿蒙阵 } this.operateNewText = { @@ -303,6 +305,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:InsertNewText(this.btnWaiDi), [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换 [FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换 + --[FUNCTION_OPEN_TYPE.HongMengZhen] = this:InsertNewText(this.btnHongMeng) -- 鸿蒙阵 } -- 红点 @@ -328,7 +331,7 @@ function this:InitComponent() this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint") this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换 this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽 - + this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.transform) @@ -402,7 +405,7 @@ function this:InitComponent() this.btnFunHide[FUNCTION_OPEN_TYPE.EMAIL] = this.btnYouJian this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank - + --this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng --this.btnFunGray[FUNCTION_OPEN_TYPE.NORMALCARBON] = this.btnFuBen --this.btnFunGray[FUNCTION_OPEN_TYPE.MONSTER_COMING] = this.btnMonster --this.btnFunGray[FUNCTION_OPEN_TYPE.ADVENTURE] = this.btnMijing @@ -884,13 +887,24 @@ function this:BindEvent() end) Util.AddClick(this.btnHongMeng,function() - local table = HeroManager.GetAllHeroDatas(330) - -- if #table>6 then - -- body - UIManager.OpenPanel(UIName.HongMengEnvoyPanel) - -- else - -- UIManager.OpenPanel(UIName.HongMengPanel) - -- end + UIManager.OpenPanel(UIName.HongMengEnvoyPanel) + -- if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.HongMengZhen)) then + + -- -- if #table>6 then + -- -- body + + -- -- else + -- -- UIManager.OpenPanel(UIName.HongMengPanel) + -- -- end + -- -- NetManager.RankFirstRequest(types,activiteIds,function (msg) + -- -- UIManager.OpenPanel(UIName.RankingListMainPanel,msg) + -- -- end) + -- else + -- local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.HongMengZhen) + -- PopupTipPanel.ShowTip(tip) + -- end + --this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HongMengZhen) + end) this.BindRedPoint() @@ -967,6 +981,7 @@ function this.BindRedPoint() BindRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint) BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon) + BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) end -- 绑定红点 function this.ClearRedPoint() @@ -1005,6 +1020,8 @@ function this.ClearRedPoint() ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) ClearRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint) ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon) + + ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 382603f5f6..21cf3e77d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4801,11 +4801,11 @@ function this.HongMengRequset(_gridId,func) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.HONGMENG_OPEN_RESONANCE_REQUEST, MessageTypeProto_pb.HONGMENG_OPEN_RESONANCE_RESPONSE, msg, function(buffer) local data = buffer:DataByte() - local msg = HeroInfoProto_pb.OpenResonanceResponse() - msg:ParseFromString(data) if func then - func(msg) + func() end + + end) end --开启共鸣,卸下装备 @@ -4829,20 +4829,21 @@ function this.SendGongMingBox(heroId,gridId,_type,func) end) end -function this.UnlockGrid(gridId,func) +function this.UnlockGrid(gridId,_type,func) local data = HeroInfoProto_pb.CleanResonanceTimeRequest(); data.gridId= gridId + data.type = _type local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.HONGMENG_CLEAN_TIME_RESQUEST , MessageTypeProto_pb.HONGMENG_CLEAN_TIME_RESPONSE, msg, function(buffer) - if buffer then - local data = buffer:DataByte() - local msg = HeroInfoProto_pb.ResonanceResponse() - msg:ParseFromString(data) - if func then - func(msg) - end + -- if buffer then + -- local data = buffer:DataByte() + -- local msg = HeroInfoProto_pb.ResonanceResponse() + -- msg:ParseFromString(data) + + -- end + if func then + func() end - end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 56ca3420a8..24df416beb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -265,6 +265,11 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Pokemon_Fetter, RedPointType.PokemonMainCity) RPData:SetParent(RedPointType.Pokemon_Recruit, RedPointType.PokemonMainCity) RPData:SetParent(RedPointType.Pokemon_ChipCompound, RedPointType.PokemonMainCity) + + --鸿蒙阵 + RPData:SetParent(RedPointType.HongMeng_Evory,RedPointType.HongMeng) + RPData:SetParent(RedPointType.HongMeng_OpenBox,RedPointType.HongMeng) + RPData:SetParent(RedPointType.HongMeng_UpTower,RedPointType.HongMeng) end -- 注册红点检测方法 @@ -445,6 +450,11 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_Recruit,PokemonManager.RefreshPokemonRecruitRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_ChipCompound,PokemonManager.PokemonChipCompoundRedPoint) + + + RPData:AddCheckFunc(RedPointType.HongMeng_Evory,HarmonyManager.RefreshEnvoyPoint) + RPData:AddCheckFunc(RedPointType.HongMeng_OpenBox,HarmonyManager.RefreshOpenBoxPoint) + RPData:AddCheckFunc(RedPointType.HongMeng_UpTower,HarmonyManager.RefreshUpTowerPoint) end