Merge branch 'master' into fujian

@@ -1046,14 +1046,14 @@ cc.Topdraw.TVCanvas =
         showComingSoonBox: function (fiBackend, bHideBg) {
             try {
                 this._bShowExitBox = true;
-                if (this._nodeSystemPrompt) {
+                if (this._nodeCommonSoonPrompt) {
                     try {
-                        this._nodeSystemPrompt.opacity = 255;
+                        this._nodeCommonSoonPrompt.opacity = 255;
                         if (null == this._aFocusTargets[1]) {   //focus放到第二层级，避免冲突
                             this._aFocusTargets[1] = [];
                         }
-                        this._aFocusTargets[1]['coming_soon_confirm_btn'] = cc.find("PromptBox/ComingSoonConfirm", this._nodeSystemPrompt);
-                        this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt);
+                        this._aFocusTargets[1]['coming_soon_confirm_btn'] = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt);
+                        this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt);
                         this._fiBeforeDetainBox = this._fiCurrentFocus;
                         this._fiBackend = fiBackend;
                         this._iSceneStatus = 1;
@@ -1067,13 +1067,13 @@ cc.Topdraw.TVCanvas =
                     //初始弹框
                     Common.loadRes('Prefab/pfbComingSoonPrompt',//提示预制
                         function (loadedResource) {
-                            this._nodeSystemPrompt = cc.instantiate(loadedResource);
-                            this._nodeSystemPrompt.parent = this.node;
+                            this._nodeCommonSoonPrompt = cc.instantiate(loadedResource);
+                            this._nodeCommonSoonPrompt.parent = this.node;
                             if (bHideBg) {
-                                this._nodeSystemPrompt.getChildByName("Background").opacity = 0;
+                                this._nodeCommonSoonPrompt.getChildByName("Background").opacity = 0;
                             }
-                            let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeSystemPrompt);
-                            let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt);
+                            let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt);
+                            let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt);
                             nodeConfirm.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeConfirm.width, nodeConfirm.height));
                             nodeCancel.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeCancel.width, nodeCancel.height));
                             let fiConfirm = nodeConfirm.addComponent(FocusInfo);
@@ -1096,7 +1096,7 @@ cc.Topdraw.TVCanvas =
         },
         hideComingSoonBox: function () {
             try {
-                this._nodeSystemPrompt.opacity = 0;
+                this._nodeCommonSoonPrompt.opacity = 0;
                 delete this._aFocusTargets[1]['system_confirm_btn'];
                 delete this._aFocusTargets[1]['system_cancel_btn'];
                 this._iSceneStatus = 0;