From 7109e86706b573c7dfc9affc904f86b23502018d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 13 Dec 2022 16:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=83=AD=E6=A6=9C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/HotRankAtlas/hotRank_bg.png | Bin 0 -> 31390 bytes .../Atlas/HotRankAtlas/hotRank_bg.png.meta | 110 +++++++ .../Atlas/HotRankAtlas/hotRank_zan.png | Bin 0 -> 7202 bytes .../Atlas/HotRankAtlas/hotRank_zan.png.meta | 110 +++++++ .../UI/GeneralPanel/GeneralBigPopup.prefab | 140 +++++++-- .../Modules/GeneralPanel/GeneralBigPopup.lua | 9 + .../~Lua/Modules/Main/MainPanel.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 42 ++- .../View/GeneralBigPopup_GiveLikeHotHero.lua | 292 ++++++++++++++++++ .../GeneralBigPopup_GiveLikeHotHero.lua.meta | 7 + 10 files changed, 672 insertions(+), 40 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png create mode 100644 Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png.meta create mode 100644 Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png create mode 100644 Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua.meta diff --git a/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..aad9e6359bf9f5df8aa4c7e13cbfdd3117726236 GIT binary patch literal 31390 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 A>Hq)$ literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png.meta b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png.meta new file mode 100644 index 0000000000..24a3924b90 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_bg.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 83da9ff80ee61124c84b3f8749a830ca +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1cd063b17b87f544a9ab0fb78d6cb5ce + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HotRankAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png new file mode 100644 index 0000000000000000000000000000000000000000..27a8087424f4840654928f6cf55de8e50ccfd378 GIT binary patch literal 7202 zcmaJ_by!n>+aDd$9Red&1V)V52uT6y4nY`Wz^LIEF+xB@5F{j}Ceou6Ns&^T5ds1d z3X)RNjrj6=p5O0z-#?z~J=b;4`Nn;J?mpM|KF^E|wP~rjr~v=~t*(xy>DAlt>NcSy zzj}sM)EY<)4P#vm4WJJi<%0A?004p0xn=>@DaULobH@mJOZBfi)ft`<00F@Y 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png.meta b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png.meta new file mode 100644 index 0000000000..a9af7a5325 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HotRankAtlas/hotRank_zan.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: fc803b6c0ebc833488ee07ae02f5d369 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4a3954b4c5aa05341b9b37ae5814e436 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HotRankAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 3da87fe25a..a9228611c9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -2350,7 +2350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1006421095 RectTransform: m_ObjectHideFlags: 0 @@ -10289,10 +10289,10 @@ RectTransform: m_Father: {fileID: 6669000462376630719} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 720, y: -50} - m_SizeDelta: {x: 60, y: 88} + 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 &8682382969320885722 CanvasRenderer: @@ -20931,10 +20931,10 @@ RectTransform: m_Father: {fileID: 6669000462376630719} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 580, y: -50} - m_SizeDelta: {x: 60, y: 88} + 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 &2548272237263765984 CanvasRenderer: @@ -24124,10 +24124,10 @@ RectTransform: m_Father: {fileID: 6669000462376630719} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 440, y: -50} - m_SizeDelta: {x: 60, y: 88} + 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 &725074640987852237 CanvasRenderer: @@ -28134,7 +28134,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: -3.1000977, y: -14.600098} + m_AnchoredPosition: {x: -3.1000977, y: -14.600586} m_SizeDelta: {x: -168.8, y: -584} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3588302341315408117 @@ -30799,7 +30799,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1823191076860614843 RectTransform: m_ObjectHideFlags: 0 @@ -36848,10 +36848,10 @@ RectTransform: m_Father: {fileID: 6669000462376630719} 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: 160, y: -50} - m_SizeDelta: {x: 60, y: 88} + 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 &1752293183709431928 CanvasRenderer: @@ -37482,6 +37482,7 @@ GameObject: - component: {fileID: 7336085064903931144} - component: {fileID: 8046442266353428765} - component: {fileID: 7092694893323203805} + - component: {fileID: 1560321842092125119} m_Layer: 5 m_Name: hero m_TagString: Untagged @@ -37545,6 +37546,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &1560321842092125119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6744069080421557670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7092694893323203805} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6767514454267608244 GameObject: m_ObjectHideFlags: 0 @@ -40706,6 +40749,7 @@ GameObject: - component: {fileID: 8306107612781045166} - component: {fileID: 1319808899209099893} - component: {fileID: 6492142687987720600} + - component: {fileID: 6886144436042898446} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -40769,6 +40813,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &6886144436042898446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7442490526007532560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6492142687987720600} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &7447930034037549550 GameObject: m_ObjectHideFlags: 0 @@ -43600,8 +43686,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.61627, y: 80.399994} - m_SizeDelta: {x: 1016.6, y: 1188.2} + m_AnchoredPosition: {x: 0.61627, y: 73.5} + m_SizeDelta: {x: 1016.6, y: 1174.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1091340552195664627 CanvasRenderer: @@ -45798,7 +45884,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 11.4, y: -0.000022888} - m_SizeDelta: {x: 948.1, y: 0} + m_SizeDelta: {x: 948.1, y: 149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1478443720213518412 CanvasRenderer: @@ -46390,7 +46476,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -46514,10 +46600,10 @@ RectTransform: m_Father: {fileID: 6669000462376630719} 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: 300, y: -50} - m_SizeDelta: {x: 60, y: 88} + 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 &5187175447103501528 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index c3edbaf08c..79a47f0d7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -47,6 +47,8 @@ local contentScripts = { [GENERAL_POPUP_TYPE.GemCompound] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_GemCompound"), panelName = "GeneralBigPopup_GemCompound"}, --神印 [GENERAL_POPUP_TYPE.GodPrintUp ] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp"), panelName = "GeneralBigPopup_GodPrintUp"}, + --英雄热度排行榜 + [GENERAL_POPUP_TYPE.GiveLikeHotHero ] = {view = require("Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero"), panelName = "GeneralBigPopup_GiveLikeHotHero"}, } --子模块预设 local contentPrefabs={} @@ -58,7 +60,9 @@ function GeneralBigPopup:InitComponent() this.spLoader = SpriteLoader.New() this.contents=Util.GetGameObject(this.gameObject,"Contents") this.backBtn=Util.GetGameObject(this.contents,"BG/BackBtn") + this.backBtn2=Util.GetGameObject(this.contents,"BG2/BackBtn") this.BG=Util.GetGameObject(this.contents,"BG") + this.BG2=Util.GetGameObject(this.contents,"BG2") this.Mask=Util.GetGameObject(this.gameObject,"Mask") this.BG:SetActive(true) this.Mask:SetActive(true) @@ -82,6 +86,10 @@ function GeneralBigPopup:BindEvent() Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) self:ClosePanel() end) + Util.AddClick(this.backBtn2,function() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) + self:ClosePanel() + end) Util.AddClick(this.Mask,function() Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) self:ClosePanel() @@ -111,6 +119,7 @@ function GeneralBigPopup:OnOpen(popupKey,...) end this.Mask:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) this.BG:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) + this.BG2:SetActive(popupKey == GENERAL_POPUP_TYPE.GiveLikeHotHero) this.popupKey = popupKey contentScripts[this.popupKey].view:OnShow(this,onOpenArgs)--1、传入自己 2、传入不定参 end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 7b5d670dd5..a6e31cfcea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -150,7 +150,7 @@ function this:InitComponent() this.gmRedPoint:SetActive(false) this.btnHotRank=Util.GetGameObject(self.gameObject,"RightDown/btnHotRank") this.hrRedPoint = Util.GetGameObject(this.btnHotRank,"redPoint") - this.btnHotRank:SetActive(false) + --this.btnHotRank:SetActive(false) this.hrRedPoint:SetActive(false) --gm礼包 this.btnGMGift=Util.GetGameObject(self.gameObject,"RightDown/btnGMGift") diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 89adad9a49..fe66532237 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6798,7 +6798,6 @@ function NetManager.QueryWeekCardInfoRequest(id,func) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.QueryWeekCardInfoRequest, MessageTypeProto_pb.QueryWeekCardInfoResponse,msg, function(buffer) -- LogError("buffer=="..buffer) - LogError("11111111111111111") local data = buffer:DataByte() local msg1 = PlayerInfoProto_pb.QueryWeekCardInfoResponse() msg1:ParseFromString(data) @@ -6853,19 +6852,38 @@ function NetManager.CompareNumBonusRequest(levelId,func) end) end +function NetManager.LikeHeroRankRequest(type,id,func) + local data=HeroInfoProto_pb.LikeHeroRankRequest() + data.rankSubId=type + data.heroTid=id + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.LIKE_HERO_RANK_REQUEST,MessageTypeProto_pb.LIKE_HERO_RANK_RESPONSE,msg,function(buffer) + local data = buffer:DataByte() + --local msg = PlayerInfoProto_pb.CompareNumBonusResponse() + --msg:ParseFromString(data) + LogError("点赞成功") + PopupTipPanel.ShowTip("点赞成功") + if func then + func() + end + end) +end + + function NetManager.UserLikeHeroRankRequest(rankId,func) - -- local data = HeroInfoProto_pb.userLikeHeroRankInfoRequest() - -- data.rankSubId=rankId - -- local msg = data:SerializeToString() - -- Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_LIKE_HERO_RANK_INFO_REQUEST,MessageTypeProto_pb.COMPARENUM_BONUS_RESPONSE,msg,function(buffer) - -- local data = buffer:DataByte() - -- local msg = PlayerInfoProto_pb.CompareNumBonusResponse() - -- msg:ParseFromString(data) - -- if func then - -- func(msg) - -- end - -- end) + local data = HeroInfoProto_pb.userLikeHeroRankInfoRequest() + data.rankSubId=rankId + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_LIKE_HERO_RANK_INFO_REQUEST,MessageTypeProto_pb.USER_LIKE_HERO_RANK_INFO_RESPONSE,msg,function(buffer) + local data = buffer:DataByte() + local msg = HeroInfoProto_pb.userLikeHeroRankInfoResponse() + msg:ParseFromString(data) + + if func then + func(msg) + end + end) end function NetManager.TowerCleanfloorRequest(func) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua new file mode 100644 index 0000000000..6ce459ac48 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua @@ -0,0 +1,292 @@ +----- 送神弹窗 ----- +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local heros=nil +local confirmFunc=nil +local currPro=0 +local curPage = 1 +local type=1 +local curZanId=0 +local fiveHero={} +local newHeroId=0 +local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) +local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) +local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +local hotRankConfig=ConfigManager.GetConfig(ConfigName.HotRanking) +local specialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,152) +local TabBox = require("Modules/Common/TabBox") + local _TabData={ +-- [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "人气热榜" }, +-- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "山河社稷图" }, +-- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "心魔试炼" }, +-- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "大闹天宫" }, + } +local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), + select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} +function this:InitComponent(gameObject) + this.spLoader = SpriteLoader.New() + this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + this.prefab=Util.GetGameObject(gameObject,"ItemPre") + --滚动条根节点 + this.newObj=Util.GetGameObject(gameObject,"new") + this.root = Util.GetGameObject(gameObject, "Root") + this.root2 = Util.GetGameObject(gameObject, "Root2") + this.preList={} + this.tabbox= Util.GetGameObject(gameObject, "TabBox") + local natural=tonumber(specialConfig.Value) + for _, config in ConfigPairs(heroConfig) do + if config.Natural>=natural and config.Id~=21061 and config.Hide==0 and config.Newhero==0 then + table.insert(fiveHero,config.Id) + end + if config.Newhero==1 then + newHeroId=config.Id + end + end + local parObj=nil + if newHeroId==0 then + parObj=this.root2 + this.newObj:SetActive(false) + else + parObj=this.root + this.newObj:SetActive(true) + end + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, parObj.transform, + this.prefab,nil, Vector2.New(parObj.transform.rect.width,parObj.transform.rect.height), 1, 1,Vector2.New(20,5)) + this.ScrollView.moveTween.MomentumAmount = 1 + this.ScrollView.moveTween.Strength = 2 + this.ScrollView.elastic = false + + + this.selectBar = Util.GetGameObject(gameObject,"pros/Grid") + this.light = Util.GetGameObject(gameObject,"pros/SelectBtn") + this.light:SetActive(true) + this.newIcon=Util.GetGameObject(gameObject,"new/icon"):GetComponent("Image") + this.newPro=Util.GetGameObject(gameObject,"new/pro"):GetComponent("Image") + this.newName=Util.GetGameObject(gameObject,"new/name"):GetComponent("Text") + this.des1=Util.GetGameObject(gameObject,"new/des1"):GetComponent("Text") + this.des2=Util.GetGameObject(gameObject,"new/des2"):GetComponent("Text") + this.hint=Util.GetGameObject(gameObject,"new/hint"):GetComponent("Text") + this.btnList = {} + for i = 1, 5 do + this.btnList[i] = Util.GetGameObject(this.selectBar,"Btn"..i) + end + for index, config in ConfigPairs(hotRankConfig) do + if config.Open==1 then + local rank={} + rank.default="r_hero_xuanze_002" + rank.select="r_hero_xuanze_001" + rank.name=config.HeroID + rank.id=config.Id + table.insert(_TabData,rank) + end + end + + this.TabCtrl = TabBox.New() + this.TabCtrl:SetTabAdapter(this.TabAdapter) + this.TabCtrl:SetChangeTabCallBack(this.SwitchView) + this.TabCtrl:Init(this.tabbox, _TabData) + +end +function this:BindEvent() + -- LogError("1111111111111111") + + for i = 1, 5 do + Util.AddClick(this.btnList[i],function() + if curPage ~= i then + this:Refresh(i) + end + end) + end +end + + +-- tab节点显示自定义 +function this.TabAdapter(tab, index, status) + local tabLab = Util.GetGameObject(tab, "Text") + Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status]) + tabLab:GetComponent("Text").text = _TabData[index].name + tabLab:GetComponent("Text").color = _TabFontColor[status] +end +local allHeros={} +--切换视图 +function this.SwitchView(index) + --先执行上一面板关闭逻辑 + --local oldSelect + --oldSelect, curIndex = curIndex, index + -- for i = 1, #this.contents do + -- if oldSelect~=0 then this.contents[oldSelect].view:OnClose() break end + -- end + --切换预设显隐 + -- for i = 1, #this.prefabs do + -- this.prefabs[i].gameObject:SetActive(i == index)--切换子模块预设显隐 + -- end + type=_TabData[index].id + NetManager.UserLikeHeroRankRequest(type,function(msg1) + if msg1.heroTid and #msg1.heroTid>0 then + LogError("msg1.heroTid len=="..#msg1.heroTid) + curZanId=msg1.heroTid[1] + else + curZanId=0 + end + + NetManager.RequestRankInfo(RANK_TYPE.HotHero,function(msg) + LogError("发送请求--------------"..index.." id==".._TabData[index].id) + allHeros={} + local ids={} + for i = 1, #msg.ranks do + local heroId=msg.ranks[i].rankInfo.param1 + --LogError("i=="..i.." heroid=="..heroId) + table.insert(ids,heroId) + table.insert(allHeros,{id=heroId,power=msg.ranks[i].rankInfo.param2,pro=heroConfig[heroId].PropertyName}) + end + for i = 1, #fiveHero do + if not BattleUtil.ChecklistIsContainValue(ids,fiveHero[i]) then + --LogError("fiveHero[i]=="..fiveHero[i]) + table.insert(allHeros,{id=fiveHero[i],power=0,pro=heroConfig[fiveHero[i]].PropertyName}) + end + end + --this:ShowHeroList(0) + this:Refresh(1) + end,_TabData[index].id,1,1) + end) + + --执行子模块初始化 + -- this.contents[index].view:OnShow(this) +end +local list={} +function this:ShowHeroList(_pro) + if not allHeros then + return + end + list={} + if _pro==0 then + list=allHeros + else + for key, value in pairs(allHeros) do + if value.pro==_pro then + table.insert(list,value) + end + end + end + this.ScrollView:SetData(list, function(index, go) + this.SingleHeroDataShow(go,list[index],index) + end) +end + + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent,_args) + + if this.TabCtrl then + this.TabCtrl:ChangeTab(1) + end + this.titleText.text = "神将热榜" + + parent=_parent + sortingOrder =_parent.sortingOrder + if newHeroId~=0 then + this.newObj:SetActive(true) + local newHeroConfig=heroConfig[newHeroId] + this.des1.text=newHeroConfig.HeroLocation + this.des2.text=newHeroConfig.HeroLocationDesc1 + this.newPro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(newHeroConfig.PropertyName)) + this.newName.text = newHeroConfig.ReadingName + this.newIcon.sprite = this.spLoader:LoadSprite(artResourcesConfig[newHeroConfig.Icon].Name) + this.hint.text="即将上线,敬请期待" + Util.AddOnceClick(this.newIcon.gameObject,function() + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, newHeroConfig.Id, newHeroConfig.MaxRank) + end) + end + +end +function this:Refresh(_page) + curPage = _page + LogError("curpage=="..curPage) + currPro=curPage-1 + this.light.transform:SetParent(this.btnList[_page].transform) + this.light.transform.localPosition = Vector3.zero + this.light.transform.localScale = Vector3.one + this:ShowHeroList(currPro) + +end + +--英雄单个数据展示 +function this.SingleHeroDataShow(go,_heroData,_index) + local heroData = _heroData + local config=heroConfig[heroData.id] + --LogError("herodata id=="..heroData.id) + local _go = go + -- _go.gameObject:SetActive(true) + -- local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image") + local name = Util.GetGameObject(_go.transform, "Name"):GetComponent("Text") + local icon = Util.GetGameObject(_go.transform, "hero"):GetComponent("Image") + local rankImg=Util.GetGameObject(_go.transform, "rankImg"):GetComponent("Image") + local rank=Util.GetGameObject(_go.transform, "rank"):GetComponent("Text") + local proIcon = Util.GetGameObject(_go.transform, "pro"):GetComponent("Image") + local desc=Util.GetGameObject(_go.transform, "Desc"):GetComponent("Text") + desc.text=config.HeroLocation + local desc2=Util.GetGameObject(_go.transform, "Desc2"):GetComponent("Text") + local hot=Util.GetGameObject(_go.transform, "hot") + hot:SetActive(false) + local btn_zan=Util.GetGameObject(_go.transform, "btn_zan") + local numTxt=Util.GetGameObject(_go.transform, "numTxt"):GetComponent("Text") + numTxt.text=PrintWanNum(heroData.power) + desc2.text=config.HeroLocationDesc1 + proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(config.PropertyName)) + name.text = config.ReadingName + icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[config.Icon].Name) + if _index<4 then + rankImg.sprite=this.spLoader:LoadSprite("r_Dungeon_00".._index) + rank.gameObject:SetActive(false) + else + rankImg.sprite=this.spLoader:LoadSprite("r_hero_zhuangbeidi") + rank.gameObject:SetActive(true) + end + rank.text=_index + + Util.SetGray(btn_zan,curZanId~=0) + Util.AddOnceClick(icon.gameObject, function() + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, config.Id, config.MaxRank) + --UIManager.OpenPanel(UIName.RoleInfoPopup, false, heroData) + end) + + Util.AddOnceClick(btn_zan, function() + if curZanId~=0 then + return + end + NetManager.LikeHeroRankRequest(type,heroData.id,function() + heroData.power=heroData.power+1 + numTxt.text=PrintWanNum(heroData.power) + curZanId=heroData.id + this.ScrollView:SetData(list, function(index, go) + this.SingleHeroDataShow(go,list[index],index) + end) + this.ScrollView:SetIndex(_index) + end) + end) +end + + +function this:OnClose() + curZanId=0 + heros=nil + +end + +function this:OnDestroy() + this.spLoader:Destroy() + this.choosedList = {} + this.btnList = {} + _TabData={} + fiveHero={} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua.meta new file mode 100644 index 0000000000..47b2f1bb26 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8c10ef69290be64b9c133b1a63647b7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: