From 142956ca6ac91b39c7ba59be38cf1b7d7934a24c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 5 Nov 2021 16:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E3=80=91=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page14.prefab | 148 +++++++++++++++--- .../~Lua/Common/functions.lua | 2 +- .../Popup/RewardEquipSingleShowPopup2.lua | 59 +++++-- .../Modules/RoleInfo/RoleEquipChangePopup.lua | 4 +- .../ManagedResources/~Lua/View/ItemView.lua | 2 +- 5 files changed, 174 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab index 232b819e5a..7a4f586eea 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab @@ -2251,6 +2251,7 @@ GameObject: - component: {fileID: 536416954957209500} - component: {fileID: 8484350655529497226} - component: {fileID: 8299872936883894912} + - component: {fileID: 6892480146084945424} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -2332,7 +2333,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 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} @@ -2350,12 +2351,31 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 2814387352704514925} + m_TargetGraphic: {fileID: 8484350655529497226} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &6892480146084945424 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607868955093274827} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &2624568799117268437 GameObject: m_ObjectHideFlags: 0 @@ -4387,6 +4407,7 @@ GameObject: - component: {fileID: 2301194970848858043} - component: {fileID: 1607926104100010689} - component: {fileID: 6450201803617199459} + - component: {fileID: 3201590447526276804} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -4468,7 +4489,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 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} @@ -4486,12 +4507,31 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 2814387352704514925} + m_TargetGraphic: {fileID: 1607926104100010689} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &3201590447526276804 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4419268852024028867} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &4422358821283067026 GameObject: m_ObjectHideFlags: 0 @@ -5305,6 +5345,7 @@ GameObject: - component: {fileID: 7209294530025527452} - component: {fileID: 4904941686599514872} - component: {fileID: 2387597702530308170} + - component: {fileID: 6716575243991008492} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -5386,7 +5427,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 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} @@ -5404,12 +5445,31 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 2814387352704514925} + m_TargetGraphic: {fileID: 4904941686599514872} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &6716575243991008492 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5590353601829272693} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5649169632290935247 GameObject: m_ObjectHideFlags: 0 @@ -5696,6 +5756,7 @@ GameObject: - component: {fileID: 9188653184634836637} - component: {fileID: 4753984475428844237} - component: {fileID: 7428351106517305304} + - component: {fileID: 6721380333103638322} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -5777,7 +5838,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 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} @@ -5795,12 +5856,31 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 2814387352704514925} + m_TargetGraphic: {fileID: 4753984475428844237} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &6721380333103638322 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930410925864295149} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5978915409478269495 GameObject: m_ObjectHideFlags: 0 @@ -6951,6 +7031,7 @@ GameObject: - component: {fileID: 13421219839169261} - component: {fileID: 2814387352704514925} - component: {fileID: 18626032154856209} + - component: {fileID: 3781776857907758928} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -7032,7 +7113,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 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} @@ -7056,6 +7137,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &3781776857907758928 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7030344685759189580} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7081833197688038501 GameObject: m_ObjectHideFlags: 0 @@ -9641,6 +9741,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: + - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit01 + objectReference: {fileID: 0} - target: {fileID: 1934794854557949801, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} propertyPath: m_LocalPosition.x @@ -9696,11 +9801,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit01 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} --- !u!4 &2487093841126313949 stripped @@ -9716,6 +9816,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: + - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit02 + objectReference: {fileID: 0} - target: {fileID: 5538650172890135995, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} propertyPath: m_LocalPosition.x @@ -9771,11 +9876,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit02 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} --- !u!4 &1934620330201386658 stripped @@ -9791,6 +9891,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8706985993115206498} m_Modifications: + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} propertyPath: m_LocalPosition.x @@ -9896,11 +10001,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, - type: 3} - propertyPath: m_Name - value: Fx_Circle 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} --- !u!224 &7044522832318906514 stripped diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 49931dadc3..ad1d596b4b 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2102,7 +2102,7 @@ function GetCutOutStr(_str,_num) return "" end local str="" - if LengthString(_str) > _num + 1 then + if LengthString(_str) >= _num + 1 then str=SubString(_str,_num) .. "..." else str = _str diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index 5bf5294cb4..92a153ba23 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -1,9 +1,6 @@ require("Base/BasePanel") local RewardEquipSingleShowPopup2 = Inherit(BasePanel) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) -local equipData -local func -local isRewardItemPop local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig) local _BaseProList = {}--基础属性对象 @@ -67,6 +64,37 @@ function RewardEquipSingleShowPopup2:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) + --使用 + Util.AddClick(self.btnJump, function() + if self.equipData.itemConfig then + JumpManager.GoJump(self.equipData.itemConfig.UseJump) + end + end) + --分解 + Util.AddClick(self.btnSure, function() + --数量大于1 ,弹选择框 + if BagManager.GetItemCountById(self.equipData.id) > 1 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipSingleSell,self.equipData) + self:ClosePanel() + elseif BagManager.GetItemCountById(self.equipData.id) == 1 then + --只有一个,分解品质大于4, 弹框 + if self.equipData.itemConfig.Quantity>=4 then + UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel,2,self.equipData.itemConfig.ItemBaseType,self.equipData) + else + local curResolveAllItemList={} + local equip = {} + equip.itemId = self.equipData.id + equip.itemNum = 1 + table.insert(curResolveAllItemList,equip) + local type = 1 + NetManager.UseAndPriceItemRequest(type,curResolveAllItemList,function (drop) + self.SendBackResolveReCallBack(drop) + end) + end + else + PopupTipPanel.ShowTip(Language[11506]) + end + end) end --添加事件监听(用于子类重写) @@ -80,20 +108,21 @@ function RewardEquipSingleShowPopup2:RemoveListener() end --界面打开时调用(用于子类重写) -function RewardEquipSingleShowPopup2:OnOpen(_equipData, _func,_isRewardItemPop,_isShowfenjie) +function RewardEquipSingleShowPopup2:OnOpen(_equipData,_openType,_isRewardItemPop,_curHeroData) if not _equipData then return end - equipData = _equipData - func = _func - isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false + self.equipData = _equipData + self.openType = _openType + self.isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false + self.curHeroData = _curHeroData end function RewardEquipSingleShowPopup2:OnShow() --上部装备基础信息 - LogBlue(equipData.id) - local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(equipData.id)) - local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(equipData.id)) + LogBlue(self.equipData.id) + local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id)) + local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id)) self.btnSure:SetActive(itemConfigData.IfResolve==1) self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfigData.Quality) self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality)) @@ -101,7 +130,7 @@ function RewardEquipSingleShowPopup2:OnShow() self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(equipConfigData.Quality)) self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfigData.ResourceID)) self.equipInfoText.text=GetLanguageStrById(itemConfigData.ItemDescribe) - self.powerNum.text=EquipManager.CalculateWarForce(equipData.id) + self.powerNum.text=EquipManager.CalculateWarForce(self.equipData.id) EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id) self.equipType.text=Language[11089]..GetEquipPosStrByEquipPosNum(equipConfigData.Position) --下部按钮信息 @@ -133,6 +162,10 @@ function RewardEquipSingleShowPopup2:OnShow() end --suitPro套装属性 + if self.curHeroData then + -- body + end + local equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList) local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig) if suitConFig[equipConfigData.Star] then self.suitPro:SetActive(true) @@ -193,12 +226,12 @@ function RewardEquipSingleShowPopup2:OnShow() SubUIManager.Close(self.jumpViewList[i]) end end - local curitemData = itemConfig[tonumber(equipData.id)] + local curitemData = itemConfig[tonumber(self.equipData.id)] if curitemData and curitemData.Jump then if curitemData.Jump and #curitemData.Jump>0 then self.canGetScrollView:SetData(curitemData.Jump,function (index, item) local tempView = nil - if isRewardItemPop then + if self.isRewardItemPop then tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false) else tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 4f8e25ccd8..b62b42e966 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -135,7 +135,7 @@ function RoleEquipChangePopup:OnOpen(...) local data={...} openThisPanel=data[1] type=data[2]--1 穿戴 2 卸下 3 替换 - + LogRed("OpenType:"..tostring(type)) if type==1 or type==2 then curHeroData=data[3] curEquipData=data[4] @@ -304,7 +304,7 @@ function this.ShowCurEquipData(index) local proVa = endProList[i][2][3] local suitNum = endProList[i][2][1] local Star = endProList[i][1] - + LogGreen("#equipSuit:"..tostring(#equipSuit)) if type ~= 1 and #equipSuit > 0 then--激活的要变颜色 Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. GetLanguageStrById(propertyConfig[proId].Info) .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "(" .. GetEquipSuitStr(Star,suitNum) .. ")" diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 8304db878c..b6fbc3d58f 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -132,7 +132,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.iconGo:SetActive(true) self.circleFrameBg:SetActive(false) - self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),5) + self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),4) Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu) Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)