Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 85eb25d3 85eb25d39d1a3cfcfed89acb57c3a8a51971fadc by 金学艇
Options

1.解决退出挽留框和通用弹窗错乱问题

1 parent 0bd6c189
Inline Side-by-side
Showing 3 changed files with 17 additions and 12 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._nodeSystemPrompt) { 1049 if (this._nodeCommonSoonPrompt) {
1050 try { 1050 try {
1051 this._nodeSystemPrompt.opacity = 255; 1051 this._nodeCommonSoonPrompt.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._nodeSystemPrompt); 1055 this._aFocusTargets[1]['coming_soon_confirm_btn'] = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt);
1056 this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt); 1056 this._aFocusTargets[1]['coming_soon_cancel_btn'] = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt);
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._nodeSystemPrompt = cc.instantiate(loadedResource); 1070 this._nodeCommonSoonPrompt = cc.instantiate(loadedResource);
1071 this._nodeSystemPrompt.parent = this.node; 1071 this._nodeCommonSoonPrompt.parent = this.node;
1072 if (bHideBg) { 1072 if (bHideBg) {
1073 this._nodeSystemPrompt.getChildByName("Background").opacity = 0; 1073 this._nodeCommonSoonPrompt.getChildByName("Background").opacity = 0;
1074 } 1074 }
1075 let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeSystemPrompt); 1075 let nodeConfirm = cc.find("PromptBox/ComingSoonConfirm", this._nodeCommonSoonPrompt);
1076 let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeSystemPrompt); 1076 let nodeCancel = cc.find("PromptBox/ComingSoonCancel", this._nodeCommonSoonPrompt);
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._nodeSystemPrompt.opacity = 0; 1099 this._nodeCommonSoonPrompt.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;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <uses-permission android:name="com.hiveview.cloudscreen.user.WRITE_USERINFO_DB" /> 30 <uses-permission android:name="com.hiveview.cloudscreen.user.WRITE_USERINFO_DB" />
31 31
32 <application 32 <application
33 android:name="com.topdraw.melody.MelodyApplication" 33 android:name="org.cocos2dx.javascript.common.MelodyApplication"
34 android:allowBackup="true" 34 android:allowBackup="true"
35 android:icon="@mipmap/icon" 35 android:icon="@mipmap/icon"
36 android:label="@string/app_name"> 36 android:label="@string/app_name">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 android:value="FJ.CMCC" /> 51 android:value="FJ.CMCC" />
52 <meta-data 52 <meta-data
53 android:name="TOPDRAW.PLATFORM_SERVER" 53 android:name="TOPDRAW.PLATFORM_SERVER"
54 android:value="http://eastcity.fj.a176.ottcn.com:81/clutch" /> 54 android:value="http://forfun.fj.a183.ottcn.com" />
55 <meta-data 55 <meta-data
56 android:name="TOPDRAW.APPID" 56 android:name="TOPDRAW.APPID"
57 android:value="EastCity" /> 57 android:value="EastCity" />
......
...@@ -138,4 +138,9 @@ dependencies { ...@@ -138,4 +138,9 @@ dependencies {
138 implementation project(':libcocos2dx') 138 implementation project(':libcocos2dx')
139 implementation files('libs/TopdrawSDK.jar') 139 implementation files('libs/TopdrawSDK.jar')
140 implementation files('libs/universal-image-loader-1.9.5.jar') 140 implementation files('libs/universal-image-loader-1.9.5.jar')
141 implementation files('libs/ottlogin.jar')
142 implementation files('libs/logsdk.jar')
143 implementation files('libs/KYSDK.jar')
144 implementation files('libs/icntvplayersdk.jar')
145 implementation files('libs/adsdk.jar')
141 } 146 }
......