Commit 04a5fae4 authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents e23c619e ab604005
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 310, "x": 311.62799999999993,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "完成", "_string": "完成",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 24, "_actualFontSize": 24,
...@@ -697,7 +697,7 @@ ...@@ -697,7 +697,7 @@
"_alignFlags": 32, "_alignFlags": 32,
"_target": null, "_target": null,
"_left": 0, "_left": 0,
"_right": 40, "_right": 38.37200000000007,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -767,7 +767,9 @@ ...@@ -767,7 +767,9 @@
"_disabledSprite": null, "_disabledSprite": null,
"_duration": 0.05, "_duration": 0.05,
"_zoomScale": 0.9, "_zoomScale": 0.9,
"_target": null, "_target": {
"__id__": 14
},
"_id": "" "_id": ""
}, },
{ {
...@@ -783,8 +785,6 @@ ...@@ -783,8 +785,6 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "dd2Foqv6hD7q6W6n32vozp", "fileId": "dd2Foqv6hD7q6W6n32vozp",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
......
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
</style> </style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/assets/plugin/zepto.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/assets/plugin/declare-process.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/assets/plugin/jszip.min.v3.10.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/assets/plugin/rem.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/assets/plugin/rem.min.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.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/1733907677492/style.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/custom.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/custom.css" />-->
<!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>--> <!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
<!-- <script>eruda.init()</script>--> <!-- <script>eruda.init()</script>-->
...@@ -118,20 +118,20 @@ ...@@ -118,20 +118,20 @@
</div> </div>
<!-- Polyfills bundle. --> <!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/polyfills.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. --> <!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/system.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map --> <!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>--> <!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<script type="systemjs-importmap" charset="utf-8"> <script type="systemjs-importmap" charset="utf-8">
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/cocos-js/cc.js"}} {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/cocos-js/cc.js"}}
</script> </script>
<script> <script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/index.js').catch(function (err) { System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733908188142/index.js').catch(function (err) {
console.error(err); console.error(err);
}) })
</script> </script>
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
"progress": 1, "progress": 1,
"state": "success", "state": "success",
"stage": "build", "stage": "build",
"message": "2024-12-11 17:03:01 build success in 1 min 44 s!", "message": "2024-12-11 17:11:28 build success in 1 min 40 s!",
"detailMessage": "refresh db internal success\r", "detailMessage": "Asset DB is resume!\r",
"options": { "options": {
"name": "cocos-template-3d", "name": "cocos-template-3d",
"server": "", "server": "",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"__version__": "1.3.8", "__version__": "1.3.8",
"logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log" "logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
}, },
"time": "2024-12-11 17:01:17", "time": "2024-12-11 17:09:47",
"dirty": false "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