diff --git a/assets/GameplayIntro/compressed.meta b/assets/GameplayIntro/compressed.meta new file mode 100644 index 0000000..c55f304 --- /dev/null +++ b/assets/GameplayIntro/compressed.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "c02a54ac-79f5-491a-bad9-38c015806432", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index c241f39..31008d5 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -9417,6 +9417,27 @@ }, { "__uuid__": "d597dbfa-8b35-4068-976b-f24f10688660" + }, + { + "__uuid__": "c9dad5fa-dbcb-4480-ae8a-642d27583b88" + }, + { + "__uuid__": "d3820083-8dca-4026-b900-b612f690c81d" + }, + { + "__uuid__": "6589032c-e39c-4425-8be0-68f12c50d53f" + }, + { + "__uuid__": "3ceea96d-8a3a-40fb-9e30-d9b3ea8c4092" + }, + { + "__uuid__": "f9545822-4235-4a6c-bb1e-66d9e59dc70e" + }, + { + "__uuid__": "e8920af3-7bbc-4b7a-81fa-7322be1e666a" + }, + { + "__uuid__": "e447580f-5a67-4c78-927a-99d9cb820b35" } ], "targetNode": [ diff --git a/assets/Script/ItemGuide.ts b/assets/Script/ItemGuide.ts index 547a27b..3fced95 100644 --- a/assets/Script/ItemGuide.ts +++ b/assets/Script/ItemGuide.ts @@ -38,7 +38,7 @@ export default class ItemGuide extends cc.Component { this.itemList[2].getComponent(cc.Sprite).spriteFrame = this.itemSpriteList[8]; this.itemList[3].getComponent(cc.Sprite).spriteFrame = this.itemSpriteList[12]; } - else if (cc.fx.GameConfig.shouldShowWinStreakGuide()) { + else if (cc.fx.GameConfig.shouldShowWinStreakGuide() && !cc.fx.GameConfig.usesRainbowWinStreakUI()) { this.itemList[0].getComponent(cc.Sprite).spriteFrame = this.itemSpriteList[9]; this.itemList[1].getComponent(cc.Sprite).spriteFrame = this.itemSpriteList[10]; this.itemList[2].getComponent(cc.Sprite).spriteFrame = this.itemSpriteList[11]; @@ -46,6 +46,51 @@ export default class ItemGuide extends cc.Component { } } + onEnable() { + if (cc.fx.GameConfig.shouldShowWinStreakGuide() && cc.fx.GameConfig.usesRainbowWinStreakUI()) { + // guide2 素材直接挂在场景的 itemSpriteList[14..20]。 + const images = this.itemSpriteList.slice(14, 21); + if (images.length !== 7 || images.some(frame => !frame)) { + cc.error("guidet 缺少 guide2 图片绑定"); + return; + } + this.showRainbowWinStreakGuide(images); + } + } + + private showRainbowWinStreakGuide(images: cc.SpriteFrame[]) { + const [title, bottle, text, rays, ribbon, glow, button] = images; + const [titleNode, bottleNode, textNode, raysNode] = this.itemList; + [title, bottle, text, rays].forEach((frame, index) => { + this.itemList[index].getComponent(cc.Sprite).spriteFrame = frame; + }); + this.node.getChildByName("btn_lq").getComponent(cc.Sprite).spriteFrame = button; + + titleNode.setPosition(0, 710); + bottleNode.setPosition(0, 150); + textNode.setPosition(0, -360); + raysNode.setPosition(0, 150); + this.node.getChildByName("btn_lq").setPosition(0, -590); + + const addDecoration = (name: string, frame: cc.SpriteFrame, zIndex: number) => { + let node = this.node.getChildByName(name); + if (!node) { + node = new cc.Node(name); + node.addComponent(cc.Sprite).spriteFrame = frame; + this.node.addChild(node); + } else { + node.getComponent(cc.Sprite).spriteFrame = frame; + } + node.setContentSize(frame.getOriginalSize()); + node.setPosition(0, 150); + node.zIndex = zIndex; + node.active = true; + }; + addDecoration("rainbowGlow", glow, 1); + bottleNode.zIndex = 2; + addDecoration("rainbowRibbon", ribbon, 3); + } + start() { } //关闭引导 diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 3703b54..11242c8 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -757,7 +757,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: "1.0.71", //版本号 + version: "1.0.72", //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/assets/gacha_bundle/compressed.meta b/assets/gacha_bundle/compressed.meta new file mode 100644 index 0000000..6373d9a --- /dev/null +++ b/assets/gacha_bundle/compressed.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "58d542f9-b25a-4e6c-8071-07da2a8be1ab", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/gacha_bundle/img/cat.meta b/assets/gacha_bundle/img/cat.meta new file mode 100644 index 0000000..6ad75a0 --- /dev/null +++ b/assets/gacha_bundle/img/cat.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "614e3af4-08ac-49a8-911a-4229f13592b0", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/libs/dn-sdk-minigame.meta b/assets/libs/dn-sdk-minigame.meta new file mode 100644 index 0000000..f9b2538 --- /dev/null +++ b/assets/libs/dn-sdk-minigame.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "5826e28c-06b5-45da-82f9-e007946f1387", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/passCheck/script.meta b/assets/passCheck/script.meta new file mode 100644 index 0000000..0c3b027 --- /dev/null +++ b/assets/passCheck/script.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "1460cef7-79ed-4031-b791-412c7d7addbd", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/propWindow/compressed.meta b/assets/propWindow/compressed.meta new file mode 100644 index 0000000..ef62f43 --- /dev/null +++ b/assets/propWindow/compressed.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "bca9be2f-9d8d-445f-a549-48a6757980e9", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/res/shop.meta b/assets/res/shop.meta new file mode 100644 index 0000000..7834a57 --- /dev/null +++ b/assets/res/shop.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "46f84194-3ed8-482c-bbdc-18d3e3d56ba7", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/win/compressed.meta b/assets/win/compressed.meta new file mode 100644 index 0000000..ff2adfb --- /dev/null +++ b/assets/win/compressed.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "b30f5dd8-bf92-4b91-8051-a163b35922fb", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/win/prefab/Win.prefab b/assets/win/prefab/Win.prefab index ef21f6c..4ab660f 100644 --- a/assets/win/prefab/Win.prefab +++ b/assets/win/prefab/Win.prefab @@ -15121,7 +15121,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -433.391, + -438.658, -84.081, 0, 0,