Skip to content

X
xiaoxiaole
Commit ffa0e799 authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'hotfix2' into dev

parents d6980ab8 5e3c2ea6
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 1 deletion
docs/README.md 0 → 100644
View file @ ffa0e799
# xiaoxiaole
aa
docs/index.html 0 → 100644
View file @ ffa0e799
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>duiba-games - 兑吧游戏自动化工程</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="description" content="兑吧游戏自动化工程">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css">
</head>
<body>
<div id="app"></div>
<script>
window.$docsify = {
name: 'duiba-games',
repo: ''
}
</script>
<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
</body>
</html>
egret/libs/new_wx/components/PrizePanel.ts
View file @ ffa0e799
...@@ -37,6 +37,7 @@ export default class PrizePanel extends Panel { ...@@ -37,6 +37,7 @@ export default class PrizePanel extends Panel {
this.img.visible = false; this.img.visible = false;
this.propGroup.visible = true; this.propGroup.visible = true;
this.prop.source = 'prize_money_png'; this.prop.source = 'prize_money_png';
this.prop.y=90;
this.nums.text = `×${realValue || 1}`; this.nums.text = `×${realValue || 1}`;
break; break;
default: default:
......
egret/resource/skins/PrizeSkin.exml
View file @ ffa0e799
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<e:Label id="nums" text="×8" size="48" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" bold="true" anchorOffsetX="0" width="205" x="278" y="102.24"/> <e:Label id="nums" text="×8" size="48" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" bold="true" anchorOffsetX="0" width="205" x="278" y="102.24"/>
<e:Image id="prop" scaleY="0.8" scaleX="0.8" x="173" y="81.24" source="prize_blood_png"/> <e:Image id="prop" scaleY="0.8" scaleX="0.8" x="173" y="81.24" source="prize_blood_png"/>
</e:Group> </e:Group>
<e:Image id="img" width="480" height="214" source="{data.url}" horizontalCenter="0" y="575.76" visible="false"/> <e:Image id="img" width="480" height="214" source="{data.url}" horizontalCenter="0" y="739.76" visible="false"/>
<e:Button id="closeBtn" label="" x="594.5" y="456.01"> <e:Button id="closeBtn" label="" x="594.5" y="456.01">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
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