Commit 0200efba authored by zjz1994's avatar zjz1994

Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩

parents 7ad61ecd 0cdff16a
# xiaoxiaole
aa
<!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>
...@@ -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:
......
...@@ -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">
......
...@@ -259,14 +259,23 @@ export const Chapters4: ChapterData[] = [ ...@@ -259,14 +259,23 @@ export const Chapters4: ChapterData[] = [
baseElementTypes: [0, 2, 1, 3, 4], bubbleProbability: 0, stepCount: 29, passTarget: { type: 1, elements: [{ type: 9, count: 68 }] }, starScores: [8000, 15000, 22200], map: { lattices: [1, 0, 1, 0, 1, 0, 1, 0, 1, 2, 0, 2, 0, 2, 0, 2, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], connectedLats: [], elements: [1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 5, 2, 5, 2, 5, 2, 2, 4, 2, 4, 2, 4, 2, 4, 2, 1, 4, 2, 4, 2, 4, 2, 4, 2], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 13, 0, 13, 0, 23, 0, 0, 13, 0, 21, 0, 31, 0, 11, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 2, type: null }, { index: 4, type: null }, { index: 6, type: null }, { index: 8, type: null }] } baseElementTypes: [0, 2, 1, 3, 4], bubbleProbability: 0, stepCount: 29, passTarget: { type: 1, elements: [{ type: 9, count: 68 }] }, starScores: [8000, 15000, 22200], map: { lattices: [1, 0, 1, 0, 1, 0, 1, 0, 1, 2, 0, 2, 0, 2, 0, 2, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], connectedLats: [], elements: [1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 5, 2, 5, 2, 5, 2, 2, 4, 2, 4, 2, 4, 2, 4, 2, 1, 4, 2, 4, 2, 4, 2, 4, 2], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 13, 0, 13, 0, 23, 0, 0, 13, 0, 21, 0, 31, 0, 11, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 2, type: null }, { index: 4, type: null }, { index: 6, type: null }, { index: 8, type: null }] }
}, },
//70 //70
{ {
baseElementTypes: [1, 0, 2, 3], baseElementTypes: [1, 0, 2, 3],
bubbleProbability: 0, bubbleProbability: 0,
stepCount: 20, stepCount: 20,
passTarget: { type: 1, elements: [{ type: 1, count: 90 }] }, passTarget: { type: 1, elements: [{ type: 1, count: 90 }] },
starScores: [5000, 11000, 20000], starScores: [5000, 11000, 20000],
map: { map: {
lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }] lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [
0, 0, 2, 2, 2, 2, 2, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 7, 7, 7, 7, 7, 0, 0,
0, 6, 7, 7, 7, 7, 7, 6, 0,
0, 2, 7, 7, 7, 7, 7, 2, 0,
0, 2, 7, 7, 7, 7, 7, 2, 0,
0, 0, 2, 2, 2, 6, 2, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }]
} }
}, },
//71 //71
......
...@@ -441,8 +441,17 @@ export const Chapters8: ChapterData[] = [ ...@@ -441,8 +441,17 @@ export const Chapters8: ChapterData[] = [
{ {
baseElementTypes: [0, 2, 3, 4], baseElementTypes: [0, 2, 3, 4],
bubbleProbability: 0, bubbleProbability: 0,
stepCount: 20, stepCount: 28,
passTarget: { type: 1, elements: [{ type: 1, count: 88 }, { type: 10, count: 18 }] }, starScores: [5000, 12000, 21000], map: { lattices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 9, 9, 6, 9, 6, 9, 6, 9, 9, 9, 9, 6, 9, 6, 9, 6, 9, 9, 9, 9, 6, 9, 6, 9, 6, 9, 9], baseElements: [20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }] } passTarget: { type: 1, elements: [{ type: 1, count: 66 }, { type: 10, count: 18 }] }, starScores: [5000, 12000, 21000], map: { lattices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [
4, 1, 4, 1, 4, 1, 4, 1, 4,
1, 4, 1, 4, 1, 4, 1, 4, 1,
4, 1, 4, 1, 4, 1, 4, 1, 4,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 6, 1, 6, 1, 6, 1, 1,
8, 8, 1, 8, 6, 8, 1, 8, 8,
8, 8, 1, 8, 1, 8, 1, 8, 8,
9, 9, 1, 9, 1, 9, 1, 9, 9], baseElements: [20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }] }
}, },
//156 //156
{ {
......
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