From bc2d95ddec8e7755621bccbaa72cefa6495e261d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 26 Feb 2021 17:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpeditionMonsterInfoPopup.prefab | 62 ++++---- .../FourElementMonsterCampPanel.prefab | 110 ++++++------- .../MonsterCamp/MonsterCampMainPanel.prefab | 146 ++++++++--------- .../UI/RoleInfo/RoleEquipChangePopup.prefab | 20 +-- .../UI/View/FourTrailSingleHelpHero.prefab | 26 +-- .../~Lua/Common/GlobalDefine.lua | 14 +- .../Expedition/ExpeditionMonsterInfoPopup.lua | 1 + .../Expedition/View/MonsterFormationInfo.lua | 26 +-- .../View/GeneralBigPopup_ShenYingShuXing.lua | 6 +- .../FourElementMonsterCampPanel.lua | 14 +- .../MonsterCamp/MonsterCampMainPanel.lua | 12 ++ .../Modules/MonsterCamp/MonsterCampPanel.lua | 2 +- .../~Lua/Modules/Popup/BattleWinPopup.lua | 23 +-- .../~Lua/Modules/Popup/RewardItemPopup.lua | 24 ++- .../Modules/Popup/UnLockNewFunctionPanel.lua | 150 ------------------ .../Popup/UnLockNewFunctionPanel.lua.meta | 9 -- .../~Lua/View/FourElementSingleWave.lua | 9 +- 17 files changed, 270 insertions(+), 384 deletions(-) delete mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua delete mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 55fb364316..2eb6a7d06a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -718,7 +718,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: -172.60002, y: 1.2001038} + m_AnchoredPosition: {x: -325.81, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6677793787739324018 @@ -20495,7 +20495,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: 166.90002, y: 1.2001038} + m_AnchoredPosition: {x: 325.9, y: 1.2001038} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &25668806821501159 @@ -36606,8 +36606,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: 1.3, y: 55.49997} - m_SizeDelta: {x: 920, y: 8} + m_AnchoredPosition: {x: 0.69, y: 55.49997} + m_SizeDelta: {x: 839.26, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2000174945816351077 CanvasRenderer: @@ -36686,7 +36686,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.00000047684, y: 0} - m_SizeDelta: {x: 221, y: 60} + m_SizeDelta: {x: 262, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4107187018623551355 CanvasRenderer: @@ -36726,7 +36726,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5390971311818116942} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -36740,7 +36740,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5390971311818116942} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -37526,8 +37526,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: -2.7, y: 593.2} - m_SizeDelta: {x: 384.31, y: 64.41} + m_AnchoredPosition: {x: -54.3, y: 610.2} + m_SizeDelta: {x: 780.6, y: 98.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5903993113174974553 CanvasRenderer: @@ -37561,14 +37561,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5929 \u5175" LanguageIndex: 10418 @@ -38422,8 +38422,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 163, y: -30} - m_SizeDelta: {x: 76, y: 42} + m_AnchoredPosition: {x: 192, y: -30} + m_SizeDelta: {x: 100, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5104595900427731501 CanvasRenderer: @@ -38457,13 +38457,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 70 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6311\u6218" @@ -50741,8 +50741,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.3, y: -300.7} - m_SizeDelta: {x: 160, y: 52} + m_AnchoredPosition: {x: -7.4, y: -304.3} + m_SizeDelta: {x: 474.6, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6746665229595312950 CanvasRenderer: @@ -50776,13 +50776,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 48 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 38 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6218\u6597\u5956\u52B1" @@ -51583,8 +51583,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 97.5, y: -30} - m_SizeDelta: {x: 55, y: 42} + m_AnchoredPosition: {x: 106, y: -30} + m_SizeDelta: {x: 72, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6806921931749410064 CanvasRenderer: @@ -51618,14 +51618,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100 --- !u!1 &8654703436078873455 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index 1ccc7323df..ac77356284 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -5992,8 +5992,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: 3.61, y: 0.0000076294} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 3.61, y: -2.95} + m_SizeDelta: {x: 184.68, y: 55.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &857682402620420529 MonoBehaviour: @@ -6013,11 +6013,11 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 8.84 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlHeight: 0 --- !u!114 &4710681254109085258 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6025,7 +6025,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2109195971380987024} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6142,8 +6142,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, y: 35.014} - m_SizeDelta: {x: 246, y: 299.83} + m_AnchoredPosition: {x: 0, y: 1.3187} + m_SizeDelta: {x: 246, y: 367.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5026953602875523087 CanvasRenderer: @@ -6268,8 +6268,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: -17.21, y: 42.7} - m_SizeDelta: {x: 405.1, y: 41.7} + m_AnchoredPosition: {x: -7.31, y: 42.7} + m_SizeDelta: {x: 385.3, y: 41.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2050254799821887389 CanvasRenderer: @@ -6303,14 +6303,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 28 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 28 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6311\u6218\u5956\u52B1" --- !u!1 &2543140424935520664 @@ -7434,8 +7434,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: -13.6, y: 35.115} - m_SizeDelta: {x: 0, y: 70.18} + m_AnchoredPosition: {x: -0.82501, y: 35.115} + m_SizeDelta: {x: 460.05, y: 70.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3297695668373979833 CanvasRenderer: @@ -7469,14 +7469,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 47 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 62 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 47 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &4749431587513265945 @@ -10675,7 +10675,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &661878180334577611 CanvasRenderer: @@ -10769,7 +10769,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -0.000011444, y: 209.47} - m_SizeDelta: {x: 1080, y: 104} + m_SizeDelta: {x: 1080, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2149029534862487200 CanvasRenderer: @@ -10940,7 +10940,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4182948843247446716 CanvasRenderer: @@ -10974,9 +10974,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 48 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -11089,14 +11089,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 33 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 62 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 33 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &5221969845250895087 @@ -11117,7 +11117,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4338331143962917799 RectTransform: m_ObjectHideFlags: 0 @@ -11132,10 +11132,10 @@ RectTransform: m_Father: {fileID: 5915792893035856279} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.47334743} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000011928, y: 9.02} - m_SizeDelta: {x: 142.21, y: 205.12} + m_AnchoredPosition: {x: 0.27691, y: 20.71} + m_SizeDelta: {x: 154.01, y: 214.34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2905438704931896490 CanvasRenderer: @@ -11825,7 +11825,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2109762473031087073 CanvasRenderer: @@ -11859,9 +11859,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 52 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -12449,7 +12449,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: -0.0000615649, y: 45} + m_AnchoredPosition: {x: -0.000061035156, y: 45} m_SizeDelta: {x: 0, y: 118.97} m_Pivot: {x: 1, y: 1} --- !u!114 &7806638948134227578 @@ -12607,8 +12607,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.31, y: -20.55} - m_SizeDelta: {x: 434.1, y: 75.6} + m_AnchoredPosition: {x: -0.69, y: -20.55} + m_SizeDelta: {x: 309.31, y: 75.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7806638948266605399 CanvasRenderer: @@ -12642,14 +12642,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5373\u5C06\u6765\u88AD" LanguageIndex: 11171 @@ -12827,8 +12827,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.0000030994, y: -21.93} - m_SizeDelta: {x: 250.54, y: 43.86} + m_AnchoredPosition: {x: -0.0015144, y: -32.49} + m_SizeDelta: {x: 152, y: 64.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7806638948968700943 CanvasRenderer: @@ -12868,7 +12868,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C55\u5C42" @@ -13137,14 +13137,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 33 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 62 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 33 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &8235688988892365530 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab index 3ed3635d5d..7b1b1511fa 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab @@ -143,14 +143,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 63 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 79 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 63 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &992660367879125238 @@ -296,14 +296,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 47 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 47 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &1492168094597050616 @@ -546,14 +546,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 47 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 47 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &2519628866901632095 @@ -701,14 +701,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 63 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 79 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 63 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &2805652353698260266 @@ -780,13 +780,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 34 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: @@ -859,14 +859,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 63 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 79 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 63 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &3130234181540564439 @@ -938,14 +938,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 63 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 79 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 63 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &3236124889095598796 @@ -1017,14 +1017,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 47 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 47 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &3498926138105722812 @@ -1061,8 +1061,8 @@ 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.0025024414, y: 0} - m_SizeDelta: {x: -0.0050049, y: 0} + m_AnchoredPosition: {x: -0.16, y: -0.05} + m_SizeDelta: {x: -8.97, y: -3.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2112863120288633553 CanvasRenderer: @@ -1097,7 +1097,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 0 - m_FillAmount: 1 + m_FillAmount: 0 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -1244,14 +1244,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 44 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 47 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &3857125884808735805 @@ -1471,13 +1471,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 34 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: @@ -1758,13 +1758,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 34 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: @@ -2492,13 +2492,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 34 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: @@ -2863,10 +2863,10 @@ RectTransform: m_Father: {fileID: 6342401768048007323} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.48499, y: 30.24} + m_SizeDelta: {x: 778, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3351360830026845840 CanvasRenderer: @@ -2889,7 +2889,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8392157, b: 0.58431375, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2900,14 +2900,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u56DB\u7075\u8BD5\u70BC\u8FDB\u5EA6\uFF1A55/2100" --- !u!1 &8314253426226152059 @@ -3173,8 +3173,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -15.449997} - m_SizeDelta: {x: 153, y: 30.9} + m_AnchoredPosition: {x: 0, y: -20.7} + m_SizeDelta: {x: 153, y: 41.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7204550795754971435 CanvasRenderer: @@ -3208,13 +3208,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 107 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 8/16 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab index 8075e90b49..0961cffd03 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab @@ -2406,7 +2406,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224009983048285920 RectTransform: m_ObjectHideFlags: 0 @@ -2421,10 +2421,10 @@ RectTransform: m_Father: {fileID: 224146404062430742} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 257.28998, y: -22.253325} + m_SizeDelta: {x: 540, y: 30} m_Pivot: {x: 0.44683328, y: 0.35822254} --- !u!222 &222754335739163912 CanvasRenderer: @@ -3926,7 +3926,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224209903497039082 RectTransform: m_ObjectHideFlags: 0 @@ -3941,10 +3941,10 @@ RectTransform: m_Father: {fileID: 224146404062430742} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 286, y: -65.2} - m_SizeDelta: {x: 540, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222364746579987122 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab b/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab index 21c3e38864..add9f33deb 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab @@ -34,8 +34,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: -53.662537, y: -100.80005} - m_SizeDelta: {x: 241.27, y: 59} + m_AnchoredPosition: {x: 135.58, y: -100.80005} + m_SizeDelta: {x: 619.76, y: 59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9085467742055475009 CanvasRenderer: @@ -69,14 +69,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- !u!1 &785060333507136899 @@ -510,7 +510,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: -0.000091552734, y: 0.000061035} + m_AnchoredPosition: {x: 3.2, y: 0.000061035} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4036714987210334616 @@ -900,8 +900,8 @@ 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, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 3.2, y: 0.000039101} + m_SizeDelta: {x: -125.3, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5935883781838750552 CanvasRenderer: @@ -935,14 +935,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u9009\u62E9\u795E\u5C06" --- !u!1 &8679684665277095035 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3002e9b791..4df94cc4d4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2263,4 +2263,16 @@ Pokemon_Formation_RefreshType={ } FourElementName = {"人杰试炼","佛禅试炼","妖灵试炼","道玄试炼"} FourElementNameImage = {"s_silingshilian_renjiezi","s_silingshilian_fochanzi","s_silingshilian_yaolingzi","s_silingshilian_daoxuanzi"} -NumConvertWeek = {[1]=Language[10005],[2]=Language[10006],[3]=Language[10007],[4]=Language[10008],[5]=Language[10009],[6]=Language[10010],[7]=Language[12303]} \ No newline at end of file +NumConvertWeek = {[1]=Language[10005],[2]=Language[10006],[3]=Language[10007],[4]=Language[10008],[5]=Language[10009],[6]=Language[10010],[7]=Language[12303]} + + + +CompShowType = { + a = 1, + b = 2, + c = 3, + d = 4, + e = 5, + f = 6, + fourElement = 7 +} \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua index 276e10e34c..3aaa8e2d3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua @@ -100,6 +100,7 @@ function ExpeditionMonsterInfoPopup:OnClose() for i = 1, #contentScripts do contentScripts[i].view:OnClose() end + Game.GlobalEvent:DispatchEvent(GameEvent.FourEle.UpdatePri) end function ExpeditionMonsterInfoPopup:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua index 367429b26f..80b0375566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua @@ -68,7 +68,7 @@ function this:BtnClickEvent() local x = function() MonsterCampManager.ExecuteFightBattle(waveId,1,function() PrivilegeManager.RefreshPrivilegeUsedTimes(data.freeTimeId, 1) - this:OnShow(parent,curType,waveId) + this:SetIcon() end,curType) end if waveId == data.monsterWave then @@ -110,24 +110,16 @@ function this:RemoveListener() end -function this:OnShow(_parent,...) - parent=_parent - sortingOrder = _parent.sortingOrder - --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 - local args = {...} - curType = args[1] - waveId = args[2] +function this:SetIcon() freeTime,buyTime = MonsterCampManager.GetTimeTip(curType) storeDataId,itemId,costNum = MonsterCampManager.GetCost(curType) - configData = MonsterCampManager.GetFourElementMonsterInfoByWave(curType,waveId) - data = MonsterCampManager.GetCurFourElementMonsterInfo(curType) Util.SetGray(this.fightBtn,false) this.fightBtnIcon.gameObject:SetActive(false) this.fightBtnNum.gameObject:SetActive(false) this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_002") if waveId == data.monsterWave then if freeTime > 0 then - this.fightBtnText.text = "免费扫荡" + this.fightBtnText.text = string.format("%s","17232A","免费扫荡") else this.fightBtnIcon.gameObject:SetActive(true) this.fightBtnNum.gameObject:SetActive(true) @@ -150,7 +142,19 @@ function this:OnShow(_parent,...) else this.fightBtnText.text =string.format("%s","17232A","确定") end +end +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 + local args = {...} + curType = args[1] + waveId = args[2] + + configData = MonsterCampManager.GetFourElementMonsterInfoByWave(curType,waveId) + data = MonsterCampManager.GetCurFourElementMonsterInfo(curType) + this:SetIcon() local rewardIds = {} if waveId == data.monsterWave then --扫荡 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua index 460d939539..8aa138d645 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua @@ -25,7 +25,7 @@ function this:OnShow(_parent) parent=_parent sortingOrder = _parent.sortingOrder parent.BG:SetActive(false) - + local curNum = SacredTreeManager.GetTowerLevel() -- attriList = {} local data = SacredTreeManager.treeSettingData for i = 1, #data do @@ -46,9 +46,9 @@ function this:OnShow(_parent) local num = Util.GetGameObject(go,"num"):GetComponent("Text") num.gameObject:SetActive(false) if SacredTreeManager.GetTowerLevel() >= data[i].allNum then - name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" + name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..curNum.."/"..data[i].allNum..")" else - name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" + name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..curNum.."/"..data[i].allNum..")" end end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index e5b18572d2..6694343e6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -117,6 +117,18 @@ function FourElementMonsterCampPanel:OnShow() this.freeMoppingTimes.text = "免费扫荡:" ..freeTimes this.buyMoppingTimes.text= "购买次数:" ..buyTimes this.InitMonsterShow() + + local waves = MonsterCampManager.GetFourElementTotalWave() + if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then + PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1) + end + if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then + PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves) + local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) + if propertyId > 0 then + UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + end + end end function this.SingleDataShow(go, data) @@ -134,7 +146,7 @@ function this.InitMonsterShow() local tempData = this.SingleDataShow(go, monsterInfo[index]) this.singledataList[monsterInfo[index].wave] = tempData end) - this.scrollView:SetIndex((#monsterInfo-trailData.monsterWave-4)) + this.scrollView:SetIndex((#monsterInfo-trailData.monsterWave-2)) end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index c3eb39a296..c54f5d41ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -71,6 +71,18 @@ function MonsterCampMainPanel:OnShow() local singleFourElementData = MonsterCampManager.GetCurFourElementMonsterInfo(i) this:SetSingleTrailData(trails[i],singleFourElementData) end + + local waves = MonsterCampManager.GetFourElementTotalWave() + if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then + PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1) + end + if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then + PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves) + local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) + if propertyId > 0 then + UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + end + end end function this:GetOpenTime(id) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua index d0f687f2b4..9566f597eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua @@ -52,7 +52,7 @@ function MonsterCampPanel:BindEvent() Util.AddClick(this.btnBack, function () -- UIManager.OpenPanel(UIName.MainPanel) PlayerManager.carbonType = 1 - UIManager.OpenPanel(UIName.CarbonTypePanelV2) + UIManager.OpenPanel(UIName.MonsterCampMainPanel) self:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 58795bf8d7..abc74ac74b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -163,23 +163,12 @@ function this.ShowBattleResultByFourElement(drop) UIManager.OpenPanel(UIName.RewardItemPopup, MonsterCampManager.drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调 LogPink("isBackBattle "..tostring(isBackBattle)) if not isBackBattle then - local waves = MonsterCampManager.GetFourElementTotalWave() - if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then - PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1) - end - if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then - PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves) - local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) - if propertyId > 0 then - UIManager.OpenPanel(UIName.UnlockExtraRewardPanel,propertyId,function() - if MonsterCampManager.fourMonsterData[MonsterCampManager.curType].openState ~= 0 then - UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,MonsterCampManager.curType) - else - UIManager.OpenPanel(UIName.MonsterCampMainPanel) - end - end) - end - end + if MonsterCampManager.fourMonsterData[MonsterCampManager.curType].openState ~= 0 then + UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,MonsterCampManager.curType) + else + UIManager.OpenPanel(UIName.MonsterCampMainPanel) + end + if _BattleBestPopup then _BattleBestPopup:ClosePanel() end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index bc2db3b3ec..51ac44bac2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -86,8 +86,9 @@ function RewardItemPopup:InitComponent() this.guildTranscript=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildTranscript") this.guildTranscript_CurScore=Util.GetGameObject(this.guildTranscript,"curScore/num"):GetComponent("Text") - local shenying = Util.GetGameObject(self.gameObject, "shenying") - shenying.gameObject:SetActive(false) + this.shenying = Util.GetGameObject(self.gameObject, "shenying") + this.shenying.gameObject:SetActive(false) + this.shenyingTxt = Util.GetGameObject(this.shenying , "Content/bg/Text"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -154,6 +155,8 @@ function RewardItemPopup:OnOpen(...) this.guildDeathPos:SetActive(compShowType == 4) this.guildTranscript:SetActive(compShowType == 6) this.guildCarDelay:SetActive(compShowType == 3) + this.expeditionGo:SetActive(compShowType == 5) + this.shenying:SetActive(compShowType == CompShowType.fourElement) -- 设置背景遮罩的显隐 local isHideBG = args[6] this.btnBack:GetComponent("Image").color = Color.New(0, 0, 0, isHideBG and 0 or 0.8) @@ -173,6 +176,13 @@ function RewardItemPopup:OnOpen(...) if compShowType == 6 then this.GuildTranscriptShow() end + if compShowType == CompShowType.fourElement then + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.ScrollView2.gameObject:SetActive(false) + this.ShengYingShow(args[8]) + return + end local starItemDataList=BagManager.GetItemListFromTempBag(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 @@ -214,8 +224,6 @@ end --一些元素的显隐 function this.SetComPShowState(type) this.btnBack:GetComponent("Button").enabled = type ~= 2 - - this.ScrollView:SetActive(#itemDataList <= 25 ) this.ScrollView2:SetActive(#itemDataList > 25 ) this.lvAndExpGo:SetActive(type == 1) @@ -227,6 +235,11 @@ function this.SetComPShowState(type) this.guildDeathPos:SetActive(type == 4) this.guildTranscript:SetActive(type == 6) end + +function this.ShengYingShow(propertyId) + this.shenyingTxt.text = ConfigManager.GetConfigData(ConfigName.PropertyConfig,propertyId).Info +end + function this.GuildCarDelayShow() if GuildCarDelayManager.score and GuildCarDelayManager.hurt then this.guildCarDelaysoreNum.text =GuildCarDelayManager.score @@ -503,6 +516,9 @@ function RewardItemPopup:ItemDataListSort(itemDataList) end --界面关闭时调用(用于子类重写) function RewardItemPopup:OnClose() + if compShowType == CompShowType.fourElement then + return + end BagManager.SetDropIsSHowEquipPrint(true) local fightConFigData = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight) if compShowType == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua deleted file mode 100644 index 0cf6c73d99..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua +++ /dev/null @@ -1,150 +0,0 @@ -require("Base/BasePanel") -UnLockNewFunctionPanel = Inherit(BasePanel) -local this = UnLockNewFunctionPanel -local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) -local itemListPrefab -local itemListPrefabMax -local func -local bagType=0 --1 正常背包 2 临时背包 3 公会车迟显示 ---需要显示的小组件类型 --- 1 -- > 界面显示升级 --- 2 -- > 显示地图自由探索按钮 -local compShowType = 0 -local sortingOrderNum = 0 -local callList = Stack.New() -local isPopGetSSR = false -local isOpenGeiSSRAvtivity = 0--五星成长礼拍脸 -local isOpenGeiSSRAvtivityTime -local isPlayerAniEnd = true -local itemDataList -local showHero = 1 -local isBackBattle = false ---初始化组件(用于子类重写) ---此界面无奈做了两套显示逻辑一个是掉落小于等于25时背景根据元素数量做拉伸状态 另一个是元素大于25做界面做可滑动 -function UnLockNewFunctionPanel:InitComponent() - - this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") - --第一种显示 - this.ScrollView = Util.GetGameObject(self.gameObject, "ScrollView") - this.ScrollView.gameObject:SetActive(false) - -- this.dropGrid= Util.GetGameObject(self.gameObject, "ScrollView/Content") - -- itemListPrefab = {} - -- for i = 1, 10 do --初始缓存10个 - -- local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) - -- view.gameObject.name = "frame"..i - -- itemListPrefab[i] = view - -- end - -- --关卡等级经验 - -- this.lvAndExpGo=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo") - -- this.lv=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/lv"):GetComponent("Text") - -- this.exp=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/exp"):GetComponent("Slider") - -- this.expText=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/exp/Text"):GetComponent("Text") - -- this.lvUpImage=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/lvUpImage") - -- -- 地图探索按钮 - -- this.btnMapBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBack") - -- -- 战斗结果按钮 - -- this.btnResult = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnResult") - -- this.btnBattleBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBattleBack") - -- -- 战斗回放按钮 - -- 任意位置继续 - this.btnGoOn = Util.GetGameObject(self.gameObject, "btnBack/Image") - - -- --第二种显示当超过25个元素时 - -- this.ScrollView2 = Util.GetGameObject(self.gameObject, "bg") - -- this.dropGridMax= Util.GetGameObject(self.gameObject, "bg/ScrollView2/ScrollView2/Content") - - -- itemListPrefabMax = {} - -- for i = 1, 25 do --初始缓存10个 - -- local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGridMax.transform) - -- view.gameObject.name = "frame"..i - -- itemListPrefabMax[i] = view - -- end - local bg = Util.GetGameObject(self.gameObject, "bg") - bg.gameObject:SetActive(false) - local star = Util.GetGameObject(self.gameObject, "star") - star.gameObject:SetActive(false) - local shenying = Util.GetGameObject(self.gameObject, "shenying") - shenying.gameObject:SetActive(true) - this.shenyingText = Util.GetGameObject(shenying, "shenying/Content/bg/Text"):GetComponent("Text") - -- this.lvAndExpGoMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo") - -- this.lvMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/lv"):GetComponent("Text") - -- this.expMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/exp"):GetComponent("Slider") - -- this.expTextMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/exp/Text"):GetComponent("Text") - -- this.lvUpImageMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/lvUpImage") - -- -- 战斗结果按钮 - -- this.btnResultMax = Util.GetGameObject(self.gameObject, "bg/btnResult") - -- this.btnMapBackMax = Util.GetGameObject(self.gameObject, "bg/btnBack") - -- -- this.btnBattleBackMax = Util.GetGameObject(self.gameObject, "bg/btnBattleBack") - - -- --车迟斗法 显示 - -- this.guildCarDelay = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/guildCarDelay") - -- this.guildCarDelaysoreNum = Util.GetGameObject(this.guildCarDelay.gameObject, "soreNum"):GetComponent("Text") - -- this.guildCarDelayhurtNum = Util.GetGameObject(this.guildCarDelay.gameObject, "hurtNum"):GetComponent("Text") - - -- --公会十绝阵显示 - -- this.guildDeathPos=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildDeathPos") - -- this.guildDeathPos_CurScore=Util.GetGameObject(this.guildDeathPos,"curScore/num"):GetComponent("Text") - -- this.guildDeathPos_State=Util.GetGameObject(this.guildDeathPos,"curScore/state"):GetComponent("Image") - -- this.guildDeathPos_MaxScore=Util.GetGameObject(this.guildDeathPos,"maxScore/num"):GetComponent("Text") - -- --大闹天功显示 - -- this.expeditionGo=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/expeditionGo") - -- --公会副本 - -- this.guildTranscript=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildTranscript") - -- this.guildTranscript_CurScore=Util.GetGameObject(this.guildTranscript,"curScore/num"):GetComponent("Text") -end - ---绑定事件(用于子类重写) -function UnLockNewFunctionPanel:BindEvent() - - Util.AddClick(this.btnBack, function() - if isPlayerAniEnd then - PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - self:ClosePanel() - if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then - Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5) - PlayerManager.IsGetFiveStarHero = false - end - end - end) - -- Util.AddClick(this.btnMapBack, function () - -- self:ClosePanel() - -- end) - -- Util.AddClick(this.btnMapBackMax, function () - -- self:ClosePanel() - -- end) - -- Util.AddClick(this.btnResult, function () - -- UIManager.OpenPanel(UIName.DamageResultPanel, 1) - -- end) - -- Util.AddClick(this.btnResultMax, function () - -- UIManager.OpenPanel(UIName.DamageResultPanel, 1) - -- end) - -- Util.AddClick(this.btnBattleBack, function () - -- LogGreen("isBackBattle = true") - -- isBackBattle = true - -- BattleManager.BattleBackFun() - -- end) -end ---界面打开时调用(用于子类重写) ---bagType 1 正常背包 2 地图临时背包 ---drop 后端掉落原始数据 ---func 回调 - -function UnLockNewFunctionPanel:OnOpen(_id,func) - local id = _id - this.shenyingText.text = propertyConfig[id].Info - if func then func() end -end - -function UnLockNewFunctionPanel:OnSortingOrderChange() - -end - ---界面关闭时调用(用于子类重写) -function UnLockNewFunctionPanel:OnClose() - -end ---界面销毁时调用(用于子类重写) -function UnLockNewFunctionPanel:OnDestroy() - itemListPrefab = {} -end -return UnLockNewFunctionPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua.meta deleted file mode 100644 index a677f30b6f..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/Popup/UnLockNewFunctionPanel.lua.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: d180f4e35d19f954c9ca5300cffe2d92 -timeCreated: 1551694390 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua index b427e8aa12..7d5e53c266 100644 --- a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua @@ -58,10 +58,8 @@ function FourElementSingleWave:OnOpen() self.pass.gameObject:SetActive(true) self.fight.gameObject:SetActive(false) self.reward.gameObject:SetActive(false) - self.hero.gameObject:SetActive(false) else self.pass.gameObject:SetActive(false) - self.hero.gameObject:SetActive(true) self.fight.gameObject:SetActive(true) self.rewardText.text = "挑战奖励" @@ -169,13 +167,14 @@ function FourElementSingleWave:UpdatePrivilage() end function FourElementSingleWave:SetIcon() + Util.SetGray(self.fight,false) if self.data.wave == self.trailData.monsterWave then self.rewardData = self.data.commonReward --设置扫荡按钮 self.rewardText.text = "扫荡奖励" - self.fightBtnMask.sprite = Util.LoadSprite("r_hero_button_002") + self.fightBtnMask.sprite = Util.LoadSprite("r_hero_button_002") if self.freeTimes > 0 then - self.fightBtnText.text = "免费扫荡" + self.fightBtnText.text = string.format("%s","17232A","免费扫荡") else self.fightBtnIcon.gameObject:SetActive(true) self.fightBtnNum.gameObject:SetActive(true) @@ -197,7 +196,7 @@ function FourElementSingleWave:SetIcon() if self.data.wave == self.trailData.monsterWave + 1 then --设置挑战fight self.fightBtnMask:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_001") - self.fightBtnText.text = "挑战" + self.fightBtnText.text = string.format("%s","17232A","挑战") else self.fight.gameObject:SetActive(false) end