From 6b9a61def73d4eece8cab4e0785895798ed1b3ed Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 14:36:03 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8A=A9=E6=88=98=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AE=9D=E7=89=A9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 24685d3e3c..fa8fe502a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -384,7 +384,7 @@ function this.EquipInfo() for n = 1, #curHeroData.jewels do local did=curHeroData.jewels[n] - local data=EquipTreasureManager.GetSingleTreasureByIdDyn(did) or ExpeditionManager.GetSingleTreasureByIdDyn(did) or GoodFriendManager.GetSingleTreasureByIdDyn(did) + local data=EquipTreasureManager.GetSingleTreasureByIdDyn(did) or ExpeditionManager.GetSingleTreasureByIdDyn(did) or GoodFriendManager.GetSingleTreasureByIdDyn(did) or MonsterCampManager.GetSingleTreasureByIdDyn(did) if not data then return end From a5dcdd4e7f1b7e19e8c60b4b221de65b6d37b7f5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 14:44:48 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AE=9D=E7=89=A9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 68c6a90f1a..0b53c27d79 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -343,6 +343,8 @@ function this.InitSingleTreasureData(_singleData) single.maxLv=currJewel.Max[1] single.maxRefineLv=currJewel.Max[2] single.upHeroDid="" + single.maxTreeLv = currJewel.GodHoodMaxlv + single.treeLv = SacredTreeManager.treeLevel <= single.maxTreeLv and SacredTreeManager.treeLevel or single.maxTreeLv local quantity=currJewel.Level single.quantity=quantity single.frame=GetQuantityImageByquality(quantity) From 8cf7fb6b2e80af2c6749e8209219b2ee6e8a3d45 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 14:52:12 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E3=80=90=E5=9B=9B=E7=81=B5=E8=AF=95?= =?UTF-8?q?=E7=82=BC=E3=80=91=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BB=8E=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E5=90=8D=E5=BC=80=E5=A7=8B=E6=89=80=E6=9C=89=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E5=AD=97=E9=83=BD=E5=8F=98=E6=88=90=E2=80=9C?= =?UTF-8?q?=E8=83=86=E5=AD=90=E8=B6=85=E7=BA=A7=E5=A4=A7=E2=80=9D=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E5=90=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Ranking/RankingSingleListPanel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 7f79cf51ea..c9d98ec5a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -432,6 +432,9 @@ function this.SetInfoShow(go,data,rankType,Value0) end elseif rankType == RANK_TYPE.PERSON_CHALLENGE then if data.rankInfo.param1 and data.rankInfo.param1 > 0 then + if Value0 then + Value0:GetComponent("Text").text = ""..data.userName.."" + end fight:SetActive(true) fight:GetComponent("Text").text = "层数:"..data.rankInfo.param1 end From 880e702a76d72e5c8c2c0d766fb1d589ad1861cb Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 14:57:09 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E3=80=90=E5=9B=9B=E7=81=B5=E8=AF=95?= =?UTF-8?q?=E7=82=BC=E3=80=91=E5=9C=A8=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=BB=E6=84=8F=E7=8E=A9=E5=AE=B6=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=88=87=E7=A3=8B=E6=88=96=E5=85=B6=E4=BB=96=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=90=8E?= =?UTF-8?q?=E9=99=A4=E7=AC=AC=E4=B8=80=E5=90=8D=E5=A4=96=E5=85=B6=E5=AE=83?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF=E6=9C=AA=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Ranking/RankingSingleListPanel.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index c9d98ec5a6..f2348b2d1a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -77,7 +77,6 @@ end --界面关闭时调用(用于子类重写) function RankingSingleListPanel:OnClose() - this.scrollParentView:SetActive(false) SoundManager.PlayOldMusic() RankingManager.isRequest=0 this.noneImage:SetActive(false) From db6c53a1134dfef8ca6dedd9626075d782134d8a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 15:11:04 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=93=81=E9=98=B6=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index fa8fe502a6..a083e443dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -256,8 +256,8 @@ function this.RoleInfo1() end this.pinjieList[i]:GetComponent("Image").sprite=Util.LoadSprite(i<=pId and pinjieImage[2] or pinjieImage[1]) end - for n = 0, this.pinjieRoot.transform.childCount-1 do --超过品阶关闭显示 - this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n+1<=#hruConfig) + for n = 1, this.pinjieRoot.transform.childCount - 1 do --超过品阶关闭显示 + this.pinjieRoot.transform:GetChild(n).gameObject:SetActive(n<=#hruConfig) end --基础属性 From 95d7c4cfea1a906386b8ad41b67e9f507ddb670c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 15:26:57 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E3=80=90=E5=9B=9B=E7=81=B5=E8=AF=95?= =?UTF-8?q?=E7=82=BC=E3=80=91=E6=89=8B=E5=8A=A8=E4=B8=8B=E9=98=B5=E7=A5=9E?= =?UTF-8?q?=E5=B0=86=EF=BC=8C=E7=A5=9E=E5=B0=86=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=8F=98=EF=BC=8C=E8=BF=98=E6=98=AF=E2=80=9C=E5=B7=B2?= =?UTF-8?q?=E4=B8=8A=E9=98=B5=E2=80=9D=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/FormationPanelV2.lua | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 080a901d44..534e6c1737 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -239,22 +239,10 @@ function this:OnOpen(_panelType,...) SoundManager.PlaySound(SoundConfig.Sound_BattleStart_01) end -function this:SetCampIcon() - if panelType == FORMATION_TYPE.FOUR_ELEMENT then - this.opView.SetCampIconByCurType(tabs,this.selectBtn) - else - for i = 0 , #tabs do - Util.SetGray(tabs[i],false) - tabs[i]:GetComponent("Button").enabled = true - end - end -end - function this:OnShow() this.ElementalResonanceView:OnOpen({sortOrder=self.sortingOrder}) this.SetDrawLevel() this.RefreshFormation(true,true) - this:SetCampIcon() end function this:OnClose() @@ -505,12 +493,8 @@ end --点击筛选 -function this.OnClickTabBtn(_proId, isTop,isAni) +function this.OnClickTabBtn(_proId, isTop,isAni) local heros - this.selectBtn:SetActive(proId ==_proId) - this.selectBtn.transform:SetParent(tabs[_proId].transform) - this.selectBtn.transform:DOAnchorPos(Vector3.zero,0) - this.selectBtn.transform:DOScale(Vector3.one,0) if this.curFormationIndex == FormationTypeDef.EXPEDITION then if _proId == ProIdConst.All then heros = HeroManager.GetAllHeroDatas(limitLevel) @@ -530,6 +514,19 @@ function this.OnClickTabBtn(_proId, isTop,isAni) end this.empty:SetActive(#heros<=0) this.SetRoleList(heros, isTop,isAni) + if panelType == FORMATION_TYPE.FOUR_ELEMENT then + this.opView.SetCampIconByCurType(tabs,this.selectBtn) + else + for i = 0 , #tabs do + Util.SetGray(tabs[i],false) + tabs[i]:GetComponent("Button").enabled = true + end + this.selectBtn:SetActive(proId ==_proId) + this.selectBtn.transform:SetParent(tabs[_proId].transform) + this.selectBtn.transform:DOAnchorPos(Vector3.zero,0) + this.selectBtn.transform:DOScale(Vector3.one,0) + end + end --设置英雄列表数据 @@ -867,7 +864,7 @@ function this.OnEndDrag(Pointgo,data)--结束拖动 end this.line.gameObject:SetActive(false) this.SetCardsData() - --this.OnClickTabBtn(proId) + this.OnClickTabBtn(proId) end function this.OnDrag(Pointgo,data)--拖动中 if data.pointerEnter==nil then--拖到屏幕外 From 6899e700de3f593de788d0e1682f698a55b4b525 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 15:33:18 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E7=99=BD=E7=89=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82=E7=A5=9E=E5=BA=94=E8=A7=A3=E9=94=81=E7=95=8C=E9=9D=A2?= =?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/Popup/RewardItemPopup.prefab | 18 +++++++++--------- .../~Lua/Modules/Arena/ArenaResultPopup.lua | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index a814c31690..03d54c8051 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -913,7 +913,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 3.2999773, y: 18} - m_SizeDelta: {x: 346, y: 123} + m_SizeDelta: {x: 477, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6190835940073535650 CanvasRenderer: @@ -943,7 +943,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8f9362bef86acb146925242736e5f414, type: 3} + m_Sprite: {fileID: 21300000, guid: 3032704d6fdf8ee458ea3d56f7e30f1f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3922,8 +3922,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 1.1, y: -212.2} - m_SizeDelta: {x: 1075.6, y: 66} + m_AnchoredPosition: {x: 1.1, y: -267.5} + m_SizeDelta: {x: 1075.6, y: 110.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &797082731835704268 CanvasRenderer: @@ -3966,7 +3966,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: sadfasdfsdaffffffff --- !u!1 &2449184198827426303 GameObject: m_ObjectHideFlags: 0 @@ -4001,7 +4001,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 350.3, y: 5} + m_AnchoredPosition: {x: 423.1, y: 5} m_SizeDelta: {x: 391, y: 83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7489574292809244955 @@ -4552,8 +4552,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.8000488, y: -9.6} - m_SizeDelta: {x: 221.7, y: 245.2} + m_AnchoredPosition: {x: 0.8000488, y: -57.1} + m_SizeDelta: {x: 221.7, y: 340.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9213105932245059169 CanvasRenderer: @@ -7190,7 +7190,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -341.20004, y: 9} + m_AnchoredPosition: {x: -418.67, y: 9} m_SizeDelta: {x: 391, y: 83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8068741244574255743 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 67ae87bd5f..19c26e7257 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -16,7 +16,7 @@ function ArenaResultPopup:InitComponent() this.loseEffect = Util.GetGameObject(self.transform, "lose/Effect (1)") this.btnResult = Util.GetGameObject(self.transform, "btnResult") this.btnBattleBack = Util.GetGameObject(self.transform, "btnBattleBack") - -- this.btnBattleBack:SetActive(false) + this.btnBattleBack:GetComponent("Image").sprite = Util.LoadSprite("s_silingshilian_huifanganniu_zh") screenAdapte(this.winEffect) screenAdapte(this.loseEffect) end From aa13c8ebab7d6d7c1cbc11e37d4ca28fa12f6e20 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 15:57:17 +0800 Subject: [PATCH 08/12] =?UTF-8?q?scrollview=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/View/ScrollCycleView.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 17da9c6a6d..b550970e9f 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -197,16 +197,16 @@ function ScrollCycleView:InitComponent() self.OnEndDragNew= function(p,d) OnEndDrag(self,p,d) end - -- self.trigger = Util.GetEventTriggerListener(self.gameObject) - -- self.trigger.onBeginDrag = self.trigger.onBeginDrag + self.OnBeginDragNew - -- self.trigger.onDrag = self.trigger.onDrag + self.OnDragNew - -- self.trigger.onEndDrag = self.trigger.onEndDrag + self.OnEndDragNew - self.trigger = Util.GetEventTriggerListener(self.gameObject) self.isCanDrag = true self.isBeginDrag = false - self.trigger.onBeginDrag = self.trigger.onBeginDrag + function (p,d) OnBeginDrag(self,p,d) end - self.trigger.onDrag = self.trigger.onDrag + function (p,d) OnDrag(self,p,d) end - self.trigger.onEndDrag = self.trigger.onEndDrag + function (p,d) OnEndDrag(self,p,d) end + self.trigger = Util.GetEventTriggerListener(self.gameObject) + self.trigger.onBeginDrag = self.trigger.onBeginDrag + self.OnBeginDragNew + self.trigger.onDrag = self.trigger.onDrag + self.OnDragNew + self.trigger.onEndDrag = self.trigger.onEndDrag + self.OnEndDragNew + -- self.trigger = Util.GetEventTriggerListener(self.gameObject) + -- self.trigger.onBeginDrag = self.trigger.onBeginDrag + function (p,d) OnBeginDrag(self,p,d) end + -- self.trigger.onDrag = self.trigger.onDrag + function (p,d) OnDrag(self,p,d) end + -- self.trigger.onEndDrag = self.trigger.onEndDrag + function (p,d) OnEndDrag(self,p,d) end self.rectTransform = self.gameObject:GetComponent("RectTransform") From e177f63787d6b4b1ca26797a443f3d23bcd6dc2f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 17:06:08 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Chat/ChatManager.lua | 3 ++- .../~Lua/Modules/Popup/RewardItemPopup.lua | 19 ++++++++++--------- .../~Lua/View/ChatTipView.lua | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index e2f2bbcc8e..a5e2c797de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -20,7 +20,8 @@ local _CHANNEL = { this.SYS_MSG_TYPE = { [0] = {name = Language[10350]}, [1] = {name = Language[10351]}, - [2] = {name = Language[10352]} + [2] = {name = Language[10352]}, + [9] = {name = Language[10352]} } -- 聊天中要显示时间的时间间隔(毫秒) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index ce2e4489e7..70c9e0409d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -141,21 +141,13 @@ function RewardItemPopup:OnOpen(...) if args[4] then - compShowType = args[4] + compShowType = args[4] or 0 end if args[7] then showHero = false else showHero = true end - if compShowType == CompShowType.fourElement then - this.ScrollView.gameObject:SetActive(false) - this.dropPrefab.gameObject:SetActive(false) - this.ScrollView2.gameObject:SetActive(false) - this.shenying.gameObject:SetActive(true) - this.ShengYingShow(args[8]) - return - end this.shenying.gameObject:SetActive(false) local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) @@ -186,6 +178,15 @@ function RewardItemPopup:OnOpen(...) if compShowType == 6 then this.GuildTranscriptShow() end + + if compShowType == CompShowType.fourElement then + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.ScrollView2.gameObject:SetActive(false) + this.shenying.gameObject:SetActive(true) + this.ShengYingShow(args[8]) + return + end local starItemDataList=BagManager.GetItemListFromTempBag(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 diff --git a/Assets/ManagedResources/~Lua/View/ChatTipView.lua b/Assets/ManagedResources/~Lua/View/ChatTipView.lua index eef1b2a65a..bc7afa09bb 100644 --- a/Assets/ManagedResources/~Lua/View/ChatTipView.lua +++ b/Assets/ManagedResources/~Lua/View/ChatTipView.lua @@ -3,7 +3,8 @@ local SYS_MSG_TYPE = { [0] = {name = Language[10350]}, [1] = {name = Language[10351]}, - [2] = {name = Language[10352]} + [2] = {name = Language[10352]}, + [9] = {name = Language[10352]} } local VIEW_TYPE = { From cf02c49ac5a44e9a6c4cd1454174b57bbba78c58 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 17:35:04 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=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 --- .../~Lua/Modules/Popup/RewardItemPopup.lua | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 70c9e0409d..ff996976f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -163,7 +163,14 @@ function RewardItemPopup:OnOpen(...) local isHideBG = args[6] this.btnBack:GetComponent("Image").color = Color.New(0, 0, 0, isHideBG and 0 or 0.8) this.btnGoOn:SetActive(not isHideBG) - + if compShowType == CompShowType.fourElement then + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.ScrollView2.gameObject:SetActive(false) + this.shenying.gameObject:SetActive(true) + this.ShengYingShow(args[8]) + return + end if not drop then this.GuildCarDelayShow() this.guildCarDelay:SetActive(compShowType == 3) @@ -179,14 +186,7 @@ function RewardItemPopup:OnOpen(...) this.GuildTranscriptShow() end - if compShowType == CompShowType.fourElement then - this.ScrollView.gameObject:SetActive(false) - this.dropPrefab.gameObject:SetActive(false) - this.ScrollView2.gameObject:SetActive(false) - this.shenying.gameObject:SetActive(true) - this.ShengYingShow(args[8]) - return - end + local starItemDataList=BagManager.GetItemListFromTempBag(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 @@ -521,6 +521,7 @@ function RewardItemPopup:ItemDataListSort(itemDataList) end --界面关闭时调用(用于子类重写) function RewardItemPopup:OnClose() + compShowType = 0 if compShowType == CompShowType.fourElement then return end @@ -539,8 +540,6 @@ function RewardItemPopup:OnClose() return end end - - compShowType = 0 if func and not isPopGetSSR then if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then func(isBackBattle) From 40e16c260107b92c82b8864d793903fa2836edb9 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 18:47:56 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=9B=9B=E7=81=B5=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 - .../~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua | 4 ++++ .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 534e6c1737..85cc74c2b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -714,7 +714,6 @@ function this.SingleHeroDataShow(_go, _heroData) PopupTipPanel.ShowTip(Language[10689]) return end - LogGreen("heroData.dynamicId:"..heroData.dynamicId) table.insert(this.choosedList, {heroId = heroData.dynamicId, position=this.GetPos()}) this.SetCardsData(this.choosedList) else diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index a096f7dba0..f51ea21749 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -144,6 +144,10 @@ function FourElementMonsterCampPanel:OnShow() local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) if propertyId > 0 then UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + local power = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + if power - MonsterCampManager.oldpower > 0 then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = MonsterCampManager.oldpower,newValue = power}) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 0b53c27d79..4269cbe567 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -10,6 +10,7 @@ local CampTowerConfig = ConfigManager.GetConfig(ConfigName.CampTowerConfig) local campTowerSetting = ConfigManager.GetConfig(ConfigName.CampTowerSetting) local gameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +this.oldpower = 0 --四灵试炼数据 this.fourMonsterData = {} this.CurOffsetIndex = -1 @@ -169,6 +170,8 @@ function this.GetMonsterTeamInfo(monsterGroupId) end function this.StraightBattle(id,type,func,curType) + this.oldpower = FormationManager.GetFormationPower(FormationManager.curFormationIndex) + LogGreen("oldpower:"..this.oldpower) this.curType = curType local fightId = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"FloorId",id,"CampId",curType).Id NetManager.FourChallengeDoRequest(fightId,type,function(msg) @@ -339,7 +342,9 @@ function this.InitSingleTreasureData(_singleData) single.id=staticId single.idDyn=_singleData.id single.lv=_singleData.exp + LogGreen("single.lv:"..single.lv) single.refineLv=_singleData.rebuildLevel + LogGreen("single.refineLv:"..single.refineLv) single.maxLv=currJewel.Max[1] single.maxRefineLv=currJewel.Max[2] single.upHeroDid="" From e3460c8b83359fc9965c23a659b690f72e285fcb Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 18:50:23 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Expert/ExpertPanel.prefab | 192 +++++++++--------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index e5ac68aaa7..7215a3fd1f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -5011,7 +5011,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11388,7 +11388,7 @@ ParticleSystem: --- !u!199 &85288511972748413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16131,7 +16131,7 @@ ParticleSystem: --- !u!199 &85288512077974317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20829,7 +20829,7 @@ ParticleSystem: --- !u!199 &85288512168349841 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25527,7 +25527,7 @@ ParticleSystem: --- !u!199 &85288512214742610 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30390,7 +30390,7 @@ ParticleSystem: --- !u!199 &85288513168343927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35088,7 +35088,7 @@ ParticleSystem: --- !u!199 &85288513351305705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35985,9 +35985,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -548.86} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5602079545849984728 @@ -36275,9 +36275,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -767.29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1515287188817918812 @@ -40948,7 +40948,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45646,7 +45646,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50344,7 +50344,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55087,7 +55087,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59785,7 +59785,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64483,7 +64483,7 @@ ParticleSystem: --- !u!199 &5899601245091579705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69921,7 +69921,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74846,7 +74846,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -76507,9 +76507,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -1422.5798} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3253678623016334174 @@ -81302,7 +81302,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87715,7 +87715,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94257,7 +94257,7 @@ ParticleSystem: --- !u!199 &7275324880265961258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100145,7 +100145,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105477,7 +105477,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110303,7 +110303,7 @@ ParticleSystem: --- !u!199 &7446892149717719861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -117305,7 +117305,7 @@ ParticleSystem: --- !u!199 &7994448136678369462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118196,9 +118196,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -2077.8696} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &352105450593286701 @@ -122983,7 +122983,7 @@ ParticleSystem: --- !u!199 &6366831406703767530 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127937,7 +127937,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -133735,7 +133735,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -138482,7 +138482,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -139538,9 +139538,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -330.43} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4183130594691691997 @@ -145059,7 +145059,7 @@ ParticleSystem: --- !u!199 &3736263280892008042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -149831,7 +149831,7 @@ ParticleSystem: --- !u!199 &3736263281027369366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -154749,7 +154749,7 @@ ParticleSystem: --- !u!199 &3736263281144678159 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -159447,7 +159447,7 @@ ParticleSystem: --- !u!199 &3736263281160650038 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -164150,7 +164150,7 @@ ParticleSystem: --- !u!199 &3736263281325203082 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -169192,7 +169192,7 @@ ParticleSystem: --- !u!199 &3736263282101879313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -173890,7 +173890,7 @@ ParticleSystem: --- !u!199 &3736263282140865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178663,7 +178663,7 @@ ParticleSystem: --- !u!199 &3736263282223057855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183406,7 +183406,7 @@ ParticleSystem: --- !u!199 &3736263282260434226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188862,7 +188862,7 @@ ParticleSystem: --- !u!199 &8736007889913585379 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -193863,7 +193863,7 @@ ParticleSystem: --- !u!199 &6218818886541518366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -194693,10 +194693,10 @@ RectTransform: m_Father: {fileID: 4953878265078755386} 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: 297.1, y: -22.5} - m_SizeDelta: {x: 594.2, y: 35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 594.2, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817061654922696 CanvasRenderer: @@ -200326,7 +200326,7 @@ ParticleSystem: --- !u!199 &3061375693970565652 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200555,9 +200555,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -1641.0098} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1514830361088202235 @@ -205886,7 +205886,7 @@ ParticleSystem: --- !u!199 &6371239923318808130 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -207866,9 +207866,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -1859.4397} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8657082432405232145 @@ -208710,8 +208710,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: 167.83, y: 711} - m_SizeDelta: {x: 594.2, y: 52} + m_AnchoredPosition: {x: 167.83, y: 684.5} + m_SizeDelta: {x: 594.2, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4953878265078755380 CanvasRenderer: @@ -208832,7 +208832,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.0000019073, y: 0} - m_SizeDelta: {x: 838.1, y: 2189.8696} + m_SizeDelta: {x: 838.1, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &385353760370003947 MonoBehaviour: @@ -214229,7 +214229,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -219108,7 +219108,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225714,7 +225714,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -226442,9 +226442,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -112} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &347261519494395572 @@ -231034,7 +231034,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -235732,7 +235732,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -241638,9 +241638,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -985.72} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8818913707777223369 @@ -246865,7 +246865,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -247578,7 +247578,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5633248320576759341 RectTransform: m_ObjectHideFlags: 0 @@ -253209,7 +253209,7 @@ ParticleSystem: --- !u!199 &3952339559707849751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253878,8 +253878,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: 167.83, y: 711} - m_SizeDelta: {x: 594.2, y: 52} + m_AnchoredPosition: {x: 167.83, y: 684.5} + m_SizeDelta: {x: 594.2, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7097480920010974223 CanvasRenderer: @@ -254346,10 +254346,10 @@ RectTransform: m_Father: {fileID: 2597592455288846907} 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: 297.1, y: -17.5} - m_SizeDelta: {x: 594.2, y: 35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 594.2, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2777627761568600087 CanvasRenderer: @@ -260005,7 +260005,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -267203,7 +267203,7 @@ ParticleSystem: --- !u!199 &4947693289891535506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -276548,7 +276548,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -281950,7 +281950,7 @@ ParticleSystem: --- !u!199 &2442695948598551547 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -283727,9 +283727,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -1204.1499} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7792564941164481903 @@ -289623,7 +289623,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -294321,7 +294321,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0}