更改红点提示和结算界面猫猫版上桌

This commit is contained in:
COMPUTER\EDY 2026-08-07 19:36:24 +08:00
parent da57305717
commit e6b59d3a27
32 changed files with 11009 additions and 7680 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2805,6 +2805,31 @@ export default class JiaZai extends cc.Component {
}
}
/** 状态数组中第一个非 2 档位为 1 时,首页 Jungle 入口显示可领取红点。 */
private refreshJungleTreasureHomeRedDot(tierStatesValue?: any[]): void {
let button = this.getJungleTreasureHomeButton();
let red = button && button.getChildByName("red");
if (!red) {
return;
}
let states = Array.isArray(tierStatesValue)
? tierStatesValue
: this.jungleTreasureKnownTierStates;
let shouldShowRed = false;
if (button.active && Array.isArray(states)) {
for (let index = 0; index < states.length; index++) {
let state = Number(states[index]);
if (state === 2) {
continue;
}
shouldShowRed = state === 1;
break;
}
}
red.active = shouldShowRed;
}
/** 使用服务器剩余时间建立本地展示倒计时,不使用本地存档重置活动。 */
private startJungleTreasureCountdown(expiresAtValue: any, serverNowValue: any): boolean {
this.stopJungleTreasureCountdown();
@ -2873,6 +2898,7 @@ export default class JiaZai extends cc.Component {
if (button) {
button.active = false;
}
this.refreshJungleTreasureHomeRedDot();
return;
}
@ -2883,6 +2909,7 @@ export default class JiaZai extends cc.Component {
if (button) {
button.active = true;
}
this.refreshJungleTreasureHomeRedDot([]);
this.setJungleHomeButtonText("活动中");
this.scheduleJungleTreasureAutoOpen();
return;
@ -2931,6 +2958,7 @@ export default class JiaZai extends cc.Component {
if (button) {
button.active = this.canOpenJungleTreasure() && shouldShow;
}
this.refreshJungleTreasureHomeRedDot(states);
return shouldShow;
}

View File

@ -3483,6 +3483,57 @@ export default class MapConroler extends cc.Component {
node.active = visible;
}
private isLayerOneVariantB(): boolean {
const abTests = cc.fx.GameConfig.GM_INFO.abTests;
return !!abTests && Number(abTests.layer_one) === 2;
}
private getSettlementNextButton(): cc.Node {
const variantB = this.isLayerOneVariantB();
const nextBtn = this.gameOverNode.getChildByName(variantB ? "nextBtn2" : "nextBtn");
const inactiveBtn = this.gameOverNode.getChildByName(variantB ? "nextBtn" : "nextBtn2");
inactiveBtn.active = false;
return nextBtn;
}
private resetRuzhiVariantBButton(button: cc.Node): void {
if (!button) {
return;
}
cc.Tween.stopAllByTarget(button);
button.scaleX = button.scaleY = 0.1;
}
private playRuzhiVariantBButtonAnimation(button: cc.Node): void {
if (!button) {
return;
}
this.resetRuzhiVariantBButton(button);
button.active = true;
cc.tween(button)
.delay(2)
.to(0.25, { scaleX: 1, scaleY: 1 }, { easing: "backOut" })
.call(() => this.startRuzhiVariantBButtonLoop(button))
.start();
}
private startRuzhiVariantBButtonLoop(button: cc.Node): void {
if (!button || !button.active) {
return;
}
button.scaleX = button.scaleY = 1;
cc.tween(button)
.repeatForever(
cc.tween()
.delay(0.8)
.to(0.1, { scaleX: 1.08, scaleY: 0.92 }, { easing: "sineInOut" })
.to(0.12, { scaleX: 0.94, scaleY: 1.08 }, { easing: "sineInOut" })
.to(0.1, { scaleX: 1.04, scaleY: 0.97 }, { easing: "sineInOut" })
.to(0.14, { scaleX: 1, scaleY: 1 }, { easing: "sineOut" })
)
.start();
}
playLayerTwoWinCoinFly() {
if (!this.node || !cc.isValid(this.node)) {
return;
@ -3523,7 +3574,7 @@ export default class MapConroler extends cc.Component {
this.playWinSettlement();
const homeBtn = this.gameOverNode.getChildByName("homeBtn");
const nextBtn = this.gameOverNode.getChildByName("nextBtn");
const nextBtn = this.getSettlementNextButton();
homeBtn.active = false;
nextBtn.active = false;
@ -3585,12 +3636,11 @@ export default class MapConroler extends cc.Component {
// ============================================
winLevel() {
// MiniGameSdk.API.showToast(cc.fx.GameConfig.GM_INFO.level);
if (this.node.parent.parent.getChildByName("Win").getChildByName("tween").
getChildByName("nextBtn").getComponent("btnControl")._touch == false) {
const nextBtn = this.getSettlementNextButton();
if (nextBtn.getComponent("btnControl")._touch == false) {
return;
}
this.node.parent.parent.getChildByName("Win").getChildByName("tween").
getChildByName("nextBtn").getComponent("btnControl").setTouch(false);
nextBtn.getComponent("btnControl").setTouch(false);
this.clearLayerTwoWinCoinFly();
cc.fx.AudioManager._instance.playEffect("anniu_Big", null);
console.log("下一关", cc.fx.GameConfig.GM_INFO.level);
@ -3640,8 +3690,7 @@ export default class MapConroler extends cc.Component {
}, 1200);
setTimeout(() => {
this.node.parent.parent.getChildByName("Win").getChildByName("tween").
getChildByName("nextBtn").getComponent("btnControl").setTouch(true);
nextBtn.getComponent("btnControl").setTouch(true);
}, 500);
// } else {
@ -6268,22 +6317,20 @@ export default class MapConroler extends cc.Component {
}
this.node.parent.parent.getChildByName("Win").getChildByName("Rank").active = false;
let Career = this.node.parent.parent.getChildByName("Win").getChildByName("Career");
if (cc.fx.GameConfig.GM_INFO.abTests && Number(cc.fx.GameConfig.GM_INFO.abTests.layer_one) === 2) {
Career.getChildByName("bg").active = false;
Career.getChildByName("bg2").active = true;
}
else {
Career.getChildByName("bg").active = true;
Career.getChildByName("bg2").active = false;
}
let progress = Career.getChildByName("progress");
const isLayerOneVariantB = this.isLayerOneVariantB();
["bg", "level", "maxlevel", "progress"].forEach((nodeName) => {
Career.getChildByName(nodeName).active = !isLayerOneVariantB;
Career.getChildByName(nodeName + "2").active = isLayerOneVariantB;
});
const variantSuffix = isLayerOneVariantB ? "2" : "";
let progress = Career.getChildByName("progress" + variantSuffix);
let level = Career.getChildByName("level" + variantSuffix);
let addLevel = cc.fx.GameConfig.GM_INFO.addLevel;
if (addLevel > 5) {
addLevel = 5;
max = true;
}
NumberToImage.numberToImageNodes4(addLevel, 43, 15, "custom", Career.getChildByName("level"), true);
NumberToImage.numberToImageNodes4(addLevel, 43, 15, "custom", level, true);
if (addLevel == 1) {
cc.tween(progress.children[4].getChildByName("win").getComponent(cc.Sprite))
.to(0.5, { fillRange: 1 })
@ -6397,7 +6444,7 @@ export default class MapConroler extends cc.Component {
let title = this.gameOverNode.getChildByName("gongxi");
let homeBtn = this.gameOverNode.getChildByName("homeBtn");
let nextBtn = this.gameOverNode.getChildByName("nextBtn");
let nextBtn = this.getSettlementNextButton();
let tiaodik = this.gameOverNode.getChildByName("tiaodik");
let pian = this.gameOverNode.getChildByName("pian");
let guang = this.gameOverNode.getChildByName("guang");
@ -6462,9 +6509,12 @@ export default class MapConroler extends cc.Component {
playButtonGroup() {
const t = (duration: number) => this.settlementAnimationTime(duration);
let homeBtn = this.gameOverNode.getChildByName("homeBtn");
let nextBtn = this.gameOverNode.getChildByName("nextBtn");
let nextBtn = this.getSettlementNextButton();
let tiaodik = this.gameOverNode.getChildByName("tiaodik");
let ruzhi = this.gameOverNode.getChildByName("Ruzhi");
const ruzhiVariantBButton = ruzhi.getChildByName("btn");
this.resetRuzhiVariantBButton(ruzhiVariantBButton);
ruzhiVariantBButton.active = false;
if (cc.fx.GameConfig.GM_INFO.otherLevel != 0) {
homeBtn = this.gameOverNode.getChildByName("homeBtn2");
}
@ -6563,11 +6613,15 @@ export default class MapConroler extends cc.Component {
.to(0.2, { scaleX: 1, scaleY: 1 })
.start();
if (cc.fx.GameConfig.GM_INFO.abTests && Number(cc.fx.GameConfig.GM_INFO.abTests.layer_one) === 2) {
if (this.isLayerOneVariantB()) {
ruzhi.getChildByName("bg2").active = true;
ruzhi.getChildByName("bg").active = false;
ruzhiVariantBButton.active = true;
cc.tween(ruzhi.getChildByName("bg2"))
.to(0.3, { rotation: -5, scaleX: 1, scaleY: 1 })
.call(() => {
this.playRuzhiVariantBButtonAnimation(ruzhiVariantBButton);
})
.start();
cc.tween(ruzhi.getChildByName("yinzhang2"))
.delay(0.5)
@ -6583,6 +6637,7 @@ export default class MapConroler extends cc.Component {
} else {
ruzhi.getChildByName("bg2").active = false;
ruzhi.getChildByName("bg").active = true;
ruzhiVariantBButton.active = false;
cc.tween(ruzhi.getChildByName("bg"))
.to(0.3, { rotation: -5, scaleX: 1, scaleY: 1 })
.start();

View File

@ -602,6 +602,11 @@ export default class SceneManager extends cc.Component {
});
}
returnHomeScene() {
cc.fx.GameTool.shushu_Track("where_am_i", {});
cc.director.loadScene("HomeScene");
}
openPause() {
cc.fx.AudioManager._instance.playEffect("anniu_little", null);
if (this.pause.getComponent("btnControl")._touch) {

View File

@ -323,7 +323,7 @@ export class GameConfig {
vibrateOpen: true, //震动
coinnum: 0, //每局的金币数
paid_user: false, //是否是付费用户
version: "1.0.25", //版本号
version: "1.0.26", //版本号
shushu_DistinctId: "", //数数访客ID
shushu_AccountId: "", //数数账号ID
uid: "", //用户和后端唯一id

View File

@ -1326,6 +1326,9 @@ var GameTool = {
let eventData = {}
switch (name) {
case "where_am_i":
eventData = {};
break;
case "login":
eventData = {
register_time: data.register_time,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

13
assets/UI/UI/pop/win.meta Normal file
View File

@ -0,0 +1,13 @@
{
"ver": "1.1.3",
"uuid": "734966fd-74d6-4358-b2f2-b10487efbdd9",
"importer": "folder",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1004 B

View File

@ -1,6 +1,6 @@
{
"ver": "2.3.7",
"uuid": "1a59640c-49b4-4e4c-b1ad-3fece900bc6b",
"uuid": "188f4a18-2d86-495f-b989-5242181af955",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
@ -8,26 +8,26 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 733,
"height": 690,
"width": 138,
"height": 33,
"platformSettings": {},
"subMetas": {
"daoju5 (1)": {
"danqianjingdut": {
"ver": "1.0.6",
"uuid": "a7f944d1-2a78-444b-875a-d7b9ae1fef6a",
"uuid": "0cecf181-d419-447e-bd31-3060b97aeacb",
"importer": "sprite-frame",
"rawTextureUuid": "1a59640c-49b4-4e4c-b1ad-3fece900bc6b",
"rawTextureUuid": "188f4a18-2d86-495f-b989-5242181af955",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 1.5,
"trimX": 19,
"trimY": 21,
"width": 695,
"height": 645,
"rawWidth": 733,
"rawHeight": 690,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 138,
"height": 33,
"rawWidth": 138,
"rawHeight": 33,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "8e9f814f-733e-4305-af75-ad18769182a4",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 64,
"height": 64,
"platformSettings": {},
"subMetas": {
"dian2": {
"ver": "1.0.6",
"uuid": "2d3955fd-8ef4-4e04-93c3-21ec6f380b7c",
"importer": "sprite-frame",
"rawTextureUuid": "8e9f814f-733e-4305-af75-ad18769182a4",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 1,
"width": 62,
"height": 62,
"rawWidth": 64,
"rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1013 B

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "7d22f016-f26c-4bf2-966e-39b47373dd06",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 64,
"height": 64,
"platformSettings": {},
"subMetas": {
"dina1": {
"ver": "1.0.6",
"uuid": "0d650991-de9e-4ad5-aa57-0308a7813c82",
"importer": "sprite-frame",
"rawTextureUuid": "7d22f016-f26c-4bf2-966e-39b47373dd06",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 1,
"width": 62,
"height": 62,
"rawWidth": 64,
"rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

View File

@ -1,6 +1,6 @@
{
"ver": "2.3.7",
"uuid": "e77a8438-0b6d-4f7d-9211-c654a5750fde",
"uuid": "bcae20cf-e2a6-466d-9fb7-4fc1b976aa41",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
@ -8,15 +8,15 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 922,
"height": 202,
"width": 546,
"height": 26,
"platformSettings": {},
"subMetas": {
"ruCat": {
"jindut00": {
"ver": "1.0.6",
"uuid": "02080381-b853-4eb7-b717-e85ff61d8101",
"uuid": "69f0a4c4-3473-41d0-95d2-faa52757cb4d",
"importer": "sprite-frame",
"rawTextureUuid": "e77a8438-0b6d-4f7d-9211-c654a5750fde",
"rawTextureUuid": "bcae20cf-e2a6-466d-9fb7-4fc1b976aa41",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
@ -24,10 +24,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 922,
"height": 202,
"rawWidth": 922,
"rawHeight": 202,
"width": 546,
"height": 26,
"rawWidth": 546,
"rawHeight": 26,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "0cef1cfb-02be-4009-b9e3-07fa64a61a47",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 546,
"height": 26,
"platformSettings": {},
"subMetas": {
"jindut02": {
"ver": "1.0.6",
"uuid": "305c6835-e53c-47b7-ab3c-9f1650e924d5",
"importer": "sprite-frame",
"rawTextureUuid": "0cef1cfb-02be-4009-b9e3-07fa64a61a47",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 546,
"height": 26,
"rawWidth": 546,
"rawHeight": 26,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "a530d2f0-4c56-4af9-aa97-6bc7de0fb831",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 562,
"height": 166,
"platformSettings": {},
"subMetas": {
"next": {
"ver": "1.0.6",
"uuid": "6023ac68-4497-47b2-a51c-0bcbdfead49c",
"importer": "sprite-frame",
"rawTextureUuid": "a530d2f0-4c56-4af9-aa97-6bc7de0fb831",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 562,
"height": 166,
"rawWidth": 562,
"rawHeight": 166,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "ba43914b-6a6b-42f8-a79b-66ac8e3ad862",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 178,
"height": 204,
"platformSettings": {},
"subMetas": {
"qozainan": {
"ver": "1.0.6",
"uuid": "5b71eac9-21a9-46b5-a190-39280f308b7d",
"importer": "sprite-frame",
"rawTextureUuid": "ba43914b-6a6b-42f8-a79b-66ac8e3ad862",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -0.5,
"offsetY": 0.5,
"trimX": 0,
"trimY": 0,
"width": 177,
"height": 203,
"rawWidth": 178,
"rawHeight": 204,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "c8d226a4-c94b-4e63-8ff2-77e425df09ee",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 154,
"height": 162,
"platformSettings": {},
"subMetas": {
"quit": {
"ver": "1.0.6",
"uuid": "3cc81ca8-8d45-4cbe-a331-01d750a0ebe6",
"importer": "sprite-frame",
"rawTextureUuid": "c8d226a4-c94b-4e63-8ff2-77e425df09ee",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 154,
"height": 162,
"rawWidth": 154,
"rawHeight": 162,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "1abde803-709a-4117-bd83-2d84a1c07ee8",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 968,
"height": 230,
"platformSettings": {},
"subMetas": {
"ruCat": {
"ver": "1.0.6",
"uuid": "4a9eec20-f71c-4b6c-9f98-0923bfea29c2",
"importer": "sprite-frame",
"rawTextureUuid": "1abde803-709a-4117-bd83-2d84a1c07ee8",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 968,
"height": 230,
"rawWidth": 968,
"rawHeight": 230,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 107,
"borderRight": 758,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "8c5d45ea-fd7a-44a7-a5b3-bbbb8a4a32f0",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 91,
"height": 39,
"platformSettings": {},
"subMetas": {
"xiegang": {
"ver": "1.0.6",
"uuid": "b9f95266-ae7b-4247-99c9-6f253bd88b16",
"importer": "sprite-frame",
"rawTextureUuid": "8c5d45ea-fd7a-44a7-a5b3-bbbb8a4a32f0",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 91,
"height": 39,
"rawWidth": 91,
"rawHeight": 39,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "d2595c5c-5e74-4332-9c35-ceb3c5c88b69",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 102,
"height": 100,
"platformSettings": {},
"subMetas": {
"zuozi": {
"ver": "1.0.6",
"uuid": "2c50bb1d-6530-4286-b5b2-6c1319db12c7",
"importer": "sprite-frame",
"rawTextureUuid": "d2595c5c-5e74-4332-9c35-ceb3c5c88b69",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 0,
"width": 100,
"height": 100,
"rawWidth": 102,
"rawHeight": 100,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB