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 =
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;
......
......@@ -30,7 +30,7 @@
<uses-permission android:name="com.hiveview.cloudscreen.user.WRITE_USERINFO_DB" />
<application
android:name="com.topdraw.melody.MelodyApplication"
android:name="org.cocos2dx.javascript.common.MelodyApplication"
android:allowBackup="true"
android:icon="@mipmap/icon"
android:label="@string/app_name">
......@@ -51,7 +51,7 @@
android:value="FJ.CMCC" />
<meta-data
android:name="TOPDRAW.PLATFORM_SERVER"
android:value="http://eastcity.fj.a176.ottcn.com:81/clutch" />
android:value="http://forfun.fj.a183.ottcn.com" />
<meta-data
android:name="TOPDRAW.APPID"
android:value="EastCity" />
......
......@@ -138,4 +138,9 @@ dependencies {
implementation project(':libcocos2dx')
implementation files('libs/TopdrawSDK.jar')
implementation files('libs/universal-image-loader-1.9.5.jar')
implementation files('libs/ottlogin.jar')
implementation files('libs/logsdk.jar')
implementation files('libs/KYSDK.jar')
implementation files('libs/icntvplayersdk.jar')
implementation files('libs/adsdk.jar')
}
......