From a556bf7761b0d5abf01d26c8d404a2e2bd68f0d8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 15 Jan 2022 18:17:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=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/PlayerInfoPopup.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index e885abe0de..e73b4a92eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -304,6 +304,9 @@ function PlayerInfoPopup:OnShow() end) else --目前只给灵脉,如果还有其他请写明备注 + this.InfoBtns:SetActive(false) + this.InfoContentGrid:SetActive(false) + this.pokemonObj:SetActive(false) this.extraInfo.Init(this,this.data,_ViewConfig[this._ViewType]) end end From 10070d14ca0e377bbd96e9196b6ff5c6c8faea4f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 15 Jan 2022 18:29:18 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E8=B7=B3=E8=BD=AC=E3=80=91?= =?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/FirstRecharge/FirstRechargePanel.lua | 2 +- .../ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua | 2 +- .../ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index c48e8ad5e7..f88246abee 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -322,7 +322,7 @@ function FirstRechargePanel:OnRechargeBtnClicked() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then JumpManager.GoJump(36012) else - JumpManager.GoJump(36001) + JumpManager.GoJump(36008) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 022620bb8e..c30f6209f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -53,7 +53,7 @@ function MonthCardPage:BindEvent() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then JumpManager.GoJump(36012) else - JumpManager.GoJump(36001) + JumpManager.GoJump(36008) end else if self.curAllMonthCardData[cardData[i].cardType].state == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua index 6afad400ef..6031f15c07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopupNew.lua @@ -385,7 +385,7 @@ function this.SetMissionData() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then JumpManager.GoJump(36012) else - JumpManager.GoJump(36001) + JumpManager.GoJump(36008) end else JumpManager.GoJump(dataConfig.Jump[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index db9dcaee56..e05e2fa456 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -217,7 +217,7 @@ function RoleInfoLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_he this:UpdateHeroUpLvAndBreakData()--升级 --角色定位按钮 this.posBtn.gameObject:SetActive(curHeroData.heroConfig.ShowHeroLocation==1) - this.posInfo.text = curHeroData.heroConfig.HeroLocationDesc1 + this.posInfo.text = curHeroData.star < 11 and curHeroData.heroConfig.HeroLocationDesc1 or curHeroData.heroConfig.HeroLocationDesc4 ForceRebuildLayout(this.posBtn.transform) end From 9357e70d422f397c808d2abfa96610bc1b9096f9 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 15 Jan 2022 18:44:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E5=90=8D=E5=AD=97=E4=BD=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index b9f3babdff..c816c3abb6 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -35,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -6.549999, y: 5.5999947} + m_AnchoredPosition: {x: -6.550003, y: 5.599991} m_SizeDelta: {x: 14.389999, y: 4.25} m_Pivot: {x: 0, y: 1} --- !u!222 &371455537 @@ -5000,7 +5000,7 @@ ParticleSystem: --- !u!199 &199793888397422328 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10056,7 +10056,7 @@ ParticleSystem: --- !u!199 &199786334729933541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14812,7 +14812,7 @@ ParticleSystem: --- !u!199 &199812891778826125 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14906,7 +14906,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 39.2, y: 259.1} + m_AnchoredPosition: {x: 39.19995, y: 259.1} m_SizeDelta: {x: 70, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222839504031791556 @@ -19500,7 +19500,7 @@ ParticleSystem: --- !u!199 &199314592830468766 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24310,7 +24310,7 @@ ParticleSystem: --- !u!199 &199738970247411175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29482,7 +29482,7 @@ ParticleSystem: --- !u!199 &199312732024159113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29577,7 +29577,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 251.52, y: 0} + m_AnchoredPosition: {x: 241.52, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314792653266900 @@ -34548,7 +34548,7 @@ ParticleSystem: --- !u!199 &199309040906483979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39304,7 +39304,7 @@ ParticleSystem: --- !u!199 &199592651100025897 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44134,7 +44134,7 @@ ParticleSystem: --- !u!199 &199310039250832541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48890,7 +48890,7 @@ ParticleSystem: --- !u!199 &199031629276305175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53728,7 +53728,7 @@ ParticleSystem: --- !u!199 &199224694020007487 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53822,7 +53822,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -39.2, y: 259.1} + m_AnchoredPosition: {x: -39.19995, y: 259.1} m_SizeDelta: {x: 70, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222637961811482464 @@ -54086,7 +54086,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.8, y: -274} + m_AnchoredPosition: {x: -116.79999, y: -306.90002} m_SizeDelta: {x: 198.7, y: 183.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6900503861996968449 @@ -54373,7 +54373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.8, y: -142.1} + m_AnchoredPosition: {x: -116.79999, y: -175} m_SizeDelta: {x: 178.57, y: 178.57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7345339821710159408 @@ -54604,7 +54604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5369302175513246981 RectTransform: m_ObjectHideFlags: 0 @@ -54814,7 +54814,7 @@ 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: 1.005, y: -216.1} + m_AnchoredPosition: {x: 1.005, y: -216.09999} m_SizeDelta: {x: 156, y: 422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7953302478879648176 @@ -55188,11 +55188,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 10 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 4 m_Spacing: -18.48 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -55322,7 +55322,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.8, y: -403.57} + m_AnchoredPosition: {x: -116.79999, y: -436.4701} m_SizeDelta: {x: 133.01, y: 129.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2420754012896772010 @@ -55681,7 +55681,7 @@ 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, y: -23.599998} + m_AnchoredPosition: {x: 0, y: -23.600006} m_SizeDelta: {x: -81, y: -104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2988341279720194406 @@ -56548,9 +56548,9 @@ RectTransform: m_Father: {fileID: 224287801546099592} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -116, y: -26} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -116, y: 934} m_SizeDelta: {x: 100, y: 446} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6706216607764804969 @@ -56611,7 +56611,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -6.549999, y: 5.5999947} + m_AnchoredPosition: {x: -6.550003, y: 5.599991} m_SizeDelta: {x: 14.389999, y: 4.25} m_Pivot: {x: 0, y: 1} --- !u!222 &3127605417484264563 @@ -56963,7 +56963,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: 124.3, y: -70.6} + m_AnchoredPosition: {x: 124.30005, y: -70.6001} m_SizeDelta: {x: 76, y: 324.52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5002742640551563704 @@ -57368,7 +57368,7 @@ 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, y: -23.599998} + m_AnchoredPosition: {x: 0, y: -23.600006} m_SizeDelta: {x: -82, y: -104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7356600971066785858 @@ -57622,9 +57622,9 @@ RectTransform: m_Father: {fileID: 224287801546099592} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 116, y: -212.78503} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 116, y: 747.21497} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &7854679572375693773 From fbd1c9aa4360424c5c6166acb694ee095360834e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 17 Jan 2022 09:41:00 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AE=B8=E6=84=BF=E7=A5=9E=E5=B0=86?= =?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 --- .../~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index 48f01b06a4..44a9e885cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -133,11 +133,7 @@ function this.SingleHeroDataShow(go,_heroData,_index) proIcon.gameObject:SetActive(false) starGrid:SetActive(false) end - if curPage ~= 5 then - frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) - else - frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung") - end + frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung") this.choosedList[go] = choosed this.choosedList[go]:SetActive( heroData.Id==currHeroId) From e93b2816b40183b84587812eafb904a97c08d5e0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 17 Jan 2022 10:24:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90=E6=91=98=E6=98=9F=E9=98=81?= =?UTF-8?q?=E3=80=91=E8=A3=85=E5=A4=87=E6=91=98=E6=98=9F=E9=98=81=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardEquipSingleShowPopup2.prefab | 664 +++++++++++++++--- .../Popup/RewardEquipSingleShowPopup2.lua | 65 +- 2 files changed, 634 insertions(+), 95 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab index 5999d2090c..be7768c23a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab @@ -86,6 +86,86 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &339245490448663517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 306234894335262045} + - component: {fileID: 2547070929771342425} + - component: {fileID: 8773789300031343826} + m_Layer: 5 + m_Name: curProVale + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &306234894335262045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339245490448663517} + 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: + - {fileID: 8210693043289154658} + m_Father: {fileID: 1417629301715810043} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2547070929771342425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339245490448663517} + m_CullTransparentMesh: 0 +--- !u!114 &8773789300031343826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339245490448663517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +66 --- !u!1 &364503659454277403 GameObject: m_ObjectHideFlags: 0 @@ -260,8 +340,7 @@ RectTransform: 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: - - {fileID: 8851894391336208869} + m_Children: [] m_Father: {fileID: 8569408221378906818} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -312,6 +391,86 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +66 +--- !u!1 &901090634268091325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5360054861317454577} + - component: {fileID: 7449147185561767551} + - component: {fileID: 4347203054013633132} + m_Layer: 0 + m_Name: PropertyName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5360054861317454577 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901090634268091325} + 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: 2111386558047614758} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7449147185561767551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901090634268091325} + m_CullTransparentMesh: 0 +--- !u!114 &4347203054013633132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901090634268091325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6458\u661F\u9601\u52A0\u6301\uFF1A" + LanguageIndex: 0 --- !u!1 &1085209714314989767 GameObject: m_ObjectHideFlags: 0 @@ -576,6 +735,87 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1276990293255353059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1417629301715810043} + - component: {fileID: 1199318821368246912} + - component: {fileID: 5815895390516875656} + m_Layer: 5 + m_Name: curProName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1417629301715810043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276990293255353059} + 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: + - {fileID: 306234894335262045} + m_Father: {fileID: 2538206906522360066} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1199318821368246912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276990293255353059} + m_CullTransparentMesh: 0 +--- !u!114 &5815895390516875656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276990293255353059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u62A4\u7532" + LanguageIndex: 0 --- !u!1 &1300421713178413199 GameObject: m_ObjectHideFlags: 0 @@ -860,7 +1100,7 @@ RectTransform: - {fileID: 2729895378572737907} - {fileID: 2326936323343625867} m_Father: {fileID: 2948461849611934824} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -936,7 +1176,7 @@ RectTransform: - {fileID: 3535724585431877029} - {fileID: 8420829159650770875} m_Father: {fileID: 2948461849611934824} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1627,6 +1867,101 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 912, y: 130} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3043429802927297716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3198923251045082768} + - component: {fileID: 4884337174366809649} + - component: {fileID: 3129421774889529437} + - component: {fileID: 1896485925797257595} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3198923251045082768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3043429802927297716} + 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: 2111386558047614758} + m_RootOrder: 0 + 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: 0, y: -4} + m_SizeDelta: {x: 900, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4884337174366809649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3043429802927297716} + m_CullTransparentMesh: 0 +--- !u!114 &3129421774889529437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3043429802927297716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1896485925797257595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3043429802927297716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3148035006110076297 GameObject: m_ObjectHideFlags: 0 @@ -2751,85 +3086,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u83B7\u53D6\u9014\u5F84" LanguageIndex: 0 ---- !u!1 &5257108890205232593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8851894391336208869} - - component: {fileID: 5822766328601761149} - - component: {fileID: 1833719740022070665} - m_Layer: 5 - m_Name: homeValue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8851894391336208869 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5257108890205232593} - 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: 3843790720774461504} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 400, y: 0} - m_SizeDelta: {x: 250, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5822766328601761149 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5257108890205232593} - m_CullTransparentMesh: 0 ---- !u!114 &1833719740022070665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5257108890205232593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: --- !u!1 &5339795739591329494 GameObject: m_ObjectHideFlags: 0 @@ -2909,6 +3165,91 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +--- !u!1 &5369503593336553800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2538206906522360066} + - component: {fileID: 3252014967305954959} + - component: {fileID: 7889514046270932701} + - component: {fileID: 2610837192841897614} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2538206906522360066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5369503593336553800} + 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: + - {fileID: 1417629301715810043} + m_Father: {fileID: 2111386558047614758} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 467.5, y: 0} + m_SizeDelta: {x: 875, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3252014967305954959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5369503593336553800} + m_CullTransparentMesh: 0 +--- !u!114 &7889514046270932701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5369503593336553800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 100 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 250, y: 50} + m_Spacing: {x: 150, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &2610837192841897614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5369503593336553800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &5539070635017549200 GameObject: m_ObjectHideFlags: 0 @@ -3335,6 +3676,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7691181773687293707} + - {fileID: 2111386558047614758} - {fileID: 4139601617807381921} - {fileID: 6594472603124481167} m_Father: {fileID: 5981932543035177726} @@ -3774,6 +4116,83 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6799905526993297981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2111386558047614758} + - component: {fileID: 7059021513111261155} + - component: {fileID: 168891464966413774} + m_Layer: 5 + m_Name: homePro + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2111386558047614758 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799905526993297981} + 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: + - {fileID: 3198923251045082768} + - {fileID: 5360054861317454577} + - {fileID: 2538206906522360066} + m_Father: {fileID: 2948461849611934824} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 452.5, y: 0} + m_SizeDelta: {x: 905, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7059021513111261155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799905526993297981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 30 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &168891464966413774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799905526993297981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &6889380681019265094 GameObject: m_ObjectHideFlags: 0 @@ -4054,6 +4473,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4F7F \u7528" LanguageIndex: 0 +--- !u!1 &7625625760669645115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8210693043289154658} + - component: {fileID: 7634621174935024230} + - component: {fileID: 6255998838981631232} + m_Layer: 5 + m_Name: homeValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8210693043289154658 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7625625760669645115} + 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: 306234894335262045} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 400, y: 0} + m_SizeDelta: {x: 250, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7634621174935024230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7625625760669645115} + m_CullTransparentMesh: 0 +--- !u!114 &6255998838981631232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7625625760669645115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &7656865276646392508 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index e52d33dae9..fd210f6a31 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -7,6 +7,7 @@ local EquipStrengthen = ConfigManager.GetConfig(ConfigName.EquipStrengthen) local EquipRankUp = ConfigManager.GetConfig(ConfigName.EquipRankUp) local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig) local _BaseProList = {}--基础属性对象 +local _homeProList = {}--摘星阁属性对象 local _suitProList = {}--套装属性对象 local _superProList = {}--白金属性对象 local typeToUpdate = { @@ -41,6 +42,12 @@ function RewardEquipSingleShowPopup2:InitComponent() self.baseProGrid = Util.GetGameObject(self.basePro, "grid") self.baseProPre = Util.GetGameObject(self.basePro, "grid/curProName") self.baseProPre:SetActive(false) + --homePro + self.homePro = Util.GetGameObject(self.midBar, "homePro") + self.homeProName = Util.GetGameObject(self.homePro, "PropertyName"):GetComponent("Text") + self.homeProGrid = Util.GetGameObject(self.homePro, "grid") + self.homeProPre = Util.GetGameObject(self.homePro, "grid/curProName") + self.homeProPre:SetActive(false) --suitPro self.suitPro = Util.GetGameObject(self.midBar, "suitPro") self.suitProName = Util.GetGameObject(self.suitPro, "PropertyName"):GetComponent("Text") @@ -271,26 +278,59 @@ function RewardEquipSingleShowPopup2:OnShow() _BaseProList[index]:SetActive(true) _BaseProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) local vText = Util.GetGameObject(_BaseProList[index], "curProVale"):GetComponent("Text") - --摘星阁加持 - local power = prop[2] - local hText = Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text") - hText.text = "" - if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then - local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) - hText.text = string.format("(摘星阁加持:%s",num).."%)" - power = math.ceil(power*(1 + num/100)) - end - if power > 0 then - vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) + -- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置 + if prop[2] > 0 then + vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2]) else - vText.text = GetPropertyFormatStr(proConfigData.Style, power) + vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2]) end + --摘星阁加持 + -- if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then + -- local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) + -- -- hText.text = string.format("(摘星阁加持:%s",num).."%)" + -- local power = math.ceil(prop[2]*(num/100)) + + -- if not _specialAttri then + -- _specialAttri = newObjToParent(self.baseProPre, self.baseProGrid) + -- end + -- _specialAttri:SetActive(true) + -- _specialAttri:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) + -- local sText = Util.GetGameObject(_specialAttri, "curProVale"):GetComponent("Text") + -- sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) + -- Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 + + -- end end end else self.basePro:SetActive(false) end + --homePro基础属性 + if equipConfigData.Property then + for _, pro in ipairs(_homeProList) do + pro:SetActive(false) + end + for index, prop in ipairs(equipConfigData.Property) do + local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1]) + if proConfigData and self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then + self.homePro:SetActive(true) + local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) + local power = math.ceil(prop[2]*(num/100)) + if not _homeProList[index] then + _homeProList[index] = newObjToParent(self.homeProPre, self.homeProGrid) + end + _homeProList[index]:SetActive(true) + _homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) + local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text") + sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) + Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 + end + end + else + self.homePro:SetActive(false) + end + --suitPro套装属性 --获取装备套装属性 local equipSuite = {} @@ -404,6 +444,7 @@ end function RewardEquipSingleShowPopup2:OnDestroy() self.spLoader:Destroy() _BaseProList = {} + _homeProList = {} _suitProList = {} _superProList = {} self.jumpViewList = {} From 91f95890433dc0e289a0179174fffb69ae8859cf Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 17 Jan 2022 10:33:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=E6=91=98=E6=98=9F=E9=98=81?= =?UTF-8?q?=E3=80=91=E8=A3=85=E5=A4=87=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardEquipSingleShowPopup2.lua | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index fd210f6a31..aa25c274a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -284,22 +284,6 @@ function RewardEquipSingleShowPopup2:OnShow() else vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2]) end - --摘星阁加持 - -- if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then - -- local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) - -- -- hText.text = string.format("(摘星阁加持:%s",num).."%)" - -- local power = math.ceil(prop[2]*(num/100)) - - -- if not _specialAttri then - -- _specialAttri = newObjToParent(self.baseProPre, self.baseProGrid) - -- end - -- _specialAttri:SetActive(true) - -- _specialAttri:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) - -- local sText = Util.GetGameObject(_specialAttri, "curProVale"):GetComponent("Text") - -- sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) - -- Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 - - -- end end end else @@ -307,24 +291,26 @@ function RewardEquipSingleShowPopup2:OnShow() end --homePro基础属性 - if equipConfigData.Property then + if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and self.curHeroData then + self.homePro:SetActive(true) for _, pro in ipairs(_homeProList) do pro:SetActive(false) end - for index, prop in ipairs(equipConfigData.Property) do - local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1]) - if proConfigData and self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then - self.homePro:SetActive(true) - local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) - local power = math.ceil(prop[2]*(num/100)) - if not _homeProList[index] then - _homeProList[index] = newObjToParent(self.homeProPre, self.homeProGrid) + if equipConfigData.Property then + for index, prop in ipairs(equipConfigData.Property) do + local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1]) + if proConfigData and proConfigData.Style == 1 then + local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position) + local power = math.ceil(prop[2]*(num/100)) + if not _homeProList[index] then + _homeProList[index] = newObjToParent(self.homeProPre, self.homeProGrid) + end + _homeProList[index]:SetActive(true) + _homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) + local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text") + sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) + Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 end - _homeProList[index]:SetActive(true) - _homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) - local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text") - sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) - Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 end end else From 98f89d8a9b4af2de6bb3173f654a2463d3924fe1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 17 Jan 2022 10:44:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E6=91=98=E6=98=9F=E9=98=81+?= =?UTF-8?q?=E4=BF=AE=E4=B8=BA=E3=80=91=E8=A3=85=E5=A4=87=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=B1=95=E7=A4=BA+=E4=BF=AE=E4=B8=BA=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 1 + .../~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index ec1e8a4c73..eead94a34b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -1771,6 +1771,7 @@ function this.RequestUserForceChange(teamId, func) data.teamId = teamId local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_FORCE_CHANGE_REQUEST, MessageTypeProto_pb.USER_FORCE_CHANGE_RESPONSE, msg, function() + CheckRedPointStatus(RedPointType.Practice_Cultivation) if func then func() end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index aa25c274a9..dc8f51479c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -309,7 +309,7 @@ function RewardEquipSingleShowPopup2:OnShow() _homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info) local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text") sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power) - Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置 + Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(%s",num).."%)"--摘星阁加持文字显示位置 end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 91e2114f87..b96c4008ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -577,6 +577,7 @@ function RewardItemPopup:RedCheckFuns() CheckRedPointStatus(RedPointType.XunBaoMiZong) CheckRedPointStatus(RedPointType.Gem) CheckRedPointStatus(RedPointType.HomeLand) + CheckRedPointStatus(RedPointType.Practice) end --界面销毁时调用(用于子类重写) From 21e77fe60b81ddb0e7c0f8bbcee3ef33a28afb05 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 17 Jan 2022 10:45:42 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[=E5=9B=BE=E9=89=B4]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E5=9B=BE=E9=89=B4=E8=AF=A6=E6=83=85=E9=A2=84=E8=AE=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab | 2 +- .../Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab | 8 ++++---- .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 12c07070cb..6c556c2aaf 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -2249,7 +2249,7 @@ 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: -408, y: 632} + m_AnchoredPosition: {x: -408, y: 626} m_SizeDelta: {x: 156, y: 422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6359757417219209894 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab index b2d74de1a8..886783db90 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab @@ -3515,7 +3515,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 315, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2869837981932690049 @@ -4824,7 +4824,7 @@ 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: 450, y: 135.20001} + m_AnchoredPosition: {x: 449, y: 135.20001} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4075901220966401463 @@ -7267,8 +7267,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 70, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9114218537319145345 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index ed232c1500..c1c8d9a538 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -6989,7 +6989,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 58, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 101} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6149476631504047147 @@ -9323,7 +9323,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 54.505127, y: -25.000061} + m_AnchoredPosition: {x: 40, y: -25.000061} m_SizeDelta: {x: 56.39, y: 56.39} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8123468436595037891