Skip to content

X
xiaoxiaole
Commit 311c3136 authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'hotfix03261600' into dev

parents f5af0f1c 23963e8a
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 8 deletions
egret/resource/TextureMerger/common.tmproject
View file @ 311c3136
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/arrowbg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png"]}
\ No newline at end of file
egret/resource/skins/HelpInviteSkin.exml
View file @ 311c3136
......@@ -11,5 +11,5 @@
<e:Image id="txt_error0200202" horizontalCenter="0" source="help_invite2_text3_png" visible="false"/>
<e:Image id="txt_error400017" horizontalCenter="0" source="help_invite2_text4_png" visible="false"/>
</e:Group>
<e:Image id="closeBtn" source="common_closebtn2_png" x="613" y="350.12" anchorOffsetX="2"/>
<e:Image id="closeBtn" source="common_closebtn2_png" x="613" y="200" anchorOffsetX="2"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/HelpScratchSkin.exml
View file @ 311c3136
......@@ -8,9 +8,9 @@
<e:Image id="go1btn" source="help_invite_success_btn_png" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group y="406.12" width="100%" horizontalCenter="0">
<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite_text_png"/>
<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite_text_png" visible="false"/>
<e:Image id="txt_success" horizontalCenter="0" source="help_invite_success_txt_png" visible="false"/>
<e:Image id="txt_error0000024" source="help_invite_fail_text1_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_error0000024" horizontalCenter="0" source="help_invite_fail_text4_png" visible="false"/>
<e:Image id="txt_error0000022" source="help_invite_fail_text2_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_error0000023" source="help_invite_fail_text3_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_errorxxxx" horizontalCenter="0" source="help_invite_fail_text4_png" visible="false"/>
......
egret/src/panels/help/HelpBloodPanel.ts
View file @ 311c3136
......@@ -14,6 +14,7 @@ export default class HelpBloodPanel extends Panel {
success;
list: any[];
async start(data) {
super.start();
this.netCallback = data.netCallback;
this.code = data.code;
NetManager.ins.showLog(getlogItem(87));
......@@ -45,7 +46,7 @@ export default class HelpBloodPanel extends Panel {
loadSvga(getResPath() + 'resource/assets/svgas/bloodbg.svga', s);
this.addChild(this['closeBtn']);
}
onclick_gobtn() {
......
egret/src/panels/help/HelpInvitePanel.ts
View file @ 311c3136
......@@ -13,11 +13,13 @@ export default class HelpInvitePanel extends Panel {
code;
success;
async start(data) {
super.start();
this.netCallback = data.netCallback;
this.code = data.code;
const s = new egret.Sprite();
this.addChildAt(s, 0);
s.touchEnabled=s.touchChildren=false;
this['txt_standby'].visible = false;
this['helpbtn'].visible = false;
......@@ -25,6 +27,7 @@ export default class HelpInvitePanel extends Panel {
loadSvga(getResPath() + 'resource/assets/svgas/invitebg.svga', this).then((mv: egret.DisplayObject) => {
s.addChild(mv);
this.addChild(this['closeBtn']);
mv.y = -180;
});
......@@ -34,7 +37,7 @@ export default class HelpInvitePanel extends Panel {
loadSvga(getResPath() + 'resource/assets/svgas/inviteAct3.svga'),
]);
// this['list'][0].visible=false;
this['list'][1].visible = false;
this['list'][2].visible = false;
this['list'][0].y = -140;
......@@ -44,6 +47,12 @@ export default class HelpInvitePanel extends Panel {
this.addChild(this['list'][1]);
this.addChild(this['list'][2]);
this['list'][0].touchEnabled=this['list'][0].touchChildren=false;
this['list'][1].touchEnabled=this['list'][1].touchChildren=false;
this['list'][2].touchEnabled=this['list'][2].touchChildren=false;
this.addChild(this['closeBtn']);
this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
// wait(100).then(()=>{
......
egret/src/panels/help/HelpInvitePanel2.ts
View file @ 311c3136
......@@ -11,12 +11,14 @@ export default class HelpInvitePanel2 extends Panel {
// netCallback;
// code;
async start(data) {
super.start();
// this.netCallback = data.netCallback;
// this.code = data.code;
NetManager.ins.showLog(getlogItem(91));
const s = new egret.Sprite();
this.addChildAt(s,0);
s.touchEnabled=s.touchChildren=false;
this['txt_standby'].visible = true;
this['helpbtn'].visible = true;
......@@ -24,6 +26,7 @@ export default class HelpInvitePanel2 extends Panel {
loadSvga(getResPath() + 'resource/assets/svgas/invitebg.svga', this).then((mv: egret.DisplayObject) => {
s.addChild(mv);
mv.y = -180;
this.addChild(this['closeBtn']);
});
this['list'] = await Promise.all([
......@@ -36,6 +39,8 @@ export default class HelpInvitePanel2 extends Panel {
this.addChild(this['list'][0]);
this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
this.addChild(this['closeBtn']);
}
......
egret/src/panels/help/HelpScratchPanel.ts
View file @ 311c3136
......@@ -30,13 +30,14 @@ export default class HelpScratchPanel extends Panel {
}
x += 5;
this.myShape.graphics.lineTo(x, y);
if (x > this["prizeImg"].x + (+this.data.completePercent) / 100 * this["prizeImg"].width - 60) {
if (x > this["prizeImg"].x + (+this.data.completePercent) / 100 * this["prizeImg"].width) {
return;
}
this.setGtaphics(x, y);
}, 20);
}
async start(data) {
this.data.completePercent=100;
this.netCallback = data.netCallback;
this.code = data.code;
......@@ -112,6 +113,8 @@ export default class HelpScratchPanel extends Panel {
const _code = this.code.slice(8);
NetManager.ins.scratchDoHelp(async (success, res) => {
this.netCallback();
if(!success)
this.data.completePercent=70;
this.startAni();
await wait(2000);
this['txt_standby'].visible = false;
......@@ -126,6 +129,7 @@ export default class HelpScratchPanel extends Panel {
await play2(this.list[1]);
this['light'].visible = true;
} else {
// NetManager.ins.showLog(getlogItem(0));
this['go2btn'].visible = true;
this.list[2].visible = true;
......
mock/happyclear/scratchDoHelp.json
View file @ 311c3136
{
"success":0,
"code":"0000023",
"code":"0000024",
"desc":null,
"timestamp":1566199822308,
"data":""
......
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