Skip to content

X
xiaoxiaole
Commit 9e6afd87 authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'hotfix20200326' into dev

parents 49b742db 23a0738f
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 6 deletions
.buildrc.js
View file @ 9e6afd87
......@@ -17,6 +17,7 @@ module.exports = {
'/hdtool/*': 'http://localhost:3000',
'/activityPlugin/*': 'http://localhost:3000',
'/aaw/*': 'http://localhost:3000',
'/activtyShareCode/*': 'http://localhost:3000',
'/wechatShare/*': 'http://localhost:3000',
'/summer/*': 'http://localhost:3000'
}
......
egret/resource/default.res.json
View file @ 9e6afd87
......@@ -239,6 +239,10 @@
{
"keys": "eleDisNew4_9_png,eleDisNew4_8_png,eleDisNew4_7_png,eleDisNew4_6_png,eleDisNew4_5_png,eleDisNew4_4_png,eleDisNew4_3_png,eleDisNew4_2_png,eleDisNew4_14_png,eleDisNew4_13_png,eleDisNew4_12_png,eleDisNew4_11_png,eleDisNew4_10_png,eleDisNew4_1_png,eleDisNew4_0_png,eleDisNew3_9_png,eleDisNew3_8_png,eleDisNew3_7_png,eleDisNew3_6_png,eleDisNew3_5_png,eleDisNew3_4_png,eleDisNew3_3_png,eleDisNew3_2_png,eleDisNew3_14_png,eleDisNew3_13_png,eleDisNew3_12_png,eleDisNew3_11_png,eleDisNew3_10_png,eleDisNew3_1_png,eleDisNew3_0_png,eleDisNew2_9_png,eleDisNew2_8_png,eleDisNew2_7_png,eleDisNew2_6_png,eleDisNew2_5_png,eleDisNew2_4_png,eleDisNew2_3_png,eleDisNew2_2_png,eleDisNew2_14_png,eleDisNew2_13_png,eleDisNew2_12_png,eleDisNew2_11_png,eleDisNew2_10_png,eleDisNew2_1_png,eleDisNew2_0_png,eleDisNew1_9_png,eleDisNew1_8_png,eleDisNew1_7_png,eleDisNew1_6_png,eleDisNew1_5_png,eleDisNew1_4_png,eleDisNew1_3_png,eleDisNew1_2_png,eleDisNew1_14_png,eleDisNew1_13_png,eleDisNew1_12_png,eleDisNew1_11_png,eleDisNew1_10_png,eleDisNew1_1_png,eleDisNew1_0_png,eleDisNew0_9_png,eleDisNew0_8_png,eleDisNew0_7_png,eleDisNew0_6_png,eleDisNew0_5_png,eleDisNew0_4_png,eleDisNew0_3_png,eleDisNew0_2_png,eleDisNew0_14_png,eleDisNew0_13_png,eleDisNew0_12_png,eleDisNew0_11_png,eleDisNew0_10_png,eleDisNew0_1_png,eleDisNew0_0_png",
"name": "eleDisNew"
},
{
"keys": "help_blood_1_btn_png,help_blood_1_text_png,help_blood_1_bg_png,help_blood_fail_text_png,help_blood_fail_btn_png,help_blood_fail_png,help_blood_success_text_png,help_blood_success_text2_png,help_blood_success_png,help_invite_bg_png,help_invite_success_btn_png,help_invite_success_png,help_invite_fail_btn_png,help_invite_fail_text1_png,help_invite_fail_text2_png,help_invite_fail_text3_png,help_invite_fail_text4_png,help_invite_fail_png,help_invite2_text_png,help_invite2_btn_png,help_invite2_png,help_invite2_btn2_png,help_invite2_text2_png",
"name": "helpGroup"
}
],
"resources": [
......@@ -4957,6 +4961,121 @@
"url": "assets/sounds/haha.mp3",
"type": "sound",
"name": "haha_mp3"
},
{
"url": "assets/help/help_blood_1_btn.png",
"type": "image",
"name": "help_blood_1_btn_png"
},
{
"url": "assets/help/help_blood_1_text.png",
"type": "image",
"name": "help_blood_1_text_png"
},
{
"url": "assets/help/help_blood_1_bg.png",
"type": "image",
"name": "help_blood_1_bg_png"
},
{
"url": "assets/help/help_blood_fail_text.png",
"type": "image",
"name": "help_blood_fail_text_png"
},
{
"url": "assets/help/help_blood_fail_btn.png",
"type": "image",
"name": "help_blood_fail_btn_png"
},
{
"url": "assets/help/help_blood_fail.png",
"type": "image",
"name": "help_blood_fail_png"
},
{
"url": "assets/help/help_blood_success_text.png",
"type": "image",
"name": "help_blood_success_text_png"
},
{
"url": "assets/help/help_blood_success_text2.png",
"type": "image",
"name": "help_blood_success_text2_png"
},
{
"url": "assets/help/help_blood_success.png",
"type": "image",
"name": "help_blood_success_png"
},
{
"url": "assets/help/help_invite_bg.png",
"type": "image",
"name": "help_invite_bg_png"
},
{
"url": "assets/help/help_invite_success_btn.png",
"type": "image",
"name": "help_invite_success_btn_png"
},
{
"url": "assets/help/help_invite_success.png",
"type": "image",
"name": "help_invite_success_png"
},
{
"url": "assets/help/help_invite_fail_btn.png",
"type": "image",
"name": "help_invite_fail_btn_png"
},
{
"url": "assets/help/help_invite_fail_text1.png",
"type": "image",
"name": "help_invite_fail_text1_png"
},
{
"url": "assets/help/help_invite_fail_text2.png",
"type": "image",
"name": "help_invite_fail_text2_png"
},
{
"url": "assets/help/help_invite_fail_text3.png",
"type": "image",
"name": "help_invite_fail_text3_png"
},
{
"url": "assets/help/help_invite_fail_text4.png",
"type": "image",
"name": "help_invite_fail_text4_png"
},
{
"url": "assets/help/help_invite_fail.png",
"type": "image",
"name": "help_invite_fail_png"
},
{
"url": "assets/help/help_invite2_text.png",
"type": "image",
"name": "help_invite2_text_png"
},
{
"url": "assets/help/help_invite2_btn.png",
"type": "image",
"name": "help_invite2_btn_png"
},
{
"url": "assets/help/help_invite2.png",
"type": "image",
"name": "help_invite2_png"
},
{
"url": "assets/help/help_invite2_btn2.png",
"type": "image",
"name": "help_invite2_btn2_png"
},
{
"url": "assets/help/help_invite2_text2.png",
"type": "image",
"name": "help_invite2_text2_png"
}
]
}
\ No newline at end of file
egret/resource/skins/InviteSkin.exml
View file @ 9e6afd87
......@@ -6,7 +6,7 @@
<e:Image id="light1" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image y="241.33" horizontalCenter="0" source="invite_bg_png"/>
<e:Group id="con" y="-67"/>
<e:Label text="邀请好友闯关可得现金券!" y="381.33" textColor="0xF54500" size="28" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Label text="邀请新玩家闯关可得现金券!" y="381.33" textColor="0xF54500" size="28" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Image id="prizeImg" y="439.33" horizontalCenter="0.5" source="" width="510" height="228"/>
<e:Button id="closeBtn" label="" x="605" y="227.33">
<e:skinName>
......
egret/src/panels/ScratchPanel.ts
View file @ 9e6afd87
......@@ -140,7 +140,7 @@ export default class ScratchPanel extends Panel {
this.data.avatarList.push("scratch_invite_png");
}
// 添加假用户
this.data.avatarList.unshift("scratch_user1_png", "scratch_user2_png");
// this.data.avatarList.unshift("scratch_user1_png", "scratch_user2_png");
// 创建渲染列表
let rendererList = [];
......@@ -182,7 +182,9 @@ export default class ScratchPanel extends Panel {
progress = 0;
}
this['numLabel'].textFlow = (new HtmlTextParser).parser(`共<b>${2 + this.data.helpedCount}</b>位好友帮你刮了<b>${progress.toFixed(2)}</b>%`);
this['numLabel'].textFlow = (new HtmlTextParser).parser(
`再邀请${this.data.totalNeedCount-this.data.helpedCount }位好友助力可得现金券`
);
this["progressLabel"].textFlow = (new HtmlTextParser).parser(`仅剩<b>${(100 - progress).toFixed(2)}</b>%`); // 进度条文字
let _width = this["progressBg"].width * progress / 100; // 宽度
let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值
......
mock/config.js
View file @ 9e6afd87
......@@ -194,6 +194,9 @@ const config = {
},
'/customActivity/happyclear/cloudDrill/exchangeCoin':{
data: './happyclear/exchangeCoin.json'
},
'/activtyShareCode/getUserShareCode':{
data: './happyclear/exchangeCoin.json'
}
};
......
mock/happyclear/scratchGetTaskInfo.json
View file @ 9e6afd87
......@@ -9,10 +9,10 @@
"prizeImage": "//yun.dui88.com/images/201910/gxqaecxymq.jpg",
"currentTime": 1572427313215,
"endTime": 1572513706000,
"completePercent": "99",
"completePercent": "90",
"remainPercent": "9.0",
"totalNeedCount": 1,
"helpedCount": 0,
"totalNeedCount": 3,
"helpedCount": 1,
"avatarList": []
}
}
\ 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