From faf7591cf59225ffa1113d3e7f7fb70f8dec1f38 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 17 Aug 2021 17:14:03 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../Modules/Message/MissionDailyTipPanel.lua | 3 + .../~Lua/Modules/Player/RedpotManager.lua | 2 + .../Modules/Popup/DropGetSSRHeroShopPanel.lua | 6 +- .../LingLongBaoJingManager.lua | 36 ++++- .../linglongbaojing/LingLongBaoJingPanel.lua | 143 +++++++++++------- 6 files changed, 130 insertions(+), 62 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b1a8f26fb9..b6842f84ae 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -943,7 +943,7 @@ RedPointType = { jijin328 = 79, chaozhijijin = 80, - + linglongBaojing = 671, } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index 8d7113a5e5..01b994362c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent() PopupTipPanel.ShowTip(Language[11305]) return end + if GameObject.Find("LingLongBaoJingPanel") and GameObject.Find("LingLongBaoJingPanel").activeSelf then--掉落界面打开时,关闭掉落界面 + return + end if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面 UIManager.ClosePanel(UIName.RewardItemPopup, false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 7e1007e35a..48f6262d71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -538,6 +538,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.jijin128,ActivityGiftManager.CheckRedpointUpperMonthCard) RPData:AddCheckFunc(RedPointType.jijin328,ActivityGiftManager.CheckRedpointUpperMonthCard) + + RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua index fa8873f4a5..6f877ebd03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua @@ -110,8 +110,10 @@ end --界面关闭时调用(用于子类重写) function DropGetSSRHeroShopPanel:OnClose() - - poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO) + if testLiveGO then + poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO) + testLiveGO = nil + end if callBack then callBack() end diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua index 7d2be4180c..0c2a2cb618 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua @@ -5,14 +5,17 @@ local rewardList = {} --初始化 function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.RefreshData) + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold,this.CheckRedPointLingLong) end function this.RefreshData() + this.CheckRedPointLingLong() this.InitData(nil) end function this.InitData(func) local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing) + LogGreen("id:"..tostring(id)) if not id or id < 1 then hitList = {} rewardList = {} @@ -23,12 +26,15 @@ function this.InitData(func) end this.InitDataList(id) NetManager.QiMenDunJiaHitListRequest(id,function(msg) - --sLogGreen("msg.hitList:"..#msg.hitList) - -- for i = 1,#msg.hitList do - -- LogGreen("msg.hitList:"..msg.hitList[i]) - -- end hitList = msg.hitList - this.SetDataListState(hitList) + if not msg.hitList or #msg.hitList < 1 then + else + LogGreen("msg.hitList:"..#msg.hitList) + for i = 1,#msg.hitList do + LogGreen("msg.hitList:"..msg.hitList[i]) + end + this.SetDataListState(hitList) + end if func then func() end @@ -36,6 +42,7 @@ function this.InitData(func) end function this.InitDataList(id) + rewardList = {} local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.LingLongPool,"ActivityId",id) if configs then for i = 1 ,#configs do @@ -61,7 +68,9 @@ end function this.SetDataListState(list,typeIndex) if list and #list > 0 then for i = 1,#list do - rewardList[list[i]].state = 1 + if rewardList[list[i]] then + rewardList[list[i]].state = 1 + end end else for k,v in pairs(rewardList) do @@ -94,4 +103,19 @@ function this.QiMenDunJiaDrawRequest(id,func) end) end +function this.CheckRedPointLingLong() + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing) + if not id or id < 1 then + return false + end + local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117) + local strs = string.split(config.Value,"|") + local costId = tonumber(strs[1]) + LogGreen("BagManager.GetItemCountById(costId):"..BagManager.GetItemCountById(costId)) + if BagManager.GetItemCountById(costId) > 0 then + return true + end + return false +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index e3d1f5b8bb..c51dfb261a 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -17,6 +17,8 @@ end local a,b,c,d local configs +local isClose = false +local drop = nil ---初始化组件(用于子类重写) function LingLongBaoJingPanel:InitComponent(gameObject) self.spLoader = SpriteLoader.New() @@ -124,70 +126,93 @@ function LingLongBaoJingPanel:BindEvent() PopupTipPanel.ShowTip("道具不足") return end - LingLongBaoJingManager.QiMenDunJiaDrawRequest(self.actId,function(idList,drop) + LingLongBaoJingManager.QiMenDunJiaDrawRequest(self.actId,function(idList,_drop) if not idList[1] then PopupTipPanel.ShowTip("转盘奖励出错了") return - end + end + drop = _drop + LingLongBaoJingManager.CheckRedPointLingLong() self:DelayMaskWithBool(true) self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true) SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002) - -- local drop = {} - -- drop.itemlist = {} - -- local idList = {1,1} + LingLongBaoJingManager.SetDataListState(idList) + local isAllGet = false + if idList[2] and idList[2] > 0 then + if LingLongBaoJingManager.IsAllGet() then + isAllGet = true + LingLongBaoJingManager.SetDataListState(nil,1) + end + LingLongBaoJingManager.SetDataListState(nil,2) + end local x = function(isGetBigReward) - LingLongBaoJingManager.SetDataListState(idList) local tempData = {} for i = 1,#idList do table.insert(tempData,data[idList[i]]) end self:RefreshTreasureTypeState(0,tempData) - UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() - if isGetBigReward then - if LingLongBaoJingManager.IsAllGet() then - LingLongBaoJingManager.SetDataListState(nil,1) - self:RefreshTreasureTypeState(1) + if drop then + UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() + drop = nil + if isGetBigReward then + if isAllGet then + self:RefreshTreasureTypeState(1) + end + self:RefreshTreasureTypeState(2) + if not isClose then + self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false) + self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false) + end + else + if not isClose then + self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false) + end + end + self:SetPropShow() + self.fx_linglongbaojing_kaiqi.gameObject:SetActive(false) + if not isClose then + self.itemList[2][1].effect.gameObject:SetActive(false) end - LingLongBaoJingManager.SetDataListState(nil,2) - self:RefreshTreasureTypeState(2) - self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false) - self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false) - else - self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false) - end - self:SetPropShow() - self.fx_linglongbaojing_kaiqi.gameObject:SetActive(false) - self.itemList[2][1].effect.gameObject:SetActive(false) - self.fx_linglongbaojing_longchuxian.gameObject:SetActive(false) - for i = 1,#self.itemList[1] do - self.itemList[1][i].effect.gameObject:SetActive(false) - end - self:DelayMaskWithBool(false) - end) + self.fx_linglongbaojing_longchuxian.gameObject:SetActive(false) + for i = 1,#self.itemList[1] do + if not isClose then + self.itemList[1][i].effect.gameObject:SetActive(false) + end + end + self:DelayMaskWithBool(false) + end) + end end curTurnPos = 1 self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function() if idList[2] and idList[2] > 0 then --PopupTipPanel.ShowTip("播放一些开门的特效") SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004) - self.Btncoroutine = coroutine.start(function() - self.itemList[2][1].effect.gameObject:SetActive(true) - SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longsaoguang_006) - coroutine.wait(1) - self.fx_linglongbaojing_longchuxian.gameObject:SetActive(true) - SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longpanxuan_005) - coroutine.wait(1) - self:RefreshTreasureMaskByType(1,false) - SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquandianliang_008) - for i = 1,#self.itemList[1] do - self.itemList[1][i].effect.gameObject:SetActive(true) - end - coroutine.wait(1) - curTurnPos = 1 - self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function() - self:RefreshTreasureMaskByType(1,true) - x(true) - end) + self.Btncoroutine = coroutine.start(function() + local isStartWai = false + while(not isClose and not isStartWai) do + self.itemList[2][1].effect.gameObject:SetActive(true) + SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longsaoguang_006) + coroutine.wait(1) + self.fx_linglongbaojing_longchuxian.gameObject:SetActive(true) + SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longpanxuan_005) + coroutine.wait(1) + self:RefreshTreasureMaskByType(1,false) + SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquandianliang_008) + for i = 1,#self.itemList[1] do + self.itemList[1][i].effect.gameObject:SetActive(true) + end + --coroutine.wait(0.5) + isStartWai = true + end + while(not isClose and isStartWai) do + isStartWai = false + curTurnPos = 1 + self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function() + self:RefreshTreasureMaskByType(1,true) + x(true) + end) + end end) else x(false) @@ -221,6 +246,7 @@ end -- 打开,重新打开时回调 function LingLongBaoJingPanel:OnShow(_sortingOrder) + isClose = false --self.parent.tabbox.gameObject:SetActive(false) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder @@ -291,7 +317,7 @@ function LingLongBaoJingPanel:SetTime() remainTime = remainTime - 1 self.time.text = "活动倒计时:"..TimeToDHMS(remainTime) if remainTime <= 0 then - self:ClosePanel() + self.time.text = "活动倒计时:"..TimeToDHMS(0) end end,1,-1,false) self.timer:Start() @@ -337,7 +363,7 @@ function LingLongBaoJingPanel:RefreshTreasureTypeState(typeIndex,_data) tempData = data end for k,v in pairs(tempData) do - if (v.typeIndex == typeIndex) or typeIndex == 0 then + if ((v.typeIndex == typeIndex) or typeIndex == 0) and not isClose then if v.state == 0 then self.itemList[v.typeIndex][v.address].get.gameObject:SetActive(false) else @@ -349,7 +375,7 @@ end --外圈遮罩设置 function LingLongBaoJingPanel:RefreshTreasureMaskByType(typeIndex,value) for k,v in pairs(data) do - if v.typeIndex == typeIndex then + if v.typeIndex == typeIndex and not isClose then self.itemList[v.typeIndex][v.address].mask.gameObject:SetActive(value) end end @@ -357,6 +383,12 @@ end ---界面关闭时调用(用于子类重写) function LingLongBaoJingPanel:OnClose() + isClose = true + if drop then + UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() + drop = nil + end) + end --self.parent.tabbox.gameObject:SetActive(true) self.fx_linglongbaojing_long.gameObject:SetActive(false) self.fx_linglongbaojing_chuxian.gameObject:SetActive(false) @@ -411,16 +443,21 @@ end ---转盘滚动特效重设 1移动速度,值越小越快 2是否停止 3停止位置 function LingLongBaoJingPanel:TurnEffectReset(turnSpeed,treasureType,isStop,pos,func) + if not self.turnEffect then + self.turnEffect = Timer.New() + end self.turnEffect:Reset(function() if curTurnPos > #self.itemList[treasureType] then curTurnPos = 1 end - if curTurnPos == 1 then - self.itemList[treasureType][#self.itemList[treasureType]].selectKuang.gameObject:SetActive(false) - else - self.itemList[treasureType][curTurnPos - 1].selectKuang.gameObject:SetActive(false) + if not isClose then + if curTurnPos == 1 then + self.itemList[treasureType][#self.itemList[treasureType]].selectKuang.gameObject:SetActive(false) + else + self.itemList[treasureType][curTurnPos - 1].selectKuang.gameObject:SetActive(false) + end + self.itemList[treasureType][curTurnPos].selectKuang.gameObject:SetActive(true) end - self.itemList[treasureType][curTurnPos].selectKuang.gameObject:SetActive(true) if treasureType == 2 then SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_neiquanlunge_007) else From a23cd88b5bbbad3df76cbc0b03297bc191c960fa Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 17 Aug 2021 17:27:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90ID1018146=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C=E3=80=91=E5=A4=96=E5=9C=88?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E6=98=BE=E7=A4=BA10000=E4=B8=8E=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E9=A2=84=E8=A7=88=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index c51dfb261a..6417e7645d 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -333,7 +333,7 @@ function LingLongBaoJingPanel:RefreshTreasureType() end if config.ItemType ~= ItemType.Hero and config.ItemType ~= ItemType.linglongbaojingkaimen then self.itemList[v.typeIndex][v.address].numDi.gameObject:SetActive(true) - self.itemList[v.typeIndex][v.address].num.text = v.reward[2] + self.itemList[v.typeIndex][v.address].num.text = PrintWanNum(v.reward[2]) else self.itemList[v.typeIndex][v.address].numDi.gameObject:SetActive(false) end From 662a760eaf262749bd8fa7229bd7d843520beabc Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 17 Aug 2021 17:31:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90ID1018142=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=AE=9D=E7=89=A9=E3=80=91=E5=AE=9D=E7=89=A9=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=B2=BE=E7=82=BC?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=EF=BC=8C=E7=BB=9F=E4=B8=80=20=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 42cf1cd852..0ad7f6746f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -623,7 +623,8 @@ function this.ShowHeroEquip() lvObj:SetActive(false) end if curEquipTreasureDatas[i].refineLv > 0 then - refineObj:GetComponent("Text").text = "+" .. curEquipTreasureDatas[i].refineLv + + refineObj:GetComponent("Text").text = curEquipTreasureDatas[i].refineLv refineObj:SetActive(true) else refineObj:SetActive(false) @@ -841,7 +842,7 @@ function this.SingleItemDataShow(_go, _itemData) else lvObj.gameObject:SetActive(false) end - refineObj.text = "+" .. _itemData.refineLv + refineObj.text = _itemData.refineLv if _itemData.refineLv > 0 then refineObj.gameObject:SetActive(true) else From bc4af2601b368957678de39eced4b7f91f9bb104 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 17 Aug 2021 17:41:00 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BA=A2=E7=82=B9=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 --- .../~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua | 2 +- .../~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua index 0c2a2cb618..cd01a1b6c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua @@ -5,7 +5,7 @@ local rewardList = {} --初始化 function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.RefreshData) - Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold,this.CheckRedPointLingLong) + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold,function()CheckRedPointStatus(RedPointType.linglongBaojing)end) end function this.RefreshData() diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 6417e7645d..956ac21c9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -132,7 +132,7 @@ function LingLongBaoJingPanel:BindEvent() return end drop = _drop - LingLongBaoJingManager.CheckRedPointLingLong() + CheckRedPointStatus(RedPointType.linglongBaojing) self:DelayMaskWithBool(true) self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true) SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002) From c08ce1ea0bff8855d5f67acfca5031ec183084c0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 17 Aug 2021 17:55:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90ID1018087=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E9=80=82=E9=85=8D=E3=80=91=E5=8D=81=E7=BB=9D=E9=98=B51080*2550?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guild/DeathPos/DeathPosInfoPanel.prefab | 242 +++++++++--------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab index 69db6ed8b4..b1a5c3d4ef 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab @@ -260,7 +260,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &269973437117146302 Canvas: @@ -3003,9 +3003,9 @@ RectTransform: m_Father: {fileID: 9179711840133666567} m_RootOrder: 5 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: -155.85, y: -193} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 390, y: -193} m_SizeDelta: {x: 768.3, y: 146.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4939929771722818741 @@ -3124,8 +3124,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 65.2, y: 0.000015259} - m_SizeDelta: {x: 422.1, y: 146.9} + m_AnchoredPosition: {x: 77.5, y: 0.000015259} + m_SizeDelta: {x: 397.4, y: 146.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8724425877200325181 CanvasRenderer: @@ -3152,7 +3152,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 1 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 @@ -5515,9 +5515,9 @@ RectTransform: m_Father: {fileID: 8082431718913310779} 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: -244.3, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 139.7, y: 0} m_SizeDelta: {x: 196.9, y: 125.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2437786908383537040 @@ -5555,7 +5555,7 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 20 m_MaxSize: 45 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -5760,15 +5760,25 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 3.2600002 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5780,20 +5790,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5920,15 +5920,25 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 3.2600002 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5940,20 +5950,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6080,15 +6080,25 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 3.2600002 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6100,20 +6110,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6240,30 +6240,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6275,15 +6260,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.y + value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6416,30 +6416,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6451,15 +6436,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.y + value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 objectReference: {fileID: 0} - target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6592,15 +6592,25 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 3.2600002 objectReference: {fileID: 0} - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6612,20 +6622,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -16.999998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} From e2caaafbc549e9958efe802be37109868a1e368d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 18 Aug 2021 09:54:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/linglongbaojing/LingLongBaoJingManager.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua index cd01a1b6c1..039ac176c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua @@ -15,7 +15,6 @@ end function this.InitData(func) local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing) - LogGreen("id:"..tostring(id)) if not id or id < 1 then hitList = {} rewardList = {} @@ -29,10 +28,10 @@ function this.InitData(func) hitList = msg.hitList if not msg.hitList or #msg.hitList < 1 then else - LogGreen("msg.hitList:"..#msg.hitList) - for i = 1,#msg.hitList do - LogGreen("msg.hitList:"..msg.hitList[i]) - end + -- LogGreen("msg.hitList:"..#msg.hitList) + -- for i = 1,#msg.hitList do + -- LogGreen("msg.hitList:"..msg.hitList[i]) + -- end this.SetDataListState(hitList) end if func then @@ -111,7 +110,6 @@ function this.CheckRedPointLingLong() local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117) local strs = string.split(config.Value,"|") local costId = tonumber(strs[1]) - LogGreen("BagManager.GetItemCountById(costId):"..BagManager.GetItemCountById(costId)) if BagManager.GetItemCountById(costId) > 0 then return true end From 11b5425f8b47bef77353ebd64bfa6fb116fa2cda Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 18 Aug 2021 17:53:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E3=80=91=E5=88=86=E8=A7=A3=E5=AE=8C=E7=A2=8E=E7=89=87?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Resolve/View/Resolve_Pokemon.lua | 182 ++++++++---------- 1 file changed, 80 insertions(+), 102 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua index 4680cfe654..f4f9b66e40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua @@ -89,98 +89,86 @@ function this:BindEvent() end UIManager.OpenPanel(UIName.MainShopPanel, SHOP_TYPE.SOUL_CONTRACT_SHOP) end) - - --放生按钮 - Util.AddClick(this.confirmBtn,function() - if isPokemon and tonumber(LengthOfTable(selectHeroData))==0 then - PopupTipPanel.ShowTip(Language[11746]) - return + --放生按钮 + Util.AddClick(this.confirmBtn,function() + if isPokemon and tonumber(LengthOfTable(selectHeroData))==0 then + PopupTipPanel.ShowTip(Language[11746]) + return + end + if not isPokemon and (selectChipId==0 or selectChipNum==0) then + PopupTipPanel.ShowTip(Language[11746]) + return + end + --奖励物品 + --所有材料 + local allMaterials={} + local pokemonIds={} + --灵兽 + if isPokemon then + local allCoin=0 + for key, value in pairs(selectHeroData) do + --升级消耗 + table.insert(pokemonIds,key) + local lvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Level",value.lv,"Quality",value.quality) + if lvConfig then + local matrs=lvConfig.SumConsume + if matrs then + for i = 1, #matrs do + local mat=matrs[i] + table.insert(allMaterials,{mat[1],mat[2]}) + end + end end - - if not isPokemon and (selectChipId==0 or selectChipNum==0) then - PopupTipPanel.ShowTip(Language[11746]) - return + --升星消耗 + local lingshouConfig=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,value.id) + local haveNum=0 + if value.star>0 then + local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Star",value.star,"Quality",value.quality) + if starConfig then + haveNum=starConfig.SumItemNum + local starMatrs=starConfig.SumConsume + --消耗材料 + if starMatrs then + for i = 1, #starMatrs do + local starm=starMatrs[i] + table.insert(allMaterials,{starm[1],starm[2]}) + end + end + end + end + --消耗本体数量,分解成碎片 + allCoin=allCoin+lingshouConfig.CoinReturn[2]*(haveNum+1) + end + --加上所有的分解币 + table.insert(allMaterials,{1205,allCoin}) + else--灵兽碎片 + local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,selectChipId) + if itemConfig then + local groupId=itemConfig.RewardGroup[1] + local groupConfig=ConfigManager.GetConfigData(ConfigName.RewardGroup,groupId) + if groupConfig then + LogError("掉落组显示:"..groupConfig.ShowItem[1][1]) + local pokemon=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,groupConfig.ShowItem[1][1]) + if pokemon then + table.insert(allMaterials,{pokemon.PiecesCoinReturn[1],pokemon.PiecesCoinReturn[2]*selectChipNum}) end - - --奖励物品 - --所有材料 - local allMaterials={} - local pokemonIds={} - --灵兽 - if isPokemon then - local allCoin=0 - for key, value in pairs(selectHeroData) do - --升级消耗 - table.insert(pokemonIds,key) - local lvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Level",value.lv,"Quality",value.quality) - if lvConfig then - local matrs=lvConfig.SumConsume - if matrs then - for i = 1, #matrs do - local mat=matrs[i] - table.insert(allMaterials,{mat[1],mat[2]}) - end - end - end - --升星消耗 - local lingshouConfig=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,value.id) - local haveNum=0 - - if value.star>0 then - local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Star",value.star,"Quality",value.quality) - if starConfig then - haveNum=starConfig.SumItemNum - local starMatrs=starConfig.SumConsume - --消耗材料 - if starMatrs then - for i = 1, #starMatrs do - local starm=starMatrs[i] - table.insert(allMaterials,{starm[1],starm[2]}) - end - end - end - end - --消耗本体数量,分解成碎片 - allCoin=allCoin+lingshouConfig.CoinReturn[2]*(haveNum+1) - end - --加上所有的分解币 - table.insert(allMaterials,{1205,allCoin}) - else--灵兽碎片 - local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,selectChipId) - if itemConfig then - local groupId=itemConfig.RewardGroup[1] - local groupConfig=ConfigManager.GetConfigData(ConfigName.RewardGroup,groupId) - if groupConfig then - LogError("掉落组显示:"..groupConfig.ShowItem[1][1]) - local pokemon=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,groupConfig.ShowItem[1][1]) - if pokemon then - table.insert(allMaterials,{pokemon.PiecesCoinReturn[1],pokemon.PiecesCoinReturn[2]*selectChipNum}) - end - end end end - - --显示分解界面 - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonRestore,allMaterials,function() - LogError("灵兽长度 "..#pokemonIds.."碎片id "..selectChipId.." num"..selectChipNum) - NetManager.PokemonFreeRequest(pokemonIds,selectChipId,selectChipNum,function(msg) - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() - - end) - if pokemonIds and #pokemonIds>0 then - PokemonManager.RemovePokemonData(pokemonIds) - -- else - -- LogError("分解前数量"..BagManager.GetItemCountById(selectChipId)) - -- BagManager.HeroLvUpUpdateItemsNum(selectChipId,selectChipNum) - -- LogError("分解后数量"..BagManager.GetItemCountById(selectChipId)) - end - this.SortTypeClick(sortingOrder) + end + --显示分解界面 + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonRestore,allMaterials,function() + LogError("灵兽长度 "..#pokemonIds.."碎片id "..selectChipId.." num"..selectChipNum) + NetManager.PokemonFreeRequest(pokemonIds,selectChipId,selectChipNum,function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1) + if pokemonIds and #pokemonIds>0 then + PokemonManager.RemovePokemonData(pokemonIds) + end + this.SortTypeClick(sortingOrder) + this.chipObj:SetActive(false) + this.selectText.gameObject:SetActive(true) end) - - end) - - end) - + end) + end) end function this:AddListener() @@ -210,16 +198,16 @@ function this.SortTypeClick(_sortType,isTop,isAni) hero.star=v.star hero.lv=v.lv hero.dynamicId=v.dynamicId - hero.ischip=0 - hero.icon= GetResourcePath(heroConfig.Icon) + hero.ischip=0 + hero.icon= GetResourcePath(heroConfig.Icon) hero.id=v.id hero.quality=heroConfig.Quality - hero.name=heroConfig.Name + hero.name=heroConfig.Name hero.returnCoin=heroConfig.CoinReturn hero.frame=GetHeroQuantityImageByquality(heroConfig.Quality) hero.num=1 table.insert(items,hero) - end + end end end @@ -254,12 +242,6 @@ function this.SortTypeClick(_sortType,isTop,isAni) this.ScrollView:SetData(heroDatas, function (index, go) this.SingleHeroDataShow(go, heroDatas[index],false) end,isTop,isAni) - -- this.ScrollView:ForeachItemGO(function(index, go) - -- Timer.New(function() - -- go.gameObject:SetActive(true) - -- PlayUIAnim(go.gameObject) - -- end, 0.001 * (index - 1)):Start() - -- end) end --英雄单个数据展示 @@ -371,8 +353,7 @@ function this.SingleHeroDataShow(go,_heroData,isGray) this.selectText.gameObject:SetActive(true) this.chipObj:SetActive(false) isPokemon = true - end - + end end end) @@ -380,7 +361,6 @@ function this.SingleHeroDataShow(go,_heroData,isGray) Util.AddOnceClick(formationMask, function() PopupTipPanel.ShowTip(Language[11748]) end) - end --英雄排序 function this.SortHeroDatas(_heroDatas) @@ -406,8 +386,6 @@ function this.SortHeroDatas(_heroDatas) else return a.ischip Date: Thu, 19 Aug 2021 14:27:56 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E8=81=8A=E5=A4=A9=E7=95=8C=E9=9D=A2=E7=A7=B0=E5=8F=B7?= =?UTF-8?q?=E7=89=B9=E6=95=88=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Chat/ChatPanel.prefab | 527 +----------------- .../~Lua/Modules/Chat/ChatPanel.lua | 64 +-- 2 files changed, 33 insertions(+), 558 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab index 9c24ff96a0..4bd054c8cd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab @@ -1876,13 +1876,6 @@ RectTransform: - {fileID: 224555731055104148} - {fileID: 224890995552760338} - {fileID: 224840128425348974} - - {fileID: 1726105179464205488} - - {fileID: 7623883102458573942} - - {fileID: 7297077785714495003} - - {fileID: 7997087281471367570} - - {fileID: 3647602766939651864} - - {fileID: 4251482320623462343} - - {fileID: 5256010807519282371} - {fileID: 1201038047322019283} m_Father: {fileID: 0} m_RootOrder: 0 @@ -3421,80 +3414,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1444049958555565931 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7297077785714495003} - - component: {fileID: 7348271144433504799} - - component: {fileID: 817604448106051919} - m_Layer: 5 - m_Name: Image2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7297077785714495003 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444049958555565931} - 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: 224197152332357120} - m_RootOrder: 5 - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7348271144433504799 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444049958555565931} - m_CullTransparentMesh: 0 ---- !u!114 &817604448106051919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444049958555565931} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 3ef83ebb8fef9034b81e06089cc66755, type: 2} - 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: 0} - 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 &1563839245620898994 GameObject: m_ObjectHideFlags: 0 @@ -5500,154 +5419,6 @@ RectTransform: m_AnchoredPosition: {x: 421.8, y: 21} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2968913769949588523 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4251482320623462343} - - component: {fileID: 396523335348675184} - - component: {fileID: 6755521635152402434} - m_Layer: 5 - m_Name: Image5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4251482320623462343 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2968913769949588523} - 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: 224197152332357120} - m_RootOrder: 8 - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &396523335348675184 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2968913769949588523} - m_CullTransparentMesh: 0 ---- !u!114 &6755521635152402434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2968913769949588523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 65eaefa111e97b942b724745752addaa, type: 2} - 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: 0} - 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 &4035182006869693072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7623883102458573942} - - component: {fileID: 3050821877368694045} - - component: {fileID: 7172016855107129751} - m_Layer: 5 - m_Name: Image1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7623883102458573942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4035182006869693072} - 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: 224197152332357120} - m_RootOrder: 4 - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3050821877368694045 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4035182006869693072} - m_CullTransparentMesh: 0 ---- !u!114 &7172016855107129751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4035182006869693072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 690377177e4787b46b1a8d22001d52f0, type: 2} - 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: 0} - 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 &4602574600601858769 GameObject: m_ObjectHideFlags: 0 @@ -5683,7 +5454,7 @@ RectTransform: - {fileID: 224496641487165388} - {fileID: 5870792082446133048} m_Father: {fileID: 224197152332357120} - m_RootOrder: 10 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8185,228 +7956,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6641536271704471498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3647602766939651864} - - component: {fileID: 204806767338362460} - - component: {fileID: 3714588034260378868} - m_Layer: 5 - m_Name: Image4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3647602766939651864 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6641536271704471498} - 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: 224197152332357120} - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &204806767338362460 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6641536271704471498} - m_CullTransparentMesh: 0 ---- !u!114 &3714588034260378868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6641536271704471498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 082f88e7467737940a149691190f6d63, type: 2} - 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: 0} - 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 &6882448877779831183 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7997087281471367570} - - component: {fileID: 6653313540993183070} - - component: {fileID: 1881013015697137719} - m_Layer: 5 - m_Name: Image3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7997087281471367570 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6882448877779831183} - 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: 224197152332357120} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6653313540993183070 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6882448877779831183} - m_CullTransparentMesh: 0 ---- !u!114 &1881013015697137719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6882448877779831183} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 5a3d90e3268013e489e4d13baae99fed, type: 2} - 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: 0} - 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 &6932840096574000735 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1726105179464205488} - - component: {fileID: 2423732021818712883} - - component: {fileID: 1883381040914973284} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1726105179464205488 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932840096574000735} - 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: 224197152332357120} - m_RootOrder: 3 - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2423732021818712883 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932840096574000735} - m_CullTransparentMesh: 0 ---- !u!114 &1883381040914973284 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932840096574000735} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 2c75a8c8c4e0e36498f0f80aeb2275f5, type: 2} - 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: 0} - 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 &8174434967246760697 GameObject: m_ObjectHideFlags: 0 @@ -8629,77 +8178,3 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &9049746957381451038 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5256010807519282371} - - component: {fileID: 1862722206355547538} - - component: {fileID: 104447596863284600} - m_Layer: 5 - m_Name: Image6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5256010807519282371 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9049746957381451038} - 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: 224197152332357120} - m_RootOrder: 9 - 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: 1630.5, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1862722206355547538 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9049746957381451038} - m_CullTransparentMesh: 0 ---- !u!114 &104447596863284600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9049746957381451038} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 2035d90d06f71f74ba5e3d1b85fbb571, type: 2} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 313ee83573..242a09a35b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -46,13 +46,13 @@ function ChatPanel:InitComponent() this.playerPower = Util.GetGameObject(this.playerBg, "power"):GetComponent("Text") this.playerInvite = Util.GetGameObject(this.playerBg, "btnInvite") this.playerFriend = Util.GetGameObject(this.playerBg, "btnFriend") - this.shader1 = Util.GetGameObject(self.gameObject, "Image"):GetComponent("Image").material.shader - this.shader2 = Util.GetGameObject(self.gameObject, "Image1"):GetComponent("Image").material.shader - this.shader3 = Util.GetGameObject(self.gameObject, "Image2"):GetComponent("Image").material.shader - this.shader4 = Util.GetGameObject(self.gameObject, "Image3"):GetComponent("Image").material.shader - this.shader5 = Util.GetGameObject(self.gameObject, "Image4"):GetComponent("Image").material.shader - this.shader6 = Util.GetGameObject(self.gameObject, "Image5"):GetComponent("Image").material.shader - this.shader7 = Util.GetGameObject(self.gameObject, "Image6"):GetComponent("Image").material.shader + -- this.shader1 = Util.GetGameObject(self.gameObject, "Image"):GetComponent("Image").material.shader + -- this.shader2 = Util.GetGameObject(self.gameObject, "Image1"):GetComponent("Image").material.shader + -- this.shader3 = Util.GetGameObject(self.gameObject, "Image2"):GetComponent("Image").material.shader + -- this.shader4 = Util.GetGameObject(self.gameObject, "Image3"):GetComponent("Image").material.shader + -- this.shader5 = Util.GetGameObject(self.gameObject, "Image4"):GetComponent("Image").material.shader + -- this.shader6 = Util.GetGameObject(self.gameObject, "Image5"):GetComponent("Image").material.shader + -- this.shader7 = Util.GetGameObject(self.gameObject, "Image6"):GetComponent("Image").material.shader -- 上部货币显示 this.UpView = SubUIManager.Open(SubUIConfig.UpView, Util.GetGameObject(self.gameObject, "frame").transform, { showType = UpViewOpenType.ShowLeft}) end @@ -275,32 +275,32 @@ function this.RefreshShow(isForceBottom) else this.ChatItemAdapter(go, data, isShowTime) end - local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) - for key, value in pairs(particles:ToTable()) do - local mat=value:GetComponent(typeof(UnityEngine.Renderer)) - if mat.material.shader.name=="CGwell FX/Additive Lv1" then - mat.material.shader=this.shader1 - elseif mat.material.shader.name=="Shader Forge/shuibowen" then - mat.material.shader=this.shader4 - elseif mat.material.shader.name=="MagesBox/UVPanner_Add" then - mat.material.shader=this.shader5 - elseif mat.material.shader.name=="CGwell FX/Add Lv4" then - mat.material.shader=this.shader3 - elseif mat.material.shader.name=="Shader Forge/shuibowen_Alpha Blend" then - mat.material.shader=this.shader6 - elseif mat.material.shader.name=="CGwell FX/Alpha Blend Lv4" then - mat.material.shader=this.shader7 - end + -- local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + -- for key, value in pairs(particles:ToTable()) do + -- local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + -- if mat.material.shader.name=="CGwell FX/Additive Lv1" then + -- mat.material.shader=this.shader1 + -- elseif mat.material.shader.name=="Shader Forge/shuibowen" then + -- mat.material.shader=this.shader4 + -- elseif mat.material.shader.name=="MagesBox/UVPanner_Add" then + -- mat.material.shader=this.shader5 + -- elseif mat.material.shader.name=="CGwell FX/Add Lv4" then + -- mat.material.shader=this.shader3 + -- elseif mat.material.shader.name=="Shader Forge/shuibowen_Alpha Blend" then + -- mat.material.shader=this.shader6 + -- elseif mat.material.shader.name=="CGwell FX/Alpha Blend Lv4" then + -- mat.material.shader=this.shader7 + -- end - -- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1") - --mat.material= resMgr:LoadAsset("chenghao_mat1") - end - local meshs=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer)) - for key, value in pairs(meshs:ToTable()) do - -- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1") - --value.material= resMgr:LoadAsset("chenghao_mat2") - value.material.shader=this.shader2 - end + -- -- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1") + -- --mat.material= resMgr:LoadAsset("chenghao_mat1") + -- end + -- local meshs=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer)) + -- for key, value in pairs(meshs:ToTable()) do + -- -- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1") + -- --value.material= resMgr:LoadAsset("chenghao_mat2") + -- value.material.shader=this.shader2 + -- end end, _GoToIndex)