Skip to content

X
xiaoxiaole
Commit b1972501 authored by wjf's avatar wjf
Browse files
Options

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

parents 5664963a d63f67ed
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
egret/resource/assets/map/ad_icon.png
View replaced file @ 5664963a View file @ b1972501
egret/resource/assets/map/ad_icon.png

21.4 KB | W: | H:

egret/resource/assets/map/ad_icon.png

34.3 KB | W: | H:

egret/resource/assets/map/ad_icon.png
egret/resource/assets/map/ad_icon.png
egret/resource/assets/map/ad_icon.png
egret/resource/assets/map/ad_icon.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ b1972501
...@@ -139,6 +139,10 @@ ...@@ -139,6 +139,10 @@
{ {
"keys": "scratch_rule_bg_png", "keys": "scratch_rule_bg_png",
"name": "scratchrulepanel" "name": "scratchrulepanel"
},
{
"name": "preload",
"keys": "map大转盘_png,map刮现金红包_png"
} }
], ],
"resources": [ "resources": [
...@@ -2361,6 +2365,16 @@ ...@@ -2361,6 +2365,16 @@
"url": "assets/scratch/rule/scratch_rule_bg.png", "url": "assets/scratch/rule/scratch_rule_bg.png",
"type": "image", "type": "image",
"name": "scratch_rule_bg_png" "name": "scratch_rule_bg_png"
},
{
"name": "map大转盘_png",
"type": "image",
"url": "assets/map/map大转盘.png"
},
{
"name": "map刮现金红包_png",
"type": "image",
"url": "assets/map/map刮现金红包.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/MapSkin.exml
View file @ b1972501
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</e:Button> </e:Button>
<e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22"/> <e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22"/>
</e:Group> </e:Group>
<e:Button id="shopBtn" label="" x="613.08" y="174.01"> <e:Button id="shopBtn" label="" x="613.08" y="174.01" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/> <e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="recordBtn" label="" x="614.14" y="323.76"> <e:Button id="recordBtn" label="" x="614.14" y="174.01">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/> <e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/> <e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/> <e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
</e:Group> </e:Group>
<e:Image id="adBtn" y="474.02" source="ad_icon_png" right="24" width="122" height="122"/> <e:Image id="adBtn" y="478" source="ad_icon_png" right="602" width="122" height="122"/>
<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false"> <e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
...@@ -164,5 +164,19 @@ ...@@ -164,5 +164,19 @@
</e:Group> </e:Group>
<e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/> <e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/>
</e:Group> </e:Group>
<e:Group x="567.36" y="318.43" locked="true">
<e:Image source="map大转盘_png" x="33.36" y="0"/>
<e:Group x="6" y="10.24">
<e:Image id="inviteTipsBg0" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Label id="inviteTips0" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
</e:Group>
</e:Group>
<e:Group y="476" right="30">
<e:Image source="map刮现金红包_png" y="0"/>
<e:Group x="-24">
<e:Image id="inviteTipsBg1" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Label id="inviteTips1" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
</e:Group>
</e:Group>
<w:Config id="16c89f4ae1a"/> <w:Config id="16c89f4ae1a"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/ScratchSkin.exml
View file @ b1972501
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<e:Group id="progressGroup" x="8" verticalCenter="0"> <e:Group id="progressGroup" x="8" verticalCenter="0">
<e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/> <e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/>
<e:Rect id="progress" fillColor="0xeb1917" left="0" verticalCenter="0" width="0" top="0" bottom="0"/> <e:Rect id="progress" fillColor="0xeb1917" left="0" verticalCenter="0" width="0" top="0" bottom="0"/>
<e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="0" horizontalCenter="0"/> <e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="0" horizontalCenter="0" bold="true"/>
</e:Group> </e:Group>
<e:Image id="hongbao" source="scratch_hongbao_png" scaleX="1" scaleY="1" verticalCenter="0" horizontalCenter="219"/> <e:Image id="hongbao" source="scratch_hongbao_png" scaleX="1" scaleY="1" verticalCenter="0" horizontalCenter="219"/>
</e:Group> </e:Group>
......
egret/src/mapScene/MapScene.ts
View file @ b1972501
...@@ -70,12 +70,14 @@ export default class MapScene extends Scene { ...@@ -70,12 +70,14 @@ export default class MapScene extends Scene {
async start(data?) { async start(data?) {
// NetManager.ins.getInviteInfo((success, res)=>{ setTimeout(() => {
// if(!success){ NetManager.ins.getInviteInfo((success, res) => {
// if(!success) {
// }
// PanelCtrl.instance.show('scratch', res.data); }
// }); PanelCtrl.instance.show('scratch', res.data);
});
}, 1000);
super.start(); super.start();
...@@ -112,17 +114,17 @@ export default class MapScene extends Scene { ...@@ -112,17 +114,17 @@ export default class MapScene extends Scene {
noticeAdvert = {enable: false} noticeAdvert = {enable: false}
} }
if (noticeAdvert && noticeAdvert.enable && nowTimerStr2 != oldTimerStr2) { if(noticeAdvert && noticeAdvert.enable && nowTimerStr2 != oldTimerStr2) {
// if (!adTag) { // if (!adTag) {
panels.push('ad'); panels.push('ad');
// adTag = true; // adTag = true;
// } // }
localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2); localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
} }
const { signInfoVO } = DataManager.ins.getData('getSignInfo'); const {signInfoVO} = DataManager.ins.getData('getSignInfo');
if (signInfoVO.continueDay < 7) { //表示明天还可以签到 if(signInfoVO.continueDay < 7) { //表示明天还可以签到
if (signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) { if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
panels.push('sign'); panels.push('sign');
localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr); localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
} }
...@@ -267,13 +269,13 @@ export default class MapScene extends Scene { ...@@ -267,13 +269,13 @@ export default class MapScene extends Scene {
} }
updateSign(){ updateSign() {
const { signInfoVO } = DataManager.ins.getData('getSignInfo'); const {signInfoVO} = DataManager.ins.getData('getSignInfo');
if (signInfoVO.continueDay < 7) { //表示明天还可以签到 if(signInfoVO.continueDay < 7) { //表示明天还可以签到
this['sign_s1'].visible=signInfoVO.todaySigned == 0; this['sign_s1'].visible = signInfoVO.todaySigned == 0;
this['sign_s2'].visible=!this['sign_s1'].visible; this['sign_s2'].visible = !this['sign_s1'].visible;
}else { } else {
this['sign_s2'].visible=true; this['sign_s2'].visible = true;
} }
} }
......
egret/src/panels/InvitePanel.ts
View file @ b1972501
...@@ -199,7 +199,6 @@ class InviteItem extends eui.ItemRenderer { ...@@ -199,7 +199,6 @@ class InviteItem extends eui.ItemRenderer {
} }
dataChanged() { dataChanged() {
console.log(this.data);
this.img.source = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png"; this.img.source = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
if (this.data.callFun) { if (this.data.callFun) {
......
egret/src/panels/ScratchPanel.ts
View file @ b1972501
...@@ -166,8 +166,8 @@ export default class ScratchPanel extends Panel { ...@@ -166,8 +166,8 @@ export default class ScratchPanel extends Panel {
} }
private hongbaoEffect(){ private hongbaoEffect(){
egret.Tween.get(this["hongbao"]).to({scaleX:0.8, scaleY:0.8}, 300, egret.Ease.quadInOut).call(()=>{ egret.Tween.get(this["hongbao"]).to({scaleX:0.8, scaleY:0.8}, 200, egret.Ease.quadInOut).call(()=>{
egret.Tween.get(this["hongbao"]).to({scaleX:1, scaleY:1}, 200, egret.Ease.quadInOut).wait(1500).call(()=>{ egret.Tween.get(this["hongbao"]).to({scaleX:1, scaleY:1}, 100, egret.Ease.quadInOut).wait(1500).call(()=>{
this.hongbaoEffect(); this.hongbaoEffect();
}); });
}); });
...@@ -201,8 +201,7 @@ class ScratchItem extends eui.ItemRenderer { ...@@ -201,8 +201,7 @@ class ScratchItem extends eui.ItemRenderer {
} }
dataChanged() { dataChanged() {
this.img.mask = this.mask this.img.mask = this.mask;
console.log(this.data);
this.img.source = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png"; this.img.source = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
if(this.data.callFun) { if(this.data.callFun) {
......
mock/happyclear/advert.json
View file @ b1972501
{ {"code":"0000000000","data":{"mapAdvert":{"enable":true,"advertList":[{"img":"//yun.duiba.com.cn/images/201910/2iu41if4n7.png","url":"https://cuxiao.m.suning.com/scms/s11dybys.html?adTypeCode=1137&adId=https%3A%2F%2Flib.suning.com%2Fweex%2Fs11dybys.js%3FpageCode%3Ds11dybys"}]},"noticeAdvert":{"enable":true,"advertList":[{"img":"//yun.duiba.com.cn/images/201910/zqtdp6xibw.jpg","url":"https://cuxiao.m.suning.com/scms/songshu.html"}]},"popupAdvert":null},"success":true,"desc":"OK","timestamp":1571913337116}
"code": "0000000000", \ No newline at end of file
"data": {
"mapAdvert": {
"enable": true,
"advertList": [
{
"img": "//yun.duiba.com.cn/images/201910/2iu41if4n7.png",
"url": "https://cuxiao.m.suning.com/scms/s11dybys.html?adTypeCode=1137&adId=https%3A%2F%2Flib.suning.com%2Fweex%2Fs11dybys.js%3FpageCode%3Ds11dybys"
}
]
},
"noticeAdvert": {
"enable": true,
"advertList": [
{
"img": "//yun.duiba.com.cn/images/201910/mgspbjuspb.png",
"url": "http://shop.m.suning.com/sale/30001669_10269054.html"
}
]
},
"popupAdvert": null
},
"success": true,
"desc": "OK",
"timestamp": 1571821360634
}
\ 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