diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab index b829f29259..17956975c3 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab @@ -487,7 +487,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: -166.88, y: 5.9} + m_AnchoredPosition: {x: -200, y: 5.9} m_SizeDelta: {x: 233.23, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331531869443343188 @@ -696,7 +696,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: -187.8, y: 5.9} + m_AnchoredPosition: {x: -174.8, y: 5.9} m_SizeDelta: {x: 414.4, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2999171410152969528 @@ -1086,7 +1086,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: -173.6, y: 26.8} + m_AnchoredPosition: {x: -160.6, y: 26.8} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2628598768668933150 @@ -1404,7 +1404,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: -187.8, y: 5.9} + m_AnchoredPosition: {x: -174.8, y: 5.9} m_SizeDelta: {x: 414.4, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6106103707034961987 @@ -1949,7 +1949,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: -197, y: -21.7} + m_AnchoredPosition: {x: -184, y: -21.7} m_SizeDelta: {x: 263.15, y: 60} m_Pivot: {x: 0.5, y: 0.5000002} --- !u!222 &2210578185565208895 @@ -2154,7 +2154,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, y: 6.5} + m_AnchoredPosition: {x: 13, y: 6.5} m_SizeDelta: {x: 1080, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &478340198151723744 @@ -2268,7 +2268,7 @@ 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: 142.9, y: 0} + m_AnchoredPosition: {x: 155.9, y: 0} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1475802823953103828 @@ -2305,7 +2305,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: -201.7, y: -21.7} + m_AnchoredPosition: {x: -188.7, y: -21.7} m_SizeDelta: {x: 268.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1421581810915282968 @@ -2523,7 +2523,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: -201.7, y: -21.7} + m_AnchoredPosition: {x: -188.7, y: -21.7} m_SizeDelta: {x: 268.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &157617930178017104 @@ -2603,7 +2603,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: -197, y: -21.7} + m_AnchoredPosition: {x: -184, y: -21.7} m_SizeDelta: {x: 263.15, y: 60} m_Pivot: {x: 0.5, y: 0.5000002} --- !u!222 &3499594625787341371 @@ -2683,7 +2683,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: -293, y: 37} + m_AnchoredPosition: {x: -280, y: 37} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9185627090315974916 @@ -2829,7 +2829,7 @@ 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: 142.9, y: 0} + m_AnchoredPosition: {x: 155.9, y: 0} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2313064934602285021 @@ -3200,7 +3200,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: -173.6, y: 26.8} + m_AnchoredPosition: {x: -160.6, y: 26.8} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &491928103122894411 @@ -3711,7 +3711,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, y: 6.5} + m_AnchoredPosition: {x: 13, y: 6.5} m_SizeDelta: {x: 1080, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1123327696247294627 @@ -4194,7 +4194,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: -293, y: 37} + m_AnchoredPosition: {x: -280, y: 37} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8180007595095252740 @@ -4342,7 +4342,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: -187.8, y: 5.9} + m_AnchoredPosition: {x: -174.8, y: 5.9} m_SizeDelta: {x: 414.4, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7174393028860065149 @@ -4573,7 +4573,7 @@ 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: 142.9, y: 0} + m_AnchoredPosition: {x: 155.9, y: 0} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3801792105356260733 @@ -4764,7 +4764,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: -197, y: -21.7} + m_AnchoredPosition: {x: -184, y: -21.7} m_SizeDelta: {x: 263.15, y: 60} m_Pivot: {x: 0.5, y: 0.5000002} --- !u!222 &3449445868634355743 @@ -4844,7 +4844,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: -201.7, y: -21.7} + m_AnchoredPosition: {x: -188.7, y: -21.7} m_SizeDelta: {x: 268.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3936837473882025073 @@ -4924,7 +4924,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: -201.7, y: -21.7} + m_AnchoredPosition: {x: -188.7, y: -21.7} m_SizeDelta: {x: 268.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1648016456990099278 @@ -5546,7 +5546,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: -293, y: 37} + m_AnchoredPosition: {x: -280, y: 37} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5038435063746879058 @@ -5620,7 +5620,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: -173.6, y: 26.8} + m_AnchoredPosition: {x: -160.6, y: 26.8} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5118360607823116250 @@ -5704,7 +5704,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: -166.88, y: 5.9} + m_AnchoredPosition: {x: -200, y: 5.9} m_SizeDelta: {x: 233.23, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5892307164135120155 @@ -5988,7 +5988,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: -293, y: 37} + m_AnchoredPosition: {x: -280, y: 37} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1169257003327197665 @@ -6062,7 +6062,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: -187.8, y: 5.9} + m_AnchoredPosition: {x: -174.8, y: 5.9} m_SizeDelta: {x: 414.4, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &49609580165693554 @@ -6901,7 +6901,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: -173.6, y: 26.8} + m_AnchoredPosition: {x: -160.6, y: 26.8} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4219855196454062150 @@ -6982,7 +6982,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, y: 6.5} + m_AnchoredPosition: {x: 13, y: 6.5} m_SizeDelta: {x: 1080, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3611048055738855700 @@ -7102,7 +7102,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: -166.88, y: 5.9} + m_AnchoredPosition: {x: -200, y: 5.9} m_SizeDelta: {x: 233.23, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4814686390980672262 @@ -7425,7 +7425,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, y: 6.5} + m_AnchoredPosition: {x: 13, y: 6.5} m_SizeDelta: {x: 1080, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &183256255447671401 @@ -7621,7 +7621,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: -197, y: -21.7} + m_AnchoredPosition: {x: -184, y: -21.7} m_SizeDelta: {x: 263.15, y: 60} m_Pivot: {x: 0.5, y: 0.5000002} --- !u!222 &1607330080701495173 @@ -7701,7 +7701,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: -293, y: 37} + m_AnchoredPosition: {x: -280, y: 37} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6811921766301627340 @@ -8196,7 +8196,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, y: 6.5} + m_AnchoredPosition: {x: 13, y: 6.5} m_SizeDelta: {x: 1080, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4152648313741985610 @@ -8386,7 +8386,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: -197, y: -21.7} + m_AnchoredPosition: {x: -184, y: -21.7} m_SizeDelta: {x: 263.15, y: 60} m_Pivot: {x: 0.5, y: 0.5000002} --- !u!222 &3507413340228728180 @@ -8546,7 +8546,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: -173.6, y: 26.8} + m_AnchoredPosition: {x: -160.6, y: 26.8} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &309922525580728939 @@ -8688,7 +8688,7 @@ 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: 142.9, y: 0} + m_AnchoredPosition: {x: 155.9, y: 0} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8309475290306503434 @@ -8988,7 +8988,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: -201.7, y: -21.7} + m_AnchoredPosition: {x: -188.7, y: -21.7} m_SizeDelta: {x: 268.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1801463473276310991 @@ -9255,7 +9255,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: -187.8, y: 5.9} + m_AnchoredPosition: {x: -174.8, y: 5.9} m_SizeDelta: {x: 414.4, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3582054888750494270 @@ -9327,7 +9327,7 @@ 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: 142.9, y: 0} + m_AnchoredPosition: {x: 155.9, y: 0} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8675892451511021042 @@ -9462,7 +9462,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: -166.88, y: 5.9} + m_AnchoredPosition: {x: -200, y: 5.9} m_SizeDelta: {x: 233.23, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1550637447877702188 @@ -9788,7 +9788,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: -166.88, y: 5.9} + m_AnchoredPosition: {x: -200, y: 5.9} m_SizeDelta: {x: 233.23, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7650262567289162689 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index b01583d6ee..5d8cfa228d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -79,21 +79,6 @@ function this.OnLevelChange() -- end end end ---gm 用 -function this.AddFuncGuide(funcId) - if not funcId then return end - LogGreen(funcId.."funcId") - if not AppConst.isGuide then - LogGreen("不在引导内") - return - end - local guideId = GlobalSystemConfig[funcId].GuideId - if guideId and guideId ~= 0 then - table.insert(_FuncGuideList, guideId) - end - LogGreen("guideId:"..guideId) - GuideManager.ShowGuide(guideId) -end -- function this.OnFunctionOpen(funcId) @@ -172,8 +157,6 @@ end -- 检测功能引导 function GuideManager.CheckFuncGuide() PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0)--引导开始关闭右侧伸缩条 - for k,v in pairs(funcDic) do - end if not GuideManager.IsInMainGuide() and not _IsFuncGuild and #_FuncGuideList > 0 then local guideId = _FuncGuideList[1] if not funcDic[guideId] then @@ -759,16 +742,13 @@ end --gm 用 function this.AddFuncGuide(funcId) if not funcId then return end - --LogGreen(funcId.."funcId") + LogGreen(funcId.."funcId") if not AppConst.isGuide then - --LogGreen("不在引导内") + LogGreen("请勾选引导选项") return end local guideId = GlobalSystemConfig[funcId].GuideId - -- if guideId and guideId ~= 0 then - -- table.insert(_FuncGuideList, guideId) - -- end - --LogGreen("guideId:"..guideId) + LogGreen("guideId:"..guideId) GuideManager.ShowGuide(guideId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 2d49000f4f..b4feb3997f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -422,7 +422,7 @@ function this.ExecuteBehavior(beType, beArgs) Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, OnFocus) Game.GlobalEvent:AddEvent(GameEvent.UI.OnFocus, OnFocus) - elseif beType == 15 then + elseif beType == 15 then -- 强制跳转,关闭目前所有界面,跳转到指定界面 this.dialogRoot:SetActive(false) this.mask:SetActive(false) this.tipButtomRoot:SetActive(false) @@ -496,6 +496,14 @@ function this.ExecuteBehavior(beType, beArgs) end _trigger.onPointerUp = _trigger.onPointerUp + endFunc this.SetBtnGOPosition(HeroLikeAbilityPanel.giveBtn.gameObject:GetComponent("RectTransform").position) + elseif beType == 18 then -- 触发剧情节点 + this.canvas.enabled=false + this.dialogRoot:SetActive(false) + this.mask:SetActive(false) + this.tipButtomRoot:SetActive(false) + StoryManager.EventTrigger(tonumber(beArgs), function() + this.NextGuide() + end) end end