Skip to content

M
MingSnake_241120
Commit 526d68bf authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents aa475d2a a4ad399d
Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 24 deletions
assets/1205输出合成五个福袋.anim 0 → 100644
View file @ 526d68bf
{
"__type__": "cc.AnimationClip",
"_name": "",
"_objFlags": 0,
"_native": "",
"sample": 60,
"speed": 1,
"wrapMode": 1,
"events": [],
"_duration": 0,
"_keys": [],
"_stepness": 0,
"curveDatas": {},
"_curves": [],
"_commonTargets": [],
"_hash": 0
}
assets/1205输出合成五个福袋.anim.meta 0 → 100644
View file @ 526d68bf
{
"ver": "2.0.3",
"importer": "animation-clip",
"imported": true,
"uuid": "faf8b025-0eb1-4394-8eb9-34db4223db8b",
"files": [
".cconb"
],
"subMetas": {},
"userData": {
"name": "1205输出合成五个福袋"
}
}
assets/Bundles/GetPrize/png/bannerBg.png.meta 0 → 100644
View file @ 526d68bf
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "8ef0e128-e524-4226-acf4-c6eb67010dde",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "8ef0e128-e524-4226-acf4-c6eb67010dde@6c48a",
"displayName": "bannerBg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "8ef0e128-e524-4226-acf4-c6eb67010dde",
"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": "8ef0e128-e524-4226-acf4-c6eb67010dde@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": "8ef0e128-e524-4226-acf4-c6eb67010dde@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "8ef0e128-e524-4226-acf4-c6eb67010dde@6c48a"
}
}
assets/Bundles/GetPrize/png/getPrize.png.meta 0 → 100644
View file @ 526d68bf
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "d3140672-c338-4780-8380-0be9a83eccf4",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "d3140672-c338-4780-8380-0be9a83eccf4@6c48a",
"displayName": "getPrize",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "d3140672-c338-4780-8380-0be9a83eccf4",
"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": "d3140672-c338-4780-8380-0be9a83eccf4@f9941",
"displayName": "getPrize",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 420,
"height": 121,
"rawWidth": 420,
"rawHeight": 121,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-210,
-60.5,
0,
210,
-60.5,
0,
-210,
60.5,
0,
210,
60.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
121,
420,
121,
0,
0,
420,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-210,
-60.5,
0
],
"maxPos": [
210,
60.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "d3140672-c338-4780-8380-0be9a83eccf4@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "d3140672-c338-4780-8380-0be9a83eccf4@6c48a"
}
}
assets/Scripts/Scenes/BlessingBagPage.ts
View file @ 526d68bf
...@@ -163,7 +163,7 @@ export class BlessingBagPage extends Scene { ...@@ -163,7 +163,7 @@ export class BlessingBagPage extends Scene {
const prizeDiamond = instantiate(this.prize_list) const prizeDiamond = instantiate(this.prize_list)
this.prizeListDiamond.addChild(prizeDiamond) this.prizeListDiamond.addChild(prizeDiamond)
prizeDiamond.getComponent(Sprite).spriteFrame = item.prizeImg prizeDiamond.getComponent(Sprite).spriteFrame = item.prizeImg
const numBg = prizeDiamond.getChildByName("numBg") const numBg = prizeDiamond.getChildByName("numBg")
const num = numBg.getChildByName("num") const num = numBg.getChildByName("num")
......
assets/Scripts/Scenes/HomeScene.ts
View file @ 526d68bf
...@@ -196,7 +196,7 @@ export class HomeScene extends Scene { ...@@ -196,7 +196,7 @@ export class HomeScene extends Scene {
clickDetail = _asyncThrottle(async () => { clickDetail = _asyncThrottle(async () => {
if (!this.checkActTime()) return; if (!this.checkActTime()) return;
await changeScene(PointDetailScene); await changeScene(PointDetailScene,{ifFrom:HomeScene});
}); });
clickShare = _asyncThrottle(async () => { clickShare = _asyncThrottle(async () => {
......
assets/Scripts/Scenes/PointDetailScene.ts
View file @ 526d68bf
...@@ -23,6 +23,7 @@ export class PointDetailScene extends Scene { ...@@ -23,6 +23,7 @@ export class PointDetailScene extends Scene {
listData: any[] = []; listData: any[] = [];
onLoad() { onLoad() {
this.backBtn.on(Button.EventType.CLICK, this.clickBackHome, this); this.backBtn.on(Button.EventType.CLICK, this.clickBackHome, this);
} }
...@@ -45,7 +46,8 @@ export class PointDetailScene extends Scene { ...@@ -45,7 +46,8 @@ export class PointDetailScene extends Scene {
// 返回首页 // 返回首页
clickBackHome = _asyncThrottle(async () => { clickBackHome = _asyncThrottle(async () => {
await changeScene(HomeScene); const{ifFrom}=this.data
await changeScene(ifFrom);
}); });
// 数据更新 // 数据更新
......
assets/Scripts/Scenes/PropPage.ts
View file @ 526d68bf
import { _decorator, Button, instantiate, js, Label, math, Node, Prefab, Sprite } from "cc"; import {_decorator, Button, instantiate, js, Label, math, Node, Prefab, Sprite} from "cc";
import Scene from "db://assets/Module/Scene"; import Scene from "db://assets/Module/Scene";
import {MainGame} from "./MainGame/MainGame"; import {MainGame} from "./MainGame/MainGame";
import {changeScene, showPanel} from "db://assets/Module/UIFast"; import {changeScene, showPanel} from "db://assets/Module/UIFast";
...@@ -8,7 +8,7 @@ import {_asyncThrottle} from "../Utils/Utils"; ...@@ -8,7 +8,7 @@ import {_asyncThrottle} from "../Utils/Utils";
import ProPop from "db://assets/Scripts/Panels/ProPop"; import ProPop from "db://assets/Scripts/Panels/ProPop";
import {sendWebNet, WebNetName} from "db://assets/Scripts/Utils/WebNet/WebNet"; import {sendWebNet, WebNetName} from "db://assets/Scripts/Utils/WebNet/WebNet";
import {HomeScene} from "db://assets/Scripts/Scenes/HomeScene"; import {HomeScene} from "db://assets/Scripts/Scenes/HomeScene";
import { YXCollectionView, YXFlowLayout } from "../../Component/YXList/lib"; import {YXCollectionView, YXFlowLayout} from "../../Component/YXList/lib";
import {PointDetailScene} from "db://assets/Scripts/Scenes/PointDetailScene"; import {PointDetailScene} from "db://assets/Scripts/Scenes/PointDetailScene";
...@@ -92,9 +92,14 @@ export class PropPage extends Scene { ...@@ -92,9 +92,14 @@ export class PropPage extends Scene {
// btn.on(Button.EventType.CLICK, () => this.clickToConfirm(consumeSp, item, data)); // btn.on(Button.EventType.CLICK, () => this.clickToConfirm(consumeSp, item, data));
// }; // };
creditsNum = this.propPageInfo.credits;
/** 积分数据*/ /** 积分数据*/
setCredits() { setCredits() {
this.credits.string = this.propPageInfo.credits if (this.propPageInfo.credits > 999999) {
this.creditsNum = "999999+"
}
this.credits.string = this.creditsNum
} }
/** 道具卡*/ /** 道具卡*/
...@@ -135,10 +140,12 @@ export class PropPage extends Scene { ...@@ -135,10 +140,12 @@ export class PropPage extends Scene {
//预制体内的名字、解释、图片 进行更替 //预制体内的名字、解释、图片 进行更替
} }
/** 点击积分按钮*/ /** 点击积分按钮*/
clickToChange(){ clickToChange() {
changeScene(PointDetailScene) changeScene(PointDetailScene, {ifFrom: PropPage})
} }
/** 点击返回按钮*/ /** 点击返回按钮*/
clickToBack() { clickToBack() {
changeScene(HomeScene) changeScene(HomeScene)
......
build/web-mobile/index.html
View file @ 526d68bf
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
</style> </style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/zepto.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/declare-process.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/jszip.min.v3.10.1.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/rem.min.js"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/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/1733971997849/style.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/custom.css" />--> <!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/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/1733971997849/src/polyfills.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. --> <!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/system.bundle.js" charset="utf-8"></script> <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map --> <!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>--> <!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/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/1733971997849/cocos-js/cc.js"}} {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/cocos-js/cc.js"}}
</script> </script>
<script> <script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/index.js').catch(function (err) { System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733972631307/index.js').catch(function (err) {
console.error(err); console.error(err);
}) })
</script> </script>
......
preview-template/mock/exchang_1/listExchangeLimit.do.json
View file @ 526d68bf
...@@ -309,6 +309,6 @@ ...@@ -309,6 +309,6 @@
] ]
} }
], ],
"credits": "labore" "credits": 100000000000
} }
} }
\ No newline at end of file
profiles/v2/packages/builder.json
View file @ 526d68bf
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
"progress": 1, "progress": 1,
"state": "success", "state": "success",
"stage": "build", "stage": "build",
"message": "2024-12-12 10:54:03 build success in 45 s!", "message": "2024-12-12 11:05:38 build success in 1 min 47 s!",
"detailMessage": "%c兑吧发布插件 >> 版本号:1733971997849\rcolor: green\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-12 10:53:17", "time": "2024-12-12 11:03:51",
"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