From 8b56e352baefead7c2320ee8cb60c744a7e04559 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 29 Jul 2021 17:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B7=A8=E6=9C=8D=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Ranking/RankingListMainPanel.prefab | 202 +++++++++++++++++- .../Modules/Ranking/RankingListMainPanel.lua | 16 +- .../Ranking/RankingSingleListPanel.lua | 4 + 3 files changed, 217 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab index 720f711042..149d29805a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab @@ -313,6 +313,52 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &730558313868846617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 415327942404206783} + - component: {fileID: 4129316498381476580} + m_Layer: 5 + m_Name: FightLeveStar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &415327942404206783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730558313868846617} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1061055887104615604} + - {fileID: 7104819409864198558} + m_Father: {fileID: 6499392947023679896} + 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: -165.4, y: -6.2} + m_SizeDelta: {x: 0, y: 79.69} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &4129316498381476580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730558313868846617} + m_CullTransparentMesh: 0 --- !u!1 &1002578458066801753 GameObject: m_ObjectHideFlags: 0 @@ -987,6 +1033,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3656511784313375480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1061055887104615604} + - component: {fileID: 7178038862859616849} + - component: {fileID: 6867397320356522659} + m_Layer: 5 + m_Name: starImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1061055887104615604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656511784313375480} + 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: 415327942404206783} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 49.72, y: -38.34} + m_SizeDelta: {x: 44.56, y: 43.32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7178038862859616849 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656511784313375480} + m_CullTransparentMesh: 0 +--- !u!114 &6867397320356522659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656511784313375480} + 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: 8908080ead3926f4e9e9951397b9e29b, 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 &3685633209096263160 GameObject: m_ObjectHideFlags: 0 @@ -1018,6 +1138,7 @@ RectTransform: - {fileID: 6702947027024894398} - {fileID: 1293953197823642322} - {fileID: 8354247193223060076} + - {fileID: 415327942404206783} m_Father: {fileID: 1144514190134279063} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1918,6 +2039,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6692731252498184858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7104819409864198558} + - component: {fileID: 7505812245496626189} + - component: {fileID: 7653430379177118656} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7104819409864198558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6692731252498184858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: [] + m_Father: {fileID: 415327942404206783} + 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: 107.5, y: -38.59} + m_SizeDelta: {x: 71, y: 77.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7505812245496626189 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6692731252498184858} + m_CullTransparentMesh: 0 +--- !u!114 &7653430379177118656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6692731252498184858} + 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.9882353, g: 0.92156863, b: 0.7921569, 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: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 123 --- !u!1 &6816295196949776567 GameObject: m_ObjectHideFlags: 0 @@ -2268,7 +2468,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8354247193223060076 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index 061c81ce98..13004c20e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -140,7 +140,6 @@ function this.SingleRankKingListShow(indexm,id) local getRewardBtn = Util.GetGameObject(go,"getRewardBtn") local getRewardBtnText = Util.GetGameObject(go,"getRewardBtn/Text"):GetComponent("Text") getRewardBtn:SetActive(dData.uid ~= 0 ) - Util.SetGray(getRewardBtn,proud ~= 0) Util.AddOnceClick(clickBtn, function() UIManager.OpenPanel(UIName.RankingSingleListPanel,sData) end) @@ -164,6 +163,7 @@ function this.SingleRankKingListShow(indexm,id) getRewardBtnText.text = Language[11677] Util.GetGameObject(go,"getRewardBtn/redPoint"):SetActive(false) end + Util.SetGray(getRewardBtn,proud ~= 0) end --界面关闭时调用(用于子类重写) function RankingListMainPanel:OnClose() @@ -182,33 +182,41 @@ function this.SetInfoShow(go,data,rankType,nameText) local fight = Util.GetGameObject(go,"fight") local warPower = Util.GetGameObject(go,"warPower") local trial = Util.GetGameObject(go,"trial") + local FightLeveStar = Util.GetGameObject(go,"FightLeveStar") fight:SetActive(false) warPower:SetActive(false) trial:SetActive(false) + FightLeveStar:SetActive(false) if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then fight:SetActive(true) if nameText then nameText:GetComponent("Text").text = data.userName end Util.GetGameObject(go,"fight"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name) - elseif rankType == RANK_TYPE.FORCE_CURR_RANK then + elseif rankType == RANK_TYPE.FORCE_CURR_RANK or rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK then warPower:SetActive(true) if nameText then nameText:GetComponent("Text").text = data.userName end Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1--data.force - elseif rankType == RANK_TYPE.GUILD_FORCE_RANK then + elseif rankType == RANK_TYPE.GUILD_FORCE_RANK or rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK then warPower:SetActive(true) if nameText then nameText:GetComponent("Text").text = data.guildName end Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1 - elseif rankType == RANK_TYPE.MONSTER_RANK then + elseif rankType == RANK_TYPE.MONSTER_RANK or rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then trial:SetActive(true) if nameText then nameText:GetComponent("Text").text = data.userName end Util.GetGameObject(go,"trial"):GetComponent("Text").text = GetLanguageStrById(Language[11689])..data.rankInfo.param1 + elseif rankType == RANK_TYPE.FIGHTLEVEL_STAR or rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR then--山河社稷图星星 + FightLeveStar:SetActive(true) + if nameText then + nameText:GetComponent("Text").text = ""..data.userName.."" + end + Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1 end end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 77d8d818f8..c2b0a11251 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -296,6 +296,8 @@ function this.SetHeadsInfo(data,root,index,name,level) UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.TSLX) elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.serverName and data.serverName or nil) + elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then + UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid) end @@ -333,6 +335,8 @@ function this.AddPlayerInfoClick(root,uid,serverName) UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.TSLX) elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,serverName and serverName or nil) + elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then + UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, uid) end