Skip to content

M
MingSnake_241120
Commit 9d3f7d54 authored by 陈子煜's avatar 陈子煜
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	build/web-mobile/index.html
#	profiles/v2/packages/builder.json
parents 55d393dd b7a3e557
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 519 additions and 109 deletions
123123.html
View file @ 9d3f7d54
......@@ -235,11 +235,11 @@
const itemTrack = new ItemTrack(canvas, [
{
content: '会员23123: 变美体验之旅-享毛戈平明星化妆师勋勋全国',
content: '变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国',
isPrivate: false
},
{
content: '会员23123: 黑金之旅-护肤体验大全套',
content: '变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国变美体验之旅-享毛戈平明星化妆师勋勋全国',
isPrivate: true
},
{
......
assets/Bundles/MainGame/MainGame.scene
View file @ 9d3f7d54
This diff is collapsed.
assets/Bundles/MainGame/png/topCard/道具_加速_100px@1x 拷贝.png.meta 0 → 100644
View file @ 9d3f7d54
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "2323752c-8cb7-42a8-ae6f-13e3e626db0a",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "2323752c-8cb7-42a8-ae6f-13e3e626db0a@6c48a",
"displayName": "道具_加速_100px@1x 拷贝",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "2323752c-8cb7-42a8-ae6f-13e3e626db0a",
"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": "2323752c-8cb7-42a8-ae6f-13e3e626db0a@f9941",
"displayName": "道具_加速_100px@1x 拷贝",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 54,
"height": 59,
"rawWidth": 54,
"rawHeight": 59,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-27,
-29.5,
0,
27,
-29.5,
0,
-27,
29.5,
0,
27,
29.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
59,
54,
59,
0,
0,
54,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-27,
-29.5,
0
],
"maxPos": [
27,
29.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "2323752c-8cb7-42a8-ae6f-13e3e626db0a@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "2323752c-8cb7-42a8-ae6f-13e3e626db0a@6c48a"
}
}
build/web-mobile/index.html
View file @ 9d3f7d54
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/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/1733971069528/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/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/1733971069528/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/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/1733971069528/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971069528/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/index.js').catch(function (err) {
console.error(err);
})
</script>
......
profiles/v2/packages/builder.json
View file @ 9d3f7d54
......@@ -45,8 +45,8 @@
"progress": 1,
"state": "success",
"stage": "build",
"message": "2024-12-12 10:39:54 build success in 2 min 5 s!",
"detailMessage": "refresh db internal success\r",
"message": "2024-12-12 10:36:13 build success in 56 s!",
"detailMessage": "%c兑吧发布插件 >> 版本号:1733970917185\rcolor: green\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-12 10:37:49",
"time": "2024-12-12 10:35:16",
"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