From cb331c612ea1ebe34e156dd778964ff881adb45e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 25 Nov 2021 16:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB=E9=82=A3=E4=B8=AA43=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DynamicActicity/TimeLimitUpHero.prefab | 2 +- .../Prefabs/UI/DynamicActicity/page12.prefab | 18 +++++++++--------- .../Prefabs/UI/DynamicActicity/page4.prefab | 4 ++-- .../ResConfigs/ResourcePathConfig.asset | 4 ++++ .../ManagedResources/~Lua/Common/Managers.lua | 2 +- .../ActivityGift/ActivityGiftManager.lua | 6 +++--- .../ActivityGift/AllActivityManager.lua | 6 +++--- .../View/GeneralBigPopup_RecrutDetail.lua | 2 -- .../~Lua/Modules/Player/JumpManager.lua | 2 -- .../~Lua/Modules/Player/RedpotManager.lua | 10 +++++----- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index 7d81401992..bc1421af2a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -5834,7 +5834,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: -269.5, y: -510.19995} + m_AnchoredPosition: {x: -269.5, y: -514.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3840635568929308425 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index b56d49cbc2..f483a7d07c 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -1198,7 +1198,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: 0, y: 82.8139} + m_AnchoredPosition: {x: 0, y: 76} m_SizeDelta: {x: 900, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1738818626622132468 @@ -1510,7 +1510,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: -260, y: 149} + m_AnchoredPosition: {x: -269.5, y: 142.7} m_SizeDelta: {x: 202.9, y: 25.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2871767843735771204 @@ -3796,7 +3796,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: -260, y: 0} + m_AnchoredPosition: {x: -270, y: 0} m_SizeDelta: {x: 311.6, y: 92.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8951840215558122463 @@ -4060,7 +4060,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: 260, y: 0} + m_AnchoredPosition: {x: 270, y: 0} m_SizeDelta: {x: 301.1, y: 89.79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8827655975344282454 @@ -5881,8 +5881,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: 1.65, y: 1.25} - m_SizeDelta: {x: 314.17, y: 87.31} + m_AnchoredPosition: {x: 2.5, y: 0.1} + m_SizeDelta: {x: 310.4, y: 89.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6268379795907077547 CanvasRenderer: @@ -6043,15 +6043,15 @@ RectTransform: m_GameObject: {fileID: 9131811883502828318} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7073361333590792766} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3.0235, y: -8.1266} - m_SizeDelta: {x: 317.71, y: 109.18} + m_AnchoredPosition: {x: 1.8, y: -7} + m_SizeDelta: {x: 318.22, y: 108.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8601626161402792154 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 19c6b2d652..8485ce222b 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -5321,7 +5321,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: 4.06, y: 0.000012204} + m_AnchoredPosition: {x: 4.06, y: 1.5} m_SizeDelta: {x: 303.23, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6189766711027579234 @@ -15689,7 +15689,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: -250.1, y: -510.2} + m_AnchoredPosition: {x: -271.3, y: -516.1} m_SizeDelta: {x: 335, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &433126057131546742 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 5ce6ec26da..a22a1f956c 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -38296,6 +38296,10 @@ MonoBehaviour: resPathIndex: 336 resAbNameIndex: 2556 - resName: fuwenlujing + extension: .FBX + resPathIndex: 336 + resAbNameIndex: 2556 + - resName: fuwenlujing_control extension: .controller resPathIndex: 336 resAbNameIndex: 2556 diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua index 228640fca1..e3c63a6070 100644 --- a/Assets/ManagedResources/~Lua/Common/Managers.lua +++ b/Assets/ManagedResources/~Lua/Common/Managers.lua @@ -163,7 +163,7 @@ local ManagerNames = { -- 颠疯之战 "ArenaTopMatch/ArenaTopMatchManager", -- 东海寻仙(抽卡活动) - "FindFairy/FindFairyManager", + -- "FindFairy/FindFairyManager", -- 迷宫寻宝 "FindTreasure/FindTreasureManager", -- 远征 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 9b716e500e..0161cc1c07 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -593,9 +593,9 @@ function this.RefreshActivityRedPoint() --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) --东海寻仙 - CheckRedPointStatus(RedPointType.FindFairy_OneView) - CheckRedPointStatus(RedPointType.FindFairy_ThreeView) - CheckRedPointStatus(RedPointType.FindFairy_FourView) + -- CheckRedPointStatus(RedPointType.FindFairy_OneView) + -- CheckRedPointStatus(RedPointType.FindFairy_ThreeView) + -- CheckRedPointStatus(RedPointType.FindFairy_FourView) CheckRedPointStatus(RedPointType.DynamicActTask) CheckRedPointStatus(RedPointType.QinglongSerectTreasure) CheckRedPointStatus(RedPointType.chaofanrushengRed) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua index 521daf7de1..0c88a5c0af 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -151,9 +151,9 @@ function this.RefreshActivityRedPoint() --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) --东海寻仙 - CheckRedPointStatus(RedPointType.FindFairy_OneView) - CheckRedPointStatus(RedPointType.FindFairy_ThreeView) - CheckRedPointStatus(RedPointType.FindFairy_FourView) + -- CheckRedPointStatus(RedPointType.FindFairy_OneView) + -- CheckRedPointStatus(RedPointType.FindFairy_ThreeView) + -- CheckRedPointStatus(RedPointType.FindFairy_FourView) CheckRedPointStatus(RedPointType.DynamicActTask) CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 1f8fef9333..405d885ea2 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -171,8 +171,6 @@ function this:BuildRateData(actType,UpItem,upItemList) _upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"5星UP!",ConfigName.HeroConfig) rateList = this:RefreshHeroRate(UpItem,_upRateList) elseif actType == ActivityTypeDef.QianKunBox then - - _upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"魂印UP!",ConfigName.EquipConfig) rateList = this:RefreshSoulRate(UpItem,_upRateList) elseif actType == ActivityTypeDef.LingShouBaoGe then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index cb1b287931..aa9315373c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -660,8 +660,6 @@ local jumpDic = { if #data > 1 then if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) then this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) - elseif ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then - this.JumpActivity(JumpType.ZhuTiHuoDong,data[2]) else PopupTipPanel.ShowTip("活动尚未开启") this.isOpen = false diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index d7b32b6696..97faf2ce34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -258,9 +258,9 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Guid_GetPackage, RedPointType.Guild_RedPacket) RPData:SetParent(RedPointType.Chat_Friend, RedPointType.Chat) -- 东海寻仙 - RPData:SetParent(RedPointType.FindFairy_OneView, RedPointType.FindFairy) - RPData:SetParent(RedPointType.FindFairy_ThreeView, RedPointType.FindFairy) - RPData:SetParent(RedPointType.FindFairy_FourView, RedPointType.FindFairy) + -- RPData:SetParent(RedPointType.FindFairy_OneView, RedPointType.FindFairy) + -- RPData:SetParent(RedPointType.FindFairy_ThreeView, RedPointType.FindFairy) + -- RPData:SetParent(RedPointType.FindFairy_FourView, RedPointType.FindFairy) -- 成就 RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain) --灵兽 @@ -468,9 +468,9 @@ function this.RegisterRedCheckFunc() -- 剑影仙踪 RPData:AddCheckFunc(RedPointType.SupremeHero, ActivityGiftManager.CheckSupremeHeroRedPoint) -- 东海寻仙 - RPData:AddCheckFunc(RedPointType.FindFairy_OneView, FindFairyManager.CheckRedPoint) + -- RPData:AddCheckFunc(RedPointType.FindFairy_OneView, FindFairyManager.CheckRedPoint) -- RPData:AddCheckFunc(RedPointType.FindFairy_ThreeView, FindFairyManager.CheckFindFairyUpStarRedPoint)--(不用了) - RPData:AddCheckFunc(RedPointType.FindFairy_FourView, FindFairyManager.CheckFindFairyCeremonyRedPoint) + -- RPData:AddCheckFunc(RedPointType.FindFairy_FourView, FindFairyManager.CheckFindFairyCeremonyRedPoint) -- 公会boss RPData:AddCheckFunc(RedPointType.Guild_Boss, GuildBossManager.CheckGuildBossRedPoint, FUNCTION_OPEN_TYPE.GUILD_BOSS) --公会车迟