diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index cbe2e8f..c144ccc 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -4461,7 +4461,7 @@ "ctor": "Float64Array", "array": [ -414.356, - -1138.867, + -1143.494, 0, 0, 0, diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index cad18bf..e73d9a1 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -413,7 +413,7 @@ export default class JiaZai extends cc.Component { } //console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen); - AudioManager._instance.playMusicGame(); + // AudioManager._instance.playMusicGame(); // 从房间出来判断是否弹出通行证 this.popUpPassCheck(); @@ -699,20 +699,20 @@ export default class JiaZai extends cc.Component { } if (cc.fx.GameConfig.GM_INFO.level >= 21) { // top.getChildByName("passBtn").active = false; - let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); - if (xinshouNode) { - xinshouNode.y = -994; - // 强制刷新节点的变换 - xinshouNode.setPosition(xinshouNode.x, -994); - } + // let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); + // if (xinshouNode) { + // xinshouNode.y = -994; + // // 强制刷新节点的变换 + // xinshouNode.setPosition(xinshouNode.x, -994); + // } } else { // top.getChildByName("passBtn").active = false; - let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); - if (xinshouNode) { - xinshouNode.y = -806; - // 强制刷新节点的变换 - xinshouNode.setPosition(xinshouNode.x, -806); - } + // let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); + // if (xinshouNode) { + // xinshouNode.y = -806; + // // 强制刷新节点的变换 + // xinshouNode.setPosition(xinshouNode.x, -806); + // } }; if (cc.fx.GameConfig.GM_INFO.level >= 17) { top.getChildByName("hammer").active = true; @@ -1733,6 +1733,7 @@ export default class JiaZai extends cc.Component { openMonthlyCard(event?: cc.Event, customEventData?: string) { if (!JiaZai.cachedMonthlyCardPrefab) { cc.error('MonthlyCard prefab is not loaded yet.'); + console.log("月卡弹窗未加载"); return; } @@ -2681,7 +2682,7 @@ export default class JiaZai extends cc.Component { // let top = this.node.getChildByName("Load").getChildByName("Top"); // top.getChildByName("yicon").active = false; // if (this.Stamina) - // this.Stamina.parent.getChildByName("xinshou").active = true; + this.Stamina.parent.getChildByName("xinshou").active = true; cc.fx.GameConfig.GM_INFO.starter_packTime = res.data.starter_pack / 1000; if (!this.actionpNode) this.openStarter_pack(); console.log("打开新手礼包"); @@ -2739,7 +2740,7 @@ export default class JiaZai extends cc.Component { // let top = this.node.getChildByName("Load").getChildByName("Top"); // top.getChildByName("yicon").active = false; // if (this.Stamina) - // this.Stamina.parent.getChildByName("xinshou").active = true; + this.Stamina.parent.getChildByName("xinshou").active = true; cc.fx.StorageMessage.setStorage("Starter_pack", dateStr); if (!this.actionpNode) this.openStarter_pack(); console.log("打开新手礼包"); @@ -2749,7 +2750,7 @@ export default class JiaZai extends cc.Component { this.winStreakShow = true; this.newbieGift = false; // if (this.Stamina) - // this.Stamina.parent.getChildByName("xinshou").active = true; + this.Stamina.parent.getChildByName("xinshou").active = true; console.log("当天已经给过,不再弹窗新手礼包"); } } @@ -4408,11 +4409,12 @@ export default class JiaZai extends cc.Component { // ============================================ update(dt) { if (this.newbieGift && this.monthlyCardNode) { - if (this.monthlyCardNode.active == true) { - this.monthlyCardNode.active = false; + if(this.actionpNode){ + if (this.monthlyCardNode.active == true && this.actionpNode.active == true) { + this.monthlyCardNode.active = false; + } } } - } // ============================================ diff --git a/assets/gacha_bundle/script/GachaManager.ts b/assets/gacha_bundle/script/GachaManager.ts index 5e7ca7e..010bf90 100644 --- a/assets/gacha_bundle/script/GachaManager.ts +++ b/assets/gacha_bundle/script/GachaManager.ts @@ -65,6 +65,7 @@ export default class GachaManager extends cc.Component { botoom.getChildByName("no").getComponent(cc.Label).string = film.toString(); } console.log("拥有film", film); + cc.fx.GameConfig.GM_INFO.film = film; } } diff --git a/assets/shop/prefab/monthlyCard.prefab b/assets/shop/prefab/monthlyCard.prefab index 9c7400c..5caf43c 100644 --- a/assets/shop/prefab/monthlyCard.prefab +++ b/assets/shop/prefab/monthlyCard.prefab @@ -67,8 +67,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1542.857142857143, - "height": 2742.857142857143 + "width": 1080, + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -86,8 +86,8 @@ 0, 0, 1, - 0.7, - 0.7, + 1, + 1, 1 ] }, diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab index 14b28bb..5a1134b 100644 --- a/assets/shop/prefab/shop.prefab +++ b/assets/shop/prefab/shop.prefab @@ -16755,7 +16755,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -412.791, + -440.105, 15.964, 0, 0, @@ -16953,7 +16953,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -412.791, + -440.105, 15.964, 0, 0, @@ -17523,7 +17523,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -112.201, + -176, 69.422, 0, 0, @@ -19092,7 +19092,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 308.253, + 162, 71.296, 0, 0, @@ -19144,8 +19144,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 281, - "height": 74 + "width": 293, + "height": 78 }, "_anchorPoint": { "__type__": "cc.Vec2",