Skip to content

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

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

parents 32927ec3 8a20bc78
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 56 deletions
egret/index.html
View file @ bb40f76a
......@@ -127,8 +127,8 @@
// localStorage.clear();
window['imgver'] = '11112';
//top 8 ，repeat 22 , bottom 3
window['total_level'] = 8 + 3 + 22 * 26;
window['last_level'] = 575;
window['total_level'] = 8 + 3 + 22 * 27;
window['last_level'] = 600;
var sharePic = document.getElementById('pic');
sharePic.onclick = function () {
......
egret/libs/new_wx/components/NoPrizePanel.ts
View file @ bb40f76a
......@@ -41,7 +41,7 @@ export default class NoPrizePanel extends Panel {
changeMapScene();
}, this);
addRankFriendList(84,917.46,this);
addRankFriendList(68,1100,this);
}
showlog() {
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ bb40f76a
......@@ -79,7 +79,7 @@ export default class PrizePanel extends Panel {
this.setStar(hc_submitData.stars);
addRankFriendList(68, 930, this);
addRankFriendList(68, 1085, this);
}
showlog() {
......
egret/resource/skins/FriendItemSkin.exml
View file @ bb40f76a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="FriendItemSkin" width="546" height="105" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="friend_itembg_png"/>
<e:Label id="rankTxt" text="73" width="86" textAlign="center" verticalAlign="middle" height="52" size="48" textColor="0x784325" y="25"/>
<e:Label text="X55" x="480.94" y="44.29" id="star" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label id="nameTxt" text="Label" x="189" y="20.5" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label text="第15关" x="189" y="54.29" id="progress" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label text="分数:123分" x="297" y="54.29" id="score" size="24" anchorOffsetX="0" anchorOffsetY="0" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label id="rankTxt" text="73" width="86" textAlign="center" verticalAlign="middle" height="52" size="48" textColor="0x784325" y="32"/>
<e:Label text="X55" x="480.94" y="45.29" id="star" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label id="nameTxt" text="Label" x="189" y="26.5" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label text="第15关" x="189" y="60.29" id="progress" size="24" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Label text="分数:123分" x="297" y="60.29" id="score" size="24" anchorOffsetX="0" anchorOffsetY="0" textColor="0x784325" fontFamily="FZY3JW"/>
<e:Group x="108.87" y="23.79">
<e:Image id="avatar" y="0" width="60" height="60" x="0" source=""/>
<e:Rect id="avatarMask" width="60" height="60" y="0" ellipseWidth="60" ellipseHeight="60"/>
</e:Group>
<e:Group x="10" y="16">
<e:Group x="13" y="16">
<e:Image id="rank1" source="friend_icon1_png" x="0" y="0"/>
<e:Image id="rank2" source="friend_icon2_png" x="1" y="0"/>
<e:Image id="rank3" source="friend_icon3_png" x="3" y="2"/>
......
egret/resource/skins/FriendSkin.exml
View file @ bb40f76a
......@@ -2,7 +2,7 @@
<e:Skin class="FriendSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="friendbg_png" y="48.29" horizontalCenter="2" locked="true"/>
<e:Label id="star" text="X0" x="588.96" y="366.08" size="24" fontFamily="FZY3JW"/>
<e:Button id="closeBtn" label="" x="632.94" y="164.98">
<e:Button id="closeBtn" label="" x="634.94" y="239.98">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......@@ -10,9 +10,9 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Scroller id="scroll" width="546" height="555" y="412.35" scrollPolicyV="on" scrollPolicyH="off" x="106.85">
<e:Scroller id="scroll" width="546" height="439" y="446.35" scrollPolicyV="on" scrollPolicyH="off" x="108.85">
<e:Group>
<e:List id="list" width="100%" itemRendererSkinName="FriendItemSkin" visible="false">
<e:List id="list" width="100%" itemRendererSkinName="FriendItemSkin">
<e:ArrayCollection>
<e:Array>
<e:Object a="taskname1"/>
......@@ -33,7 +33,7 @@
</e:List>
</e:Group>
</e:Scroller>
<e:Button id="btn" label="" y="985.99" horizontalCenter="0">
<e:Button id="btn" label="" y="907.99" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="friend按钮-炫耀_png" source.down="friend按钮-炫耀_png" source.disabled="friend按钮-炫耀_png"/>
......
egret/resource/skins/NoPrizeSkin.exml
View file @ bb40f76a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image y="-165.72" source="擦肩而过弹窗 _png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="596.48" y="254">
<e:Skin class="NoPrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="light" source="common_prizelight_png" x="374.19" y="512.23" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image y="17" source="擦肩而过弹窗 _png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="596.48" y="436.72">
<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"/>
......@@ -18,7 +18,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="goBtn" label="" y="770" horizontalCenter="0">
<e:Button id="goBtn" label="" y="952.72" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......@@ -26,13 +26,13 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="picb" x="286" y="391.28" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="466.48" y="384.28" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="367.28" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="450.39" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="449.89" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="440.01" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Label id="lvTxt" text="关卡1" y="287.5" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0"/>
<e:Component y="917.46" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image id="picb" x="286" y="574" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="466.48" y="567" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="550" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="633.11" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="632.61" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="622.73" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Label id="lvTxt" text="关卡1" y="470.22" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Component y="1101.14" skinName="ADSmallSkin" x="68" visible="false"/>
<w:Config id="1690063a75e"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ bb40f76a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Skin class="PrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/>
<e:Component y="929.78" skinName="ADSmallSkin" x="68" visible="false"/>
<e:Component y="1086.79" skinName="ADSmallSkin" x="68" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27" visible="false"/>
<e:Image source="prizePanelbg_png" y="-138.02" scale9Grid="87,543,522,23" x="0"/>
<e:Label id="lvTxt" text="关卡1" y="313.7" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Image id="picb" x="286" y="404.48" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="465.48" y="410.48" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="386.48" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="470.48" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="476.48" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="457.48" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Group id="propGroup" y="568.96" horizontalCenter="0">
<e:Image source="prizePanelbg_png" y="0" scale9Grid="87,543,522,23" x="0"/>
<e:Label id="lvTxt" text="关卡1" y="451.72" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Image id="picb" x="286" y="542.5" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="465.48" y="548.5" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="524.5" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="608.5" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="614.5" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="595.5" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Group id="propGroup" y="706.98" horizontalCenter="0">
<e:Image source="物品奖励_png" x="0" y="0"/>
<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="80.24" source="prize_blood_png"/>
</e:Group>
<e:Image id="img" width="480" height="214" source="{data.url}" horizontalCenter="0" y="575.76" visible="false"/>
<e:Button id="closeBtn" label="" x="594.5" y="291.2">
<e:Button id="closeBtn" label="" x="594.5" y="429.22">
<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"/>
......@@ -33,7 +33,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="goBtn" label="" y="808.48" horizontalCenter="0">
<e:Button id="goBtn" label="" y="946.5" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......
egret/resource/skins/RankFriendListSkin.exml
View file @ bb40f76a
......@@ -7,11 +7,10 @@
<e:Object a="null"/>
<e:Object a="null"/>
<e:Object a="null"/>
<e:Object a="null"/>
</e:Array>
</e:ArrayCollection>
<e:layout>
<e:HorizontalLayout gap="20"/>
<e:HorizontalLayout gap="20" horizontalAlign="center" verticalAlign="middle"/>
</e:layout>
</e:List>
<e:Label id="empty" text="该关卡没有好友通关" y="97" textColor="0xC33700" size="26" x="183"/>
......
egret/src/panels/Box2Panel.ts
View file @ bb40f76a
......@@ -11,7 +11,7 @@ export default class Box2Panel extends Panel {
// }, this);
this.showlog();
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
addAdComp(84,921.52,this,27)
addAdComp(68,921.52,this,27)
}
showlog() {
NetManager.ins.showLog(getlogItem(27));
......
egret/src/panels/FailedPanel.ts
View file @ bb40f76a
......@@ -22,7 +22,7 @@ export default class FailedPanel extends Panel {
}, this);
addRankFriendList(84,772.52,this);
addRankFriendList(68,772.52,this);
}
onTouchTap_closeBtn() {
......
egret/src/panels/InviteCutTimePanel.ts
View file @ bb40f76a
......@@ -69,7 +69,7 @@ export default class InviteCutTimePanel extends Panel {
this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
this.timer.start();
this.cutTimer();
addAdComp(84, 695, this,38);
addAdComp(68, 695, this,38);
}
private cutTimer() {
......
egret/src/panels/InvitePrizePanel.ts
View file @ bb40f76a
......@@ -66,7 +66,7 @@ export default class InvitePrizePanel extends Panel {
initUI() {
this.prizeImg.source = this.data.prizeImg;
addAdComp(84, 910, this,38);
addAdComp(68, 910, this,38);
}
protected get closeBtns(): eui.Button[] {
......
egret/src/panels/Prize2Panel.ts
View file @ bb40f76a
......@@ -45,7 +45,7 @@ export default class Prize2Panel extends Panel {
const hc_submitData = DataManager.ins.getData('hc_submit').data;
this.setStar(hc_submitData.stars);
addRankFriendList(84,809,this);
addRankFriendList(68,809,this);
}
showlog() {
......
egret/src/panels/ScratchPrizePanel.ts
View file @ bb40f76a
......@@ -72,7 +72,7 @@ export default class ScratchPrizePanel extends Panel {
initUI() {
this.prizeImg.source = this.data.prizeImage;
addAdComp(84, 891, this,54);
addAdComp(68, 891, this,54);
}
protected get closeBtns(): eui.Button[] {
......
egret/src/panels/SignPrizePanel.ts
View file @ bb40f76a
......@@ -36,7 +36,7 @@ export default class SignPrizePanel extends Panel {
// if(prizeType=='coin') {
// this['numsgroup'].visible=false;
// }
addAdComp(84,779.37,this,24);
addAdComp(68,779.37,this,24);
this.showlog();
}
......
egret/src/panels/StartPanel.ts
View file @ bb40f76a
......@@ -45,10 +45,10 @@ export default class StartPanel extends Panel {
}
if(data > homedata.levels.length) {
addAdComp(72, 890, this, 29);
addAdComp(68, 890+10, this, 29);
NetManager.ins.showLog(getlogItem(29));
} else
addRankFriendList(72, 890, this, data);
addRankFriendList(68, 890+10, this, data);
// setGlow(this['levelTxt'], 0xfa4b09, 1);
this['levelTxt'].text = `第${data}关`;
......
egret/src/panels/TaskCenter/TaskCenterNoPrize.ts
View file @ bb40f76a
......@@ -67,7 +67,7 @@ export default class TaskCenterNoPrize extends Panel {
break;
}
addAdComp(84, 867.5, this);
addAdComp(68, 867.5, this);
}
onTouchTap_closeBtn() {
......
egret/src/panels/TaskCenter/TaskCenterPrize.ts
View file @ bb40f76a
......@@ -48,7 +48,7 @@ export default class TaskCenterPrize extends Panel {
}, this);
// 埋点
addAdComp(84, 830, this);
addAdComp(68, 830, this);
}
updateOption(option: any) {
......
egret/src/panels/TurntablePanel/TurntableNoPrizePanel.ts
View file @ bb40f76a
......@@ -13,7 +13,7 @@ export default class TurntableNoPrizePanel extends Panel {
super.start();
this.showlog();
this.data = data;
addAdComp(84,707, this,48);
addAdComp(68,707, this,48);
if (this['tips' + data.type])
this['tips' + data.type].visible = true;
NetManager.ins.hc_turnableBaseInfo((success, res) => {
......
egret/src/panels/TurntablePanel/TurntablePrize2Panel.ts
View file @ bb40f76a
......@@ -61,7 +61,7 @@ export default class TurnPrize2Panel extends Panel {
}, 500);
this['light1'].visible = this['light2'].visible = false;
addAdComp(84, 862, this,48);
addAdComp(68, 862, this,48);
data.mv.gotoAndPlay(10, true);
data.mv.once(egret.Event.COMPLETE, () => {
// data.mv.stop(1);
......
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @ bb40f76a
......@@ -14,7 +14,7 @@ export default class TurnPrizePanel extends Panel {
this['light1'].visible = this['light2'].visible = false;
addAdComp(84, 862, this,48);
addAdComp(68, 862, this,48);
data.mv.gotoAndPlay(10, true)
data.mv.once(egret.Event.COMPLETE, () => {
data.mv.stop(1);
......
egret/src/something/chapters/Chapter23.ts 0 → 100644
View file @ bb40f76a
import { ChapterData } from "../interface/ChapterData";
//576-600
export const Chapters23: ChapterData[] = [
]
egret/src/something/chapters/getChapter.ts
View file @ bb40f76a
......@@ -24,6 +24,7 @@ import { Chapters19 } from "./Chapter19";
import { Chapters20 } from "./Chapter20";
import { Chapters21 } from "./Chapter21";
import { Chapters22 } from "./Chapter22";
import { Chapters23 } from "./Chapter23";
//所有的关卡
const chapters: ChapterData[] = [].concat(
......@@ -49,6 +50,7 @@ const chapters: ChapterData[] = [].concat(
Chapters20,
Chapters21,
Chapters22,
Chapters23,
)
// console.log(chapters)
chapters.forEach((chapter,index) => {
......
mock/happyclear/home.json
View file @ bb40f76a
......@@ -2888,6 +2888,131 @@
"levelNum": 575,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 576,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 577,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 578,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 579,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 580,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 581,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 582,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 583,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 584,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 585,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 586,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 587,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 588,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 589,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 590,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 591,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 592,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 593,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 594,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 595,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 596,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 597,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 598,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 599,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 600,
"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