Commit 6aafc61d authored by 陈子煜's avatar 陈子煜

1

parent 9d3f7d54
This diff is collapsed.
...@@ -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")
......
...@@ -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 () => {
......
...@@ -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);
}); });
// 数据更新 // 数据更新
......
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)
......
...@@ -309,6 +309,6 @@ ...@@ -309,6 +309,6 @@
] ]
} }
], ],
"credits": "labore" "credits": 100000000000
} }
} }
\ No newline at end of file
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