From d4d1653bc265711d52daf33384dde48e827a153e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 30 Dec 2021 14:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Map/SingleExplorePlayerView.prefab | 58 +++++++++++++++++-- ...SizeFitterPopup_ExploreSelectFormation.lua | 4 +- .../GeneralSizeFitterPopup_OneKeyExplore.lua | 2 +- .../~Lua/View/SingleExplorePlayerView.lua | 5 +- 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab index e9c2a5a139..475be90fa8 100644 --- a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab +++ b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab @@ -19146,6 +19146,7 @@ GameObject: - component: {fileID: 1117909453575152904} - component: {fileID: 3128805303209545176} - component: {fileID: 1070990917816616422} + - component: {fileID: 2570599657612636824} m_Layer: 0 m_Name: tip m_TagString: Untagged @@ -19204,7 +19205,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -19216,6 +19217,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u590D\u6D3B\u4E2D." +--- !u!114 &2570599657612636824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217251524387533806} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1280090969264805897 GameObject: m_ObjectHideFlags: 0 @@ -91159,6 +91175,7 @@ GameObject: - component: {fileID: 248637413811290557} - component: {fileID: 3935862417504911882} - component: {fileID: 1831026039210701570} + - component: {fileID: 4128503116974161717} m_Layer: 0 m_Name: tip2 m_TagString: Untagged @@ -91182,7 +91199,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: 64.5, y: 0.000002861} + m_AnchoredPosition: {x: 79.7, y: 0.000002861} m_SizeDelta: {x: 20.44, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3935862417504911882 @@ -91215,7 +91232,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -91227,6 +91244,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: . +--- !u!114 &4128503116974161717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309302209407048319} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6357989039728665220 GameObject: m_ObjectHideFlags: 0 @@ -101112,6 +101144,7 @@ GameObject: - component: {fileID: 8634994636120734410} - component: {fileID: 506010228683232235} - component: {fileID: 7467283507892244381} + - component: {fileID: 8760245036843969542} m_Layer: 0 m_Name: tip1 m_TagString: Untagged @@ -101135,7 +101168,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: 56, y: 0.000002861} + m_AnchoredPosition: {x: 69.78, y: 0.000002861} m_SizeDelta: {x: 20.44, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506010228683232235 @@ -101168,7 +101201,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -101180,6 +101213,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: . +--- !u!114 &8760245036843969542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7106361098752905645} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7197431941716830224 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index 9c56906e8a..6fb34dd0dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -114,7 +114,7 @@ function this:Refresh(_data,_item) _item.heroList[j].heroData = nil Util.AddOnceClick(_item.heroList[j].frame.gameObject,function() if this.typeIndex == 0 and _item.heroList[j].heroData then - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,_item.heroList[j].heroData.id,_item.heroList[j].heroData.star) + UIManager.OpenPanel(UIName.RoleInfoPopup,_item.heroList[j].heroData) else if _data.state < 1 then ExploreManager.curFormationIndex = _data.formationId @@ -126,7 +126,7 @@ function this:Refresh(_data,_item) end) Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function() if this.typeIndex ~= 0 and _item.heroList[j].heroData then - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,_item.heroList[j].heroData.id,_item.heroList[j].heroData.star) + UIManager.OpenPanel(UIName.RoleInfoPopup,_item.heroList[j].heroData) end end, 0.5) end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index ef7b634090..a36707ed41 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -293,7 +293,7 @@ function this:Refresh(_data,_item,index) end) Util.AddLongPressClick(_item.heroList[j].frame.gameObject, function() if _item.heroList[j].heroData then - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,_item.heroList[j].heroData.id,_item.heroList[j].heroData.star) + UIManager.OpenPanel(UIName.RoleInfoPopup,_item.heroList[j].heroData) end end, 0.5) end diff --git a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua index a5191bd522..774bd3f26c 100644 --- a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua @@ -293,10 +293,7 @@ function SingleExplorePlayerView:RefreshPoints() for i = 1,#self.exploreList do self.exploreList[i].gameObject:SetActive(false) end - Timer.New(function() - if self.exploreList[index] then - self.exploreList[index].gameObject:SetActive(false) - end + Timer.New(function() index = (index + 1)%pointnum == 0 and pointnum or (index + 1)%pointnum self.exploreList[index].gameObject:SetActive(true) end,0.25,2):Start()