Skip to content

M
MingSnake_241120
Commit 54c8053c authored by 陈子煜's avatar 陈子煜
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 24d01089 4db94674
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1672 additions and 338 deletions
assets/Bundles/MainGame/MainGame.scene
View file @ 54c8053c
This diff is collapsed.
assets/Bundles/MainGame/png/横幅/bannerBg.png.meta 0 → 100644
View file @ 54c8053c
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "ca6cff09-695c-47b1-ad54-f431a11c56d4",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "ca6cff09-695c-47b1-ad54-f431a11c56d4@6c48a",
"displayName": "bannerBg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "ca6cff09-695c-47b1-ad54-f431a11c56d4",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "ca6cff09-695c-47b1-ad54-f431a11c56d4@f9941",
"displayName": "bannerBg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1620,
"height": 400,
"rawWidth": 1620,
"rawHeight": 400,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-810,
-200,
0,
810,
-200,
0,
-810,
200,
0,
810,
200,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
400,
1620,
400,
0,
0,
1620,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-810,
-200,
0
],
"maxPos": [
810,
200,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "ca6cff09-695c-47b1-ad54-f431a11c56d4@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "ca6cff09-695c-47b1-ad54-f431a11c56d4@6c48a"
}
}
assets/Bundles/MainGame/png/横幅/组 4.png.meta 0 → 100644
View file @ 54c8053c
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "8b6f379e-d16e-4355-9ca7-54581ac9a39d",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "8b6f379e-d16e-4355-9ca7-54581ac9a39d@6c48a",
"displayName": "组 4",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "8b6f379e-d16e-4355-9ca7-54581ac9a39d",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "8b6f379e-d16e-4355-9ca7-54581ac9a39d@f9941",
"displayName": "组 4",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 413,
"height": 118,
"rawWidth": 413,
"rawHeight": 118,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-206.5,
-59,
0,
206.5,
-59,
0,
-206.5,
59,
0,
206.5,
59,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
118,
413,
118,
0,
0,
413,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-206.5,
-59,
0
],
"maxPos": [
206.5,
59,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "8b6f379e-d16e-4355-9ca7-54581ac9a39d@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "8b6f379e-d16e-4355-9ca7-54581ac9a39d@6c48a"
}
}
assets/Bundles/MainGame/png/横幅/阶段一.png.meta
View file @ 54c8053c
......@@ -2,7 +2,7 @@
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "21efbe66-8698-46c0-9f61-bc692c8dd437",
"uuid": "8eab1323-3634-42c9-be4e-2256a31185be",
"files": [
".json",
".png"
......@@ -10,14 +10,14 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "21efbe66-8698-46c0-9f61-bc692c8dd437@6c48a",
"uuid": "8eab1323-3634-42c9-be4e-2256a31185be@6c48a",
"displayName": "阶段一",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "21efbe66-8698-46c0-9f61-bc692c8dd437",
"imageUuidOrDatabaseUri": "8eab1323-3634-42c9-be4e-2256a31185be",
"isUuid": true,
"visible": false,
"minfilter": "linear",
......@@ -34,7 +34,7 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "21efbe66-8698-46c0-9f61-bc692c8dd437@f9941",
"uuid": "8eab1323-3634-42c9-be4e-2256a31185be@f9941",
"displayName": "阶段一",
"id": "f9941",
"name": "spriteFrame",
......@@ -43,13 +43,13 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -6,
"offsetY": 0,
"trimX": 0,
"trimY": 72,
"width": 1620,
"height": 450,
"rawWidth": 1620,
"rawHeight": 582,
"trimY": 0,
"width": 313,
"height": 117,
"rawWidth": 313,
"rawHeight": 117,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......@@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-810,
-225,
-156.5,
-58.5,
0,
810,
-225,
156.5,
-58.5,
0,
-810,
225,
-156.5,
58.5,
0,
810,
225,
156.5,
58.5,
0
],
"indexes": [
......@@ -84,37 +84,37 @@
],
"uv": [
0,
510,
1620,
510,
117,
313,
117,
0,
60,
1620,
60
0,
313,
0
],
"nuv": [
0,
0.10309278350515463,
0,
1,
0.10309278350515463,
0,
0.8762886597938144,
0,
1,
1,
0.8762886597938144
1
],
"minPos": [
-810,
-225,
-156.5,
-58.5,
0
],
"maxPos": [
810,
225,
156.5,
58.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "21efbe66-8698-46c0-9f61-bc692c8dd437@6c48a",
"imageUuidOrDatabaseUri": "8eab1323-3634-42c9-be4e-2256a31185be@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
......@@ -129,6 +129,6 @@
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "21efbe66-8698-46c0-9f61-bc692c8dd437@6c48a"
"redirect": "8eab1323-3634-42c9-be4e-2256a31185be@6c48a"
}
}
assets/Bundles/MainGame/png/横幅/阶段二.png.meta
View file @ 54c8053c
......@@ -2,7 +2,7 @@
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "e5f47f46-1a47-4768-8a93-9be94a13ce63",
"uuid": "41b51755-7b02-4f70-a04f-f3730b56b605",
"files": [
".json",
".png"
......@@ -10,14 +10,14 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "e5f47f46-1a47-4768-8a93-9be94a13ce63@6c48a",
"uuid": "41b51755-7b02-4f70-a04f-f3730b56b605@6c48a",
"displayName": "阶段二",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "e5f47f46-1a47-4768-8a93-9be94a13ce63",
"imageUuidOrDatabaseUri": "41b51755-7b02-4f70-a04f-f3730b56b605",
"isUuid": true,
"visible": false,
"minfilter": "linear",
......@@ -34,7 +34,7 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "e5f47f46-1a47-4768-8a93-9be94a13ce63@f9941",
"uuid": "41b51755-7b02-4f70-a04f-f3730b56b605@f9941",
"displayName": "阶段二",
"id": "f9941",
"name": "spriteFrame",
......@@ -43,13 +43,13 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -6,
"offsetY": 0,
"trimX": 0,
"trimY": 102,
"width": 1620,
"height": 450,
"rawWidth": 1620,
"rawHeight": 642,
"trimY": 0,
"width": 313,
"height": 117,
"rawWidth": 313,
"rawHeight": 117,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......@@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-810,
-225,
-156.5,
-58.5,
0,
810,
-225,
156.5,
-58.5,
0,
-810,
225,
-156.5,
58.5,
0,
810,
225,
156.5,
58.5,
0
],
"indexes": [
......@@ -84,37 +84,37 @@
],
"uv": [
0,
540,
1620,
540,
117,
313,
117,
0,
90,
1620,
90
0,
313,
0
],
"nuv": [
0,
0.14018691588785046,
0,
1,
0.14018691588785046,
0,
0.8411214953271028,
0,
1,
1,
0.8411214953271028
1
],
"minPos": [
-810,
-225,
-156.5,
-58.5,
0
],
"maxPos": [
810,
225,
156.5,
58.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "e5f47f46-1a47-4768-8a93-9be94a13ce63@6c48a",
"imageUuidOrDatabaseUri": "41b51755-7b02-4f70-a04f-f3730b56b605@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
......@@ -129,6 +129,6 @@
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "e5f47f46-1a47-4768-8a93-9be94a13ce63@6c48a"
"redirect": "41b51755-7b02-4f70-a04f-f3730b56b605@6c48a"
}
}
assets/Bundles/MainGame/svga.meta 0 → 100644
View file @ 54c8053c
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "af605904-2e2a-447b-821e-2e3b4a6153b2",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Bundles/MainGame/svga/结算横幅.svga.meta 0 → 100644
View file @ 54c8053c
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "8dda1ff4-1ba5-44ad-a490-facd665a0c6d",
"files": [
".json",
".svga"
],
"subMetas": {},
"userData": {}
}
assets/Scripts/Scenes/MainGame/Components/Target.ts
View file @ 54c8053c
import { _decorator, Component, easing, Graphics, Label, Animation, misc, Node, Tween, tween, v3 } from "cc";
import { _decorator, Component, easing, Graphics, Label, Animation, misc, Node, Tween, tween, v3, UIOpacity } from "cc";
import { Global } from "../Global";
import Svga from "../../../../Component/Svga/Svga";
const { ccclass, property, executeInEditMode } = _decorator;
......@@ -22,6 +23,11 @@ export class Target extends Component {
@property(Node) mask: Node = null;
@property(Node) svga: Node = null;
@property(Node) bannerBg: Node = null;
@property(Node) banner: Node = null;
@property([Node]) bannerArr: Node[] = [];
constructor() {
......@@ -51,8 +57,23 @@ export class Target extends Component {
async showBanner(bannerNode: Node) {
await new Promise<void>((resolve) => {
bannerNode.active = true;
this.bannerBg.active = false;
this.banner.active = true;
this.mask.active = true;
tween(bannerNode)
this.svga.active = true;
this.svga.getComponent(Svga).play();
const bannerOpacity = this.banner.getComponent(UIOpacity);
bannerOpacity.opacity = 0;
tween(bannerOpacity)
.to(0.466, { opacity: 255 })
.call(() => {
this.svga.active = false;
this.bannerBg.active = true;
})
.start();
tween(this.banner)
.delay(2.666)
.to(0.666, {
position: v3(0, 345, 0),
......@@ -60,7 +81,9 @@ export class Target extends Component {
}, { easing: easing.quadInOut })
.delay(0.1)
.call(() => {
this.banner.active = false;
this.mask.active = false;
this.svga.active = false;
bannerNode.active = false;
resolve();
})
......
build/web-mobile/index.html
View file @ 54c8053c
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/assets/plugin/rem.min.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/custom.css" />-->
<!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
<!-- <script>eruda.init()</script>-->
......@@ -118,20 +118,20 @@
</div>
<!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<script type="systemjs-importmap" charset="utf-8">
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733904252123/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/index.js').catch(function (err) {
console.error(err);
})
</script>
......
profiles/v2/packages/builder.json
View file @ 54c8053c
......@@ -45,8 +45,8 @@
"progress": 1,
"state": "success",
"stage": "build",
"message": "2024-12-11 16:05:11 build success in 59 s!",
"detailMessage": "builder:build-project-total (59469ms)\r",
"message": "2024-12-11 16:43:26 build success in 52 s!",
"detailMessage": "Asset DB is resume!\r",
"options": {
"name": "cocos-template-3d",
"server": "",
......@@ -109,7 +109,7 @@
"__version__": "1.3.8",
"logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
},
"time": "2024-12-11 16:04:11",
"time": "2024-12-11 16:42:33",
"dirty": false
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment