Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a6b30706 a6b30706290ddbef91290088f6044092ae1ca7ba by 金学艇
Options

1.回退通用弹窗和退出挽留框的问题，改为从主分支合并进来

1 parent 85eb25d3
Inline Side-by-side
Showing 1 changed file with 10 additions and 10 deletions
...@@ -1046,14 +1046,14 @@ cc.Topdraw.TVCanvas = ...@@ -1046,14 +1046,14 @@ cc.Topdraw.TVCanvas =
1046 showComingSoonBox: function (fiBackend, bHideBg) { 1046 showComingSoonBox: function (fiBackend, bHideBg) {
1047 try { 1047 try {
1048 this._bShowExitBox = true; 1048 this._bShowExitBox = true;
1049 if (this._nodeCommonSoonPrompt) { 1049 if (this._nodeSystemPrompt) {
1050 try { 1050 try {
1051 this._nodeCommonSoonPrompt.opacity = 255; 1051 this._nodeSystemPrompt.opacity = 255;
1052 if (null == this._aFocusTargets[1]) { //focus放到第二层级，避免冲突 1052 if (null == this._aFocusTargets[1]) { //focus放到第二层级，避免冲突
1053 this._aFocusTargets[1] = []; 1053 this._aFocusTargets[1] = [];
1054 } 1054 }
1055 this._aFocusTargets[1]['coming_soon_confirm_btn'] = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt); 1055 this._aFocusTargets[1]['coming_soon_confirm_btn'] = cc.find("PromptBox/ComingSoonConfirm", this._nodeSystemPrompt);
1056 this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt); 1056 this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt);
1057 this._fiBeforeDetainBox = this._fiCurrentFocus; 1057 this._fiBeforeDetainBox = this._fiCurrentFocus;
1058 this._fiBackend = fiBackend; 1058 this._fiBackend = fiBackend;
1059 this._iSceneStatus = 1; 1059 this._iSceneStatus = 1;
...@@ -1067,13 +1067,13 @@ cc.Topdraw.TVCanvas = ...@@ -1067,13 +1067,13 @@ cc.Topdraw.TVCanvas =
1067 //初始弹框 1067 //初始弹框
1068 Common.loadRes('Prefab/pfbComingSoonPrompt',//提示预制 1068 Common.loadRes('Prefab/pfbComingSoonPrompt',//提示预制
1069 function (loadedResource) { 1069 function (loadedResource) {
1070 this._nodeCommonSoonPrompt = cc.instantiate(loadedResource); 1070 this._nodeSystemPrompt = cc.instantiate(loadedResource);
1071 this._nodeCommonSoonPrompt.parent = this.node; 1071 this._nodeSystemPrompt.parent = this.node;
1072 if (bHideBg) { 1072 if (bHideBg) {
1073 this._nodeCommonSoonPrompt.getChildByName("Background").opacity = 0; 1073 this._nodeSystemPrompt.getChildByName("Background").opacity = 0;
1074 } 1074 }
1075 let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt); 1075 let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeSystemPrompt);
1076 let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt); 1076 let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt);
1077 nodeConfirm.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeConfirm.width, nodeConfirm.height)); 1077 nodeConfirm.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeConfirm.width, nodeConfirm.height));
1078 nodeCancel.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeCancel.width, nodeCancel.height)); 1078 nodeCancel.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, nodeCancel.width, nodeCancel.height));
1079 let fiConfirm = nodeConfirm.addComponent(FocusInfo); 1079 let fiConfirm = nodeConfirm.addComponent(FocusInfo);
...@@ -1096,7 +1096,7 @@ cc.Topdraw.TVCanvas = ...@@ -1096,7 +1096,7 @@ cc.Topdraw.TVCanvas =
1096 }, 1096 },
1097 hideComingSoonBox: function () { 1097 hideComingSoonBox: function () {
1098 try { 1098 try {
1099 this._nodeCommonSoonPrompt.opacity = 0; 1099 this._nodeSystemPrompt.opacity = 0;
1100 delete this._aFocusTargets[1]['system_confirm_btn']; 1100 delete this._aFocusTargets[1]['system_confirm_btn'];
1101 delete this._aFocusTargets[1]['system_cancel_btn']; 1101 delete this._aFocusTargets[1]['system_cancel_btn'];
1102 this._iSceneStatus = 0; 1102 this._iSceneStatus = 0;
......