From 8d11549d86d20e79c7088863dfdab40bd4c6f7d9 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 9 Sep 2020 10:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Expedition/ExpeditionMainPanel.prefab | 24 +++++++++--------- .../~Lua/Modules/Carbon/CarbonManager.lua | 25 ++++++++++--------- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 1 + 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMainPanel.prefab index 55bf1967ba..4114874bc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMainPanel.prefab @@ -533,7 +533,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: 0} + m_AnchoredPosition: {x: -73.66, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &436980302565403450 @@ -8752,7 +8752,7 @@ ParticleSystem: --- !u!199 &5083064443145554512 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13517,7 +13517,7 @@ ParticleSystem: --- !u!199 &5083064443575096463 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -18469,7 +18469,7 @@ ParticleSystem: --- !u!199 &5083064444079536328 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23388,7 +23388,7 @@ ParticleSystem: --- !u!199 &5083064444368836343 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28298,7 +28298,7 @@ ParticleSystem: --- !u!199 &5083064444783947928 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33639,7 +33639,7 @@ ParticleSystem: --- !u!199 &6264962240844129843 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38770,7 +38770,7 @@ ParticleSystem: --- !u!199 &6264962241779056732 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43612,7 +43612,7 @@ ParticleSystem: --- !u!199 &6264962242335619732 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48400,7 +48400,7 @@ ParticleSystem: --- !u!199 &6264962242685257740 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53165,7 +53165,7 @@ ParticleSystem: --- !u!199 &6264962242711413835 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58927,7 +58927,7 @@ ParticleSystem: --- !u!199 &7877157627030819769 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 38d7d12e8b..93822a1bd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -827,19 +827,20 @@ function this. CarbonRedCheck(redType) -- return false -- end --大闹天宫 - elseif redType == RedPointType.OrdinaryExplore then - --两天一重置的红点 - local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION) - local text =PlayerManager.uid.."ExpeditionRed" - -- PlayerPrefs.DeleteKey(text) - if not PlayerPrefs.HasKey(text) then - PlayerPrefs.SetInt(text,0) - end - if PlayerPrefs.GetInt(text,serData.endTime) ~= serData.endTime then - return true - end - --奖励红点 + elseif redType == RedPointType.OrdinaryExplore then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then + --两天一重置的红点 + local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION) + local text =PlayerManager.uid.."ExpeditionRed" + -- PlayerPrefs.DeleteKey(text) + if not PlayerPrefs.HasKey(text) then + PlayerPrefs.SetInt(text,0) + end + if PlayerPrefs.GetInt(text,serData.endTime) ~= serData.endTime then + return true + end + + --奖励红点 return TreasureOfHeavenManger.RedPoint() end return false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 5921a86d29..9874a52bbe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -243,6 +243,7 @@ function CarbonTypePanelV2:OnShow(...) else BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) redPointTypeList[Util.GetGameObject(v, "redPoint")] = data.redPointType + CheckRedPointStatus(data.redPointType) end end carbonType = PlayerManager.carbonType