Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -81,7 +81,7 @@
                scene.collect = false;
                string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
                LoadSceneFunctionControlZone();
                scene.SaveSceneData(true);
                scene.CollectScene();
                new PublicAssmebly().TipMsgAutoClose(msg, true);
            };
        }
@@ -424,7 +424,6 @@
                    GetUnreadPushMessages();
                }
            };

            HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
        }