Skip to content

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

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

parents 41e902d4 e33e2cfe
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 11 deletions
egret/index.html
View file @ d1530d21
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
{ nums: '随机奖励', type: 'random' } { nums: '随机奖励', type: 'random' }
]; ];
// localStorage.clear(); // localStorage.clear();
window['total_level'] = 18 + 13 * 5; window['total_level'] = 18 + 13 * 7;
window['last_level'] = 80;//必须大于等于total_level window['last_level'] = 100;//必须大于等于total_level
// localStorage.clear(); // localStorage.clear();
......
egret/resource/default.res.json
View file @ d1530d21
...@@ -60,6 +60,10 @@ ...@@ -60,6 +60,10 @@
"keys": "prize2_icon_png", "keys": "prize2_icon_png",
"name": "prize2" "name": "prize2"
}, },
{
"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_ele9_png,startpanel_ele8_png,startpanel_ele7_png,startpanel_ele6_png,startpanel_ele5_png,startpanel_ele4_png,startpanel_ele3_png,startpanel_ele2_png,startpanel_ele1_png,startpanel_ele0_png,startpanel_block2_png",
"name": "startpanel"
},
{ {
"keys": "blood2按钮 副本1_png,blood2按钮 副本_png,blood2_png", "keys": "blood2按钮 副本1_png,blood2按钮 副本_png,blood2_png",
"name": "blood2" "name": "blood2"
...@@ -2153,9 +2157,49 @@ ...@@ -2153,9 +2157,49 @@
"name": "yezi1_png" "name": "yezi1_png"
}, },
{ {
"url": "assets/startpanel2/startpanel_xxxx.png", "url": "assets/startpanel2/startpanel_ele7.png",
"type": "image",
"name": "startpanel_ele7_png"
},
{
"url": "assets/startpanel2/startpanel_ele5.png",
"type": "image",
"name": "startpanel_ele5_png"
},
{
"url": "assets/startpanel2/startpanel_ele9.png",
"type": "image",
"name": "startpanel_ele9_png"
},
{
"url": "assets/startpanel2/startpanel_ele8.png",
"type": "image",
"name": "startpanel_ele8_png"
},
{
"url": "assets/startpanel2/startpanel_ele4.png",
"type": "image",
"name": "startpanel_ele4_png"
},
{
"url": "assets/startpanel2/startpanel_ele3.png",
"type": "image",
"name": "startpanel_ele3_png"
},
{
"url": "assets/startpanel2/startpanel_ele2.png",
"type": "image",
"name": "startpanel_ele2_png"
},
{
"url": "assets/startpanel2/startpanel_ele1.png",
"type": "image",
"name": "startpanel_ele1_png"
},
{
"url": "assets/startpanel2/startpanel_ele0.png",
"type": "image", "type": "image",
"name": "startpanel_xxxx_png" "name": "startpanel_ele0_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/TargetItemSkin.exml
View file @ d1530d21
...@@ -2,8 +2,15 @@ ...@@ -2,8 +2,15 @@
<e:Skin class="TargetItemSkin" width="60" height="81" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="TargetItemSkin" width="60" height="81" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cfafb2357"/> <w:Config id="16cfafb2357"/>
<e:Image source="startpanel_block2_png" x="0" y="0"/> <e:Image source="startpanel_block2_png" x="0" y="0"/>
<e:Image id="icon_LOLLIPOP" source="startpanel_ele6_png" width="60" height="60"/> <e:Image id="icon0" width="60" height="60" source="startpanel_ele0_png"/>
<e:Image id="icon_ICE" source="startpanel_ice1_png" width="60" height="60"/> <e:Image id="icon1" width="60" height="60" source="startpanel_ele1_png"/>
<e:Image id="icon_xxx" width="60" height="60" source="startpanel_xxxx_png"/> <e:Image id="icon2" width="60" height="60" source="startpanel_ele2_png"/>
<e:Image id="icon3" width="60" height="60" source="startpanel_ele3_png"/>
<e:Image id="icon4" width="60" height="60" source="startpanel_ele4_png"/>
<e:Image id="icon5" width="60" height="60" source="startpanel_ele5_png"/>
<e:Image id="icon6" width="60" height="60" source="startpanel_ele6_png"/>
<e:Image id="icon7" width="60" height="60" source="startpanel_ele7_png"/>
<e:Image id="icon8" width="60" height="60" source="startpanel_ele8_png"/>
<e:Image id="icon9" width="60" height="60" source="startpanel_ele9_png"/>
<e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/> <e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/panels/TargetItemRenderer.ts
View file @ d1530d21
import getSkinPath from "../../libs/new_wx/utils/getSkinPath"; import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
import { ElementType } from "../something/enum/ElementType";
export default class TargetItemRenderer extends eui.ItemRenderer { export default class TargetItemRenderer extends eui.ItemRenderer {
constructor() { constructor() {
super(); super();
...@@ -7,9 +6,14 @@ export default class TargetItemRenderer extends eui.ItemRenderer { ...@@ -7,9 +6,14 @@ export default class TargetItemRenderer extends eui.ItemRenderer {
} }
dataChanged(){ dataChanged(){
this['icon_LOLLIPOP'].visible=this.data.type == ElementType.LOLLIPOP; for (let i = 0; i <10; i++) {
this['icon_ICE'].visible=this.data.type == ElementType.ICE; this['icon' + i].visible=false;
// this['icon_xxx'].visible=this.data.type == ElementType.xxx;
}
this['icon' + this.data.type].visible=true;
this['txt'].text = `X${this.data.count }`; this['txt'].text = `X${this.data.count }`;
} }
} }
\ No newline at end of file
mock/happyclear/home.json
View file @ d1530d21
...@@ -366,6 +366,146 @@ ...@@ -366,6 +366,146 @@
"levelNum": 72, "levelNum": 72,
"maxScore": 15910, "maxScore": 15910,
"stars": 1 "stars": 1
},
{
"levelNum": 73,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 74,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 75,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 76,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 77,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 78,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 79,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 80,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 81,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 82,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 83,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 84,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 85,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 86,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 87,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 88,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 89,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 90,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 91,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 92,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 93,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 94,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 95,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 96,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 97,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 98,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 99,
"maxScore": 15910,
"stars": 1
},
{
"levelNum": 100,
"maxScore": 15910,
"stars": 1
} }
], ],
"remainProp": [ "remainProp": [
......
mock/happyclear/homemax.json 0 → 100644
View file @ d1530d21
{
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1566885811031,
"data": {
"wealth": 7960,
"totalStars": 145,
"levels": [
{
"levelNum": 1,
"maxScore": 36320,
"stars": 3
}
],
"remainProp": [
{
"type": 2,
"num": 0
},
{
"type": 3,
"num": 0
},
{
"type": 4,
"num": 0
}
],
"remainEnargy": 99,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
}
}
\ 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