From 859bd6679ef1d5f47d93851acd16c9166dc8a2f5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 1 Jun 2021 19:47:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B010=E8=BF=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BA=A2=E7=82=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagManager.lua | 1 + .../~Lua/Modules/Player/RedpotManager.lua | 6 +- .../~Lua/Modules/Recruit/RecruitManager.lua | 57 ++++++++++++++++++- .../~Lua/Modules/Recruit/RecruitPanel.lua | 8 ++- 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index c7ef08a9d7..f2613574b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -101,6 +101,7 @@ function this.BackDataRefreshEnerny(msgItemInfo) end end Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) + CheckRedPointStatus(RedPointType.Recruit_Normal) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index e663b719ac..c4fae8c2ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -186,7 +186,7 @@ function this.InitRedPointAllRelate() --秘盒红点 RPData:SetParent(RedPointType.SecretBox_Red1, RedPointType.SecretBox) --角色招募红点 - RPData:SetParent(RedPointType.Recruit_Red, RedPointType.Recruit) + -- RPData:SetParent(RedPointType.Recruit_Red, RedPointType.Recruit) --普通召唤红点 RPData:SetParent(RedPointType.Recruit_Normal, RedPointType.Recruit) -- --运营红点 @@ -383,9 +383,9 @@ function this.RegisterRedCheckFunc() --秘盒红点 RPData:AddCheckFunc(RedPointType.SecretBox_Red1, SecretBoxManager.CheckSecretRedPoint,FUNCTION_OPEN_TYPE.SECRETBOX) --角色招募红点 - RPData:AddCheckFunc(RedPointType.Recruit_Red, RecruitManager.CheckRecuritRedPoint,FUNCTION_OPEN_TYPE.RECURITY) + -- RPData:AddCheckFunc(RedPointType.Recruit_Red, RecruitManager.CheckRecuritRedPoint,FUNCTION_OPEN_TYPE.RECURITY) --普通召唤红点 - RPData:AddCheckFunc(RedPointType.Recruit_Normal, RecruitManager.CheckRecuritNormalPoint,FUNCTION_OPEN_TYPE.RECURITY) + RPData:AddCheckFunc(RedPointType.Recruit_Normal, RecruitManager.GetAllRecruitBtnRedpoint)--RecruitManager.CheckRecuritNormalPoint,FUNCTION_OPEN_TYPE.RECURITY) --七日狂欢红点 RPData:AddCheckFunc(RedPointType.SevenDayCarnival, SevenDayCarnivalManager.GetSevenDayCarnivalRedPoint) --每日首充 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 9a3a6a900e..bf7c412e14 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -46,13 +46,13 @@ function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum) if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1) this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId) - CheckRedPointStatus(RedPointType.Recruit_Red) - CheckRedPointStatus(RedPointType.Recruit_Normal) + -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.TimeLimited) CheckRedPointStatus(RedPointType.QianKunBox) CheckRedPointStatus(RedPointType.Pokemon_Recruit) end end + CheckRedPointStatus(RedPointType.Recruit_Normal) if func then func(msg) end @@ -68,7 +68,7 @@ function this.RefreshFreeTime() this.freeUseTimeList[99] = PrivilegeManager.GetPrivilegeRemainValue(99) this.freeUseTimeList[2005] = PrivilegeManager.GetPrivilegeRemainValue(2005) if (ActTimeCtrlManager.SingleFuncState(1)) then - CheckRedPointStatus(RedPointType.Recruit_Red) + -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.Recruit_Normal) CheckRedPointStatus(RedPointType.TimeLimited) CheckRedPointStatus(RedPointType.QianKunBox) @@ -358,6 +358,57 @@ function this.GetExpendDataByCostItem(str,type,LimitNum) return cost end +--抽卡类型 +local rType={ + Normal=1,--普通 + Friend=2,--友情 + Hero=3--神将 +} +--按钮类型 +local bType={ + Btn1=1, + Btn10=2 +} +--抽卡配置 +local preConfigure={ + [1] = {type=RecruitType.NormalSingle,privilegeId=38}, + [2] = {type=RecruitType.NormalTen,privilegeId=38}, + [3] = {type=RecruitType.FriendSingle}, + [4] = {type=RecruitType.FriendTen}, + [5] = {type=RecruitType.Single,privilegeId=14}, + [6] = {type=RecruitType.Ten,privilegeId=14} +} +--点将台红点状态 +function this.GetAllRecruitBtnRedpoint() + for i = 1, #preConfigure do + local redPoint = false + if preConfigure[i].privilegeId then + redPoint = this.GetRecruitBtnRedpoint(preConfigure[i].type,preConfigure[i].privilegeId) + else + redPoint = this.GetRecruitBtnRedpoint(preConfigure[i].type) + end + if redPoint then + return true + end + end + return false +end +--点将台六个按钮各自红点状态 +function this.GetRecruitBtnRedpoint(recruitType,privilegeId)--privilegeId 单抽免费特权次数 + if recruitType == RecruitType.NormalSingle or recruitType == RecruitType.Single then--普通召唤单抽 神将召唤单抽 + if privilegeId then + return PrivilegeManager.GetPrivilegeRemainValue(privilegeId) >= 1 + end + elseif recruitType == RecruitType.FriendTen or recruitType == RecruitType.NormalTen or recruitType == RecruitType.Ten then--所有召唤十连 + local data = RecruitManager.GetExpendData(recruitType) + local itemId = data[1] + local itemNum = data[2] + if BagManager.GetItemCountById(itemId) >= itemNum then + return true + end + end + return false +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 6e31ca29ae..3e25387bad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -182,7 +182,13 @@ function this.UpdatePanelData() local itemId=0 local itemNum=0 local d=RecruitManager.GetExpendData(m.type) - redPot:SetActive(isFree) + local redPoint = false + if v.privilegeId then + redPoint = RecruitManager.GetRecruitBtnRedpoint(m.type,v.privilegeId) + else + redPoint = RecruitManager.GetRecruitBtnRedpoint(m.type) + end + redPot:SetActive(redPoint) if isFree then --若1按钮有免费次数 后面逻辑不走了 info.text=Language[10489] else From 681b3b63bb591dadb66bc4e2fae13a64a73dedcb Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 1 Jun 2021 20:02:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E7=89=B9=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 3 +++ .../~Lua/Modules/DynamicActivity/LingShowTeHui.lua | 3 +++ .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 3 +++ .../~Lua/Modules/DynamicActivity/SheJiDaDian.lua | 3 +++ .../~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua | 3 +++ .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 3 +++ .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 3 +++ .../~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua | 3 +++ .../~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua | 3 +++ .../~Lua/Modules/DynamicActivity/YiJingBaoKu.lua | 3 +++ .../~Lua/Modules/NewActivity/CommonActPage.lua | 3 +++ .../~Lua/Modules/NewActivity/ConRechargePage.lua | 3 +++ .../~Lua/Modules/NewActivity/ExChangePage.lua | 3 +++ .../ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua | 3 +++ .../~Lua/Modules/Operating/CumulativeSignInPage.lua | 3 +++ .../~Lua/Modules/Operating/GrowthGiftPage.lua | 3 +++ .../~Lua/Modules/Operating/MonthCardPage.lua | 3 +++ .../~Lua/Modules/Operating/UppperMonthCard.lua | 3 +++ .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 5 +++++ .../~Lua/Modules/Recharge/View/RechargeView.lua | 3 +++ Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 3 ++- 22 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 2abd404216..55107e1a9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -145,6 +145,9 @@ end function this:OnSortingOrderChange() orginLayer = self.sortingOrder + for k,v in pairs(subViewList) do + v.sub:OnSortingOrderChange(self.sortingOrder) + end end ----==========================一级页签相关=========================================== -- tab按钮自定义显示设置 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index fe1448fafa..ab34aa03cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -90,6 +90,9 @@ function LingShouBaoGe:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function LingShouBaoGe:OnSortingOrderChange() +end + function LingShouBaoGe:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index e948a5db9c..a5502cfaf7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -54,6 +54,9 @@ function LingShowTeHui:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function LingShowTeHui:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function LingShowTeHui:OnShow(_sortingOrder,_parent) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index ddff2dc202..4a733188e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -85,6 +85,9 @@ function QianKunBox:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function QianKunBox:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function QianKunBox:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua index 1db7f3eb71..aeed2a1818 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua @@ -182,6 +182,9 @@ function SheJiDaDian:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function SheJiDaDian:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function SheJiDaDian:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index b4c43f8b0f..c71d96fe8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -66,6 +66,9 @@ function ShengYiTianJiang:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function ShengYiTianJiang:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ShengYiTianJiang:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 67da1ba79f..0f943f571a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -120,6 +120,9 @@ function TimeLimitUpHero:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function TimeLimitUpHero:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function TimeLimitUpHero:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 97315603bc..b8d3980e68 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -90,6 +90,9 @@ function TimeLimitedCall:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function TimeLimitedCall:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function TimeLimitedCall:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 8f0ea20255..35744e559e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -82,6 +82,9 @@ function XiangYaoDuoBao:BindEvent() end) end +function XiangYaoDuoBao:OnSortingOrderChange() +end + function XiangYaoDuoBao:OnShow(_sortingOrder,_parent) local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) if not actId or actId <= 0 then return end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index 66d8637cc6..d98da95fd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -111,6 +111,9 @@ function XinJiangLaiXi:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function XinJiangLaiXi:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function XinJiangLaiXi:OnShow(_sortingOrder,_parent) local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinJiangLaiXi) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 735f2905e9..f00716a114 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -83,6 +83,9 @@ function YiJingBaoKu:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function YiJingBaoKu:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function YiJingBaoKu:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 38e9f0091d..3c6bf0c98d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -61,6 +61,9 @@ function CommonActPage:OnOpen(_activityConfig,_index,parent) PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..self.actConfig.ActiveType,1) end +function CommonActPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function CommonActPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua index 0c1e57ac67..13f80a623c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua @@ -64,6 +64,9 @@ function ConRechargePage:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "ConRechargePage"..self.actConfig.Id end +function ConRechargePage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ConRechargePage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index 57119e7b43..d1856df21d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -71,6 +71,9 @@ function ExChangePage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function ExChangePage:OnSortingOrderChange() +end + --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExChangePage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 104232c6c1..1ec3d6c48c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -59,6 +59,9 @@ function ExpertPage:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "ExpertPage"..self.actConfig.Id end +function ExpertPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function ExpertPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index 2385d79fb1..54b95b8a95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -94,6 +94,9 @@ function CumulativeSignInPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function CumulativeSignInPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function CumulativeSignInPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 67b4de281a..08cdf13dd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -67,6 +67,9 @@ function GrowthGiftPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function GrowthGiftPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function GrowthGiftPage:OnShow(_sortingOrder) VipManager.SetGrowthPackagePointStatus()--成长礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 238d560350..34221b4090 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -81,6 +81,9 @@ function MonthCardPage:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function MonthCardPage:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function MonthCardPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index b83714a2ab..0d605ff232 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -109,6 +109,9 @@ function UpperMonthCard:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function UpperMonthCard:OnSortingOrderChange() +end + -- 打开,重新打开时回调 function UpperMonthCard:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 393431c339..7787db6ef7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -93,6 +93,11 @@ function EveryDayGift:OnOpen(_activityConfig,_index,parent) self.gameObject.name = "EveryDayGift"..self.actConfig.Id end +function EveryDayGift:OnSortingOrderChange(_sortingOrder) + Util.SetParticleSortLayer(self.UI_Effect_jinkuang_Yuan, _sortingOrder+1) + self.sortingOrder = _sortingOrder +end + -- 打开,重新打开时回调 function EveryDayGift:OnShow(_sortingOrder) self.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua index c6e4de4e0a..f51c944de0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua @@ -57,6 +57,9 @@ function RechargeView:OnOpen(_activityConfig,_index,parent) self.parent = parent end +function RechargeView:OnSortingOrderChange() +end + function RechargeView:OnShow(_sortingOrder) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 297bdd11d1..c96d312c6c 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -127,7 +127,8 @@ function ShopViewNew:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Shop.RefreshItem,RefreshData,self) end - +function ShopViewNew:OnSortingOrderChange() +end --界面打开时调用(用于子类重写) function ShopViewNew:OnOpen(_activityConfig,_index,parent) From f9af054ec6d6690370eeee44599c9a592a683e9b Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 1 Jun 2021 20:10:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B010=E8=BF=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BA=A2=E7=82=B9=E6=8F=90=E7=A4=BA=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index f2613574b6..2d844f3ce9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -1098,6 +1098,7 @@ function this.BagIndicationRefresh(msg) --检测背包红点 CheckRedPointStatus(RedPointType.Bag_HeroDebris) CheckRedPointStatus(RedPointType.Bag_BoxAndBlueprint) + CheckRedPointStatus(RedPointType.Recruit_Normal) -- 超出最大数量限制提示 if msg.isMax and msg.isMax == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index bf7c412e14..b72da14913 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -403,7 +403,7 @@ function this.GetRecruitBtnRedpoint(recruitType,privilegeId)--privilegeId 单 local data = RecruitManager.GetExpendData(recruitType) local itemId = data[1] local itemNum = data[2] - if BagManager.GetItemCountById(itemId) >= itemNum then + if itemId ~= 16 and BagManager.GetItemCountById(itemId) >= itemNum then--itemId ~= 16 妖精不算 return true end end From b345d54cbea1a2259d7a097d3954895032351407 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 20:22:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=89=A7=E6=83=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index 5b03c42df1..3c465b458b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -177,7 +177,7 @@ function this.RefreshPanel(eventId, isFirstOpen) local contexts =(contents[2]) --contexts = string.gsub(contexts, "【此处为玩家名】", PlayerManager.nickName) contexts = string.gsub(contexts, Language[11248], NameManager.roleName) - + contexts = string.gsub(contexts, "{ta}", NameManager.roleSex == ROLE_SEX.BOY and "他" or "她") -- 配音资源名 -- local voice = chapterEventPointData[eventId].VoiceRes -- if voice then diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index 4957cf6916..a23005e95b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -512,6 +512,7 @@ function this:ShowDialog() local resId = tonumber(contents[1]) local contexts =(contents[2]) contexts = string.gsub(contexts, Language[11248], NameManager.roleName) + contexts = string.gsub(contexts, "{ta}", NameManager.roleSex == ROLE_SEX.BOY and "他" or "她") --this.diaLogNameText.text = "" ShowText(this.diaLogContent.transform, contexts, 1) this.SetList2d(resId,setId,live2dRoot) From 39bb3d5c06bb6700d81043ad359853d46f804ebe Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 1 Jun 2021 21:13:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=B0=E5=8F=B7=E8=8A=82=E7=82=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/fx_tex_lizhi_mat.mat | 2 +- .../UI_Effect_MianBan_ChengHao_Tslx.prefab | 22 ---- .../Prefabs/UI/Common/PlayerTitle.prefab | 59 ++++++++++ .../Prefabs/UI/Common/PlayerTitle.prefab.meta | 7 ++ Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + .../~Lua/Modules/Login/LoginPanel.lua | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 8 ++ .../~Lua/Modules/Main/View/MainPlayerView.lua | 6 + .../Modules/Setting/SettingPlayerTitle.lua | 79 +++---------- .../~Lua/View/PlayerLiveView.lua | 35 +++--- .../~Lua/View/PlayerTitle.lua | 108 ++++++++++++++++++ .../~Lua/View/PlayerTitle.lua.meta | 7 ++ 12 files changed, 227 insertions(+), 109 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/View/PlayerTitle.lua create mode 100644 Assets/ManagedResources/~Lua/View/PlayerTitle.lua.meta diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat index 6f3ff5d2ca..d09b2c1950 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_tex_lizhi_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fx_tex_lizhi + m_Name: fx_tex_lizhi_mat m_Shader: {fileID: 4800000, guid: cd73b754ea97c04468b1349981704714, type: 3} m_ShaderKeywords: m_LightmapFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab index 3ed7cd2c58..06dc06b00c 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab @@ -453,7 +453,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6361193509961736898} - - component: {fileID: 7146534821247858850} m_Layer: 5 m_Name: UI_Effect_MianBan_ChengHao_Tslx m_TagString: Untagged @@ -488,27 +487,6 @@ RectTransform: m_AnchoredPosition: {x: 7, y: 338} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &7146534821247858850 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4163563969343386189} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &4320119772942752865 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab b/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab new file mode 100644 index 0000000000..703b847799 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7231000919449340602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4032346249059119572} + - component: {fileID: 3204280713171133639} + m_Layer: 5 + m_Name: PlayerTitile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4032346249059119572 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231000919449340602} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3204280713171133639 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231000919449340602} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab.meta b/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab.meta new file mode 100644 index 0000000000..6dcc232bae --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Common/PlayerTitle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a015dee4ae92d6545a25425ec3f30cf8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 87c4831ab3..9a62984200 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -422,6 +422,7 @@ SubUIConfig = { RoleUpStarLayout = { name = "RoleUpStarLayout",assetName = "RoleUpStarLayout",script = "Modules/RoleInfo/RoleUpStarLayout" }, SingleFightPlayerView = { name = "SingleFightPlayerView",assetName = "SingleFightPlayerView",script = "View/SingleFightPlayerView" }, -- 挂机界面一个人 SingleStoryPlayerView = { name = "SingleStoryPlayerView",assetName = "SingleStoryPlayerView",script = "View/SingleStoryPlayerView" } , --剧情界面一个对象 + PlayerTitle = {name = "PlayerTitle",assetName = "PlayerTitle",script = "View/PlayerTitle"}, [1] = {name = "EveryDayGift",assetName = "EveryDayGift",script = "Modules/Recharge/View/EveryDayGift"}, [2] = {name = "GiftPre",assetName = "GiftPre",script = "Modules/Recharge/View/GiftPre"}, [3] = {name = "RechargeView",assetName = "RechargeView",script = "Modules/Recharge/View/RechargeView"}, diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index e816dc0d51..c20ae53d51 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -673,7 +673,7 @@ end function this.SubmitGameData() local isNewRole = PlayerPrefs.GetString(tostring(PlayerManager.uid), "") - if isNewRole == "" then + if isNewRole == "" and PlayerManager.level == 1 then PlayerPrefs.SetString(tostring(PlayerManager.uid), tostring(PlayerManager.uid)) SubmitExtraData({ type = SDKSubMitType.TYPE_CREATE_ROLE }) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 044d6a6ee6..fcd9645558 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -707,6 +707,14 @@ function this:OnSortingOrderChange() if this.playerInfoView then this.playerInfoView:SetLayer(self.sortingOrder) end + + if curNPCList then + for _, mpv in pairs(curNPCList) do + if mpv.OnSortingOrderChange then + mpv:OnSortingOrderChange(self.sortingOrder) + end + end + end end function this:OnOpen() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index baadeb2e51..7d00286dd9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -96,6 +96,12 @@ function MainPlayerView:SetAutoMove() self:SetAutoMove() end) end +function MainPlayerView:OnSortingOrderChange(sortingOrder) + if self.NpcGO and self.NpcGO.OnSortingOrderChange then + self.NpcGO:OnSortingOrderChange(sortingOrder) + end +end + function MainPlayerView:SetName() self.NameText.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel) diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua index 8fb08a4448..3692940c2b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua @@ -12,14 +12,8 @@ function SettingPlayerTitle:ctor(mainPanel, gameObject) self:InitComponent(gameObject) self:BindEvent() end -local titleLive -local titleLive2 -local titleLiveCanvas -local titleLiveCanvas2 -local _sortingorder = 0 -local titleLiveStr -local titleLiveStr2 +local _sortingorder = 0 local curUserRideId --初始化组件(用于子类重写) function SettingPlayerTitle:InitComponent(gameObject,rootPanel) @@ -59,6 +53,11 @@ function SettingPlayerTitle:InitComponent(gameObject,rootPanel) this.scrollViewPro.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) this.scrollViewPro.moveTween.MomentumAmount = 1 this.scrollViewPro.moveTween.Strength = 2 + + + this.titleLive = SubUIManager.Open(SubUIConfig.PlayerTitle, this.live2dRootParent.transform) + this.titleLive2 = SubUIManager.Open(SubUIConfig.PlayerTitle, this.live2dRootParent2.transform) + end --绑定事件(用于子类重写) @@ -202,50 +201,15 @@ function this.SingleRideClickShowInfo(data,go) sex = NameManager.roleSex, ride =0, } - if titleLive then - -- 特效大小修改后无法还原,所以直接删除 - destroy(titleLive) - titleLive = nil - end - if titleLive2 then - -- 特效大小修改后无法还原,所以直接删除 - destroy(titleLive2) - titleLive2 = nil - end live2dRoot = PlayerLiveView:New(this.live2dRootParent,2, curPlayerLiveViewData) live2dRoot:OnOpen(GetPlayerRoleSingleConFig().Scale7,nil,WALK_DIR.IDLE_LEFT) local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,data.ItemId) local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) this.name.text = curArtResourcesConfig.Desc - titleLiveStr = curArtResourcesConfig.Name - titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) - titleLive.transform:SetParent(this.live2dRootParent.transform) - titleLive.transform.localPosition = Vector3.New(0,150,0) - titleLive.transform.localScale = Vector3.New(0.5,0.5,0.5) - Util.SetParticleScale(titleLive, 0.5) - Util.AddParticleSortLayer(titleLive, _sortingorder) - titleLiveCanvas = titleLive:GetComponent("Canvas") - if titleLiveCanvas then - titleLiveCanvas.overrideSorting = true - titleLiveCanvas.sortingOrder = _sortingorder - end - - - local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,data.ItemId) - local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) - titleLiveStr2 = curArtResourcesConfig.Name - titleLive2 = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) - titleLive2.transform:SetParent(this.live2dRootParent2.transform) - titleLive2.transform.localPosition = Vector3.New(0,0,0) - titleLive2.transform.localScale = Vector3.New(1,1,1) - Util.SetParticleScale(titleLive2, 1) - Util.AddParticleSortLayer(titleLive2, _sortingorder) - titleLiveCanvas2 = titleLive2:GetComponent("Canvas") - if titleLiveCanvas2 then - titleLiveCanvas2.overrideSorting = true - titleLiveCanvas2.sortingOrder = _sortingorder - end + -- 设置称号显示 + this.titleLive:SetShow(data.ItemId, Vector3.New(0,150,0), 0.5, 0.5, _sortingorder) + this.titleLive2:SetShow(data.ItemId, Vector3.New(0,0,0), 1, 1, _sortingorder) Util.AddOnceClick(this.goToBtn, function() if not isGet and not isUser then @@ -270,20 +234,13 @@ end -- 界面层级变动 function SettingPlayerTitle:OnSortingOrderChange(sortingOrder) - local titleSort = sortingOrder + 10 - if titleLive then - Util.AddParticleSortLayer(titleLive, titleSort - _sortingorder) + if this.titleLive then + this.titleLive:SetLayer(sortingOrder) end - if titleLive2 then - Util.AddParticleSortLayer(titleLive2, titleSort - _sortingorder) + if this.titleLive2 then + this.titleLive2:SetLayer(sortingOrder) end - if titleLiveCanvas then - titleLiveCanvas.sortingOrder = titleSort - end - if titleLiveCanvas2 then - titleLiveCanvas2.sortingOrder = titleSort - end - _sortingorder = titleSort + _sortingorder = sortingOrder end --界面关闭时调用(用于子类重写) @@ -300,12 +257,8 @@ end function SettingPlayerTitle:OnDestroy() _sortingorder = 0 this.spLoader:Destroy() - titleLive=nil - titleLive2=nil - titleLiveCanvas = nil - titleLiveCanvas2 = nil - titleLiveStr=nil - titleLiveStr2=nil + SubUIManager.Close(this.titleLive) + SubUIManager.Close(this.titleLive2) end return SettingPlayerTitle \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index ccf9a4001a..82a1ed24a4 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -43,7 +43,7 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer) --立绘对象 instance.rideLive = nil instance.playerLive = nil - instance.titleLive = nil + instance.titleLive = SubUIManager.Open(SubUIConfig.PlayerTitle, instance.titleLiveGo.transform) --立绘资源名字 instance.rideLiveStr = "" instance.playerLiveStr = "" @@ -64,7 +64,6 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer) end --初始化组件(用于子类重写) function PlayerLiveView:InitComponent() - end --绑定事件(用于子类重写) @@ -96,6 +95,14 @@ function PlayerLiveView:OnOpen(scale,pos,dir) end end local sortingorder=0 + +function PlayerLiveView:OnSortingOrderChange(sortingOrder) + if self.titleLive then + self.titleLive:SetLayer(sortingOrder) + end +end + + --加载三个立绘(称号 坐骑 皮肤) function PlayerLiveView:OnShowLive() -- LogBlue("self.rideLiveGo "..self.rideLiveGo.name) @@ -110,10 +117,6 @@ function PlayerLiveView:OnShowLive() poolManager:UnLoadLive(self.playerLiveStr, self.playerLive, PoolManager.AssetType.GameObject) self.playerLive = nil end - if self.titleLive then - poolManager:UnLoadAsset(self.titleLiveStr, self.titleLive, PoolManager.AssetType.GameObject) - self.titleLive = nil - end --时装 if self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 then self.playerLiveGo:SetActive(true) @@ -161,17 +164,7 @@ function PlayerLiveView:OnShowLive() y=y+3 end local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],y,0) - self.titleLiveStr = curArtResourcesConfig.Name--GetResourcePath(ConfigManager.GetConfigData(ConfigName.PlayerAppearance,PlayerManager.designation).Live) - self.titleLive = poolManager:LoadAsset(self.titleLiveStr, PoolManager.AssetType.GameObject) - self.titleLive.transform:SetParent(self.titleLiveGo.transform) - self.titleLive.transform.localPosition = curLocalPosition - self.titleLive.transform.localScale = curLocalScale - if self.orginLayer then - LogError("self.orginlayer "..self.orginLayer.."sortingOrder "..sortingorder) - Util.SetParticleSortLayer(self.titleLive,self.orginLayer) - --sortingorder = self.orginLayer - end - + self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale* self.transform.localScale.x, self.orginLayer) end end function PlayerLiveView:SetNameHeight(hei) @@ -311,15 +304,13 @@ function PlayerLiveView:OnClose() poolManager:UnLoadLive(self.playerLiveStr, self.playerLive, PoolManager.AssetType.GameObject) self.playerLive = nil end - if self.titleLive then - poolManager:UnLoadAsset(self.titleLiveStr, self.titleLive, PoolManager.AssetType.GameObject) - self.titleLive = nil - end if self.leader then poolManager:UnLoadAsset("PlayerLiveView",self.leader, PoolManager.AssetType.GameObject) self.leader = nil end - + if self.titleLive then + SubUIManager.Close(self.titleLive) + end end --判断动画是否存在 diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua new file mode 100644 index 0000000000..58be8c00c5 --- /dev/null +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -0,0 +1,108 @@ +PlayerTitle = {} +local this=PlayerTitle +local mapNpcOp = "PlayerTitle" + +function PlayerTitle:New(gameObject) + local b = {} + b.gameObject = gameObject + b.transform = gameObject.transform + setmetatable(b, { __index = PlayerTitle }) + return b +end +--初始化组件(用于子类重写) +function PlayerTitle:InitComponent() + self.layer = 0 + self.canvas = self.gameObject:GetComponent("Canvas") +end + +--绑定事件(用于子类重写) +function PlayerTitle:BindEvent() + +end + +--添加事件监听(用于子类重写) +function PlayerTitle:AddListener() + +end + +--移除事件监听(用于子类重写) +function PlayerTitle:RemoveListener() + +end + +--界面打开时调用(用于子类重写) +function PlayerTitle:OnOpen(itemId, position, scale, layer) + if itemId then + self:SetShow(itemId, position, scale, layer) + end +end + +function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) + self:ClearTitle() + + local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,itemId) + local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) + self.curTitleName = curArtResourcesConfig.Name + self.titleLive = poolManager:LoadAsset(self.curTitleName, PoolManager.AssetType.GameObject) + self.titleLive.transform:SetParent(self.canvas.transform) + + if position then + self:SetPostion(position) + end + if scale then + self:SetScale(scale) + end + if effectScale then + self:SetEffectScale(effectScale) + end + if layer then + self:SetLayer(layer) + end +end + +function PlayerTitle:SetPostion(position) + if self.titleLive then + self.titleLive.transform.localPosition = position + end +end + + +function PlayerTitle:SetScale(scale) + if self.titleLive then + self.titleLive.transform.localScale = Vector3.one * scale + end +end + +function PlayerTitle:SetEffectScale(effectScale) + if self.titleLive then + Util.SetParticleScale(self.titleLive, effectScale) + end +end + +function PlayerTitle:SetLayer(layer) + local _layer = layer + 10 + if self.titleLive then + Util.AddParticleSortLayer(self.titleLive, _layer - self.layer) + end + if self.canvas then + self.canvas.overrideSorting = true + self.canvas.sortingOrder = _layer + end + self.layer = _layer +end + +function PlayerTitle:ClearTitle() + if self.titleLive then + destroy(self.titleLive) + end + self.titleLive = nil + self.curTitleName = nil + self.layer = 0 +end + +--界面销毁时调用(用于子类重写) +function PlayerTitle:OnClose() + self:ClearTitle() +end + +return PlayerTitle \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua.meta b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua.meta new file mode 100644 index 0000000000..da91d1cef7 --- /dev/null +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e31794c072cdb5e4bba6a0ce30c47286 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 18053ad1927c41f46a7de0e9b5c7791beff42d24 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 2 Jun 2021 10:16:57 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E9=AD=82=E5=8D=B0=E3=80=91?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/SoulPrint/SoulPrintManager.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua index dfe6b014ce..7c1aa6963f 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua @@ -743,6 +743,10 @@ end local allSoulPrintUpHeros = {}-- soulPrintSid = {heroDid,heroDid,heroDid} --增加魂印装备的英雄did function this.AddSoulPrintUpHeroDynamicId(soulPrintSid, heroDid) + if not equipConfig[soulPrintSid] then + LogYellow("魂印表里不存在,需要策划君! "..soulPrintSid) + return + end if allSoulPrintUpHeros[soulPrintSid] then table.insert(allSoulPrintUpHeros[soulPrintSid],heroDid) else From ec55dc15afae82d0f428972044f9318caef42d5a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Jun 2021 11:08:03 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationPanelV2.lua | 1 + Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua | 1 + .../~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua | 1 + 4 files changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 6b748919f7..87fc8b5967 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -268,6 +268,7 @@ function this:OnClose() if this.curFormationIndex == FormationTypeDef.FORMATION_ENDLESS_MAP then EndLessMapManager.SetCanUseHeroNew() CheckRedPointStatus(RedPointType.wujinBianDui) + CheckRedPointStatus(RedPointType.EndlessPanel) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 71532fdeab..b08f3d916d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -52,6 +52,7 @@ function this.RefreshItemData() this.treasureData.curDataLevel = level this.SetTreasureState() CheckRedPointStatus(RedPointType.wujinTreasure) + CheckRedPointStatus(RedPointType.EndlessPanel) end local count = BagManager.GetItemCountById(this.shiQiValue) @@ -525,6 +526,7 @@ function this.SetCanUseHeroNew() LogGreen("v.isNew:"..v.isNew) end CheckRedPointStatus(RedPointType.wujinBianDui) + CheckRedPointStatus(RedPointType.EndlessPanel) end function this.GetHeroDataByProperty(_proId) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 61c377508d..cda01a724b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -258,6 +258,7 @@ function this.ChangeVipRedPointState() CheckRedPointStatus(RedPointType.QinglongSerectTreasure) CheckRedPointStatus(RedPointType.pozhenzhuxianTask) CheckRedPointStatus(RedPointType.wujinMission) + CheckRedPointStatus(RedPointType.EndlessPanel) --CheckRedPointStatus(RedPointType.Achievement_One) --CheckRedPointStatus(RedPointType.Achievement_Two) --CheckRedPointStatus(RedPointType.Achievement_Three) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua index ba78c8520e..aeb2dfca04 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua @@ -222,6 +222,7 @@ function EndLessTreasurePanel:OnBtnDealClicked(rewardItem,singleData) EndLessMapManager.SetTreasureState(singleData.Id,-1) end CheckRedPointStatus(RedPointType.wujinTreasure) + CheckRedPointStatus(RedPointType.EndlessPanel) self:refresh()--刷新界面 end) end) From 7679f85af3b9b9f79372ca2312862b6ec023a44d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 11:08:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Map/UI_MainPlayer.prefab | 128 +++++++++++++++--- .../UI/PlayerInfoView/PlayerInfoView.prefab | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 4 +- .../~Lua/Modules/Main/View/MainPlayerView.lua | 16 +-- 4 files changed, 122 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab index f6667b9c7f..6733525470 100644 --- a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab +++ b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab @@ -60,7 +60,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7868520532870301331} m_Father: {fileID: 7615970307446995481} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -143,7 +144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7586917845628614106 RectTransform: m_ObjectHideFlags: 0 @@ -151,16 +152,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3621620809879865289} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} m_Children: [] - m_Father: {fileID: 7615970307446995481} - m_RootOrder: 2 + m_Father: {fileID: 5993955088853526996} + 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: 5, y: -32.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} m_SizeDelta: {x: 59, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9115302304514649136 @@ -332,7 +333,6 @@ RectTransform: m_Children: - {fileID: 8542266226903761540} - {fileID: 5993955088853526996} - - {fileID: 7586917845628614106} m_Father: {fileID: 6947002124225122056} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -452,6 +452,101 @@ RectTransform: m_AnchoredPosition: {x: 283, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8136241361327276901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7868520532870301331} + - component: {fileID: 8659842356983684918} + - component: {fileID: 1432783152129603294} + - component: {fileID: 1289954329682749125} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7868520532870301331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} + m_Children: [] + m_Father: {fileID: 8542266226903761540} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} + m_SizeDelta: {x: 59, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8659842356983684918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_CullTransparentMesh: 0 +--- !u!114 &1432783152129603294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + 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: b47ba13ec7c5df340aa580bb5505abac, 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!114 &1289954329682749125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + 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 &9071092462066928365 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +565,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5993955088853526996 RectTransform: m_ObjectHideFlags: 0 @@ -481,14 +576,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7586917845628614106} m_Father: {fileID: 7615970307446995481} 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: 630, y: -35} - m_SizeDelta: {x: 420, y: 66} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 630, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3764668692912066610 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index ad98be8423..583048d3a0 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -6152,7 +6152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 393, y: -33} + m_AnchoredPosition: {x: 440, y: -33} m_SizeDelta: {x: 137.2, y: 52.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8833716866223761799 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fcd9645558..30af02ce28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -334,8 +334,8 @@ function this:BindEvent() -- LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel)) local _lv = NPCList[i].lv or NPCList[i].level or NPCList[i].userLevel if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then - view.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(view.ImprintImg,NPCList[i].practiceLevel) + view.ImprintImg2:SetActive(true) + PracticeManager.SetPracticeIcon(view.ImprintImg2,NPCList[i].practiceLevel) end view:SetAutoMove() view.leader.transform.name = "MainPlayerView"..i diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 7d00286dd9..07e0e0e566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -17,8 +17,11 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) instance.leader.transform:SetParent(root.transform) instance.leader.transform.localPosition = Vector3.zero instance.leader.transform.localScale = Vector3.one - instance.ImprintImg = Util.GetGameObject(instance.leader, "name/Icon")--:GetComponent("Image")--修行标识 - instance.ImprintImg:SetActive(false) + + instance.ImprintImg1 = Util.GetGameObject(instance.leader, "name/text/Icon")--修行标识 + instance.ImprintImg2 = Util.GetGameObject(instance.leader, "name/text2/Icon")--修行标识 + instance.ImprintImg1:SetActive(false) + instance.ImprintImg2:SetActive(false) local _sex, npc, scale if isSelf then @@ -35,19 +38,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) end --如果修行开启设置修行标识 if ActTimeCtrlManager.SingleFuncState(108) then - instance.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(instance.ImprintImg,PracticeManager.PracticeLevel) + instance.ImprintImg1:SetActive(true) + PracticeManager.SetPracticeIcon(instance.ImprintImg1,PracticeManager.PracticeLevel) end else instance.NameText = Util.GetGameObject(instance.leader, "name/text2"):GetComponent("Text") Util.GetGameObject(instance.leader, "name/text"):SetActive(false) Util.GetGameObject(instance.leader, "name/text2"):SetActive(true) _sex = _NpvData.sex - -- --如果修行开启设置修行标识 - -- if _NpvData.lv and _NpvData.lv >= GlobalSysConfig[108].OpenRules[2] then - -- instance.ImprintImg:SetActive(true) - -- PracticeManager.SetPracticeIcon(instance.ImprintImg,_NpvData.practiceLevel) - -- end if _sex == 0 then zuoqi = 80008 end local PlayerLiveViewData = { skin = _NpvData.userSkin, From dbcaf8e5cac2cc78e0f56bb6bb218471171eb042 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 2 Jun 2021 11:25:06 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E8=B8=8F=E7=A2=8E=E5=87=8C=E9=9C=84=E7=A7=B0=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fx_ui_tasuilingxiao_caihongbanyuan.mat | 2 +- .../UI_Effect_MianBan_ChengHao_Tslx.prefab | 77 ++++++++++++++++++- .../Chenghao_TaSuiLingXiao/Prefab/tslx.prefab | 48 ++++++------ .../Textures/fx_tex_caihongbanyuan.png.meta | 17 +++- 4 files changed, 115 insertions(+), 29 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat index 2723b6124e..32bd86a1a1 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat @@ -26,4 +26,4 @@ Material: m_Floats: - _InvFade: 1 m_Colors: - - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _TintColor: {r: 0.6226415, g: 0.5012328, b: 0.23202206, a: 0.5019608} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab index 06dc06b00c..bdefe58b4a 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab @@ -148,6 +148,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1399205022525211762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8018801407814597797} + - component: {fileID: 6436426854285322771} + - component: {fileID: 8871751318743663811} + m_Layer: 5 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8018801407814597797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + 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: 6361193509961736898} + m_RootOrder: 7 + 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: 57} + m_SizeDelta: {x: 512, y: 512} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6436426854285322771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + m_CullTransparentMesh: 0 +--- !u!114 &8871751318743663811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: e58858f1b1ab3a7458d9d47baf18a9fa, type: 2} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: db22a7aa0cabda647bc0284b80246bb8, 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 &1606432551381439893 GameObject: m_ObjectHideFlags: 0 @@ -478,6 +552,7 @@ RectTransform: - {fileID: 5367728379246610282} - {fileID: 5894301615642667041} - {fileID: 7610283183577423566} + - {fileID: 8018801407814597797} - {fileID: 5531222548493163716} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1061,7 +1136,7 @@ PrefabInstance: - target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e, type: 3} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab index 38158bceb1..092cc93434 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab @@ -4652,7 +4652,7 @@ ParticleSystem: --- !u!199 &1502086534190128304 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9417,7 +9417,7 @@ ParticleSystem: --- !u!199 &1502086534398472809 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14183,7 +14183,7 @@ ParticleSystem: --- !u!199 &1502086534435668158 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -18948,7 +18948,7 @@ ParticleSystem: --- !u!199 &1502086534450209971 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23713,7 +23713,7 @@ ParticleSystem: --- !u!199 &1502086534619458174 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28478,7 +28478,7 @@ ParticleSystem: --- !u!199 &1502086534741814842 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33244,7 +33244,7 @@ ParticleSystem: --- !u!199 &1502086534848615861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38010,7 +38010,7 @@ ParticleSystem: --- !u!199 &1502086534911569893 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42775,7 +42775,7 @@ ParticleSystem: --- !u!199 &1502086535142922346 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47473,7 +47473,7 @@ ParticleSystem: --- !u!199 &1502086535199694531 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52171,7 +52171,7 @@ ParticleSystem: --- !u!199 &1502086535281454448 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56870,7 +56870,7 @@ ParticleSystem: --- !u!199 &1502086535292549113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61626,7 +61626,7 @@ ParticleSystem: --- !u!199 &1502086535324031562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66382,7 +66382,7 @@ ParticleSystem: --- !u!199 &1502086535355478197 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71147,7 +71147,7 @@ ParticleSystem: --- !u!199 &1502086535674928818 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75913,7 +75913,7 @@ ParticleSystem: --- !u!199 &1502086535719110089 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80611,7 +80611,7 @@ ParticleSystem: --- !u!199 &1502086535748455003 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85377,7 +85377,7 @@ ParticleSystem: --- !u!199 &1502086535782171297 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90143,7 +90143,7 @@ ParticleSystem: --- !u!199 &1502086535919702147 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94899,7 +94899,7 @@ ParticleSystem: --- !u!199 &1502086535990888684 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94975,7 +94975,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6941918884040322754 Transform: m_ObjectHideFlags: 0 @@ -95073,7 +95073,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.99 minScalar: 1.5 maxCurve: serializedVersion: 2 @@ -96311,7 +96311,7 @@ ParticleSystem: m_RotationOrder: 4 separateAxes: 0 ColorModule: - enabled: 1 + enabled: 0 gradient: serializedVersion: 2 minMaxState: 1 @@ -99655,7 +99655,7 @@ ParticleSystem: --- !u!199 &1088076127499487974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta index c36fad2932..5bda25fc92 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta @@ -34,8 +34,8 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 nPOTScale: 0 lightmap: 0 @@ -51,7 +51,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []