From e34f6a79cbd7410fec59ba16912d0403c43f4a90 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 16 Jul 2021 14:49:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90log=E3=80=91=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5=E6=8E=A8=E9=80=81log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Net/IndicationManager.lua | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index cc937151e1..f8b85fb72c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -1,4 +1,4 @@ -IndicationManager = {} +IndicationManager = {} local this = IndicationManager function this.Initialize() Game.GlobalEvent:AddEvent(Protocal.Connect, this.RegisterMessage) @@ -169,18 +169,18 @@ function this.HongMengIndication(buffer) if msg.hongmengTabletMax ~= 0 then -- body - LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax) + -- LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax) HarmonyManager:SetHongMengTowerUpLimit(msg.hongmengTabletMax) end if msg.hongmengGuards then - LogError("鸿蒙阵更新数据的Indication..##msg.hongmengGuards:"..tostring(#msg.hongmengGuards)) - for i = 1, #msg.hongmengGuards do - if msg.hongmengGuards[i].heroId == "" then - Log("鸿蒙守卫:"..i.."为nil") - else - Log("鸿蒙守卫:"..i..HeroManager.GetSingleHeroData(msg.hongmengGuards[i].heroId).name) - end - end + -- LogError("鸿蒙阵更新数据的Indication..##msg.hongmengGuards:"..tostring(#msg.hongmengGuards)) + -- for i = 1, #msg.hongmengGuards do + -- if msg.hongmengGuards[i].heroId == "" then + -- Log("鸿蒙守卫:"..i.."为nil") + -- else + -- Log("鸿蒙守卫:"..i..HeroManager.GetSingleHeroData(msg.hongmengGuards[i].heroId).name) + -- end + -- end HarmonyManager.UpdateHongMengDataGuards(msg.hongmengGuards) end From 324ba7bc57e8d8f8acc1210f387b73eef04706f3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <3046463818@qq.com> Date: Fri, 16 Jul 2021 15:04:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E5=AD=97=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Recruit/RecruitPanelNew.prefab | 8 ++++---- .../~Lua/Modules/Recruit/RecruitPanelNew.lua | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index b70999fdda..b5f36543a0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -36892,8 +36892,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: 0.0015545, y: 41.719936} - m_SizeDelta: {x: 192.63, y: 0} + m_AnchoredPosition: {x: 4.8, y: 37.749943} + m_SizeDelta: {x: 183.1, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6680648963269486201 CanvasRenderer: @@ -42992,8 +42992,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: 0.22, y: 3.85} - m_SizeDelta: {x: 192.63, y: 83.44} + m_AnchoredPosition: {x: 0.22, y: -0.9} + m_SizeDelta: {x: 192.6, y: 75.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4105330798162488110 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 9f98d78f4d..a7a8294ec5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -240,7 +240,7 @@ function RecruitPanelNew:UpdataWishPanel() if RecruitManager.isTenRecruit == 0 then self.tenTipText.text = "首次十连必得五星神将" else - self.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount()) + self.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount()) end end @@ -351,6 +351,7 @@ function RecruitPanelNew:Recruit(recrutType,recrutId,bType) if bType == 1 then UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],recrutId,bType,{self.config.ShopData[3][1],self.config.ShopData[3][2]}) else + RecruitManager.isTenRecruit = 1 UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,recrutId,bType,{self.config.ShopData[3][1],self.config.ShopData[3][2]}) end CheckRedPointStatus(self.config.RpType) From d6226e77bf0dd0521f221edb966ece8e2d6034cc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 16 Jul 2021 15:11:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92]=3D?= =?UTF-8?q?=3D=3D=3D=3D=E9=AD=82=E5=8D=B0=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab | 4 ++-- .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index f9211632ba..2f6ed5ca74 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -5323,7 +5323,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: 57, y: -365} + m_AnchoredPosition: {x: 62.5, y: -365} m_SizeDelta: {x: 129, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6020975154716938251 @@ -30609,7 +30609,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: 58, y: -224.5} + m_AnchoredPosition: {x: 63.5, y: -224} m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2892560023550008126 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index e9fc14e2bd..f12c527495 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -242,7 +242,7 @@ function QianKunBox:contentShow() self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[wishSoulData[i]].Quantity].circle) --点击能查看魂印信息 Util.AddOnceClick(self.icons[i].kuang.gameObject,function () - UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,iconsData[i].Reward[1],nil,nil) + UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,id,nil,nil) end) else self.icons[i].icon.gameObject:SetActive(false)