From 8f853ab5a57c1d10982e6feb768652a69aee4ba6 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Thu, 18 Jan 2024 16:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E5=88=B6=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActicity/ActivityMainPanel.prefab | 6 +- .../UI/NewActivity/CommonActPage.prefab | 88 ++++--- .../UI/NewActivity/ItemUpstarPre.prefab | 223 ++++++++++++++++-- .../Prefabs/UI/NewActivity/MissionPre.prefab | 42 ++-- .../Modules/NewActivity/CommonActPage.lua | 24 +- .../~Lua/Modules/Operating/MissionPre.lua | 3 + 6 files changed, 307 insertions(+), 79 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab index 5ded0d4d69..d469022958 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab @@ -336,7 +336,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &455843809901100221 MonoBehaviour: @@ -607,7 +607,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6860202946281388347 RectTransform: m_ObjectHideFlags: 0 @@ -914,7 +914,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} + m_Sprite: {fileID: 21300000, guid: be7ae6fdd9a4dce4d96dc48da0958290, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab index 6b6ee6a7b7..9bf16d5a76 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab @@ -311,8 +311,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: -547.5} - m_SizeDelta: {x: 584, y: 84} + m_AnchoredPosition: {x: 0, y: -553.3} + m_SizeDelta: {x: 584, y: 55.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6415175731582749822 CanvasRenderer: @@ -342,7 +342,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c79ca6ef5a3666c43b6b15a4d3b88f4e, type: 3} + m_Sprite: {fileID: 21300000, guid: b966aac416f404f4f90ad0c1a4b0572d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -422,7 +422,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} + m_Sprite: {fileID: 21300000, guid: 16b2a28b57bc1384fbfd40787779dcbf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -442,6 +442,8 @@ GameObject: - component: {fileID: 4714540340252889000} - component: {fileID: 1026034543820029689} - component: {fileID: 1558490356398566187} + - component: {fileID: 4905878759946321720} + - component: {fileID: 159754406332017169} m_Layer: 5 m_Name: titleTip m_TagString: Untagged @@ -465,8 +467,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: -120, y: -112} - m_SizeDelta: {x: 700, y: 50} + m_AnchoredPosition: {x: -285, y: 42} + m_SizeDelta: {x: 747.93, y: 327} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1026034543820029689 CanvasRenderer: @@ -489,28 +491,58 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8862745, g: 0.78275764, b: 0.62748235, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9490197, g: 0.9921569, b: 0.9490197, 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: 30 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 90 + m_FontStyle: 3 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 1 + m_MaxSize: 100 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.5 - m_Text: + m_Text: "\u4E91\u6E38\u5546\u4EBA" LanguageIndex: 0 +--- !u!114 &4905878759946321720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656629724001852270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &159754406332017169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656629724001852270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.45098042, g: 0.8352942, b: 0.4431373, a: 1} + m_EffectDistance: {x: 4, y: -4} + m_UseGraphicAlpha: 1 --- !u!1 &1666366372407203116 GameObject: m_ObjectHideFlags: 0 @@ -653,7 +685,7 @@ GameObject: - component: {fileID: 4171307939584926396} - component: {fileID: 7395852945417161834} m_Layer: 5 - m_Name: Image (1) + m_Name: RechraBg2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -875,7 +907,7 @@ GameObject: - component: {fileID: 4502545718952029418} - component: {fileID: 8135804685053177851} m_Layer: 5 - m_Name: Image + m_Name: RechraBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -949,7 +981,7 @@ GameObject: - component: {fileID: 3542381087953946503} - component: {fileID: 6762053783592453661} m_Layer: 5 - m_Name: Image + m_Name: RechraBg1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1023,7 +1055,7 @@ GameObject: - component: {fileID: 4311489124954685649} - component: {fileID: 4825523470156603960} m_Layer: 5 - m_Name: Text (3) + m_Name: RechraText2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1433,7 +1465,7 @@ GameObject: - component: {fileID: 7595152283568987033} - component: {fileID: 6939552592980683895} m_Layer: 5 - m_Name: Text (2) + m_Name: RechraText1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1647,7 +1679,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7105731049622345673 RectTransform: m_ObjectHideFlags: 0 @@ -1738,8 +1770,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: 0.010009766, y: 2.75} - m_SizeDelta: {x: 1080, y: 476.5} + m_AnchoredPosition: {x: 282, y: 0} + m_SizeDelta: {x: 415.1, y: 471} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7818771457603853711 CanvasRenderer: @@ -1769,7 +1801,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: ba242737f47b4a446ac77b53e1fa76ea, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1883,7 +1915,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.84313726, b: 0.7490196, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1891,11 +1923,11 @@ MonoBehaviour: 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: 38 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 26 + m_MinSize: 3 m_MaxSize: 38 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1903,5 +1935,5 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: 11111111111 LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab index 0f4d673b3d..ee9c3abcb4 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab @@ -662,7 +662,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3141396366400318218 RectTransform: m_ObjectHideFlags: 0 @@ -779,7 +779,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 150} + m_SizeDelta: {x: 1080, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &729041312112412494 GameObject: @@ -886,13 +886,14 @@ RectTransform: - {fileID: 6669198770587612397} - {fileID: 7109536443945642743} - {fileID: 7997253878173143200} + - {fileID: 2847944145576404682} m_Father: {fileID: 0} 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: 1080, y: 265} + m_AnchoredPosition: {x: 0, y: -21.8} + m_SizeDelta: {x: 1080, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8482199436476565633 CanvasRenderer: @@ -2007,7 +2008,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0.2} - m_SizeDelta: {x: 1080, y: 239.6} + m_SizeDelta: {x: 1080, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5497550576431792030 CanvasRenderer: @@ -2037,7 +2038,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 064b311ca0c97a0438a84c77d7271da7, type: 3} + m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2958,7 +2959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -182, y: 5} + m_AnchoredPosition: {x: -182, y: -13} m_SizeDelta: {x: 210, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7301856383923185155 @@ -2989,7 +2990,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0a532ebdeed70794ab64fbeb4b884ca1, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3404,7 +3405,7 @@ RectTransform: 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: 1080, y: 272.02} + m_SizeDelta: {x: 1080, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5096225099853364121 CanvasRenderer: @@ -3432,7 +3433,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6152102917317440459 RectTransform: m_ObjectHideFlags: 0 @@ -3852,7 +3853,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -298, y: 0} - m_SizeDelta: {x: 56, y: 58} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1061057259873547079 CanvasRenderer: @@ -3882,7 +3883,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f0de54808b5704c45bc7571f0b2fcab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 1749f0558e7a633478f04db1ed64459b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4340,13 +4341,14 @@ 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: 1828696451625426072} m_Father: {fileID: 422889395483537237} 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: 44} + m_AnchoredPosition: {x: -12, y: 56} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4708442608581007944 @@ -4364,7 +4366,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5408289240471606003} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -5133,8 +5135,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: -33, y: -19} - m_SizeDelta: {x: 109, y: 41} + m_AnchoredPosition: {x: -29, y: 3} + m_SizeDelta: {x: 119, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5394818939192951364 CanvasRenderer: @@ -5164,7 +5166,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9131c7e32e8611c4d8f4c64958f8be57, type: 3} + m_Sprite: {fileID: 21300000, guid: d8a904e4d56f67e48bed0f6f2d3642a6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5311,7 +5313,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32941177, g: 0.1137255, b: 0.04705883, a: 1} + m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -5319,9 +5321,9 @@ MonoBehaviour: 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: 40 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 45 @@ -5704,6 +5706,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &6947554833552140275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2847944145576404682} + - component: {fileID: 3747534159095419130} + - component: {fileID: 7528795885809030731} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2847944145576404682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947554833552140275} + 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: 4714066090596083411} + 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: -37.997253, y: -49.5} + m_SizeDelta: {x: 1082, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3747534159095419130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947554833552140275} + m_CullTransparentMesh: 0 +--- !u!114 &7528795885809030731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6947554833552140275} + 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: 83847b06a109a7244b203b0775ef4432, 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 &6988570209815819842 GameObject: m_ObjectHideFlags: 0 @@ -6214,7 +6290,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: 354.50003, y: -54.070015} + m_AnchoredPosition: {x: 354.50003, y: 49} m_SizeDelta: {x: 291.2, y: 49.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7503709519928557785 @@ -6238,7 +6314,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9921569, g: 0.9490197, b: 0.79215693, a: 1} + m_Color: {r: 0.9960785, g: 0.9960785, b: 0.9960785, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6246,7 +6322,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -6513,7 +6589,7 @@ RectTransform: 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: 1080, y: 240} + m_SizeDelta: {x: 1080, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2653934830838833476 MonoBehaviour: @@ -6673,6 +6749,101 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7975995736346982176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828696451625426072} + - component: {fileID: 906872674182789537} + - component: {fileID: 7998031416785445929} + - component: {fileID: 1837893383917535659} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1828696451625426072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975995736346982176} + 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: 1258725882805172207} + 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: -9, y: -27} + m_SizeDelta: {x: 160, y: 35.37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &906872674182789537 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975995736346982176} + m_CullTransparentMesh: 0 +--- !u!114 &7998031416785445929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975995736346982176} + 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.9686275, g: 0.8196079, b: 0.38431376, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 28 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5151" +--- !u!114 &1837893383917535659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975995736346982176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &7991723916940370399 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab index 6499cd9e11..68e93cd906 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab @@ -193,7 +193,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6419813998889485645 RectTransform: m_ObjectHideFlags: 0 @@ -212,7 +212,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -527, y: -29} - m_SizeDelta: {x: 338.7, y: 0} + m_SizeDelta: {x: 338.7, y: 48} m_Pivot: {x: 0, y: 1} --- !u!222 &7607199292195836623 CanvasRenderer: @@ -285,7 +285,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2033273734823041075 RectTransform: m_ObjectHideFlags: 0 @@ -304,7 +304,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: -281, y: 7} + m_AnchoredPosition: {x: -296, y: 7} m_SizeDelta: {x: 466.9, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2565642249346851103 @@ -710,7 +710,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.27058825, g: 0.18039216, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -718,11 +718,11 @@ MonoBehaviour: 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: 40 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 28 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 + m_BestFit: 0 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 @@ -790,7 +790,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2784314, g: 0.18039216, b: 0.23529413, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -798,11 +798,11 @@ MonoBehaviour: 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: 50 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 + m_BestFit: 0 + m_MinSize: 3 m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 @@ -1074,10 +1074,10 @@ RectTransform: m_Father: {fileID: 2244133262350069716} 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: 51.6} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -23} + m_SizeDelta: {x: 850, y: 51.6} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8379782961658539162 CanvasRenderer: @@ -1409,7 +1409,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -1600,8 +1600,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -0.49996948, y: -119} - m_SizeDelta: {x: 0, y: 46} + m_AnchoredPosition: {x: -0.5, y: -119} + m_SizeDelta: {x: 850, y: 46} m_Pivot: {x: 0, y: 0} --- !u!222 &5887333990996486046 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 8190ae0ecd..840b618252 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -33,7 +33,13 @@ function CommonActPage:InitComponent() self.titleIma = Util.GetGameObject(self.bg,"titleIma"):GetComponent("Image") self.titleTipBg = Util.GetGameObject(self.bg,"titleTipBg"):GetComponent("Image") self.titleTip = Util.GetGameObject(self.bg,"titleTip"):GetComponent("Text") - +--充值商店 + self.RechraBg=Util.GetGameObject(self.gameObject, "Bg/RechraBg") + self.RechraText1=Util.GetGameObject(self.bg, "RechraText1") + self.RechraText2=Util.GetGameObject(self.bg, "RechraText2") + self.RechraBg1=Util.GetGameObject(self.bg, "RechraBg1") + self.RechraBg2=Util.GetGameObject(self.bg, "RechraBg2") +-- self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem") self.scrollItemPos = self.scrollItem.transform.localPosition self.scrollItemRect = self.scrollItem.transform.rect @@ -101,6 +107,8 @@ function CommonActPage:OnShow(_sortingOrder) if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then self.titleBgIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3]) self.titleBgIma:SetNativeSize() + else + self.titleBgIma:SetActive(false) end if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then self.titleIma.gameObject:SetActive(true) @@ -135,7 +143,21 @@ function CommonActPage:OnShow(_sortingOrder) space = Vector2.New(0, -40) self.parent.tabbox.gameObject:SetActive(true) end + if self.actType== ActivityTypeDef.yaojingleichong or self.actType== ActivityTypeDef.xianjingleichong then + self.RechraBg:SetActive(true) + self.RechraBg1:SetActive(true) + self.RechraBg2:SetActive(true) + self.RechraText1:SetActive(true) + self.RechraText2:SetActive(true) + else + self.RechraBg:SetActive(false) + self.RechraBg1:SetActive(false) + self.RechraBg2:SetActive(false) + self.RechraText1:SetActive(false) + self.RechraText2:SetActive(false) + + end if not self.scrollView then local rootHight = self.scrollItemRect.height local width = self.scrollItemRect.width diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index dd2d62f74d..5d07b9f17d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -103,8 +103,10 @@ function MissionPre:SetData(data,_parent,sortingOrder,actData,actConfig,func) if (not self.data.itemName or self.data.itemName == "") and (not self.data.content or self.data.content == "") then self.contents:SetActive(false) + self.type1Text1.gameObject:SetActive(true) else self.contents:SetActive(true) + self.type1Text1.gameObject:SetActive(false) end if self.data.itemName and self.data.itemName ~= "" then @@ -157,6 +159,7 @@ function MissionPre:SetContent1() if self.actConfig.ActiveType == ActivityTypeDef.DynamicAct_recharge or self.actConfig.ActiveType == ActivityTypeDef.AccumulativeRechargeExper then -- self.scrollView.transform.localPosition = Vector3.New(-370,-9,0) self.upLayout.gameObject:SetActive(false) + self.type1.gameObject:SetActive(false) self:SetType1("累计充值",self.data.value,Language[10477].."("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")") elseif self.actConfig.ActiveType == ActivityTypeDef.yaojingleichong or self.actConfig.ActiveType == ActivityTypeDef.xianjingleichong then self.upLayout.gameObject:SetActive(false)