From cecf89dc70808735321bb845fa898fa7dbab62dc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Thu, 6 Jul 2023 15:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=8B=9B=E5=8B=9F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 167 +++++++++++++----- .../View/GeneralBigPopup_WishEquipDraw.lua | 9 +- .../Modules/Recruit/HeroPreviewNewPanel.lua | 42 ++--- .../~Lua/Modules/Recruit/RecruitManager.lua | 2 +- 4 files changed, 153 insertions(+), 67 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 0a6cb29a09..cfea0a838f 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -13209,6 +13209,7 @@ RectTransform: - {fileID: 5793828240706962153} - {fileID: 688799785851715064} - {fileID: 3029319918031989597} + - {fileID: 1334765576008760127} m_Father: {fileID: 1485510886863199599} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16655,10 +16656,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} 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: 111, y: -39} - m_SizeDelta: {x: 182, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8901599938845851609 CanvasRenderer: @@ -18248,7 +18249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6207233311855498205 RectTransform: m_ObjectHideFlags: 0 @@ -22254,10 +22255,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} 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: 524, y: -50} - m_SizeDelta: {x: 88, 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 &7938110807914979896 CanvasRenderer: @@ -29402,10 +29403,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} 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: 692, y: -50} - m_SizeDelta: {x: 88, 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 &9123156298422617933 CanvasRenderer: @@ -29520,10 +29521,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} 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: 356, y: -50} - m_SizeDelta: {x: 88, 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 &3360686523141670100 CanvasRenderer: @@ -30781,10 +30782,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} 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: 188, y: -50} - m_SizeDelta: {x: 88, 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 &2874496421868159407 CanvasRenderer: @@ -31575,9 +31576,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} 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: 116.66667, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6665704931721194040 @@ -34113,9 +34114,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} 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: 583.3334, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &977875292258055025 @@ -37100,6 +37101,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6004426462806792890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1334765576008760127} + - component: {fileID: 4853978035179852181} + - component: {fileID: 1478459038207916293} + m_Layer: 5 + m_Name: heroName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1334765576008760127 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6004426462806792890} + 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: 0} + m_Children: [] + m_Father: {fileID: 5186505839805660594} + m_RootOrder: 6 + 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: -90.8} + m_SizeDelta: {x: 64.4, y: 37.51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4853978035179852181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6004426462806792890} + m_CullTransparentMesh: 0 +--- !u!114 &1478459038207916293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6004426462806792890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92941177, g: 0.7137255, b: 0.29803923, a: 1} + m_RaycastTarget: 0 + 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 27 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5B59\u609F\u7A7A" + LanguageIndex: 0 --- !u!1 &6024979662384741555 GameObject: m_ObjectHideFlags: 0 @@ -39729,7 +39810,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: -93} + m_AnchoredPosition: {x: 0, y: -115.3} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8882210015230521761 @@ -40976,9 +41057,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} 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: 350, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773993077155745798 @@ -41976,10 +42057,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} 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: 525, y: -39} - m_SizeDelta: {x: 646, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164081279567279265 CanvasRenderer: @@ -43133,9 +43214,9 @@ RectTransform: m_Father: {fileID: 2428012996653233923} 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: 282, y: -35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8675641990459156184 @@ -47199,7 +47280,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: -808, y: 46} + m_AnchoredPosition: {x: -955, y: 46} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1922244613149749003 @@ -52248,10 +52329,10 @@ RectTransform: m_Father: {fileID: 2428012996653233923} 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: 151, y: -35} - m_SizeDelta: {x: 262, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6340918513921812379 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua index fcfe734300..f6ba8be84f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua @@ -15,7 +15,7 @@ function this:InitComponent(gameObject) local width = self.scroll.transform.rect.width self.infoTxt=Util.GetGameObject(gameObject,"Bg/tiao1/Text (1)"):GetComponent("Text") self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform, - self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(20, 45)) + self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(20, 60)) self.scrollView.moveTween.MomentumAmount = 1 self.scrollView.moveTween.Strength = 2 @@ -169,13 +169,15 @@ function this:SetHeroList(isTop,isAni) end function this:ShowSingleHero(go,data,index) - local heroData = itemConfig[data] + local equipId=heroConfig[data].EquipTalismana[2] + local heroData = itemConfig[equipId] self.itemList[self.curSelect][index] = go Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Quantity)) Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.ResourceID)) --Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) Util.GetGameObject(go, "proIcon"):SetActive(false) Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.Name + Util.GetGameObject(go, "heroName"):GetComponent("Text").text=heroConfig[data].ReadingName local starGrid = Util.GetGameObject(go, "star") -- SetHeroStars(self.spLoader,starGrid, heroData.Star) self.maskList[self.curSelect][index] = Util.GetGameObject(go, "choosed") @@ -213,7 +215,8 @@ function this:ShowSingleHero(go,data,index) end) end Util.AddLongPressClick(go,function () - UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, data, 5) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, heroData.Id) + --UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, data, 5) end,0.5) end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua index a231e12c68..80b020fcd6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua @@ -8,8 +8,9 @@ local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) --Tab local TabBox = require("Modules/Common/TabBox") local _TabData={[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10536] }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11707] }, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10306] }} + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "法宝" }, + --[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10306] } + } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} --上一模块索引 @@ -179,23 +180,24 @@ function this.SwitchView(index) local sixData={} local sevenData={} for index, v in ipairs(RecruitManager.GetRewardPreviewData(dataType[curIndex])) do - if curIndex==2 then - if itemConfig[v.Reward[1]].Quantity==1 then - table.insert(oneData,v) - elseif itemConfig[v.Reward[1]].Quantity==2 then - table.insert(twoData,v) - elseif itemConfig[v.Reward[1]].Quantity==3 then - table.insert(threeData,v) - elseif itemConfig[v.Reward[1]].Quantity==4 then - table.insert(fourData,v) - elseif itemConfig[v.Reward[1]].Quantity==5 then - table.insert(fiveData,v) - elseif itemConfig[v.Reward[1]].Quantity==6 then - table.insert(sixData,v) - elseif itemConfig[v.Reward[1]].Quantity==7 then - table.insert(sevenData,v) - end - else + -- if curIndex==2 then + -- LogError("v.v.Reward[1].quan=="..v.Quality) + -- if v.Quality==1 then + -- table.insert(oneData,v) + -- elseif v.Quality==2 then + -- table.insert(twoData,v) + -- elseif v.Quality==3 then + -- table.insert(threeData,v) + -- elseif v.Quality==4 then + -- table.insert(fourData,v) + -- elseif v.Quality==5 then + -- table.insert(fiveData,v) + -- elseif v.Quality==6 then + -- table.insert(sixData,v) + -- elseif v.Quality==7 then + -- table.insert(sevenData,v) + -- end + -- else if itemConfig[v.Reward[1]].HeroQuantity==1 then table.insert(oneData,v) elseif itemConfig[v.Reward[1]].HeroQuantity==2 then @@ -211,7 +213,7 @@ function this.SwitchView(index) elseif itemConfig[v.Reward[1]].HeroQuantity==7 then table.insert(sevenData,v) end - end + --end end if index == 3 then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 447939aebb..bdb08711b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -598,7 +598,7 @@ function this.GetCurHeroTalismanaList(curIndex) and time > heroConfig[v.Reward[1]].JoinWishDay and HeroManager.InVersion(v.Reward[1]) -- 判断神将是否加入版本 then - table.insert(heroList,heroConfig[v.Reward[1]].EquipTalismana[2]) + table.insert(heroList,v.Reward[1]) end end return heroList