From f18880622e9333da357c1f158d1a72def86d55f3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 9 Nov 2021 17:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=C2=B7=E9=AD=82=E7=81=B5?= =?UTF-8?q?=E5=AE=9D=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardEquipSingleShowPopup2.prefab | 14 +- .../RewardTalismanSingleShowPopup2.prefab | 203 ++++++++++++++++-- .../~Lua/Modules/Bag/BagPanel.lua | 5 +- .../Popup/RewardTalismanSingleShowPopup2.lua | 131 +++++++++-- .../~Lua/Modules/Popup/RoleInfoPopup.lua | 3 +- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 9 +- 6 files changed, 319 insertions(+), 46 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab index 4d81490aea..e694e2f72e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab @@ -224,7 +224,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 20 + m_Bottom: 0 m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 @@ -639,7 +639,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 30 m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -2697,8 +2697,8 @@ RectTransform: m_Father: {fileID: 6594472603124481167} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 442.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} @@ -3012,9 +3012,9 @@ RectTransform: m_Father: {fileID: 5981932543035177726} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 460, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 460, y: -385} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5201084322800259043 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab index a56d23dd48..bd8fc6313d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab @@ -32,6 +32,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6309988179621275829} + - {fileID: 2943323019176369767} m_Father: {fileID: 1010245359547345673} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -847,7 +848,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 925, y: 200} + m_SizeDelta: {x: 925, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &947196721163537717 MonoBehaviour: @@ -864,7 +865,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 70 m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: 0 @@ -1613,7 +1614,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 30 m_ChildAlignment: 1 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -1789,7 +1790,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 20 + m_Bottom: 0 m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 @@ -1797,6 +1798,80 @@ MonoBehaviour: m_Spacing: {x: 40, y: 0} m_Constraint: 0 m_ConstraintCount: 1 +--- !u!1 &3144276962258623337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2943323019176369767} + - component: {fileID: 4006395159395324770} + - component: {fileID: 6911222919104936668} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2943323019176369767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144276962258623337} + 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: 1599797043945116798} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4006395159395324770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144276962258623337} + m_CullTransparentMesh: 0 +--- !u!114 &6911222919104936668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144276962258623337} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &3403868580219706264 GameObject: m_ObjectHideFlags: 0 @@ -2327,6 +2402,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7159385356827199391} + - {fileID: 2906090485422011319} m_Father: {fileID: 1010245359547345673} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2469,8 +2545,8 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 912.8, y: 130} - m_Pivot: {x: 0.5, y: 1} + m_SizeDelta: {x: 924, y: 530} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7362701906403983055 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4050,6 +4126,7 @@ GameObject: - component: {fileID: 3818926394599610717} - component: {fileID: 7538924608705574010} - component: {fileID: 5910199899076126610} + - component: {fileID: 3835266503832035902} m_Layer: 5 m_Name: way m_TagString: Untagged @@ -4072,9 +4149,9 @@ RectTransform: m_Father: {fileID: 536955465069247768} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 462.5, y: -35} m_SizeDelta: {x: 911.109, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7538924608705574010 @@ -4114,6 +4191,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &3835266503832035902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6595189249871214395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6882669673046456913 GameObject: m_ObjectHideFlags: 0 @@ -4172,7 +4269,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4251,7 +4348,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4410,7 +4507,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4470,7 +4567,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00005393355} + m_AnchoredPosition: {x: 0, y: -0.000013638759} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &22196219189311584 @@ -4510,6 +4607,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 1 +--- !u!1 &7128502974740987248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2906090485422011319} + - component: {fileID: 3631761058427521969} + - component: {fileID: 6376177277757071040} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2906090485422011319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7128502974740987248} + 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: 8824000577553895258} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3631761058427521969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7128502974740987248} + m_CullTransparentMesh: 0 +--- !u!114 &6376177277757071040 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7128502974740987248} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7140120539858836794 GameObject: m_ObjectHideFlags: 0 @@ -5158,7 +5329,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 30, y: 0} + m_AnchoredPosition: {x: 55, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &716734368547964724 @@ -5188,7 +5359,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 50 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -5566,7 +5737,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index cc052e6ce0..879cc434be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -495,7 +495,10 @@ function this.SingleItemDataShow(_go, _itemData) end elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.EquipTreasure then --宝器 - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function() + -- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function() + -- this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true) + -- end) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,1,true,true,nil,nil,nil,function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true) end) elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.SoulPrint then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index 780ad1b9e1..494b78911a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -2,8 +2,11 @@ require("Base/BasePanel") local RewardTalismanSingleShowPopup2 = Inherit(BasePanel) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) +local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig) +local isGongMing = false local typeToUpdate = { + -- [1] = 3,--已穿戴->卸载单件 [2] = 2,--已穿戴->卸载单件 [3] = 1,--未穿戴->穿单件 [4] = 3,--未穿戴->替换单件 @@ -26,6 +29,7 @@ function RewardTalismanSingleShowPopup2:InitComponent() self.powerNum=Util.GetGameObject(self.topBar, "powerNum"):GetComponent("Text") --装备属性--midBar + self.mid = Util.GetGameObject(self.transform, "Content/midBar") self.midBar = Util.GetGameObject(self.transform, "Content/midBar/Grid") --baseAttri self.baseAttri = Util.GetGameObject(self.midBar, "baseAttri") @@ -40,8 +44,9 @@ function RewardTalismanSingleShowPopup2:InitComponent() self.refineName = Util.GetGameObject(self.refineAttri, "refineName/attriName"):GetComponent("Text") self.refineLevel = Util.GetGameObject(self.refineAttri, "refineName/attriNum"):GetComponent("Text") self.refineGrid = Util.GetGameObject(self.refineAttri, "grid") - self.refineMasterName = Util.GetGameObject(self.refineAttri, "refineMaster/attriName"):GetComponent("Text") - self.refineMasterGrid = Util.GetGameObject(self.refineAttri, "gridMaster") + self.refineMaster = Util.GetGameObject(self.midBar, "refineMasterAttri") + self.refineMasterName = Util.GetGameObject(self.refineMaster, "refineMaster/attriName"):GetComponent("Text") + self.refineMasterGrid = Util.GetGameObject(self.refineMaster, "gridMaster") --treeAttri self.treeAttri = Util.GetGameObject(self.midBar, "treeAttri") self.treeName = Util.GetGameObject(self.treeAttri, "treeName/attriName"):GetComponent("Text") @@ -59,6 +64,8 @@ function RewardTalismanSingleShowPopup2:InitComponent() self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch") self.btnUpgrade = Util.GetGameObject(self.btnGrid, "btnUpgrade") self.btnUpstar = Util.GetGameObject(self.btnGrid, "btnUpstar") + self.upgradeRed = Util.GetGameObject(self.btnUpgrade, "red") + self.upstarRed = Util.GetGameObject(self.btnUpstar, "red") --装备获取途径--btmBar self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre") self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll") @@ -74,8 +81,10 @@ function RewardTalismanSingleShowPopup2:InitComponent() self.BaseAttriList = {}--基础属性对象 self.RefineAttriList = {}--精炼属性对象 - self.treeAttriList = {}--神应属性对象 - self.treeAttriList2 = {}--神应属性对象2 + self.TreeAttriList = {}--神应属性对象 + self.TreeAttriList2 = {}--神应属性对象2 + self.BaseMasterList = {}--强化大师 + self.RefineMasterList = {}--精炼大师 end --绑定事件(用于子类重写) @@ -95,23 +104,78 @@ function RewardTalismanSingleShowPopup2:BindEvent() end) --穿戴 Util.AddClick(self.btnWear, function() + local config=spcialConfig[40] + if config then + local limits = string.split(config.Value, "|") + if limits then + local heroConfig=ConfigManager.GetConfigData(ConfigName.HeroConfig,self.curHeroData.id) + local lvs=string.split(limits[1],"#") + local stars=string.split(limits[2],"#") + local lv=tonumber(lvs[2]) + if PlayerManager.level