Commit e0ef2f4c authored by 邱旭's avatar 邱旭

1

parent 568e10bd
...@@ -6,6 +6,7 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher"; ...@@ -6,6 +6,7 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import { ModuleTypes } from "../../../libs/new_wx/types/sceneTypes"; import { ModuleTypes } from "../../../libs/new_wx/types/sceneTypes";
import { loadSvga } from "../../loadSvga"; import { loadSvga } from "../../loadSvga";
import getResPath from "../../../libs/new_tc/getResPath"; import getResPath from "../../../libs/new_tc/getResPath";
import Utils from "../../Utils";
export default class ScratchIcon extends IconBase { export default class ScratchIcon extends IconBase {
private cutTimer: CutTimer = null; private cutTimer: CutTimer = null;
...@@ -72,8 +73,9 @@ export default class ScratchIcon extends IconBase { ...@@ -72,8 +73,9 @@ export default class ScratchIcon extends IconBase {
case (status == 1): // 当前任务进行中 打开任务面板 case (status == 1): // 当前任务进行中 打开任务面板
loadSvga(getResPath() + 'resource/assets/svgas/sprize.svga').then(async (mv: any) => { loadSvga(getResPath() + 'resource/assets/svgas/sprize.svga').then(async (mv: any) => {
// await wait(100); // await wait(100);
res.data.mv = mv; let data = Utils.deepClone(res.data);
PanelCtrl.instance.show('scratch', res.data) data.mv = mv;
PanelCtrl.instance.show('scratch', data);
}); });
// PanelCtrl.instance.show('scratch', res.data); // PanelCtrl.instance.show('scratch', res.data);
break; break;
......
...@@ -3,9 +3,9 @@ import getSkinPath from "../../libs/new_wx/utils/getSkinPath"; ...@@ -3,9 +3,9 @@ import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
import { GDispatcher } from "../../libs/tc/util/GDispatcher"; import { GDispatcher } from "../../libs/tc/util/GDispatcher";
import { NetManager } from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import { iswx } from "../iswx"; import { iswx } from "../iswx";
import Utils from "../Utils";
import ScratchRulePanel from "./ScratchRulePanel"; import ScratchRulePanel from "./ScratchRulePanel";
import CutTimer from "../CutTimer"; import CutTimer from "../CutTimer";
import Utils from "../Utils";
export default class ScratchPanel extends Panel { export default class ScratchPanel extends Panel {
private cutTimer: CutTimer; private cutTimer: CutTimer;
...@@ -82,6 +82,7 @@ export default class ScratchPanel extends Panel { ...@@ -82,6 +82,7 @@ export default class ScratchPanel extends Panel {
this["progressGroup"].mask = this["progressMask"]; this["progressGroup"].mask = this["progressMask"];
this["prizeImg"].source = this.data.prizeImage; this["prizeImg"].source = this.data.prizeImage;
if(!this.data.avatarList) { if(!this.data.avatarList) {
this.data.avatarList = []; this.data.avatarList = [];
} }
......
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