Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaole
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wildfirecode13
xiaoxiaole
Commits
750d53bc
Commit
750d53bc
authored
Mar 23, 2020
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
db167370
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
126 additions
and
38 deletions
+126
-38
blood_fail.svga
egret/resource/assets/svgas/blood_fail.svga
+0
-0
blood_success.svga
egret/resource/assets/svgas/blood_success.svga
+0
-0
invitebg.svga
egret/resource/assets/svgas/invitebg.svga
+0
-0
HelpBloodSkin.exml
egret/resource/skins/HelpBloodSkin.exml
+2
-2
HelpInviteSkin.exml
egret/resource/skins/HelpInviteSkin.exml
+3
-0
HelpScratchSkin.exml
egret/resource/skins/HelpScratchSkin.exml
+6
-6
MapScene.ts
egret/src/mapScene/MapScene.ts
+1
-1
HelpBloodPanel.ts
egret/src/panels/help/HelpBloodPanel.ts
+61
-2
HelpInvitePanel.ts
egret/src/panels/help/HelpInvitePanel.ts
+7
-2
HelpScratchPanel.ts
egret/src/panels/help/HelpScratchPanel.ts
+43
-22
doHelpNew.json
mock/happyclear/doHelpNew.json
+1
-1
scratchDoHelp.json
mock/happyclear/scratchDoHelp.json
+2
-2
No files found.
egret/resource/assets/svgas/blood_fail.svga
0 → 100644
View file @
750d53bc
File added
egret/resource/assets/svgas/blood_success.svga
0 → 100644
View file @
750d53bc
File added
egret/resource/assets/svgas/invitebg.svga
0 → 100644
View file @
750d53bc
File added
egret/resource/skins/HelpBloodSkin.exml
View file @
750d53bc
<?xml version="1.0" encoding="utf-8"?>
<e:Skin
class=
"HelpBloodSkin"
width=
"750"
height=
"1206"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
source=
"help_blood_1_bg_png"
y=
"26"
horizontalCenter=
"0"
/>
<e:Image
source=
"help_blood_1_bg_png"
y=
"26"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Group
y=
"855"
horizontalCenter=
"0"
>
<e:Image
id=
"helpbtn"
source=
"help_blood_1_btn_png"
x=
"0"
y=
"0"
/>
<e:Image
id=
"gobtn"
source=
"help_blood_fail_btn_png"
x=
"0"
y=
"0"
visible=
"false"
/>
</e:Group>
<e:Group
y=
"
8
8"
width=
"100%"
horizontalCenter=
"0"
>
<e:Group
y=
"
10
8"
width=
"100%"
horizontalCenter=
"0"
>
<e:Image
id=
"txt_standby"
source=
"help_blood_1_text_png"
y=
"0"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_success"
source=
"help_blood_success_text2_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error2002002026"
source=
"help_blood_fail_text_png"
horizontalCenter=
"0"
visible=
"false"
/>
...
...
egret/resource/skins/HelpInviteSkin.exml
View file @
750d53bc
<?xml version="1.0" encoding="utf-8"?>
<e:Skin
class=
"HelpInviteSkin"
width=
"750"
height=
"1206"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Group
id=
"g1"
>
</e:Group>
<e:Image
y=
"26"
horizontalCenter=
"0"
source=
"help_invite2_png"
/>
<e:Group
y=
"855"
horizontalCenter=
"0"
>
<e:Image
id=
"helpbtn"
x=
"0"
y=
"0"
source=
"help_invite2_btn_png"
/>
...
...
egret/resource/skins/HelpScratchSkin.exml
View file @
750d53bc
...
...
@@ -3,16 +3,16 @@
<e:Image
y=
"240"
horizontalCenter=
"0"
source=
"help_invite_bg_png"
/>
<e:Group
y=
"695"
horizontalCenter=
"0"
>
<e:Image
id=
"helpbtn"
y=
"0"
source=
"help_invite_btn1_png"
horizontalCenter=
"0"
/>
<e:Image
id=
"go
btn2
"
x=
"0"
y=
"0"
source=
"help_invite_fail_btn_png"
visible=
"false"
/>
<e:Image
id=
"go
btn1
"
source=
"help_invite_success_btn_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"go
2btn
"
x=
"0"
y=
"0"
source=
"help_invite_fail_btn_png"
visible=
"false"
/>
<e:Image
id=
"go
1btn
"
source=
"help_invite_success_btn_png"
horizontalCenter=
"0"
visible=
"false"
/>
</e:Group>
<e:Group
y=
"294"
width=
"100%"
horizontalCenter=
"0"
>
<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_error
1
"
source=
"help_invite_fail_text1_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error
400017
"
source=
"help_invite_fail_text2_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error0"
source=
"help_invite_fail_text3_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error
2
"
horizontalCenter=
"0"
source=
"help_invite_fail_text4_png"
visible=
"false"
/>
<e:Image
id=
"txt_error
0000024
"
source=
"help_invite_fail_text1_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error
0000022
"
source=
"help_invite_fail_text2_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error0
000023
"
source=
"help_invite_fail_text3_png"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
id=
"txt_error
xxxx
"
horizontalCenter=
"0"
source=
"help_invite_fail_text4_png"
visible=
"false"
/>
</e:Group>
<e:Image
id=
"closeBtn"
source=
"help_closebtn1_png"
x=
"613"
y=
"238"
/>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/MapScene.ts
View file @
750d53bc
...
...
@@ -392,7 +392,7 @@ export default class MapScene extends Scene {
if
(
!
window
[
'development'
])
{
RES
.
getResAsync
(
`inviterulepanel_json`
);
}
},
5
*
1000
);
},
10
*
1000
);
loadFireworks
();
...
...
egret/src/panels/help/HelpBloodPanel.ts
View file @
750d53bc
...
...
@@ -3,10 +3,14 @@ import { NetManager } from "../../../libs/tw/manager/NetManager";
import
{
getlogItem
}
from
"../../Main"
;
import
{
showToast
}
from
"../../../libs/new_wx/ctrls/toastCtrl"
;
import
{
gotoNextLevel
}
from
"../gotoNextLevel"
;
import
{
loadSvga
}
from
"../../loadSvga"
;
import
getResPath
from
"../../../libs/new_tc/getResPath"
;
export
default
class
HelpBloodPanel
extends
Panel
{
netCallback
;
code
;
mv1
;
mv2
;
start
(
data
)
{
this
.
netCallback
=
data
.
netCallback
;
this
.
code
=
data
.
code
;
...
...
@@ -16,6 +20,57 @@ export default class HelpBloodPanel extends Panel {
this
[
'helpbtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onClick
,
this
);
this
[
'txt_standby'
].
visible
=
true
;
this
[
'helpbtn'
].
visible
=
true
;
loadSvga
(
getResPath
()
+
'resource/assets/svgas/blood_success.svga'
,
this
).
then
((
mv
:
egret
.
DisplayObject
)
=>
{
mv
.
touchEnabled
=
false
;
mv
.
visible
=
false
;
this
.
mv1
=
mv
;
this
.
mv1
.
y
=
-
250
;
this
.
tostandby1
();
this
.
mv1
.
addEventListener
(
egret
.
Event
.
ENTER_FRAME
,
()
=>
{
if
(
this
.
mv1
.
currentFrame
==
this
.
mv1_end
)
this
.
mv1
.
gotoAndPlay
(
this
.
mv1_start
);
if
(
this
.
mv1
.
currentFrame
==
420
)
{
this
.
mv1_start
=
421
;
this
.
mv1_end
=
this
.
mv1
.
totalFrames
;
}
},
this
);
});
loadSvga
(
getResPath
()
+
'resource/assets/svgas/blood_fail.svga'
,
this
).
then
((
mv
:
egret
.
DisplayObject
)
=>
{
mv
.
touchEnabled
=
false
;
mv
.
visible
=
true
;
this
.
mv2
=
mv
;
this
.
mv2
.
y
=
-
250
;
this
.
tostandby2
();
this
.
mv2
.
addEventListener
(
egret
.
Event
.
ENTER_FRAME
,
()
=>
{
if
(
this
.
mv2
.
currentFrame
==
this
.
mv2_end
)
this
.
mv2
.
gotoAndPlay
(
this
.
mv2_start
);
if
(
this
.
mv2
.
currentFrame
==
420
)
{
this
.
mv2_start
=
421
;
this
.
mv2_end
=
this
.
mv2
.
totalFrames
;
}
},
this
);
});
}
mv1_start
;
mv1_end
;
mv2_start
;
mv2_end
;
tostandby1
()
{
this
.
mv1_start
=
1
;
this
.
mv1_end
=
180
;
}
toAction1
()
{
this
.
mv1
.
gotoAndPlay
(
181
);
}
toAction2
()
{
this
.
mv2
.
gotoAndPlay
(
181
);
}
tostandby2
()
{
this
.
mv2_start
=
1
;
this
.
mv2_end
=
180
;
}
onclick_gobtn
()
{
...
...
@@ -27,17 +82,21 @@ export default class HelpBloodPanel extends Panel {
onClick
()
{
this
[
'helpbtn'
].
visible
=
false
;
this
[
'gobtn'
].
visible
=
true
;
this
.
mv1
.
visible
=
false
;
this
.
mv2
.
visible
=
false
;
NetManager
.
ins
.
showLog
(
getlogItem
(
88
));
NetManager
.
ins
.
clickLog
(
getlogItem
(
87
));
NetManager
.
ins
.
doHelpNew
((
s
,
res
)
=>
{
this
.
netCallback
();
this
[
'txt_standby'
].
visible
=
false
;
// doHelpFlag = true;
if
(
s
)
{
this
.
mv1
.
visible
=
true
;
this
[
'txt_success'
].
visible
=
true
;
// showToast("助力成功!一起闯关赢现金吧")
this
.
toAction1
();
}
else
{
this
.
toAction2
();
this
.
mv2
.
visible
=
true
;
var
codeMsgs
=
{
//具体code还没给
"2002002016"
:
"不可以给自己助力哦~"
,
//
"2002002036"
:
"已经给好友助力过了哦~"
,
...
...
egret/src/panels/help/HelpInvitePanel.ts
View file @
750d53bc
...
...
@@ -4,6 +4,8 @@ import { getlogItem } from "../../Main";
import
{
showToast
}
from
"../../../libs/new_wx/ctrls/toastCtrl"
;
import
{
gotoNextLevel
}
from
"../gotoNextLevel"
;
import
{
DataManager
}
from
"../../../libs/tw/manager/DataManager"
;
import
{
loadSvga
}
from
"../../loadSvga"
;
import
getResPath
from
"../../../libs/new_tc/getResPath"
;
export
default
class
HelpInvitePanel
extends
Panel
{
netCallback
;
...
...
@@ -13,11 +15,14 @@ export default class HelpInvitePanel extends Panel {
this
.
code
=
data
.
code
;
// NetManager.ins.showLog(getlogItem(87));
this
[
'go1btn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'go2btn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'gobtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'helpbtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onClick
,
this
);
this
[
'txt_standby'
].
visible
=
true
;
this
[
'helpbtn'
].
visible
=
true
;
loadSvga
(
getResPath
()
+
'resource/assets/svgas/invitebg.svga'
,
this
).
then
((
mv
:
egret
.
DisplayObject
)
=>
{
this
[
'g1'
].
addChild
(
mv
)
});
}
onclick_gobtn
()
{
...
...
egret/src/panels/help/HelpScratchPanel.ts
View file @
750d53bc
import
Panel
from
"../../../libs/new_wx/components/Panel"
;
import
{
NetManager
}
from
"../../../libs/tw/manager/NetManager"
;
import
{
getlogItem
}
from
"../../Main"
;
import
{
showToast
}
from
"../../../libs/new_wx/ctrls/toastCtrl"
;
import
{
NetManager
}
from
"../../../libs/tw/manager/NetManager"
;
import
{
gotoNextLevel
}
from
"../gotoNextLevel"
;
import
{
DataManager
}
from
"../../../libs/tw/manager/DataManager"
;
export
default
class
HelpScratchPanel
extends
Panel
{
netCallback
;
...
...
@@ -13,12 +11,17 @@ export default class HelpScratchPanel extends Panel {
this
.
code
=
data
.
code
;
// NetManager.ins.showLog(getlogItem(87));
this
[
'gobtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'closeBtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_closeBtn
,
this
);
this
[
'go2btn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'go1btn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onclick_gobtn
,
this
);
this
[
'helpbtn'
].
once
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onClick
,
this
);
this
[
'txt_standby'
].
visible
=
true
;
this
[
'helpbtn'
].
visible
=
true
;
}
onclick_closeBtn
()
{
this
.
hidePanel
();
}
onclick_gobtn
()
{
// NetManager.ins.clickLog(getlogItem(88));
this
.
hidePanel
();
...
...
@@ -27,28 +30,46 @@ export default class HelpScratchPanel extends Panel {
onClick
()
{
this
[
'helpbtn'
].
visible
=
false
;
this
[
'gobtn'
].
visible
=
true
;
const
_code
=
this
.
code
.
slice
(
8
);
NetManager
.
ins
.
scratchDoHelp
((
success
,
res
)
=>
{
this
.
netCallback
();
switch
(
true
)
{
case
(
res
.
code
==
"0000024"
):
showToast
(
"今日刮卡次数已达到上线限哦~"
);
break
;
case
(
res
.
code
==
"0000022"
):
showToast
(
"不可以给自己刮哦~"
);
break
;
case
(
res
.
code
==
"0000023"
):
showToast
(
"已经给好友刮过了哦~"
);
break
;
default
:
break
;
this
[
'txt_standby'
].
visible
=
false
;
if
(
success
)
{
this
[
'go1btn'
].
visible
=
true
;
this
[
'txt_success'
].
visible
=
true
;
}
else
{
this
[
'go2btn'
].
visible
=
true
;
var
codeMsgs
=
{
"0000024"
:
"今日刮卡次数已达到上线限哦~"
,
"0000022"
:
"不可以给自己刮哦~"
,
"0000023"
:
"已经给好友刮过了哦~"
,
}
if
(
res
&&
codeMsgs
[
res
.
code
]
&&
this
[
`txt_error
${
res
.
code
}
`
])
{
this
[
`txt_error
${
res
.
code
}
`
].
visible
=
true
;
}
else
{
showToast
(
res
&&
codeMsgs
[
res
.
code
]
?
codeMsgs
[
res
.
code
]
:
"助力失败"
);
}
if
(
!
success
)
{
return
;
}
showToast
(
"助力成功,参与闯关赢现金"
/*"帮刮成功!"*/
);
// switch (true) {
// case (res.code == "0000024"):
// showToast("今日刮卡次数已达到上线限哦~");
// break;
// case (res.code == "0000022"):
// showToast("不可以给自己刮哦~");
// break;
// case (res.code == "0000023"):
// showToast("已经给好友刮过了哦~");
// break;
// default:
// break;
// }
// if (!success) {
// return;
// }
// showToast("助力成功,参与闯关赢现金"/*"帮刮成功!"*/);
},
_code
);
}
...
...
mock/happyclear/doHelpNew.json
View file @
750d53bc
{
"success"
:
fals
e
,
"success"
:
tru
e
,
"code"
:
"2002002036"
,
"desc"
:
"OK"
,
"timestamp"
:
1571052938097
,
...
...
mock/happyclear/scratchDoHelp.json
View file @
750d53bc
{
"success"
:
true
,
"code"
:
null
,
"success"
:
0
,
"code"
:
"0000023"
,
"desc"
:
null
,
"timestamp"
:
1566199822308
,
"data"
:
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment