diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index 74e16f3ff5..056ce18182 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -2268,7 +2268,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 49, y: 110.6001} + m_AnchoredPosition: {x: 49, y: 158.4} m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1442028839347931044 @@ -4783,12 +4783,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 250 + m_Left: 100 m_Right: 80 m_Top: 0 m_Bottom: 80 m_ChildAlignment: 3 - m_Spacing: 30.52 + m_Spacing: -15 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -5478,7 +5478,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: -20 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab index fe08b7c8b7..e41ee9288c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab @@ -4704,7 +4704,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: 122, y: 8} + m_AnchoredPosition: {x: 60, y: 0} m_SizeDelta: {x: 68.5, y: 68.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7363477031707390935 diff --git a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab index 93adf0693c..b9a7d75292 100644 --- a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab @@ -6089,7 +6089,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &90191335777602678 RectTransform: m_ObjectHideFlags: 0 @@ -6139,8 +6139,8 @@ 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: 9282a727850779b4c982b7339b750be0, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 45d2121886b276c47a7dcbc93e216d50, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6243,7 +6243,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, y: 3} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &90191336444902904 @@ -6267,7 +6267,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1} + m_Color: {r: 0.49803925, g: 0.37647063, b: 0.1764706, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6275,12 +6275,12 @@ 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: 50 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 40 + m_MinSize: 45 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -7478,8 +7478,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: 148, y: 37} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 173.1, y: 50.9} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7788271229686631584 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7068240c08..9401dbc0cf 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1851,7 +1851,7 @@ FUNCTION_OPEN_TYPE = { Number_Game = 149, --数字游戏 Train = 150, --特训 TrainBuild = 151, --特训建筑 - + DAILYCHALLENGE_six =163, --日常副本第六个 } diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index e034976e88..4e803fae22 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -15,15 +15,17 @@ local maxForce = 0 --顶部背景图 local titleBg={ --金币 - [1]={bg="21044", titleImg = "r_richang_banner_5_zi_zh",name="礼物副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)}, + [1]={bg="21044", titleImg = "r_richang_banner_5_zi_zh",name="资源副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)}, --经验 - [2]={bg="21072", titleImg = "r_richang_banner_4_zi_zh",name="残片副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, + [2]={bg="21072", titleImg = "r_richang_banner_4_zi_zh",name="礼物副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, --英雄 - [3]={bg="21073", titleImg = "r_richang_banner_3_zi_zh", name="兽息副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, + [3]={bg="21073", titleImg = "r_richang_banner_3_zi_zh", name="羁绊副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, --法宝 - [4]={bg="21041", titleImg = "r_richang_banner_2_zi_zh",name="意念副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)}, + [4]={bg="21041", titleImg = "r_richang_banner_2_zi_zh",name="残片副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)}, --魂印 - [5]={bg="21049", titleImg = "r_richang_banner_1_zi_zh", name="本源技副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)}, + [5]={bg="21049", titleImg = "r_richang_banner_1_zi_zh", name="兽息副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)}, + --副本6 + [6]={bg="21015", titleImg = "r_richang_banner_1_zi_zh", name="心法副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)}, } --难度图片 local qualityBg={ @@ -60,11 +62,12 @@ local maxFreeTime=0 --Tab local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, - [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, - [3] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, - --[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN }, - --[5] = { default = "r_richang_anniu_hunyin_01_zh", select = "r_richang_anniu_hunyin_zh",lock = "r_richang_anniu_hunyin_zh", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT } +local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = "资源副本",type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, + [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, + [3] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = "羁绊副本",type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, + [4] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN }, + [5] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT }, + [6] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = "心法副本",type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_six } } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(255 / 255, 255 / 255, 255 / 255, 1),