Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	assets/Bundles/BlessingBagPage/BlessingBagPage.scene
parents 9fdc439b 4ec847a3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1347 additions and 318 deletions
assets/Bundles/BlessingBagPage/earn_list_1.prefab
View file @ 54109059
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -379.648, "x": -379.648,
"y": 25.83099999999996, "y": 48.39699999999999,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
...@@ -137,12 +137,12 @@ ...@@ -137,12 +137,12 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 500, "width": 500,
"height": 30 "height": 63.279999999999994
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0, "x": 0,
"y": 0.5 "y": 1
}, },
"_id": "" "_id": ""
}, },
...@@ -172,14 +172,14 @@ ...@@ -172,14 +172,14 @@
"b": 0, "b": 0,
"a": 255 "a": 255
}, },
"_string": "邀请的好友在游戏中达到xxx分数", "_string": "邀请的好友在游戏中达到xxx分数邀请的好友在游戏中达到xxx分数邀请",
"_horizontalAlign": 0, "_horizontalAlign": 0,
"_verticalAlign": 0, "_verticalAlign": 0,
"_actualFontSize": 24, "_actualFontSize": 24,
"_fontSize": 24, "_fontSize": 24,
"_fontFamily": "Arial", "_fontFamily": "Arial",
"_lineHeight": 40, "_lineHeight": 28,
"_overflow": 1, "_overflow": 3,
"_enableWrapText": true, "_enableWrapText": true,
"_font": null, "_font": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130.01300000000003, "x": -130.01300000000003,
"y": -21.134000000000015, "y": -34.46900000000002,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
......
assets/Bundles/MainGame/MainGame.scene
View file @ 54109059
...@@ -10858,7 +10858,7 @@ ...@@ -10858,7 +10858,7 @@
"y": 180, "y": 180,
"z": 0 "z": 0
}, },
"_id": "eeRVOY9YpBUK96ehw0lgVO" "_id": "ec8chuj35Ciqj5FKETcZUx"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -10880,7 +10880,7 @@ ...@@ -10880,7 +10880,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "c16a1SkX1MXLgOBlZruAAR" "_id": "f1rleA4HxKOLIyIor4U1qX"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -10916,7 +10916,7 @@ ...@@ -10916,7 +10916,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "27aAK88sFDpYab3XK8VOtf" "_id": "3aIsomZzFO1bLIddxSc0P5"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -10964,7 +10964,7 @@ ...@@ -10964,7 +10964,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "7f4T4palpEDa2sDyXHc/26" "_id": "ef+tYUGs9PUKruzwVrZeQG"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -10986,7 +10986,7 @@ ...@@ -10986,7 +10986,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "77EMf4kClFGIWbfWB54WfK" "_id": "2dPYMeTmRJIaSk3x2sWUG9"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -11022,7 +11022,7 @@ ...@@ -11022,7 +11022,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "9a1+gn/75BB4KHC1sNf1/G" "_id": "4fotCh1vZNrLliPOIJ9zv2"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -11070,7 +11070,7 @@ ...@@ -11070,7 +11070,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "0cCuzFCnNEbpjYamisZTzh" "_id": "94FKhHPvBNfahbsm/fqUAk"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
...@@ -11092,7 +11092,7 @@ ...@@ -11092,7 +11092,7 @@
"x": 0, "x": 0,
"y": 1 "y": 1
}, },
"_id": "05MmnETjhBirV4hsyFxYM+" "_id": "7cgkUjVldABbCq1RzEV9Sh"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -11128,7 +11128,7 @@ ...@@ -11128,7 +11128,7 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "5auNJP90pGOKf49wWtaCkq" "_id": "f4fHEF5mlCj4Tsf68czMLd"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
......
build/web-mobile/index.html
View file @ 54109059
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
</style> </style>
<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/1733907677492/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/1733907677492/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/1733907677492/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/1733907677492/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="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/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/1733906553798/style.css" />--> <!-- <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/1733906553798/custom.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/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/1733906553798/src/polyfills.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. --> <!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/src/system.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map --> <!-- Import map -->
<!--<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 src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/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/1733906553798/cocos-js/cc.js"}} {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/cocos-js/cc.js"}}
</script> </script>
<script> <script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733906553798/index.js').catch(function (err) { System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733907677492/index.js').catch(function (err) {
console.error(err); console.error(err);
}) })
</script> </script>
......
preview-template/mock/bag/index.do.json
View file @ 54109059
...@@ -7,6 +7,36 @@ ...@@ -7,6 +7,36 @@
"bagPrizeVO": [ "bagPrizeVO": [
{ {
"prizeVOList": [ "prizeVOList": [
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{ {
"prizeId": "o489d781c", "prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg", "prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
...@@ -18,6 +48,36 @@ ...@@ -18,6 +48,36 @@
}, },
{ {
"prizeVOList": [ "prizeVOList": [
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{ {
"prizeId": "o489d781c", "prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg", "prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
...@@ -29,6 +89,36 @@ ...@@ -29,6 +89,36 @@
}, },
{ {
"prizeVOList": [ "prizeVOList": [
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{
"prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
"prizeName": "鸣鸣很忙-商家自冲优惠券测试",
"sendCount": 1
},
{ {
"prizeId": "o489d781c", "prizeId": "o489d781c",
"prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg", "prizeImg": "//yun.dui88.com/images/202411/k4u20295lx.jpg",
......
profiles/v2/packages/builder.json
View file @ 54109059
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
"progress": 1, "progress": 1,
"state": "success", "state": "success",
"stage": "build", "stage": "build",
"message": "2024-12-11 16:43:26 build success in 52 s!", "message": "2024-12-11 17:03:01 build success in 1 min 44 s!",
"detailMessage": "Asset DB is resume!\r", "detailMessage": "refresh db internal success\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 16:42:33", "time": "2024-12-11 17:01:17",
"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