diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index b741e29952..5037005b0c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -20328,7 +20328,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4093429386761372513 RectTransform: m_ObjectHideFlags: 0 @@ -20344,10 +20344,10 @@ RectTransform: m_Father: {fileID: 1080492301643067761} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64, y: -400} + m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1972044086975063874 GameObject: @@ -21063,6 +21063,144 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2237243291090950460} m_CullTransparentMesh: 0 +--- !u!1 &2258032000070857356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5723062008989145107} + - component: {fileID: 1661146730132922393} + - component: {fileID: 5596648735206574009} + - component: {fileID: 2988003592653698928} + - component: {fileID: 2366828982702406790} + m_Layer: 5 + m_Name: ZhuSheng + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5723062008989145107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258032000070857356} + 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: 2388682364799312477} + m_Father: {fileID: 1080492301643067761} + 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: 64, y: -64} + m_SizeDelta: {x: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1661146730132922393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258032000070857356} + m_CullTransparentMesh: 0 +--- !u!114 &5596648735206574009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258032000070857356} + 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: 36875583fcd78b64982d5e5545499b79, 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 &2988003592653698928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258032000070857356} + 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: 5596648735206574009} + 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 &2366828982702406790 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258032000070857356} + 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 &2292696022178856073 GameObject: m_ObjectHideFlags: 0 @@ -23249,7 +23387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3958316192645827337 RectTransform: m_ObjectHideFlags: 0 @@ -23267,10 +23405,10 @@ RectTransform: m_Father: {fileID: 1080492301643067761} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64, y: -232} + m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4367344497533921501 CanvasRenderer: @@ -33049,7 +33187,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8935360825500051851 RectTransform: m_ObjectHideFlags: 0 @@ -33065,10 +33203,10 @@ RectTransform: m_Father: {fileID: 1080492301643067761} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64, y: -64} + m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3609404473290929707 GameObject: @@ -78024,6 +78162,7 @@ RectTransform: - {fileID: 8935360825500051851} - {fileID: 3958316192645827337} - {fileID: 4093429386761372513} + - {fileID: 5723062008989145107} m_Father: {fileID: 1470640894515440942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -84655,6 +84794,102 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8367386007212292203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2388682364799312477} + - component: {fileID: 8677907642781959488} + - component: {fileID: 1905058291458814453} + - component: {fileID: 4201311472809348106} + m_Layer: 5 + m_Name: Image_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2388682364799312477 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8367386007212292203} + 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: 100037405422114823} + m_Father: {fileID: 5723062008989145107} + 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: -15.1, y: -127.6} + m_SizeDelta: {x: 160, y: 53.26} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8677907642781959488 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8367386007212292203} + m_CullTransparentMesh: 0 +--- !u!114 &1905058291458814453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8367386007212292203} + 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: d69429d22e71bbd439bbf280edeb3a71, 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 &4201311472809348106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8367386007212292203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8420904656110204138 GameObject: m_ObjectHideFlags: 0 @@ -90607,6 +90842,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9005848868890573479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 100037405422114823} + - component: {fileID: 6606536070185729565} + - component: {fileID: 1295761843600766288} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &100037405422114823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005848868890573479} + 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: 2388682364799312477} + 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: -80, y: 15} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6606536070185729565 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005848868890573479} + m_CullTransparentMesh: 0 +--- !u!114 &1295761843600766288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005848868890573479} + 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: 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 47 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 0.8 + m_Text: "\u7ED3\u675F\u65F6\u95F4\n01:00:00" --- !u!1 &9020041330340483714 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 3cd831ca97..f8602343f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -93,6 +93,10 @@ function this:InitComponent() this.rpFifteenDayGift = Util.GetGameObject(this.fgBtn,"redPoint") this.rpFifteenDayEffect = Util.GetGameObject(this.fgBtn,"UI_Effect_DengLu15Day_YuanKuang") + --逐胜之巅 + this.zhuShengBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/ZhuSheng") + this.zhuShengTime = Util.GetGameObject(this.zhuShengBtn,"Image_1/time"):GetComponent("Text") + ---------------topRightPart---------------- -- 邮件 this.btnYouJian = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnYouJian") @@ -355,6 +359,11 @@ function this:BindEvent() UIManager.OpenPanel(UIName.FifteenDayGiftPanel) end) + --逐胜之巅 + Util.AddClick(this.zhuShengBtn,function () + UIManager.OpenPanel(UIName.ArenaTopMatchPanel) + end) + --六星前往 Util.AddClick(this.btnSixStarGo,function() --PlayerManager.isSixStarJump=true @@ -892,8 +901,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.AchievementPanel) elseif id == 72 then JumpManager.GoJump(75001) - elseif id == FUNCTION_OPEN_TYPE.ARENA then - UIManager.OpenPanel(UIName.ArenaTopMatchPanel) + -- elseif id == FUNCTION_OPEN_TYPE.ARENA then + -- UIManager.OpenPanel(UIName.ArenaTopMatchPanel) elseif id == 93 then UIManager.OpenPanel(UIName.UpGradePackagePanel) elseif id == 94 then @@ -1110,6 +1119,10 @@ function this.TimeFormat() this.jingying:SetActive(false) end end + + --逐胜之巅 + this.ZhuShengZhiDianBtn() + for k,v in pairs(activitys) do local ishow = DynamicActivityManager.IsQualifiled(v.Id) if ishow then @@ -1245,25 +1258,25 @@ function this.TimeFormat() else activityTabs[k].go.gameObject:SetActive(false) end - elseif v.FunType == FUNCTION_OPEN_TYPE.ARENA then - local isOpen = ActTimeCtrlManager.SingleFuncState(v.FunType) - local baseInfo = ArenaTopMatchManager.GetBaseData() - if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then - activityTabs[k].go.gameObject:SetActive(false) - elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then - local startTime = ArenaTopMatchManager.GetTopMatchTime() - local tempTime = startTime - PlayerManager.serverTime - -- 当日五点开始显示 - if tempTime > 0 and tempTime < 16 * 60 * 60 then - activityTabs[k].go.gameObject:SetActive(true) - activityTabs[k].timeText.text = Language[11211]..TimeToHMS(tempTime) - else - activityTabs[k].go.gameObject:SetActive(false) - end - else - activityTabs[k].go.gameObject:SetActive(true) - activityTabs[k].timeText.text = Language[11212] - end + -- elseif v.FunType == FUNCTION_OPEN_TYPE.ARENA then + -- local isOpen = ActTimeCtrlManager.SingleFuncState(v.FunType) + -- local baseInfo = ArenaTopMatchManager.GetBaseData() + -- if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then + -- activityTabs[k].go.gameObject:SetActive(false) + -- elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then + -- local startTime = ArenaTopMatchManager.GetTopMatchTime() + -- local tempTime = startTime - PlayerManager.serverTime + -- -- 当日五点开始显示 + -- if tempTime > 0 and tempTime < 16 * 60 * 60 then + -- activityTabs[k].go.gameObject:SetActive(true) + -- activityTabs[k].timeText.text = Language[11211]..TimeToHMS(tempTime) + -- else + -- activityTabs[k].go.gameObject:SetActive(false) + -- end + -- else + -- activityTabs[k].go.gameObject:SetActive(true) + -- activityTabs[k].timeText.text = Language[11212] + -- end elseif v.FunType == 72 then local status = DeathPosManager.GetStatus() local endTime = DeathPosManager.GetOverTime() @@ -1534,7 +1547,7 @@ function this.RefreshEightGiftPreview() end end - -- 七日登陆奖励预览 + -- 八日登陆奖励预览 function this.RefreshSevenGiftPreview() --判断今日是否有可领取 local isHaveGift = ActivityGiftManager.CheckSevenDayRed() @@ -1575,6 +1588,28 @@ end this.sgName.text=ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name end + --逐胜之巅 +function this.ZhuShengZhiDianBtn() + local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) + local baseInfo = ArenaTopMatchManager.GetBaseData() + + if not isOpen or not baseInfo or not baseInfo.battleStage or baseInfo.battleStage == TOP_MATCH_STAGE.OVER then + this.zhuShengBtn:SetActive(false) + elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then + local tempTime = ArenaTopMatchManager.GetTopMatchTime() - PlayerManager.serverTime + -- 当日五点开始显示 + if tempTime > 0 and tempTime < 16 * 60 * 60 then + this.zhuShengBtn:SetActive(true) + this.zhuShengTime.text = Language[11211]..TimeToHMS(tempTime) + else + this.zhuShengBtn:SetActive(false) + end + else + this.zhuShengBtn:SetActive(true) + this.zhuShengTime.text = Language[11212] + end +end + function this.RefreshBattleUpLvTip() this.battleUpLvTip:SetActive(true) end