Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
db-game-template
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
崔立强
db-game-template
Commits
ec44ebf9
Commit
ec44ebf9
authored
Jan 19, 2020
by
lujinlei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-a
parent
7044f500
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
54 additions
and
61 deletions
+54
-61
accept_panel.tmproject
egret/resource/TextureMerger/accept_panel.tmproject
+0
-1
alert.tmproject
egret/resource/TextureMerger/alert.tmproject
+0
-1
card.tmproject
egret/resource/TextureMerger/card.tmproject
+0
-1
loading.tmproject
egret/resource/TextureMerger/loading.tmproject
+0
-1
msg_panel.tmproject
egret/resource/TextureMerger/msg_panel.tmproject
+0
-1
noIos_panel.tmproject
egret/resource/TextureMerger/noIos_panel.tmproject
+0
-1
pop.tmproject
egret/resource/TextureMerger/pop.tmproject
+0
-1
preload.tmproject
egret/resource/TextureMerger/preload.tmproject
+0
-1
prize_panel.tmproject
egret/resource/TextureMerger/prize_panel.tmproject
+0
-1
receive_panel.tmproject
egret/resource/TextureMerger/receive_panel.tmproject
+0
-1
rule_panel.tmproject
egret/resource/TextureMerger/rule_panel.tmproject
+0
-1
startscene.tmproject
egret/resource/TextureMerger/startscene.tmproject
+0
-1
store_panel.tmproject
egret/resource/TextureMerger/store_panel.tmproject
+0
-1
waiting.tmproject
egret/resource/TextureMerger/waiting.tmproject
+0
-1
write_panel.tmproject
egret/resource/TextureMerger/write_panel.tmproject
+0
-1
cardjinlab.png
egret/resource/assets/card/cardjinlab.png
+0
-0
default.res.json
egret/resource/default.res.json
+7
-7
CardPanelSkin.exml
egret/resource/skins/CardPanelSkin.exml
+1
-0
GetCardPanelSkin.exml
egret/resource/skins/GetCardPanelSkin.exml
+1
-1
CardPanel.ts
egret/src/CardPanel/CardPanel.ts
+8
-4
GetCardPanel.ts
egret/src/CardPanel/GetCardPanel.ts
+5
-3
WXSharePanel.ts
egret/src/WXSharePanel/WXSharePanel.ts
+4
-4
PrizePanel.ts
egret/src/prizePanel/PrizePanel.ts
+7
-7
RulePanel.ts
egret/src/rulePanel/RulePanel.ts
+4
-4
StartScene.ts
egret/src/startScene/StartScene.ts
+17
-16
No files found.
egret/resource/TextureMerger/accept_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"accept_panel","version":5,"files":["..\\assets\\accept_panel\\friendAccept.png","..\\assets\\accept_panel\\failAccept.png","..\\assets\\accept_panel\\acceptBtn.png","..\\assets\\accept_panel\\acceptBg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/alert.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert","version":5,"files":["..\\assets\\alert\\Bitmap-4.png","..\\assets\\alert\\Bitmap-2.png","..\\assets\\alert\\Bitmap-1.png"]}
\ No newline at end of file
egret/resource/TextureMerger/card.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"card","version":5,"files":["..\\assets\\card\\sharetoast.png","..\\assets\\card\\nocardBG.png","..\\assets\\card\\closepopBtn.png","..\\assets\\card\\cardshop.png","..\\assets\\card\\cardshareBtn.png","..\\assets\\card\\cardreturn.png","..\\assets\\card\\cardpeachlab.png","..\\assets\\card\\cardpeach3.png","..\\assets\\card\\cardpeach2.png","..\\assets\\card\\cardpeach.png","..\\assets\\card\\cardjinlab.png","..\\assets\\card\\cardheallab.png","..\\assets\\card\\cardheal3.png","..\\assets\\card\\cardheal2.png","..\\assets\\card\\cardheal.png","..\\assets\\card\\cardhapplab.png","..\\assets\\card\\cardhapp3.png","..\\assets\\card\\cardhapp2.png","..\\assets\\card\\cardhapp.png","..\\assets\\card\\cardfinalab.png","..\\assets\\card\\cardfina3.png","..\\assets\\card\\cardfina2.png","..\\assets\\card\\cardfina.png","..\\assets\\card\\cardcaselab.png","..\\assets\\card\\cardcase3.png","..\\assets\\card\\cardcase2.png","..\\assets\\card\\cardcase.png","..\\assets\\card\\cardgoget.png","..\\assets\\card\\cardlab.png","..\\assets\\card\\cardlucky.png","..\\assets\\card\\cardlucky3.png","..\\assets\\card\\nocardlab.png","..\\assets\\card\\nocardjinlab.png","..\\assets\\card\\cardlucky2.png","..\\assets\\card\\cardnoBtn1.png","..\\assets\\card\\cardnoBtn.png","..\\assets\\card\\cardluckylab.png","..\\assets\\card\\jinlilab.png"]}
\ No newline at end of file
egret/resource/TextureMerger/loading.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["..\\assets\\loading\\progress.png","..\\assets\\loading\\bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/msg_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"msg_panel","version":5,"files":["..\\assets\\msg_panel\\closeBtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/noIos_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noIos_panel","version":5,"files":["..\\assets\\noIos_panel\\noIosBtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/pop.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"pop","version":5,"files":["..\\assets\\pop\\redyuan.png","..\\assets\\pop\\redlab3.png","..\\assets\\pop\\redlab2.png","..\\assets\\pop\\redlab1.png","..\\assets\\pop\\redgetBtn.png","..\\assets\\pop\\redBG.png","..\\assets\\pop\\red.png","..\\assets\\pop\\redwx.png"]}
\ No newline at end of file
egret/resource/TextureMerger/preload.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\card\\cardluckylab.png","..\\assets\\accept_panel\\acceptBg.png","..\\assets\\accept_panel\\acceptBtn.png","..\\assets\\accept_panel\\failAccept.png","..\\assets\\accept_panel\\friendAccept.png","..\\assets\\startscene\\startnoTips.png","..\\assets\\rule_panel\\ruleTitle.png","..\\assets\\startscene\\ruleBtn.png","..\\assets\\startscene\\startcloseBtn.png","..\\assets\\card\\cardnoBtn1.png","..\\assets\\card\\cardnoBtn.png","..\\assets\\card\\jinlilab.png","..\\assets\\card\\cardlucky2.png","..\\assets\\pop\\redwx.png","..\\assets\\startscene\\starttime.png","..\\assets\\startscene\\getBtn.png","..\\assets\\noIos_panel\\noIosBtn.png","..\\assets\\prize_panel\\npcIcon.png"]}
\ No newline at end of file
egret/resource/TextureMerger/prize_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize_panel","version":5,"files":["..\\assets\\prize_panel\\prizeTitle.png","..\\assets\\prize_panel\\prizeLine.png","..\\assets\\prize_panel\\prizeIcon.png","..\\assets\\prize_panel\\prizeBackBtn.png","..\\assets\\prize_panel\\prizeArrow.png"]}
\ No newline at end of file
egret/resource/TextureMerger/receive_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"receive_panel","version":5,"files":["..\\assets\\receive_panel\\receiveTitle.png","..\\assets\\receive_panel\\receiveHint3.png","..\\assets\\receive_panel\\receiveHint2.png","..\\assets\\receive_panel\\receiveHint1.png","..\\assets\\receive_panel\\receiveBtn.png","..\\assets\\receive_panel\\inputBg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/rule_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule_panel","version":5,"files":["..\\assets\\rule_panel\\ruleTitle.png"]}
\ No newline at end of file
egret/resource/TextureMerger/startscene.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startscene","version":5,"files":["..\\assets\\startscene\\waitBtn.png","..\\assets\\startscene\\todoBtn.png","..\\assets\\startscene\\taskTitle.png","..\\assets\\startscene\\taskIcon.png","..\\assets\\startscene\\taskBg.png","..\\assets\\startscene\\starttitle.png","..\\assets\\startscene\\startpoint.png","..\\assets\\startscene\\startopenBtn.png","..\\assets\\startscene\\startlight2.png","..\\assets\\startscene\\startgong.png","..\\assets\\startscene\\returncard.png","..\\assets\\startscene\\prizeBtn.png","..\\assets\\startscene\\openBtn.png","..\\assets\\startscene\\hadopenBtn.png","..\\assets\\startscene\\endgameBtn.png","..\\assets\\startscene\\completeBtn.png","..\\assets\\startscene\\cardxing.png","..\\assets\\startscene\\cardtao.png","..\\assets\\startscene\\cardshi.png","..\\assets\\startscene\\cardjian.png","..\\assets\\startscene\\cardcai.png","..\\assets\\startscene\\cardjin.png","..\\assets\\startscene\\startdi.png","..\\assets\\startscene\\starttips2.png","..\\assets\\startscene\\starttips.png","..\\assets\\startscene\\startnoTips.png","..\\assets\\startscene\\startcloseBtn.png","..\\assets\\startscene\\ruleBtn.png","..\\assets\\startscene\\starttime.png","..\\assets\\startscene\\getBtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/store_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"store_panel","version":5,"files":["..\\assets\\store_panel\\stroeLine.png","..\\assets\\store_panel\\storeCloseBtn.png","..\\assets\\store_panel\\selectBtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/waiting.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"waiting","version":5,"files":["..\\assets\\waiting\\progress.png","..\\assets\\waiting\\bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/write_panel.tmproject
deleted
100644 → 0
View file @
7044f500
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"write_panel","version":5,"files":["..\\assets\\write_panel\\writeTitle.png","..\\assets\\write_panel\\writeFont4.png","..\\assets\\write_panel\\writeFont3.png","..\\assets\\write_panel\\writeFont2.png","..\\assets\\write_panel\\writeFont1.png","..\\assets\\write_panel\\writeFont0.png","..\\assets\\write_panel\\writeEndBtn.png","..\\assets\\write_panel\\writeBg.png"]}
\ No newline at end of file
egret/resource/assets/card/cardjinlab.png
View replaced file @
7044f500
View file @
ec44ebf9
5 KB
|
W:
|
H:
4.01 KB
|
W:
|
H:
2-up
Swipe
Onion skin
egret/resource/default.res.json
View file @
ec44ebf9
...
...
@@ -5,7 +5,7 @@
"name"
:
"alert"
},
{
"keys"
:
"sharetoast_png,nocardBG_png,closepopBtn_png,cardshop_png,cardshareBtn_png,cardreturn_png,cardpeachlab_png,cardpeach3_png,cardpeach2_png,cardpeach_png,card
jinlab_png,card
heallab_png,cardheal3_png,cardheal2_png,cardheal_png,cardhapplab_png,cardhapp3_png,cardhapp2_png,cardhapp_png,cardfinalab_png,cardfina3_png,cardfina2_png,cardfina_png,cardcaselab_png,cardcase3_png,cardcase2_png,cardcase_png,cardgoget_png,cardlab_png,cardlucky_png,cardlucky3_png,nocardlab_png,nocardjinlab_png,cardlucky2_png,cardnoBtn1_png,cardnoBtn_png,cardluckylab_png,jinlilab_png"
,
"keys"
:
"sharetoast_png,nocardBG_png,closepopBtn_png,cardshop_png,cardshareBtn_png,cardreturn_png,cardpeachlab_png,cardpeach3_png,cardpeach2_png,cardpeach_png,cardheallab_png,cardheal3_png,cardheal2_png,cardheal_png,cardhapplab_png,cardhapp3_png,cardhapp2_png,cardhapp_png,cardfinalab_png,cardfina3_png,cardfina2_png,cardfina_png,cardcaselab_png,cardcase3_png,cardcase2_png,cardcase_png,cardgoget_png,cardlab_png,cardlucky_png,cardlucky3_png,nocardlab_png,nocardjinlab_png,cardlucky2_png,cardnoBtn1_png,cardnoBtn_png,cardluckylab_png,jinlilab_png"
,
"name"
:
"card"
},
{
...
...
@@ -45,7 +45,7 @@
"name"
:
"write_panel"
},
{
"keys"
:
"prizeBg_jpg,cardluckylab_png,acceptBg_png,acceptBtn_png,failAccept_png,friendAccept_png,startnoTips_png,ruleTitle_png,ruleBtn_png,storePanelBg_jpg,startcloseBtn_png,cardnoBtn1_png,cardnoBtn_png,jinlilab_png,cardlucky2_png,redwx_png,starttime_png,getBtn_png,noIosBtn_png,noIos_jpg,npcIcon_png"
,
"keys"
:
"prizeBg_jpg,cardluckylab_png,acceptBg_png,acceptBtn_png,failAccept_png,friendAccept_png,startnoTips_png,ruleTitle_png,ruleBtn_png,storePanelBg_jpg,startcloseBtn_png,cardnoBtn1_png,cardnoBtn_png,jinlilab_png,cardlucky2_png,redwx_png,starttime_png,getBtn_png,noIosBtn_png,noIos_jpg,npcIcon_png
,cardjinlab_png
"
,
"name"
:
"preload"
},
{
...
...
@@ -157,11 +157,6 @@
"type"
:
"image"
,
"name"
:
"cardheallab_png"
},
{
"url"
:
"assets/card/cardjinlab.png"
,
"type"
:
"image"
,
"name"
:
"cardjinlab_png"
},
{
"url"
:
"assets/card/cardpeach.png"
,
"type"
:
"image"
,
...
...
@@ -646,6 +641,11 @@
"name"
:
"npcIcon_png"
,
"type"
:
"image"
,
"url"
:
"assets/prize_panel/npcIcon.png"
},
{
"name"
:
"cardjinlab_png"
,
"type"
:
"image"
,
"url"
:
"assets/card/cardjinlab.png"
}
]
}
\ No newline at end of file
egret/resource/skins/CardPanelSkin.exml
View file @
ec44ebf9
...
...
@@ -64,4 +64,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image
id=
"turnlab"
width=
"394"
height=
"40"
y=
"1390"
source=
"cardjinlab_png"
scaleX=
"1"
scaleY=
"1"
x=
"343"
/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/GetCardPanelSkin.exml
View file @
ec44ebf9
...
...
@@ -13,7 +13,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image
id=
"turnlab"
width=
"
415"
height=
"40"
x=
"122"
y=
"1116"
source=
"cardjinlab_png"
scaleX=
"1"
scaleY=
"1"
visible=
"false
"
/>
<e:Image
id=
"turnlab"
width=
"
394"
height=
"40"
y=
"1116"
source=
"cardjinlab_png"
scaleX=
"1"
scaleY=
"1"
x=
"170
"
/>
<e:Button
id=
"shareBtn"
label=
""
x=
"62"
y=
"1096"
scaleX=
"1"
scaleY=
"1"
width=
"517"
height=
"213"
visible=
"false"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
egret/src/CardPanel/CardPanel.ts
View file @
ec44ebf9
...
...
@@ -33,6 +33,9 @@ export default class CardPanel extends Panel {
private
backExposure
:
any
;
private
jinExposure
:
any
;
private
cardstatus
=
1
;
public
turnlab
:
eui
.
Image
;
constructor
(
data
?)
{
super
(
data
);
this
.
mData
=
data
;
...
...
@@ -83,8 +86,7 @@ export default class CardPanel extends Panel {
}
initUI
(){
this
.
turnlab
.
visible
=
false
;
if
(
this
.
mData
.
cardid
==
6
){
this
.
lab
.
source
=
"nocardjinlab_png"
this
.
jinExposure
=
GetBuriedData
(
17
)
...
...
@@ -103,7 +105,8 @@ export default class CardPanel extends Panel {
this
.
cardjinGroup
.
visible
=
false
;
this
.
cardImg
.
source
=
"cardlucky_png"
this
.
turn2Btn
.
visible
=
false
;
this
.
lab
.
source
=
"jinlilab_png"
this
.
lab
.
source
=
"jinlilab_png"
;
this
.
turnlab
.
visible
=
true
;
//this.shareBtn.visible = true;
this
.
backBtn
.
visible
=
false
;
this
.
cardImg
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
turnAni
,
this
);
...
...
@@ -197,6 +200,7 @@ export default class CardPanel extends Panel {
if
(
this
.
mData
.
cardid
==
6
){
this
.
cardGroup
.
visible
=
false
;
this
.
cardjinGroup
.
visible
=
true
;
this
.
turnlab
.
visible
=
false
;
//二维码显示
this
.
geterweima
();
...
...
@@ -238,7 +242,7 @@ export default class CardPanel extends Panel {
if
(
this
.
mData
.
cardid
==
6
){
this
.
cardGroup
.
visible
=
true
;
this
.
cardjinGroup
.
visible
=
false
;
this
.
turnlab
.
visible
=
true
;
}
else
if
(
this
.
mData
.
cardid
==
1
){
this
.
cardImg
.
source
=
"cardpeach_png"
this
.
turnBtn
.
visible
=
true
;
...
...
egret/src/CardPanel/GetCardPanel.ts
View file @
ec44ebf9
...
...
@@ -97,6 +97,7 @@ export default class GetCardPanel extends Panel {
initUI
()
{
this
.
shareimg
.
visible
=
false
;
this
.
jinli2
.
visible
=
false
;
this
.
turnlab
.
visible
=
false
;
this
.
showAni
()
if
(
this
.
mData
.
prizeId
==
"egg_card"
)
{
this
.
turnjin1Exposure
=
GetBuriedData
(
15
)
...
...
@@ -104,7 +105,7 @@ export default class GetCardPanel extends Panel {
this
.
closeBtn
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
checkCard
,
this
);
this
.
cardImg
.
source
=
"cardlucky_png"
//this.shareBtn.visible = false;
//
this.turnlab.visible = true;
this
.
turnlab
.
visible
=
true
;
this
.
turnBtn
.
visible
=
true
;
this
.
turn2Btn
.
visible
=
false
;
this
.
title1
.
source
=
"cardluckylab_png"
...
...
@@ -167,7 +168,7 @@ export default class GetCardPanel extends Panel {
NetManager
.
ins
.
showLog
(
this
.
turnjin2Exposure
);
this
.
cardGroup
.
visible
=
false
;
this
.
jinli2
.
visible
=
true
;
//this.turnlab.visible = tru
e;
this
.
turnlab
.
visible
=
fals
e
;
//二维码显示
this
.
geterweima
();
...
...
@@ -214,6 +215,7 @@ export default class GetCardPanel extends Panel {
NetManager
.
ins
.
clickLog
(
this
.
turnjin2Exposure
)
this
.
cardGroup
.
visible
=
true
;
this
.
jinli2
.
visible
=
false
;
this
.
turnlab
.
visible
=
true
;
}
else
if
(
this
.
mData
.
prizeId
==
"card_1"
)
{
NetManager
.
ins
.
clickLog
(
this
.
turnExposure
)
...
...
@@ -476,7 +478,7 @@ export default class GetCardPanel extends Panel {
this
.
title1
.
visible
=
false
;
this
.
title2
.
visible
=
false
;
this
.
closeBtn
.
visible
=
false
;
//
this.turnlab.visible = false;
this
.
turnlab
.
visible
=
false
;
//this.shareBtn.visible = false;
if
(
this
.
mData
.
prizeId
==
"egg_card"
)
{
egret
.
Tween
.
get
(
this
.
cardGroup
)
...
...
egret/src/WXSharePanel/WXSharePanel.ts
View file @
ec44ebf9
...
...
@@ -19,10 +19,10 @@ export default class WXSharePanel extends Panel {
}
private
onLoad
():
void
{
// console.log('屏幕',screen.width,screen.height)
if
(
screen
.
height
/
screen
.
width
>=
2.22
)
{
this
.
hint
.
y
=
140
;
}
//
if(screen.height/screen.width >= 2.22)
//
{
//
this.hint.y = 140;
//
}
}
initEvents
(){
this
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
closePanel
,
this
);
...
...
egret/src/prizePanel/PrizePanel.ts
View file @
ec44ebf9
...
...
@@ -82,10 +82,10 @@ export default class PrizePanel extends Panel {
// this.delParam('prize');
// }
// console.log('屏幕',screen.width,screen.height)
if
(
screen
.
height
/
screen
.
width
>=
2.22
)
{
this
.
prizeGroup
.
y
=
140
;
}
//
if(screen.height/screen.width >= 2.22)
//
{
//
this.prizeGroup.y = 140;
//
}
NetManager
.
ins
.
getRecords
((
success
,
result
)
=>
{
if
(
!
success
){
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
result
.
message
})
...
...
@@ -170,7 +170,7 @@ export default class PrizePanel extends Panel {
if
(
prizeData
.
hasMainOrder
){
if
(
prizeData
.
status
==
'success'
){
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包已经发放至你的微信账户啦,注意查收~'
})
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包已经发放至你的微信账户啦,
\
n
注意查收~'
})
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'因微信账号异常,
\
n受到微信官方发放限制,
\
n请联系客服补发红包~'
})
}
...
...
@@ -187,11 +187,11 @@ export default class PrizePanel extends Panel {
if
(
result
.
data
){
window
.
location
.
href
=
window
[
'getPrizeUrl'
]
+
prizeData
.
projectOrderNo
+
'&orderId='
+
prizeData
.
orderId
+
'&retry=1'
;
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包将于24小时内到账,请稍后前来查看~'
})
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包将于24小时内到账,
\
n
请稍后前来查看~'
})
}
},
prizeData
.
orderId
)
}
else
if
(
prizeData
.
status
==
'success'
){
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包已经发放至你的支付宝账户啦,注意查收~'
})
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'红包已经发放至你的支付宝账户啦,
\
n
注意查收~'
})
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
TOAST_PANEL
,{
msg
:
'请至活动规则中,联系客服处理~'
})
}
...
...
egret/src/rulePanel/RulePanel.ts
View file @
ec44ebf9
...
...
@@ -49,10 +49,10 @@ export default class RulePanel extends Panel {
private
onLoad
():
void
{
//this.ruleLb.textColor = 0xBBD7E6;
// console.log('屏幕',screen.width,screen.height)
if
(
screen
.
height
/
screen
.
width
>=
2.22
)
{
this
.
ruleGroup
.
y
=
140
;
}
//
if(screen.height/screen.width >= 2.22)
//
{
//
this.ruleGroup.y = 140;
//
}
this
.
ruleLb
.
stroke
=
0
;
this
.
ruleLb
.
text
=
window
[
'rule'
];
NetManager
.
ins
.
showLog
(
GetBuriedData
(
11
));
...
...
egret/src/startScene/StartScene.ts
View file @
ec44ebf9
...
...
@@ -320,10 +320,10 @@ export default class StartScene extends Scene {
private
onLoad
():
void
{
// console.log('屏幕',screen.width,screen.height)
if
(
screen
.
height
/
screen
.
width
>=
2.22
)
{
this
.
startList
.
y
=
140
;
}
//
if(screen.height/screen.width >= 2.22)
//
{
//
this.startList.y = 140;
//
}
if
(
GFun
.
isIOS
){
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
IOSNO_PANEL
);
}
else
{
...
...
@@ -428,12 +428,12 @@ export default class StartScene extends Scene {
this
[
"card"
+
i
+
"Group"
].
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
[
"func"
+
i
],
this
);
}
if
(
screen
.
height
/
screen
.
width
>=
2.22
){
this
.
startList
.
height
=
1080
/
window
.
innerWidth
*
window
.
innerHeight
-
140
;
}
else
{
this
.
startList
.
height
=
1080
/
window
.
innerWidth
*
window
.
innerHeight
;
}
//
this.startList.height = 1080 / window.innerWidth * window.innerHeight;
//
if(screen.height/screen.width >= 2.22){
//
this.startList.height = 1080 / window.innerWidth * window.innerHeight-140;
//
}else{
//
this.startList.height = 1080 / window.innerWidth * window.innerHeight;
//
}
this
.
startList
.
height
=
1080
/
window
.
innerWidth
*
window
.
innerHeight
;
//this.startList.height = 750 / window.innerWidth * window.innerHeight;
this
.
func6
=
this
.
showCard
.
bind
(
this
,
6
,
this
.
mData
.
baseinfo
.
eggCardStatus
)
...
...
@@ -622,9 +622,9 @@ export default class StartScene extends Scene {
this
.
taskGroup
.
height
=
taskRenderer
.
height
this
.
height
+=
(
this
.
taskGroup
.
height
-
500
)
let
setHeight
=
500
;
if
(
screen
.
height
/
screen
.
width
>=
2.22
){
setHeight
=
700
;
}
//
if(screen.height/screen.width >= 2.22){
//
setHeight = 700;
//
}
if
(
this
.
diheight
<
this
.
startGroup
.
height
+
setHeight
)
{
console
.
log
(
'任务'
,
setHeight
,
this
.
startGroup
.
height
,
this
.
diheight
);
//4255 700 4955
...
...
@@ -660,7 +660,7 @@ export default class StartScene extends Scene {
private
handleAccept
()
{
let
shareCode
=
GFun
.
getQueryString
(
'shareCode'
);
console
.
log
(
'分享shareCode'
,
shareCode
);
//
console.log('分享shareCode',shareCode);
if
(
shareCode
)
{
NetManager
.
ins
.
acceptPopup
((
success
,
result
)
=>
{
console
.
log
(
'后端返回'
,
success
,
result
);
...
...
@@ -673,8 +673,9 @@ export default class StartScene extends Scene {
}
else
{
if
(
result
.
code
==
'100014'
){
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
ACCEPT_PANEL
,
{
acceptResult
:
false
,
content
:
"不能给自己助力哦,
\n
快去集稳卡吧~"
});
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
ACCEPT_PANEL
,
{
acceptResult
:
false
,
content
:
result
.
message
});
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
ACCEPT_PANEL
,
{
acceptResult
:
false
,
content
:
"助力失败啦,
\n
快让好友重新分享助力吧~"
});
}
}
},
shareCode
)
...
...
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