Skip to content

X
xiaoxiaole
Commit 6d690f55 authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 1ce652ee
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 61 deletions
egret/libs/new_wx/MainBase.ts
View file @ 6d690f55
...@@ -54,7 +54,7 @@ import InviteCutTimePanel from "../../src/panels/InviteCutTimePanel"; ...@@ -54,7 +54,7 @@ import InviteCutTimePanel from "../../src/panels/InviteCutTimePanel";
import RulePanel2 from "./components/RulePanel2"; import RulePanel2 from "./components/RulePanel2";
import ScratchPanel from "../../src/panels/ScratchPanel"; import ScratchPanel from "../../src/panels/ScratchPanel";
import ScratchPrizePanel from "../../src/panels/ScratchPrizePanel"; import ScratchPrizePanel from "../../src/panels/ScratchPrizePanel";
import TurntablePanel from "../../src/panels/TurntablePanel/TurntablePanel"; import Turntable from "../../src/panels/TurntablePanel/Turntable";
import BagQuitPanel from "../../src/panels/BagQuitPanel"; import BagQuitPanel from "../../src/panels/BagQuitPanel";
export default class MainBase extends eui.UILayer { export default class MainBase extends eui.UILayer {
...@@ -101,7 +101,7 @@ export default class MainBase extends eui.UILayer { ...@@ -101,7 +101,7 @@ export default class MainBase extends eui.UILayer {
['inviteRule', { cls: InviteRulePanel }], ['inviteRule', { cls: InviteRulePanel }],
['scratch', { cls: ScratchPanel }], ['scratch', { cls: ScratchPanel }],
['scratchPrize', { cls: ScratchPrizePanel }], ['scratchPrize', { cls: ScratchPrizePanel }],
['turnTable', { cls: TurntablePanel }], ['turnTable', { cls: Turntable }],
['friend', { cls: FriendPanel }], ['friend', { cls: FriendPanel }],
['ad', { cls: ADPanel }], ['ad', { cls: ADPanel }],
]; ];
......
egret/resource/default.res.json
View file @ 6d690f55
...@@ -147,6 +147,10 @@ ...@@ -147,6 +147,10 @@
{ {
"keys": "bag退出弹窗_png,bag退出按钮_png,bag继续按钮_png", "keys": "bag退出弹窗_png,bag退出按钮_png,bag继续按钮_png",
"name": "bagquit" "name": "bagquit"
},
{
"keys": "turntable_bg_png,turntable_panel_png",
"name": "turntable"
} }
], ],
"resources": [ "resources": [
...@@ -2564,6 +2568,16 @@ ...@@ -2564,6 +2568,16 @@
"url": "assets/bag/bagbg.png", "url": "assets/bag/bagbg.png",
"type": "image", "type": "image",
"name": "bagbg_png" "name": "bagbg_png"
},
{
"url": "assets/turntable/turntable_bg.png",
"type": "image",
"name": "turntable_bg_png"
},
{
"url": "assets/turntable/turntable_panel.png",
"type": "image",
"name": "turntable_panel_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/TurntablePanelSkin.exml deleted 100644 → 0
View file @ 1ce652ee
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image scaleX="1" scaleY="1" y="73.35" horizontalCenter="0" source=""/>
<e:Group horizontalCenter="0" verticalCenter="-190" touchEnabled="false">
<e:Image scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" source=""/>
<e:Group id="panel" anchorOffsetX="273.5" anchorOffsetY="274" rotation="0" horizontalCenter="0" verticalCenter="0">
<e:Image scaleX="1" scaleY="1" anchorOffsetX="277" anchorOffsetY="276.5" rotation="0" horizontalCenter="0" verticalCenter="0" source=""/>
<e:Group id="prize0" y="14.28" x="202">
<e:Image id="img0" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab0" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xe33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize1" y="124.33" rotation="-40" x="51">
<e:Image id="img1" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab1" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize2" y="305.71" rotation="-80" x="7">
<e:Image id="img2" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab2" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize3" y="472.4" rotation="-120" x="88">
<e:Image id="img3" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab3" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize4" y="547.74" rotation="-160" x="258">
<e:Image id="img4" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab4" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize5" y="496.44" rotation="-200" x="438">
<e:Image id="img5" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab5" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize6" y="342.33" rotation="-240" x="540.33">
<e:Image id="img6" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab6" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize7" y="157.32" rotation="-280" x="520.6">
<e:Image id="img7" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab7" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
<e:Group id="prize8" y="27.91" rotation="-320" x="388.98">
<e:Image id="img8" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab8" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0"/>
</e:Group>
</e:Group>
<e:Button id="start_btn" label="" anchorOffsetX="93" anchorOffsetY="140" horizontalCenter="0" verticalCenter="-25">
</e:Button>
</e:Group>
<e:Button id="closeBtn" label="" y="135.31" x="565.89">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurntableSkin.exml 0 → 100644
View file @ 6d690f55
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image scaleX="1" scaleY="1" y="73.35" horizontalCenter="0" source=""/>
<e:Group horizontalCenter="0" verticalCenter="-190" touchEnabled="false">
<e:Image scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" source="turntable_bg_png"/>
<e:Group id="panel" anchorOffsetX="253.5" anchorOffsetY="253.5" rotation="0" horizontalCenter="0" verticalCenter="0" width="507" height="507">
<e:Image scaleX="1" scaleY="1" anchorOffsetX="253.5" anchorOffsetY="253.5" rotation="0" horizontalCenter="0" verticalCenter="0" source="turntable_panel_png"/>
<e:Group id="prize0" y="-10" x="179">
<e:Image id="img0" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab0" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xe33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize1" y="187" x="-11" rotation="-60">
<e:Image id="img1" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab1" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize2" y="450" x="64" rotation="-120">
<e:Image id="img2" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab2" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize3" y="516.5" rotation="-180" x="329">
<e:Image id="img3" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab3" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize4" y="320.1" rotation="-240" x="519.18">
<e:Image id="img4" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab4" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize5" y="56.5" rotation="-300" x="444.18">
<e:Image id="img5" y="50" width="83" height="83" rotation="0" horizontalCenter="0"/>
<e:Label id="lab5" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
</e:Group>
<e:Button id="start_btn" label="" anchorOffsetX="93" anchorOffsetY="140" horizontalCenter="0" verticalCenter="-25">
</e:Button>
</e:Group>
<e:Button id="closeBtn" label="" y="135.31" x="565.89">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
egret/src/panels/ScratchPanel.ts
View file @ 6d690f55
...@@ -146,7 +146,7 @@ export default class ScratchPanel extends Panel { ...@@ -146,7 +146,7 @@ export default class ScratchPanel extends Panel {
this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`; // 进度条文字 this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`; // 进度条文字
let _width = this["progressBg"].width * progress / 100; // 宽度 let _width = this["progressBg"].width * progress / 100; // 宽度
let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值 let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值
let _duration = 2000 * dProgress / 100; // 算出变化的时间 let _duration = 1000 * dProgress / 100; // 算出变化的时间
egret.Tween.get(this["progress"]).to({width: _width}, _duration); egret.Tween.get(this["progress"]).to({width: _width}, _duration);
} }
......
egret/src/panels/TurntablePanel/TurntablePanel.ts → egret/src/panels/TurntablePanel/Turntable.ts
View file @ 6d690f55
...@@ -11,13 +11,13 @@ import Loading from "../../../libs/new_wx/components/Loading"; ...@@ -11,13 +11,13 @@ import Loading from "../../../libs/new_wx/components/Loading";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import Utils from "../../Utils"; import Utils from "../../Utils";
export default class TurntablePanel extends Panel { export default class Turntable extends Panel {
public panel:eui.Group; public panel:eui.Group;
public start_btn:eui.Button; public start_btn:eui.Button;
public closeBtn:eui.Button; public closeBtn:eui.Button;
public get skinKey() { public get skinKey() {
return 'TurntablePanel' return 'Turntable'
} }
constructor(data?) { constructor(data?) {
......
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