Skip to content

X
xiaoxiaole
Commit c94f4077 authored by zjz1994's avatar zjz1994
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化性能

parents 95074d48 fdddf17f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 465 additions and 29 deletions
egret/index.html
View file @ c94f4077
......@@ -127,8 +127,8 @@
// localStorage.clear();
window['imgver'] = '11112';
//top 8 ，repeat 22 , bottom 3
window['total_level'] = 8 + 3 + 22 * 28;
window['last_level'] = 625;
window['total_level'] = 8 + 3 + 22 * 30;
window['last_level'] = 650;
var sharePic = document.getElementById('pic');
sharePic.onclick = function () {
......
egret/resource/skins/BackSkin.exml
View file @ c94f4077
......@@ -5,7 +5,7 @@
<e:Image id="combglight1" source="combglight_png" y="417.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image source="backbg_png" scale9Grid="93,550,564,42" y="-107" horizontalCenter="0"/>
<e:Image id="bg" source="commom_prop_bg_png" y="456.76" horizontalCenter="0"/>
<e:Image id="img" source="{data.url}" y="452.76" width="494" height="226" horizontalCenter="0"/>
<e:Image id="img" source="{data.url}" y="452.76" width="494" height="226" horizontalCenter="0" visible="false"/>
<e:Image id="blood" y="522.8" horizontalCenter="-33.5" source="common_blood_png" locked="true" visible="false"/>
<e:Image id="money" y="543" horizontalCenter="-33.5" scaleX="0.8" scaleY="0.8" source="common_yuanbao_png" visible="false"/>
<e:Image id="propImg" source="{data.url}" y="507.76" x="283" visible="false"/>
......@@ -18,7 +18,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="inviteBtn" label="" y="786.45" horizontalCenter="12">
<e:Button id="inviteBtn" label="" y="786.45" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="back按钮 副本 91_png" source.down="back按钮 副本 91_png" source.disabled="back按钮 副本 91_png"/>
......
egret/resource/skins/BagSkin.exml
View file @ c94f4077
......@@ -23,7 +23,7 @@
<e:Group id="group2" y="337.61" horizontalCenter="0.5">
<e:Image y="0" source="bag我的奖券_png" horizontalCenter="0"/>
<e:Image id="btn2" x="302.41" y="5" source="bagbtn我的道具_png"/>
<e:Image id="recordbtn" source="bag按钮 副本 10_png" y="619" horizontalCenter="0.5"/>
<e:Image id="recordbtn" source="bag按钮 副本 10_png" y="619" horizontalCenter="0"/>
<e:Scroller width="508" y="102" horizontalCenter="0" height="487">
<e:Group>
<e:List id="list2" itemRendererSkinName="BagItem2Skin" scaleX="1" scaleY="1">
......
egret/resource/skins/BoxSkin.exml
View file @ c94f4077
......@@ -18,7 +18,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="close2Btn" label="" y="716.99" horizontalCenter="0.5">
<e:Button id="close2Btn" label="" y="716.99" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="boxbtn_png" source.down="boxbtn_png" source.disabled="boxbtn_png"/>
......
egret/resource/skins/Buy1Skin.exml
View file @ c94f4077
......@@ -17,7 +17,7 @@
<e:Label id="moneyTxt" text="0000000000" x="96.97" y="0" size="24" fontFamily="FZY3JW" textColor="0xc17343"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04" scaleX="0.25" scaleY="0.25"/>
</e:Group>
<e:Button id="buyBtn" label="" y="667" horizontalCenter="2">
<e:Button id="buyBtn" label="" y="667" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="exchangebtn_png" source.down="exchangebtn_png" source.disabled="exchangebtn_png"/>
......@@ -25,5 +25,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="3" x="251.73" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
<e:Label id="priceTxt" text="3" x="248" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy2Skin.exml
View file @ c94f4077
......@@ -16,7 +16,7 @@
<e:Label id="moneyTxt" text="0000000000" x="96.97" y="0" textColor="0xC17343" size="24" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04" scaleX="0.25" scaleY="0.25"/>
</e:Group>
<e:Button id="buyBtn" label="" y="667" horizontalCenter="2">
<e:Button id="buyBtn" label="" y="667" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="exchangebtn_png" source.down="exchangebtn_png" source.disabled="exchangebtn_png"/>
......@@ -24,5 +24,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="3" x="251.73" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
<e:Label id="priceTxt" text="3" x="248" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy3Skin.exml
View file @ c94f4077
......@@ -17,7 +17,7 @@
<e:Label id="moneyTxt" text="0000000000" x="96.97" y="0" size="24" fontFamily="FZY3JW" textColor="0xC17343"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04" scaleX="0.25" scaleY="0.25"/>
</e:Group>
<e:Button id="buyBtn" label="" y="667" horizontalCenter="2">
<e:Button id="buyBtn" label="" y="667" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="exchangebtn_png" source.down="exchangebtn_png" source.disabled="exchangebtn_png"/>
......@@ -25,5 +25,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="3" x="251.73" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
<e:Label id="priceTxt" text="3" x="248" y="703.65" bold="true" size="40" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/FailSkin.exml
View file @ c94f4077
......@@ -13,7 +13,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="againBtn" label="" y="808" horizontalCenter="5">
<e:Button id="againBtn" label="" y="808" horizontalCenter="6">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 9_png" source.down="按钮 副本 9_png" source.disabled="按钮 副本 9_png" />
......
egret/resource/skins/HbPrizeSkin.exml
View file @ c94f4077
......@@ -7,7 +7,7 @@
<e:Image id="img" width="518" height="230" source="{data.url}" y="516.3" horizontalCenter="0"/>
<e:Image id="prop" scaleX="1" scaleY="1" horizontalCenter="-63.5" source="taskPrize_money_png" verticalCenter="15.5"/>
<e:Image source="hbp_bg_png" y="517.96" horizontalCenter="0"/>
<e:Group id="numsgroup" x="384.4" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="16">
<e:Group id="numsgroup" x="384.4" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="16" visible="false">
<e:Label id="nums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xC17343" left="0" bold="true"/>
</e:Group>
<e:Image id="money" source="signprize元宝_png" y="491.4" scaleX="0.8" scaleY="0.8" horizontalCenter="-3" visible="false"/>
......
egret/resource/skins/InvitePrizePanelSkin.exml
View file @ c94f4077
......@@ -23,7 +23,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="game_btn" label="" y="790" anchorOffsetX="139" anchorOffsetY="56.5" x="527">
<e:Button id="game_btn" label="" y="790" anchorOffsetX="139" anchorOffsetY="56.5" x="525">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="invitePrize_game_btn_png"/>
......
egret/resource/skins/QuitSkin.exml
View file @ c94f4077
......@@ -17,7 +17,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="resumeBtn" label="" x="376" y="546.5">
<e:Button id="resumeBtn" label="" x="378" y="546.5">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 8_png" source.down="按钮 副本 8_png" source.disabled="按钮 副本 8_png"/>
......
egret/resource/skins/ScratchPrizeSkin.exml
View file @ c94f4077
......@@ -14,7 +14,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="ok_btn" label="" y="764" anchorOffsetX="138.5" anchorOffsetY="56.5" x="236.5">
<e:Button id="ok_btn" label="" y="764" anchorOffsetX="138.5" anchorOffsetY="56.5" x="234.98">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="scratchPrize_btn_png" source.down="scratchPrize_btn_png" source.disabled="scratchPrize_btn_png"/>
......@@ -22,7 +22,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="game_btn" label="" y="764" anchorOffsetX="139" anchorOffsetY="56.5" x="527">
<e:Button id="game_btn" label="" y="764" anchorOffsetX="139" anchorOffsetY="56.5" x="525.48">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="scratchPrize_game_btn_png" source.down="scratchPrize_game_btn_png" source.disabled="scratchPrize_game_btn_png"/>
......
egret/resource/skins/ShopTipSkin.exml
View file @ c94f4077
......@@ -10,5 +10,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="btn" y="761.15" scaleX="0.9" scaleY="0.9" source="shopTip_btn_png" horizontalCenter="22"/>
<e:Image id="btn" y="761.15" scaleX="0.9" scaleY="0.9" source="shopTip_btn_png" horizontalCenter="2"/>
</e:Skin>
egret/resource/skins/SignSkin.exml
View file @ c94f4077
......@@ -19,7 +19,7 @@
</e:Group>
</e:Scroller>
<e:Label text="连续登录闯关可以获得更丰厚的奖励哦～" y="371" textColor="0xf7713a" size="26" horizontalCenter="0" fontFamily="FZY4JW" visible="false"/>
<e:Button id="btn1" label="" anchorOffsetX="184" anchorOffsetY="55" x="375" y="916" visible="false">
<e:Button id="btn1" label="" anchorOffsetX="184" anchorOffsetY="55" y="916" horizontalCenter="0" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="signbtn1_png" source.down="signbtn1_png" source.disabled="signbtn1_png"/>
......@@ -28,7 +28,7 @@
</e:skinName>
</e:Button>
<e:Button id="btn0" label="" anchorOffsetX="184" anchorOffsetY="55" x="375" y="916" visible="false">
<e:Button id="btn0" label="" anchorOffsetX="184" anchorOffsetY="55" y="916" horizontalCenter="0" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="unsignbtn_png" source.down="unsignbtn_png" source.disabled="unsignbtn_png"/>
......
egret/resource/skins/StartPanelSkin.exml
View file @ c94f4077
......@@ -7,7 +7,7 @@
<e:Label id="levelTxt" text="关卡1" y="229" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339"
stroke="3" anchorOffsetX="0" width="236" textAlign="center" verticalAlign="middle" anchorOffsetY="0" horizontalCenter="0" height="52"/>
<e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020" visible="false"/>
<e:Button id="startBtn" label="" y="769" horizontalCenter="0.5">
<e:Button id="startBtn" label="" y="769" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="startpanel按钮_png" source.down="startpanel按钮_png" source.disabled="startpanel按钮_png"/>
......
egret/resource/skins/TurntableNoPrizeSkin.exml
View file @ c94f4077
......@@ -12,7 +12,7 @@
</e:skinName>
</e:Button>
<e:Group horizontalCenter="0.5" verticalCenter="14.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:Button id="btn1" label="" y="0" x="-0.99">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
......@@ -31,7 +31,7 @@
</e:skinName>
</e:Button>
<e:Group id="status1" x="52" y="75" touchChildren="false" touchEnabled="false">
<e:Group id="status1" x="41.92" y="75" touchChildren="false" touchEnabled="false">
<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
......
egret/resource/skins/TurntablePrizeSkin.exml
View file @ c94f4077
......@@ -13,8 +13,8 @@
<e:Image id="money" source="signprize元宝_png" y="400.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="362.8" horizontalCenter="0" visible="false"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="411.76" visible="false"/>
<e:Image id="prop" scaleX="1.1" scaleY="1.1" verticalCenter="-80" x="260" source="common_blood_png"/>
<e:Group id="numsgroup" x="410" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="-80">
<e:Image id="prop" scaleX="1.1" scaleY="1.1" verticalCenter="-80" x="260" source="common_blood_png" visible="false"/>
<e:Group id="numsgroup" x="410" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="-80" visible="false">
<e:Label id="propnums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" left="0" bold="true"/>
</e:Group>
<e:Group id="numsgroup111" x="407.38" y="390.4" scaleX="1.5" scaleY="1.5" visible="false">
......@@ -30,7 +30,7 @@
</e:skinName>
</e:Button>
<e:Group y="693.67" horizontalCenter="0.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:Button id="btn1" label="" y="0" x="3.09">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
......@@ -50,7 +50,7 @@
</e:Button>
<e:Group id="status1" x="52" y="75">
<e:Group id="status1" x="46" y="75">
<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
......
egret/src/panels/BackPanel.ts
View file @ c94f4077
......@@ -33,6 +33,7 @@ export default class BackPanel extends Panel {
const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['propnums'].visible = false;
this['img'].visible = false;
this['propnums'].text = 'x1';
if(num)
this['propnums'].text = 'x' + num;
......
egret/src/something/chapters/Chapter25.ts 0 → 100644
View file @ c94f4077
This diff is collapsed.
egret/src/something/chapters/getChapter.ts
View file @ c94f4077
......@@ -26,7 +26,7 @@ import { Chapters21 } from "./Chapter21";
import { Chapters22 } from "./Chapter22";
import { Chapters23 } from "./Chapter23";
import { Chapters24 } from "./Chapter24";
import { Chapters25 } from "./Chapter25";
//所有的关卡
const chapters: ChapterData[] = [].concat(
Chapters1,
......@@ -53,6 +53,7 @@ const chapters: ChapterData[] = [].concat(
Chapters22,
Chapters23,
Chapters24,
Chapters25
)
// console.log(chapters)
chapters.forEach((chapter,index) => {
......
mock/happyclear/home.json
View file @ c94f4077
......@@ -3138,6 +3138,131 @@
"levelNum": 625,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 626,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 627,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 628,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 629,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 630,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 631,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 632,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 633,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 634,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 635,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 636,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 637,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 638,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 639,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 640,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 641,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 642,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 643,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 644,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 645,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 646,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 647,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 648,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 649,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 650,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
......
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