diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index 3cda33caa3..62be8df172 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -77,6 +77,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &120835498341656909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7647412491874848298} + - component: {fileID: 3353661154713415312} + - component: {fileID: 6733638397459251560} + m_Layer: 0 + m_Name: tiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7647412491874848298 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120835498341656909} + 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: 8849108110584066241} + m_Father: {fileID: 3026942363793877950} + 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: 0.000012398, y: -756.2} + m_SizeDelta: {x: 502, y: 54.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3353661154713415312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120835498341656909} + m_CullTransparentMesh: 0 +--- !u!114 &6733638397459251560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120835498341656909} + 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: 7f7ef0b74ef147c4e82b3f037352d751, 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 &201470256467503165 GameObject: m_ObjectHideFlags: 0 @@ -111,8 +186,8 @@ 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: -601.6} - m_SizeDelta: {x: 1068, y: 1305} + m_AnchoredPosition: {x: 0, y: -562.5} + m_SizeDelta: {x: 1068, y: 1226.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5046095925682704895 CanvasRenderer: @@ -1174,8 +1249,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: -9.9, y: -509.5} - m_SizeDelta: {x: 986.4, y: 900.1} + m_AnchoredPosition: {x: -9.9, y: -469.3} + m_SizeDelta: {x: 986.4, y: 819.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9177181720887223299 CanvasRenderer: @@ -1617,6 +1692,7 @@ RectTransform: - {fileID: 6210539784487420772} - {fileID: 146850524550947220} - {fileID: 1350465337999593540} + - {fileID: 7647412491874848298} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1809,7 +1885,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 275} + m_AnchoredPosition: {x: 0, y: 297} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3824647323492070119 @@ -2186,7 +2262,8 @@ RectTransform: 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_Children: + - {fileID: 453597364146430693} m_Father: {fileID: 484504342669095539} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2307,6 +2384,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4622268229002954602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 976674176078188953} + - component: {fileID: 7096228294599665147} + - component: {fileID: 4278810175383752963} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &976674176078188953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4622268229002954602} + 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: 453597364146430693} + 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, y: 5.3149} + m_SizeDelta: {x: 160, y: 31.37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7096228294599665147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4622268229002954602} + m_CullTransparentMesh: 0 +--- !u!114 &4278810175383752963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4622268229002954602} + 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: 0.909804, b: 0.8117648, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 30000 --- !u!1 &4689356545102374745 GameObject: m_ObjectHideFlags: 0 @@ -7564,6 +7720,85 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &5532096389828808701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8849108110584066241} + - component: {fileID: 5035164546636351580} + - component: {fileID: 4856947487757474452} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8849108110584066241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5532096389828808701} + 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: 7647412491874848298} + 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, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5035164546636351580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5532096389828808701} + m_CullTransparentMesh: 0 +--- !u!114 &4856947487757474452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5532096389828808701} + 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.7607844, g: 0.7019608, b: 0.5372549, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 75 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &5717577223512066150 GameObject: m_ObjectHideFlags: 0 @@ -9317,7 +9552,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: -9.9, y: -736} + m_AnchoredPosition: {x: -9.9, y: -634.23} m_SizeDelta: {x: 986.4, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8778273487242550425 @@ -9394,6 +9629,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8848279672364018784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 453597364146430693} + - component: {fileID: 6976397986984294231} + - component: {fileID: 7737212468643318140} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &453597364146430693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848279672364018784} + 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: 976674176078188953} + m_Father: {fileID: 2956175676004163674} + 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, y: -83.51} + m_SizeDelta: {x: 157, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6976397986984294231 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848279672364018784} + m_CullTransparentMesh: 0 +--- !u!114 &7737212468643318140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8848279672364018784} + 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: 974f29e827072824092a5ffa4037adc8, 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 &8864034437004162414 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index ddadee6e5f..c7f95b6430 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -39,7 +39,8 @@ function NiuQiChongTianPanel:InitComponent() --进度条 self.progress = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount self.reward = Util.GetGameObject(self.gameObject, "mid/reward") - + self.time = Util.GetGameObject(self.gameObject, "tiao/Text"):GetComponent("Text") + self.NiuQiValue = Util.GetGameObject(self.gameObject, "mid/progress/niu/Image/Text"):GetComponent("Text") --任务列表 self.itemPre = Util.GetGameObject(self.gameObject, "rewardPre") self.scrollItem = Util.GetGameObject(self.gameObject, "mid/rewardArena") @@ -127,10 +128,41 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) self.TabCtrl:SetTabAdapter(NiuQiChongTianPanelTabAdapter) self.TabCtrl:SetChangeTabCallBack(NiuQiChongTianPanelSwitchView) self.TabCtrl:Init(self.tabBox, _TabData, self.curIndex) + + self:SetTime() +end + +function NiuQiChongTianPanel:SwitchView(index,bool) + self.curPage = index + self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) + + self:SetProgress() + self:SetReward(bool) +end + +function NiuQiChongTianPanel:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + local info = ActivityGiftManager.GetActivityTypeInfo(self.actType) + local tempTime = info.endTime - GetTimeStamp() + if tempTime < 0 then + return + end + local updateTime = function() + self.time.text = "剩余时间:"..TimeToFelaxible(tempTime) + end + self.timer = Timer.New(function() + tempTime = tempTime - 1 + updateTime() + end,1,-1,false) + self.timer:Start() end function NiuQiChongTianPanel:SetProgress() self.curScore = NiuQiChongTianManager.GetScore() + self.NiuQiValue.text = self.curScore self.progressData = NiuQiChongTianManager.configData self.progress.fillAmount = self.curScore/self.progressData[#self.progressData].value[2][1] for i = 1, self.reward.transform.childCount do @@ -219,7 +251,7 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () CheckRedPointStatus(RedPointType.NiuQiChongTian + self.curPage) CheckRedPointStatus(RedPointType.NiuQiChongTian_4) - self.SwitchView(self.curPage,true) + self:SwitchView(self.curPage,true) end) end) end @@ -233,6 +265,10 @@ function NiuQiChongTianPanel:OnClose() ClearRedPointObject(key, value) end self.redPointList = {} + if self.timer then + self.timer:Stop() + self.timer = nil + end end --界面销毁时调用(用于子类重写)