diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index d4be951811..9d78fb58c0 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1114,6 +1114,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4EC5\u9650\u7B2C\u4E8C\u5C42" LanguageIndex: 0 +--- !u!1 &1635522195388721489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1986228561599426778} + - component: {fileID: 8230390605963261009} + - component: {fileID: 5776781038012390848} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1986228561599426778 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635522195388721489} + 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: 9089028877129916138} + 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: 109, y: 38} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8230390605963261009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635522195388721489} + m_CullTransparentMesh: 0 +--- !u!114 &5776781038012390848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635522195388721489} + 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 &1958333681059384058 GameObject: m_ObjectHideFlags: 0 @@ -3316,6 +3390,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6667437736065762079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3135212788455900131} + - component: {fileID: 6933090873600084616} + - component: {fileID: 2542805038495233572} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3135212788455900131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667437736065762079} + 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: 5334655340217632472} + 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: 109, y: 38} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6933090873600084616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667437736065762079} + m_CullTransparentMesh: 0 +--- !u!114 &2542805038495233572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667437736065762079} + 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 &6835674612777269341 GameObject: m_ObjectHideFlags: 0 @@ -3347,6 +3495,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3095263655024518535} + - {fileID: 3135212788455900131} m_Father: {fileID: 2701184383076925226} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3778,6 +3927,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1981324586652204717} + - {fileID: 1986228561599426778} m_Father: {fileID: 2701184383076925226} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index ac77356284..3fcc58cca2 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -5127,7 +5127,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: 1719991210506140705} m_Father: {fileID: 7806638948147681323} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12093,6 +12094,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7270042825784085269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1719991210506140705} + - component: {fileID: 6353402314294648269} + - component: {fileID: 6342776911548304619} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1719991210506140705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7270042825784085269} + 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: 3409865561245001776} + 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: 53.5, y: 53} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6353402314294648269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7270042825784085269} + m_CullTransparentMesh: 0 +--- !u!114 &6342776911548304619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7270042825784085269} + 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 &7332164317129553119 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab index 7b1b1511fa..01ab305855 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab @@ -556,6 +556,154 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &2093781260781437669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3237263451956369982} + - component: {fileID: 6595011086822041179} + - component: {fileID: 8893688897646586007} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3237263451956369982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093781260781437669} + 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: 868240997070367043} + 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: -186, y: 22} + m_SizeDelta: {x: 37.5, y: 37.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6595011086822041179 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093781260781437669} + m_CullTransparentMesh: 0 +--- !u!114 &8893688897646586007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093781260781437669} + 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 &2146804591469493836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4300771784587347048} + - component: {fileID: 1873995313118416092} + - component: {fileID: 3822761163397273227} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4300771784587347048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146804591469493836} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.95238096, y: 0.95238096, z: 1} + m_Children: [] + m_Father: {fileID: 1252269825180492747} + 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} + m_AnchoredPosition: {x: 257.9, y: 417.55} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1873995313118416092 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146804591469493836} + m_CullTransparentMesh: 0 +--- !u!114 &3822761163397273227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146804591469493836} + 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 &2519628866901632095 GameObject: m_ObjectHideFlags: 0 @@ -632,6 +780,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2572487136501627307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8405720891597481347} + - component: {fileID: 3012530916858573275} + - component: {fileID: 3036297474262954957} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8405720891597481347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572487136501627307} + 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: 1417247154555764304} + 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: 186, y: 22} + m_SizeDelta: {x: 37.5, y: 37.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3012530916858573275 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572487136501627307} + m_CullTransparentMesh: 0 +--- !u!114 &3036297474262954957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572487136501627307} + 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 &2634832901597374156 GameObject: m_ObjectHideFlags: 0 @@ -1061,7 +1283,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.16, y: -0.05} + m_AnchoredPosition: {x: -0.16000366, y: -0.05000019} m_SizeDelta: {x: -8.97, y: -3.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2112863120288633553 @@ -1631,6 +1853,7 @@ RectTransform: - {fileID: 6749849671992991666} - {fileID: 1568685859224997408} - {fileID: 1593534098685063726} + - {fileID: 7981364898394692271} m_Father: {fileID: 3961690423647271749} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1689,6 +1912,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4823338124448762274} m_CullTransparentMesh: 0 +--- !u!1 &5344325313099297986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7981364898394692271} + - component: {fileID: 2016512541008838561} + - component: {fileID: 3011323720577595980} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7981364898394692271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5344325313099297986} + 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: 8063354211924401121} + 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: 186, y: 280} + m_SizeDelta: {x: 37.5, y: 37.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2016512541008838561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5344325313099297986} + m_CullTransparentMesh: 0 +--- !u!114 &3011323720577595980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5344325313099297986} + 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 &5658573919720207457 GameObject: m_ObjectHideFlags: 0 @@ -1802,6 +2099,7 @@ RectTransform: - {fileID: 7276053826500739453} - {fileID: 4064824210468836868} - {fileID: 6509552891453255038} + - {fileID: 3237263451956369982} m_Father: {fileID: 3961690423647271749} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1968,6 +2266,7 @@ RectTransform: - {fileID: 4614240479294507019} - {fileID: 8727235740639113165} - {fileID: 166331187407207989} + - {fileID: 6489330602894791834} m_Father: {fileID: 3961690423647271749} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2257,6 +2556,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7422118504293731458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6489330602894791834} + - component: {fileID: 4986841671367522860} + - component: {fileID: 830630101848985859} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6489330602894791834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422118504293731458} + 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: 3294220471957828190} + 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: -186, y: 280} + m_SizeDelta: {x: 37.5, y: 37.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4986841671367522860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422118504293731458} + m_CullTransparentMesh: 0 +--- !u!114 &830630101848985859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422118504293731458} + 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 &7594284194467603593 GameObject: m_ObjectHideFlags: 0 @@ -2365,6 +2738,7 @@ RectTransform: - {fileID: 432877242610551367} - {fileID: 1805540325840091157} - {fileID: 353832390160171508} + - {fileID: 8405720891597481347} m_Father: {fileID: 3961690423647271749} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2940,6 +3314,7 @@ RectTransform: - {fileID: 721588110232646809} - {fileID: 6760869819602811802} - {fileID: 2178611684651558167} + - {fileID: 4300771784587347048} m_Father: {fileID: 1327116469934475768} m_RootOrder: 1 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 4df94cc4d4..3cd0985487 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -848,7 +848,17 @@ RedPointType = { Pokemon_Fetter = 794,--灵兽羁绊 Pokemon_Recruit = 795,--灵兽 御兽斋免费 Pokemon_ChipCompound = 796,--灵兽 碎片合成 - + + HeartDemon = 797, --心魔试炼红点 + PersonTrail = 798, --人杰试炼 + BuddishTrail = 799,--佛禅试炼 + DemonTrail = 800,--妖灵试炼 + TaoistTrail = 801,--道玄试炼 + + PersonTrailHelp = 802, --人杰试炼 + BuddishTrailHelp = 803,--佛禅试炼 + DemonTrailHelp = 804,--妖灵试炼 + TaoistTrailHelp = 805,--道玄试炼 } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index b5dcd85725..8bdc5417b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -820,7 +820,7 @@ function this. CarbonRedCheck(redType) end return false --心魔 - elseif redType == RedPointType.EpicExplore then + elseif redType == RedPointType.HeartDemon then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do if v.SpecialReward and #v.SpecialReward > 0 then @@ -860,8 +860,6 @@ function this. CarbonRedCheck(redType) end end - - --日常副本红点数据 --1 金币副本 2 经验副本 3角色碎片副本 4 每日法宝副本 5每日魂印副本 0全部 function this.GetDailyCarbons(index) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua index a613d84c76..47a290c878 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua @@ -17,7 +17,12 @@ local rate = 0 local waveId = 0 local curType = 0 local configData = {} - +local redTrailType = { + [1] = RedPointType.PersonTrailHelp, + [2] = RedPointType.BuddishTrailHelp, + [3] = RedPointType.DemonTrailHelp, + [4] = RedPointType.TaoistTrailHelp, +} function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "itemPre") @@ -43,6 +48,7 @@ function this:BindEvent() this:BtnClick(i) end) end + BindRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) end function this:BtnClick(i) @@ -82,22 +88,46 @@ function this:OnShow(_parent,...) end function this:SortHeros(data) + local tempData = MonsterCampManager.GetMyHelpHero(curType) + if tempData then + for i = 1 ,#data do + if data[i].dynamicId == tempData.dynamicId then + data[i].fourElementSortId = 1 + else + data[i].fourElementSortId = 0 + end + end + end table.sort(data,function(a,b) - if a.warPower == b.warPower then - return a.star > b.star + if a.fourElementSortId == b.fourElementSortId then + if a.warPower == b.warPower then + return a.star > b.star + else + return a.warPower > b.warPower + end else - return a.warPower > b.warPower + return a.fourElementSortId > b.fourElementSortId end end) end - function this:SortHeros1(data) - table.sort(data,function(a,b) - if a.hero.warPower == b.hero.warPower then - return a.hero.star > b.hero.star + for i = 1 ,#data do + if data[i].hero.warPower > heightPower then + data[i].sortId = 0 else - return a.hero.warPower > b.hero.warPower + data[i].sortId = 1 + end + end + table.sort(data,function(a,b) + if a.sortId == b.sortId then + if a.hero.warPower == b.hero.warPower then + return a.hero.star > b.hero.star + else + return a.hero.warPower > b.hero.warPower + end + else + return a.sortId > b.sortId end end) end @@ -161,6 +191,7 @@ function this:OnDestroy() this.ScrollView = nil end itemList = {} + ClearRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 6694343e6b..df34531532 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -15,6 +15,13 @@ local freeTimes = 0 local buyTimes = 0 local storeDataId = 0 local callBack + +local redTrailType = { + [1] = RedPointType.PersonTrailHelp, + [2] = RedPointType.BuddishTrailHelp, + [3] = RedPointType.DemonTrailHelp, + [4] = RedPointType.TaoistTrailHelp, +} --初始化组件(用于子类重写) function FourElementMonsterCampPanel:InitComponent() this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) @@ -99,7 +106,8 @@ end --界面打开时调用(用于子类重写) function FourElementMonsterCampPanel:OnOpen(index) - curType = index + curType = index + BindRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint")) this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) end @@ -160,6 +168,7 @@ function FourElementMonsterCampPanel:OnDestroy() for k,v in pairs(this.singledataList) do v:OnDestroy() end + ClearRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint")) end return FourElementMonsterCampPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index c54f5d41ff..c173e41716 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -6,7 +6,12 @@ local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0) local trails = {} - +local redTrailType = { + [1] = RedPointType.PersonTrail, + [2] = RedPointType.BuddishTrail, + [3] = RedPointType.DemonTrail, + [4] = RedPointType.TaoistTrail, +} --初始化组件(用于子类重写) function MonsterCampMainPanel:InitComponent() orginLayer = 0 @@ -23,7 +28,7 @@ function MonsterCampMainPanel:InitComponent() this.shenYingProgressText = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Text"):GetComponent("Text") this.shenYingProgressIma = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Image"):GetComponent("Image") end - + --绑定事件(用于子类重写) function MonsterCampMainPanel:BindEvent() Util.AddClick(this.btnBack, function () @@ -39,6 +44,12 @@ function MonsterCampMainPanel:BindEvent() Util.AddClick(this.btnShenYing, function () UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenYingShuXing) end) + + for i = 1 ,#trails do + BindRedPointObject(redTrailType[i],Util.GetGameObject(trails[i],"redPoint")) + end + + BindRedPointObject(RedPointType.HeartDemon,Util.GetGameObject(self.gameObject, "Bg/BgRoot/redPoint")) end --添加事件监听(用于子类重写) @@ -142,6 +153,10 @@ end function MonsterCampMainPanel:OnDestroy() SubUIManager.Close(this.UpView) trails = {} + for i = 1 ,#trails do + ClearRedPointObject(redTrailType[i],Util.GetGameObject(trails[i],"redPoint")) + end + ClearRedPointObject(RedPointType.HeartDemon,Util.GetGameObject(self.gameObject, "Bg/BgRoot/redPoint")) end return MonsterCampMainPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 3e9e8aa3bf..fa9b64e937 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -48,6 +48,15 @@ end function this.GetTimeTip(campId) this.fourMonsterData[campId].buyTime = PrivilegeManager.GetPrivilegeRemainValue(this.fourMonsterData[campId].buyTimeId) this.fourMonsterData[campId].freeTime= PrivilegeManager.GetPrivilegeRemainValue(this.fourMonsterData[campId].freeTimeId) --免费次数 + if campId == 1 then + CheckRedPointStatus(RedPointType.PersonTrail) + elseif campId == 2 then + CheckRedPointStatus(RedPointType.BuddishTrail) + elseif campId == 3 then + CheckRedPointStatus(RedPointType.DemonTrail) + elseif campId == 4 then + CheckRedPointStatus(RedPointType.TaoistTrail) + end return this.fourMonsterData[campId].freeTime,this.fourMonsterData[campId].buyTime end @@ -490,6 +499,15 @@ function this.SetMyHelpHeroData(trail,_data,func) this.myHelpHeroData[trail] = {} end this.myHelpHeroData[trail] = _data + if trail == 1 then + CheckRedPointStatus(RedPointType.PersonTrailHelp) + elseif trail == 2 then + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + elseif trail == 3 then + CheckRedPointStatus(RedPointType.DemonTrailHelp) + elseif trail == 4 then + CheckRedPointStatus(RedPointType.TaoistTrailHelp) + end end if func then func() @@ -517,13 +535,77 @@ end ------------------------------四灵试炼 红点--------------------------------------- -function this.CheckTrailRedPoint() - +-- 红点检测方法 +function this.FourElementRedCheck(redType) + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then + return false + end + if redType == RedPointType.PersonTrail then + if this.fourMonsterData[1] and this.fourMonsterData[1].openState > 0 then + if this.fourMonsterData[1].freeTime > 0 then + return true + end + end + return this.CheckHelpFightRedPoint(RedPointType.PersonTrailHelp) + elseif redType == RedPointType.BuddishTrail then + if this.fourMonsterData[2] and this.fourMonsterData[2].openState > 0 then + if this.fourMonsterData[2].freeTime > 0 then + return true + end + end + return this.CheckHelpFightRedPoint(RedPointType.BuddishTrailHelp) + elseif redType == RedPointType.DemonTrail then + if this.fourMonsterData[3] and this.fourMonsterData[3].openState > 0 then + if this.fourMonsterData[3].freeTime > 0 then + return true + end + end + return this.CheckHelpFightRedPoint(RedPointType.DemonTrailHelp) + elseif redType == RedPointType.TaoistTrail then + if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then + if this.fourMonsterData[4].freeTime > 0 then + return true + end + end + return this.CheckHelpFightRedPoint(RedPointType.TaoistTrailHelp) + end + return false end -function this.CheckHelpFightRedPoint() - - this.getRewardWave = {} +function this.CheckHelpFightRedPoint(redType) + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then + return false + end + if redType == RedPointType.PersonTrailHelp then + if this.fourMonsterData[1] and this.fourMonsterData[1].openState > 0 then + if not this.GetMyHelpHero(1) then + return true + end + end + return false + elseif redType == RedPointType.BuddishTrailHelp then + if this.fourMonsterData[2] and this.fourMonsterData[2].openState > 0 then + if not this.GetMyHelpHero(2) then + return true + end + end + return false + elseif redType == RedPointType.DemonTrailHelp then + if this.fourMonsterData[3] and this.fourMonsterData[3].openState > 0 then + if not this.GetMyHelpHero(3) then + return true + end + end + return false + elseif redType == RedPointType.TaoistTrailHelp then + if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then + if not this.GetMyHelpHero(4) then + return true + end + end + return false + end + end function this.SetRewardWave(waves) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua index 9566f597eb..d67d7ab816 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua @@ -48,7 +48,7 @@ end --绑定事件(用于子类重写) function MonsterCampPanel:BindEvent() - BindRedPointObject(RedPointType.EpicExplore,this.btnRewardRed) + BindRedPointObject(RedPointType.HeartDemon,this.btnRewardRed) Util.AddClick(this.btnBack, function () -- UIManager.OpenPanel(UIName.MainPanel) PlayerManager.carbonType = 1 @@ -114,7 +114,7 @@ function MonsterCampPanel:BindEvent() if rewardFunc then rewardFunc() end - CheckRedPointStatus(RedPointType.EpicExplore) + CheckRedPointStatus(RedPointType.HeartDemon) end) end) end,2) @@ -135,7 +135,7 @@ end --界面打开时调用(用于子类重写) function MonsterCampPanel:OnOpen(...) SoundManager.PlayMusic(SoundConfig.BGM_Carbon) - CheckRedPointStatus(RedPointType.EpicExplore) + CheckRedPointStatus(RedPointType.HeartDemon) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) -- 初始化界面数据 this.InitShow() @@ -155,7 +155,7 @@ end --界面销毁时调用(用于子类重写) function MonsterCampPanel:OnDestroy() SubUIManager.Close(this.UpView) - ClearRedPointObject(RedPointType.EpicExplore,this.btnRewardRed) + ClearRedPointObject(RedPointType.HeartDemon,this.btnRewardRed) end function this.InitShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 4ba92d864f..f033e3193f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -103,6 +103,11 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.OrdinaryExplore, RedPointType.ExploreMain) RPData:SetParent(RedPointType.HeroExplore, RedPointType.ExploreMain) RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain) + RPData:SetParent(RedPointType.HeartDemon,RedPointType.EpicExplore) + RPData:SetParent(RedPointType.PersonTrail,RedPointType.EpicExplore) + RPData:SetParent(RedPointType.BuddishTrail,RedPointType.EpicExplore) + RPData:SetParent(RedPointType.DemonTrail,RedPointType.EpicExplore) + RPData:SetParent(RedPointType.TaoistTrail,RedPointType.EpicExplore) RPData:SetParent(RedPointType.LegendExplore, RedPointType.ExploreMain) RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) @@ -429,7 +434,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck) - RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck) + RPData:AddCheckFunc(RedPointType.HeartDemon, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck) --万象境副本 @@ -451,8 +456,17 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_Recruit,PokemonManager.RefreshPokemonRecruitRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_ChipCompound,PokemonManager.PokemonChipCompoundRedPoint) -end + RPData:AddCheckFunc(RedPointType.PersonTrail, MonsterCampManager.FourElementRedCheck) + RPData:AddCheckFunc(RedPointType.BuddishTrail, MonsterCampManager.FourElementRedCheck) + RPData:AddCheckFunc(RedPointType.DemonTrail, MonsterCampManager.FourElementRedCheck) + RPData:AddCheckFunc(RedPointType.TaoistTrail, MonsterCampManager.FourElementRedCheck) + + RPData:AddCheckFunc(RedPointType.PersonTrailHelp, MonsterCampManager.CheckHelpFightRedPoint) + RPData:AddCheckFunc(RedPointType.BuddishTrailHelp, MonsterCampManager.CheckHelpFightRedPoint) + RPData:AddCheckFunc(RedPointType.DemonTrailHelp, MonsterCampManager.CheckHelpFightRedPoint) + RPData:AddCheckFunc(RedPointType.TaoistTrailHelp, MonsterCampManager.CheckHelpFightRedPoint) +end -- 向红点绑定物体 function this.BindObject(rpType, rpObj) diff --git a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua index b1c2654c6c..8cf9638506 100644 --- a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua +++ b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua @@ -134,9 +134,7 @@ function FourTrailSingleHelpHero:SetIcon1(heroData,player) end function FourTrailSingleHelpHero:SetIcon2(heroData) - LogGreen(heroData.dynamicId) local tempData = MonsterCampManager.GetMyHelpHero(self.curType) - LogGreen(heroData.dynamicId) self.btn:GetComponent("Button").enabled = true if tempData and heroData.dynamicId == tempData.dynamicId then self.btn:GetComponent("Button").enabled = false @@ -155,7 +153,10 @@ function FourTrailSingleHelpHero:SetIcon2(heroData) else NetManager.SetHelpHeroRequest(heroData.dynamicId,function(msg) MonsterCampManager.SetMyHelpHeroData(self.curType,heroData,nil) - UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1) + if msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then + local item = msg.drop.itemlist[1] + PopupTipPanel.ShowTip(string.format("已选择神将,获得%s%s",item.itemNum,ConfigManager.GetConfigData(ConfigName.ItemConfig,item.itemId).Name)) + end self:SetIcon2(heroData) end) end