yangzhao/MatchMaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新优化

Browse Source
This commit is contained in:
COMPUTER\EDY 2026-06-18 20:05:38 +08:00
parent a02da817dc
commit ca3d217488
5 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Scene/HomeScene.fire
View File

@ -4461,7 +4461,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-414.356, -414.356,
-1138.867, -1143.494,
0, 0,
0, 0,
0, 0,

40
assets/Script/JiaZai.ts
View File

@ -413,7 +413,7 @@ export default class JiaZai extends cc.Component {
} }
//console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen); //console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
AudioManager._instance.playMusicGame(); // AudioManager._instance.playMusicGame();
// 从房间出来判断是否弹出通行证 // 从房间出来判断是否弹出通行证
this.popUpPassCheck(); this.popUpPassCheck();
@ -699,20 +699,20 @@ export default class JiaZai extends cc.Component {
} }
if (cc.fx.GameConfig.GM_INFO.level >= 21) { if (cc.fx.GameConfig.GM_INFO.level >= 21) {
// top.getChildByName("passBtn").active = false; // top.getChildByName("passBtn").active = false;
let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); // let xinshouNode = this.Stamina.parent.getChildByName("xinshou");
if (xinshouNode) { // if (xinshouNode) {
xinshouNode.y = -994; // xinshouNode.y = -994;
// 强制刷新节点的变换 // // 强制刷新节点的变换
xinshouNode.setPosition(xinshouNode.x, -994); // xinshouNode.setPosition(xinshouNode.x, -994);
} // }
} else { } else {
// top.getChildByName("passBtn").active = false; // top.getChildByName("passBtn").active = false;
let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); // let xinshouNode = this.Stamina.parent.getChildByName("xinshou");
if (xinshouNode) { // if (xinshouNode) {
xinshouNode.y = -806; // xinshouNode.y = -806;
// 强制刷新节点的变换 // // 强制刷新节点的变换
xinshouNode.setPosition(xinshouNode.x, -806); // xinshouNode.setPosition(xinshouNode.x, -806);
} // }
}; };
if (cc.fx.GameConfig.GM_INFO.level >= 17) { if (cc.fx.GameConfig.GM_INFO.level >= 17) {
top.getChildByName("hammer").active = true; top.getChildByName("hammer").active = true;
@ -1733,6 +1733,7 @@ export default class JiaZai extends cc.Component {
openMonthlyCard(event?: cc.Event, customEventData?: string) { openMonthlyCard(event?: cc.Event, customEventData?: string) {
if (!JiaZai.cachedMonthlyCardPrefab) { if (!JiaZai.cachedMonthlyCardPrefab) {
cc.error('MonthlyCard prefab is not loaded yet.'); cc.error('MonthlyCard prefab is not loaded yet.');
console.log("月卡弹窗未加载");
return; return;
} }
@ -2681,7 +2682,7 @@ export default class JiaZai extends cc.Component {
// let top = this.node.getChildByName("Load").getChildByName("Top"); // let top = this.node.getChildByName("Load").getChildByName("Top");
// top.getChildByName("yicon").active = false; // top.getChildByName("yicon").active = false;
// if (this.Stamina) // 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; cc.fx.GameConfig.GM_INFO.starter_packTime = res.data.starter_pack / 1000;
if (!this.actionpNode) this.openStarter_pack(); if (!this.actionpNode) this.openStarter_pack();
console.log("打开新手礼包"); console.log("打开新手礼包");
@ -2739,7 +2740,7 @@ export default class JiaZai extends cc.Component {
// let top = this.node.getChildByName("Load").getChildByName("Top"); // let top = this.node.getChildByName("Load").getChildByName("Top");
// top.getChildByName("yicon").active = false; // top.getChildByName("yicon").active = false;
// if (this.Stamina) // if (this.Stamina)
// this.Stamina.parent.getChildByName("xinshou").active = true; this.Stamina.parent.getChildByName("xinshou").active = true;
cc.fx.StorageMessage.setStorage("Starter_pack", dateStr); cc.fx.StorageMessage.setStorage("Starter_pack", dateStr);
if (!this.actionpNode) this.openStarter_pack(); if (!this.actionpNode) this.openStarter_pack();
console.log("打开新手礼包"); console.log("打开新手礼包");
@ -2749,7 +2750,7 @@ export default class JiaZai extends cc.Component {
this.winStreakShow = true; this.winStreakShow = true;
this.newbieGift = false; this.newbieGift = false;
// if (this.Stamina) // if (this.Stamina)
// this.Stamina.parent.getChildByName("xinshou").active = true; this.Stamina.parent.getChildByName("xinshou").active = true;
console.log("当天已经给过，不再弹窗新手礼包"); console.log("当天已经给过，不再弹窗新手礼包");
} }
} }
@ -4408,11 +4409,12 @@ export default class JiaZai extends cc.Component {
// ============================================ // ============================================
update(dt) { update(dt) {
if (this.newbieGift && this.monthlyCardNode) { if (this.newbieGift && this.monthlyCardNode) {
if (this.monthlyCardNode.active == true) { if(this.actionpNode){
this.monthlyCardNode.active = false; if (this.monthlyCardNode.active == true && this.actionpNode.active == true) {
this.monthlyCardNode.active = false;
}
} }
} }
} }
// ============================================ // ============================================

1
assets/gacha_bundle/script/GachaManager.ts
View File

@ -65,6 +65,7 @@ export default class GachaManager extends cc.Component {
botoom.getChildByName("no").getComponent(cc.Label).string = film.toString(); botoom.getChildByName("no").getComponent(cc.Label).string = film.toString();
} }
console.log("拥有film", film); console.log("拥有film", film);
cc.fx.GameConfig.GM_INFO.film = film;
} }
} }

8
assets/shop/prefab/monthlyCard.prefab
View File

@ -67,8 +67,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1542.857142857143, "width": 1080,
"height": 2742.857142857143 "height": 1920
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -86,8 +86,8 @@
0, 0,
0, 0,
1, 1,
0.7, 1,
0.7, 1,
1 1
] ]
}, },

12
assets/shop/prefab/shop.prefab
View File

@ -16755,7 +16755,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-412.791, -440.105,
15.964, 15.964,
0, 0,
0, 0,
@ -16953,7 +16953,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-412.791, -440.105,
15.964, 15.964,
0, 0,
0, 0,
@ -17523,7 +17523,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-112.201, -176,
69.422, 69.422,
0, 0,
0, 0,
@ -19092,7 +19092,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
308.253, 162,
71.296, 71.296,
0, 0,
0, 0,
@ -19144,8 +19144,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 281, "width": 293,
"height": 74 "height": 78
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",