Merge remote-tracking branch 'remotes/origin/master' into dev

# Conflicts:
#	GameClient/Assets/Plugins/Android/AndroidManifest.xml
#	GameClient/ProjectSettings/ProjectSettings.asset

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

@@ -43,8 +43,7 @@ namespace GFGGame
 
             bool isPhotoOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
             bool isgalleryOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name, false);
-            //_ui.m_TimeTracing.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0 ? false : true;
-            _ui.m_TimeTracing.target.visible = false;
+            _ui.m_TimeTracing.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0 ? false : true;
             if (_ui.m_TimeTracing.target.visible == true)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_TimeTracing.target, TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward());