From 70729ca2d0cd71e7cf194e5e75716dc519e67c47 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 24 May 2021 11:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Practice/PracticeImprintPanel.prefab | 225 ++++++++++++++++++ .../Prefabs/UI/Practice/PracticePanel.prefab | 152 +++++++++++- .../~Lua/Common/GlobalDefine.lua | 2 + .../Modules/FightLevel/FightLevelManager.lua | 1 + .../~Lua/Modules/Player/RedpotManager.lua | 9 +- .../Modules/Practice/PracticeImprintPanel.lua | 7 + .../~Lua/Modules/Practice/PracticeManager.lua | 31 +++ .../~Lua/Modules/Practice/PracticePanel.lua | 5 + Assets/ManagedResources/~Lua/View/BtView.lua | 2 +- 9 files changed, 430 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index 43ddcae8f1..eb04bf505d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -1852,6 +1852,7 @@ RectTransform: - {fileID: 4549600931157267954} - {fileID: 210402868851130800} - {fileID: 4009494090188769547} + - {fileID: 5535931567833718795} m_Father: {fileID: 5353814514358887014} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2129,6 +2130,7 @@ RectTransform: - {fileID: 2797638014019322202} - {fileID: 2463532497538197397} - {fileID: 5825586489040679772} + - {fileID: 1842534313573914462} m_Father: {fileID: 5353814514358887014} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2271,6 +2273,7 @@ RectTransform: - {fileID: 699233606372742812} - {fileID: 845397727455121091} - {fileID: 1136814786482102462} + - {fileID: 70197198623497364} m_Father: {fileID: 5353814514358887014} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3562,6 +3565,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4829900165364819156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1842534313573914462} + - component: {fileID: 6264561523652895373} + - component: {fileID: 6095408299411042342} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1842534313573914462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4829900165364819156} + 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: 2077488212179021100} + 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} + m_AnchoredPosition: {x: 75, y: 75} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6264561523652895373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4829900165364819156} + m_CullTransparentMesh: 0 +--- !u!114 &6095408299411042342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4829900165364819156} + 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 &5089616391355594994 GameObject: m_ObjectHideFlags: 0 @@ -4488,6 +4565,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6111143261335003240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 70197198623497364} + - component: {fileID: 6732840278004061994} + - component: {fileID: 4679964697346878830} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &70197198623497364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111143261335003240} + 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: 4133575855501179576} + 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} + m_AnchoredPosition: {x: 75, y: 75} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6732840278004061994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111143261335003240} + m_CullTransparentMesh: 0 +--- !u!114 &4679964697346878830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111143261335003240} + 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 &6139901755147080176 GameObject: m_ObjectHideFlags: 0 @@ -5788,6 +5939,80 @@ MonoBehaviour: m_Spacing: {x: 80, y: 0} m_Constraint: 1 m_ConstraintCount: 3 +--- !u!1 &8371288006938617958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5535931567833718795} + - component: {fileID: 4285073155505635076} + - component: {fileID: 3952250903840706665} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5535931567833718795 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8371288006938617958} + 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: 3584215037867388847} + 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} + m_AnchoredPosition: {x: 75, y: 75} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4285073155505635076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8371288006938617958} + m_CullTransparentMesh: 0 +--- !u!114 &3952250903840706665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8371288006938617958} + 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 &8373824329140748901 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index e33e9c1148..9b490ee707 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -948,6 +948,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3611043203501552994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7363238053438362400} + - component: {fileID: 78611489581619870} + - component: {fileID: 3079245092469667708} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7363238053438362400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3611043203501552994} + 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: 5425594471415034572} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -20} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &78611489581619870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3611043203501552994} + m_CullTransparentMesh: 0 +--- !u!114 &3079245092469667708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3611043203501552994} + 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 &4208685104409804932 GameObject: m_ObjectHideFlags: 0 @@ -1464,6 +1538,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 999 LanguageIndex: 0 +--- !u!1 &5719940507185675018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 694908019140045443} + - component: {fileID: 2680025493036236923} + - component: {fileID: 2492966112414158874} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &694908019140045443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719940507185675018} + 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: 7687275820350529986} + 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: 100, y: 30} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2680025493036236923 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719940507185675018} + m_CullTransparentMesh: 0 +--- !u!114 &2492966112414158874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719940507185675018} + 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 &5949173385848022806 GameObject: m_ObjectHideFlags: 0 @@ -1494,7 +1642,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: 7363238053438362400} m_Father: {fileID: 3759887136319108211} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2111,6 +2260,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8218812462647253869} + - {fileID: 694908019140045443} m_Father: {fileID: 3818728531437821566} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b1b8ffceed..ebfee90f41 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -907,6 +907,8 @@ RedPointType = { --修行 Practice = 500,--主界面下方按钮 + Practice_upgrade = 5001,--突破按钮 + Practice_imprint = 5002,--神印按钮 } diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 2e63adbde0..07da351058 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -84,6 +84,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup) allChapterData[msg.chapter[i].chapterId] = singleHardStageChapter end CheckRedPointStatus(RedPointType.FightLevel) + PracticeManager.StarNum = FightLevelManager.GetAllChapterStars() end end --获取整个章节信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 4b1d05696e..98fb4e25cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -1,4 +1,4 @@ ---- + --- --- 红点系统使用方法: --- 1、注册: --- 在 RedPointType 中注册相应的红点枚举 @@ -297,6 +297,9 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.FifteenDayGift_1,RedPointType.FifteenDayGift) --化虚坛 RPData:SetParent(RedPointType.Huaxutan_CompoundHero,RedPointType.Huaxutan) + --主角修行 + RPData:SetParent(RedPointType.Practice_upgrade,RedPointType.Practice) + RPData:SetParent(RedPointType.Practice_imprint,RedPointType.Practice) for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do if v.RpType > 0 and v.RpTypeParent > 0 then RPData:SetParent(v.RpType,v.RpTypeParent) @@ -519,7 +522,9 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.FifteenDayGift_1,FifteenDayGiftManager.CheckRedPoint) --化虚坛英雄合成 RPData:AddCheckFunc(RedPointType.Huaxutan_CompoundHero,HeroManager.GetAllHeroCompoundRedPoint) - + --主角修行 + RPData:AddCheckFunc(RedPointType.Practice_upgrade,PracticeManager.PracticeCheckUpgrade) + RPData:AddCheckFunc(RedPointType.Practice_imprint,PracticeManager.PracticeCheckImprint) end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 56221c15da..544f7e8c7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -115,7 +115,9 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) local maskBlack = Util.GetGameObject(_go, "maskblack") local name = Util.GetGameObject(_go, "name/Text"):GetComponent("Text") local selectImg = Util.GetGameObject(_go, "select") + local redPoint = Util.GetGameObject(_go, "redPoint") selectImg:SetActive(false) + redPoint:SetActive(false) self.SelectList[_imprintId] = selectImg heroImg.gameObject:SetActive(configData.Type == 1) heroImg.sprite = self.spLoader:LoadSprite("r_zjm_chongzhijiahao") @@ -124,6 +126,9 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) maskBlack:SetActive(true) else--已解锁 maskBlack:SetActive(false) + if PlayerPrefs.GetInt(PlayerManager.uid.."Imprint"..configData.Id) == 0 then + redPoint:SetActive(true) + end if serverData.state == 0 then--未使用 _go:GetComponent("Image").enabled = false elseif serverData.state == 1 then--已使用 @@ -137,6 +142,8 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) name.text = configData.Name Util.AddOnceClick(maskBtn,function () + PlayerPrefs.SetInt(PlayerManager.uid.."Imprint"..configData.Id,1) + redPoint:SetActive(false) local ScrollTrans = self.Scrollgrid:GetComponent("RectTransform") curNum = configData.UnlockId - 1 local num = 100 + (curNum-2)*468 > 0 and 100 + (curNum-2)*468 or 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 77a77e6b84..ed36109264 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -328,4 +328,35 @@ function this.GetSingleAddition(_data) end end +--升级红点检测 +function this.PracticeCheckUpgrade() + local configData = XiuXianConfig[this.PracticeLevel] + if this.StarNum >= configData.NeedStarNum then + for i = 1, #configData.LevelUpCost do + local data = configData.LevelUpCost[i] + if BagManager.GetTotalItemNum(data[1]) < data[2] then + LogRed("return false Upgrade 1") + return false + end + end + LogGreen("return true Upgrade") + return true + end + LogRed("return false Upgrade 2") + return false +end + +--神印红点检测 +function this.PracticeCheckImprint() + for i, v in ConfigPairs(XiuXianSkillConfig) do + local str = PlayerPrefs.GetInt(PlayerManager.uid.."Imprint"..v.Id) + if str == 0 then + LogGreen("return true Imprint") + return true + end + end + LogRed("return false Imprint") + return false +end + return PracticeManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 76f3dbabeb..08d37ff229 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -20,6 +20,7 @@ function Practice:InitComponent() self.previewBtn = Util.GetGameObject(self.gameObject, "Btns/previewBtn") self.additionBtn = Util.GetGameObject(self.gameObject, "Btns/additionBtn") self.imprintBtn = Util.GetGameObject(self.gameObject, "Btns/imprintBtn") + self.imprintRedPoint = Util.GetGameObject(self.imprintBtn, "redPoint") self.starBtn = Util.GetGameObject(self.gameObject, "Btns/starBtn") self.starNum = Util.GetGameObject(self.starBtn, "starNum"):GetComponent("Text") --MidPart @@ -36,6 +37,7 @@ function Practice:InitComponent() self.needPre = Util.GetGameObject(self.needs, "pre") self.button = Util.GetGameObject(self.bottom, "Button") self.buttonText = Util.GetGameObject(self.button, "Text"):GetComponent("Text") + self.redPoint = Util.GetGameObject(self.button, "redPoint") self.content = Util.GetGameObject(self.bottom, "Content") self.textBtn = Util.GetGameObject(self.content, "Text") self.needStar = Util.GetGameObject(self.content, "num"):GetComponent("Text") @@ -82,6 +84,8 @@ function Practice:BindEvent() self:OnShow() end) end) + RedpotManager.BindObject(RedPointType.Practice_upgrade,self.redPoint) + RedpotManager.BindObject(RedPointType.Practice_imprint,self.imprintRedPoint) end --Check @@ -126,6 +130,7 @@ end function Practice:OnShow() self.playerInfoView:OnShow() + -- CheckRedPointStatus(RedPointType.Practice) FormationManager.RefreshMainFormationPower() self.curLevelConfig = PracticeManager.GetCurConfigData() LogYellow("当前修行等级Id:"..tostring(PracticeManager.PracticeLevel)) diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index c119ab4317..2c6a2e24a9 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -47,7 +47,7 @@ function this:InitComponent() [PanelTypeView.Carbon] = {node = self.BtnCarbon, funcId = {17, 18, 30, 46, 67}, rpType = RedPointType.ExploreMain, clickFunc = self.OpenCarbon}, [PanelTypeView.GongHui] = {node = self.BtnGongHui, funcId = {4}, rpType = RedPointType.Guild, clickFunc = self.OpenGuild}, -- [PanelTypeView.TeQuan] = {node = self.BtnTeQuan, funcId = {}, rpType = RedPointType.VipPrivilege, clickFunc = self.OpenVIP}, - [PanelTypeView.Practice] = {node = self.BtnPractice, funcId = {}, rpType = RedPointType.Practice, clickFunc = self.OpenPractice}, + [PanelTypeView.Practice] = {node = self.BtnPractice, funcId = {108}, rpType = RedPointType.Practice, clickFunc = self.OpenPractice}, } end