diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab index fdae14dff5..7e5d9bacd6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/GongMingResultPanel.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8081481610987422976} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -104,7 +104,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -148,6 +148,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1155687612620198211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7739775199471190959} + - component: {fileID: 3716202059003348205} + - component: {fileID: 8833808572235287633} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7739775199471190959 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155687612620198211} + 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: 6119187174730095044} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.6, y: -198.8} + m_SizeDelta: {x: 987.4, y: 689.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3716202059003348205 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155687612620198211} + m_CullTransparentMesh: 0 +--- !u!114 &8833808572235287633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155687612620198211} + 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: 0.13207549, g: 0.120238535, b: 0.120238535, a: 0.7764706} + 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: 0} + 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 &2002137612996306651 GameObject: m_ObjectHideFlags: 0 @@ -337,6 +411,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4369878354462932941} - {fileID: 6119187174730095044} - {fileID: 917442717006195055} - {fileID: 6617956877845356924} @@ -616,7 +691,7 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8081481610987422976} - 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} @@ -896,7 +971,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -968,6 +1043,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 200.00002} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7739775199471190959} - {fileID: 4295126611195974249} - {fileID: 824243234944541189} - {fileID: 4420068252593448750} @@ -979,7 +1055,7 @@ RectTransform: - {fileID: 7661384844395682692} - {fileID: 6897358528758527623} m_Father: {fileID: 8081481610987422976} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1024,7 +1100,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - 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} @@ -1258,7 +1334,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1412,7 +1488,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 4 + 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} @@ -1566,7 +1642,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1610,6 +1686,41 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6710935365531832006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4369878354462932941} + m_Layer: 5 + m_Name: HeroSkin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4369878354462932941 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6710935365531832006} + 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: 8081481610987422976} + 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: 5, y: 135} + m_SizeDelta: {x: 1091.8, y: 1328.1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6745114888964542168 GameObject: m_ObjectHideFlags: 0 @@ -1640,7 +1751,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1881,7 +1992,7 @@ RectTransform: - {fileID: 8368375225317432911} - {fileID: 117241134819610646} m_Father: {fileID: 6119187174730095044} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2153,7 +2264,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2504,7 +2615,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6119187174730095044} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2578,7 +2689,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8081481610987422976} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index b9cd8274d0..8ba1345d45 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -77160,8 +77160,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.3, y: 0} - m_SizeDelta: {x: 194.7, y: 176} + m_AnchoredPosition: {x: -1, y: 0.6} + m_SizeDelta: {x: 190, y: 177.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6866971562866975378 CanvasRenderer: @@ -77191,7 +77191,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5a8901c400a952045b296654b26852ab, type: 3} + m_Sprite: {fileID: 21300000, guid: 57887231ae107c949be3c516782932c6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index 8764fdb6f1..66896c0c13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -119,7 +119,13 @@ 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) + if self.data.time-GetTimeStamp() > 0 then + -- body + self.RedPoint:SetActive(false) + else + self.RedPoint:SetActive(true) + end + end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua index 62f86d0fad..9b1bf06438 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua @@ -18,6 +18,7 @@ function GongMingResultTips:InitComponent() this.TextOneAll = Util.GetGameObject(self.transform,"grid/TextOne") this.TextTwoAll = Util.GetGameObject(self.transform,"grid/TextTwo") + this.HeroSkin = Util.GetGameObject(self.transform,"grid/ver/HeroSkin") end @@ -48,7 +49,26 @@ function GongMingResultTips:OnOpen(flag) local SelectId = HarmonyManager:GetUnLoadData() local herodata = HeroManager.GetSingleHeroData(SelectId) + local heroTData=nil + + if herodata.skinId and herodata.skinId>0 then + heroTData=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",herodata.skinId) + else + heroTData= ConfigManager.GetConfigData(ConfigName.HeroConfig,herodata.id) + end + this.liveName = GetResourcePath(heroTData.Live) + this.liveNode = poolManager:LoadLive(this.liveName, this.HeroSkin.transform, Vector3.one * heroTData.Scale*0.7, Vector3.New(heroTData.Position[1], heroTData.Position[2])) + this.liveNode.transform.sizeDelta = Vector2.New(1000, 1000) + local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") + local idle = function() + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + end + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle + poolManager:SetLiveClearCall(this.liveName, this.liveNode, function() + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle + end) --共鸣后 if flag then -- body @@ -188,7 +208,10 @@ end --界面销毁时调用(用于子类重写) function GongMingResultTips:OnDestroy() - + if this.liveNode then + poolManager:UnLoadLive(this.liveName, this.liveNode) + this.liveNode = nil + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index 8f54dfbf38..dc1dd3e578 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -41,7 +41,7 @@ function GongMingResultTips:RemoveListener() end -function GongMingResultTips:OnOpen(equipSId) +function GongMingResultTips:OnOpen(skinId) LogGreen("打开面板") local data = HarmonyManager:GetAdditions() -- for key, value in pairs(heroConfig[]) do diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 7cb67d1bdd..fd80767655 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -887,7 +887,13 @@ function this:BindEvent() end) Util.AddClick(this.btnHongMeng,function() - UIManager.OpenPanel(UIName.HongMengEnvoyPanel) + if HarmonyManager.hongmengTablet >= 330 then + -- body + UIManager.OpenPanel(UIName.HongMengEnvoyPanel) + else + UIManager.OpenPanel(UIName.HongMengPanel) + end + -- if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.HongMengZhen)) then -- -- if #table>6 then