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
bb51e54a
Commit
bb51e54a
authored
Oct 29, 2019
by
wjf
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev
parents
45c5db23
2fea965a
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
224 additions
and
712 deletions
+224
-712
exml.json
egret/.wing/exml.json
+6
-2
PrizePanel.ts
egret/libs/new_wx/components/PrizePanel.ts
+32
-3
scratchprize.tmproject
egret/resource/TextureMerger/scratchprize.tmproject
+1
-0
default.res.json
egret/resource/default.res.json
+1
-1
BackSkin.exml
egret/resource/skins/BackSkin.exml
+3
-3
BoxSkin.exml
egret/resource/skins/BoxSkin.exml
+10
-4
MapSkin.exml
egret/resource/skins/MapSkin.exml
+28
-28
PrizeSkin.exml
egret/resource/skins/PrizeSkin.exml
+7
-1
MainScene.ts
egret/src/mainScene/MainScene.ts
+31
-24
MapScene.ts
egret/src/mapScene/MapScene.ts
+8
-20
BackPanel.ts
egret/src/panels/BackPanel.ts
+7
-4
BagPanel.ts
egret/src/panels/BagPanel.ts
+5
-4
BoxPanel.ts
egret/src/panels/BoxPanel.ts
+33
-4
ScratchPanel.ts
egret/src/panels/ScratchPanel.ts
+1
-1
Turntable.ts
egret/src/panels/TurntablePanel/Turntable.ts
+3
-0
TurntablePrizePanel.ts
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
+2
-1
config.js
mock/config.js
+1
-1
getBackReward.json
mock/happyclear/getBackReward.json
+3
-2
home.json
mock/happyclear/home.json
+0
-600
openTreasureBox.json
mock/happyclear/openTreasureBox.json
+24
-7
scratchGetTaskInfo.json
mock/happyclear/scratchGetTaskInfo.json
+1
-1
submit.json
mock/happyclear/submit.json
+17
-1
No files found.
egret/.wing/exml.json
View file @
bb51e54a
...
...
@@ -115,6 +115,10 @@
{
"key"
:
"data.img"
,
"value"
:
"http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif"
},
{
"key"
:
"data.url"
,
"value"
:
"turnprize_icon1_png"
}
]
},
...
...
@@ -164,8 +168,8 @@
"16cc233ca3b"
:
{
"bindingDataTestObj"
:
[
{
"key"
:
"data.
img
"
,
"value"
:
"
http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif
"
"key"
:
"data.
url
"
,
"value"
:
"
turnprize_icon1_png
"
}
]
},
...
...
egret/libs/new_wx/components/PrizePanel.ts
View file @
bb51e54a
...
...
@@ -11,14 +11,43 @@ import { NetManager } from "../../tw/manager/NetManager";
import
Panel
from
"./Panel"
;
export
default
class
PrizePanel
extends
Panel
{
_level
;
updateOption
(
option
:
any
)
{
const
{
categoryType
,
img
,
num
,
propType
,
realValue
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x1'
;
if
(
num
)
this
[
'propnums'
].
text
=
'x'
+
num
;
switch
(
categoryType
)
{
case
2
:
this
[
'blood'
].
visible
=
true
;
this
[
'numsgroup'
].
visible
=
true
;
break
;
case
3
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'img'
].
visible
=
true
;
this
.
data
.
url
=
`turnprize_icon
${
propType
}
_png`
;
break
;
case
4
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'money'
].
visible
=
true
;
this
[
'propnums'
].
text
=
'x'
+
realValue
;
break
;
default
:
this
[
'img'
].
visible
=
true
;
this
.
data
.
url
=
img
;
break
;
}
}
start
(
data
)
{
super
.
start
();
setGray
(
this
[
'pica'
]);
setGray
(
this
[
'picb'
]);
setGray
(
this
[
'picc'
]);
this
.
_level
=
parseInt
(
data
.
level
+
''
);
const
itemid
=
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
).
lottery
.
itemId
;
this
.
data
.
img
=
`http://yun.duiba.com.cn/db_games/
${
window
[
'imgver'
]}
/
${
itemid
}
.png`
;
this
.
updateOption
(
data
.
option
)
;
this
[
'shareBtn'
].
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
NetManager
.
ins
.
clickLog
(
getlogItem
(
15
));
...
...
@@ -29,7 +58,7 @@ export default class PrizePanel extends Panel {
},
this
);
this
[
'goBtn'
].
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
this
.
hidePanel
();
if
(
this
.
_level
+
1
<=
70
)
if
(
this
.
_level
+
1
<=
window
[
'last_level'
]
)
changeMapScene
({
level
:
this
.
_level
+
1
});
else
changeMapScene
();
...
...
egret/resource/TextureMerger/scratchprize.tmproject
0 → 100644
View file @
bb51e54a
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratchprize","version":5,"files":["../assets/scratch/prize/scratchPrize_bg.png","../assets/scratch/prize/scratchPrize_btn.png","../assets/scratch/prize/scratchPrize_game_btn.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @
bb51e54a
...
...
@@ -134,7 +134,7 @@
},
{
"keys"
:
"scratchPrize_bg_png,scratchPrize_btn_png,scratchPrize_game_btn_png"
,
"name"
:
"scratchprize
panel
"
"name"
:
"scratchprize"
},
{
"keys"
:
"scratch_rule_bg_png"
,
...
...
egret/resource/skins/BackSkin.exml
View file @
bb51e54a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin
class=
"BackSkin"
width=
"750"
height=
"1206"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<w:Config
id=
"16e0235c541"
/>
<e:Component
y=
"8
06.52
"
skinName=
"ADSmallSkin"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
y=
"-
30.27"
source=
"backbg_png"
horizontalCenter=
"
0"
/>
<e:Component
y=
"8
48.94
"
skinName=
"ADSmallSkin"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Image
y=
"-
48.45"
source=
"backbg_png"
horizontalCenter=
"0"
scale9Grid=
"93,550,564,42"
height=
"91
0"
/>
<e:Image
y=
"-20.27"
horizontalCenter=
"0"
x=
"10"
source=
""
/>
<e:Image
id=
"img"
width=
"508"
height=
"225"
source=
"{data.url}"
horizontalCenter=
"0"
y=
"377.76"
visible=
"false"
/>
<e:Image
id=
"money"
source=
"signprize元宝_png"
y=
"368.2"
horizontalCenter=
"0"
scaleX=
"0.8"
scaleY=
"0.8"
visible=
"false"
/>
...
...
@@ -19,7 +19,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button
id=
"inviteBtn"
label=
""
y=
"
67
5"
horizontalCenter=
"12"
>
<e:Button
id=
"inviteBtn"
label=
""
y=
"
720.4
5"
horizontalCenter=
"12"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"back按钮 副本 91_png"
source.down=
"back按钮 副本 91_png"
source.disabled=
"back按钮 副本 91_png"
/>
...
...
egret/resource/skins/BoxSkin.exml
View file @
bb51e54a
...
...
@@ -2,9 +2,8 @@
<e:Skin
class=
"BoxSkin"
width=
"750"
height=
"1205"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<w:Config
id=
"16cc233ca3b"
/>
<e:Component
y=
"739.52"
skinName=
"ADSmallSkin"
x=
"84"
visible=
"false"
/>
<e:Image
source=
"boxbg_png"
y=
"33.76"
horizontalCenter=
"0"
/>
<e:Image
id=
"img"
y=
"355"
touchEnabled=
"true"
source=
"{data.img}"
width=
"512"
height=
"240"
scaleX=
"0.9"
scaleY=
"0.9"
horizontalCenter=
"0"
/>
<e:Button
id=
"closeBtn"
label=
""
x=
"604.96"
y=
"190.84"
>
<e:Image
source=
"boxbg_png"
y=
"-32.9"
horizontalCenter=
"0"
scale9Grid=
"93,413,564,43"
height=
"783"
/>
<e:Button
id=
"closeBtn"
label=
""
x=
"604.96"
y=
"124.18"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"closeCommonBtn_png"
source.down=
"closeCommonBtn_png"
source.disabled=
"closeCommonBtn_png"
/>
...
...
@@ -12,7 +11,14 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button
id=
"close2Btn"
label=
""
y=
"602"
horizontalCenter=
"0"
>
<e:Image
id=
"img"
width=
"508"
height=
"225"
source=
"{data.url}"
horizontalCenter=
"0"
y=
"311.1"
/>
<e:Image
id=
"money"
source=
"signprize元宝_png"
y=
"301.54"
horizontalCenter=
"0"
scaleX=
"0.8"
scaleY=
"0.8"
visible=
"false"
/>
<e:Image
id=
"blood"
source=
"singprize体力_png"
y=
"264.14"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Group
id=
"numsgroup"
x=
"396.38"
y=
"309.74"
visible=
"false"
>
<e:Image
id=
"numsbg"
source=
"signprize_numsbg_png"
x=
"0"
y=
"0"
/>
<e:Label
id=
"propnums"
text=
"X8"
size=
"22"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
/>
</e:Group>
<e:Button
id=
"close2Btn"
label=
""
y=
"597.34"
horizontalCenter=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"boxbtn_png"
source.down=
"boxbtn_png"
source.disabled=
"boxbtn_png"
/>
...
...
egret/resource/skins/MapSkin.exml
View file @
bb51e54a
...
...
@@ -105,6 +105,34 @@
<e:Label
id=
"inviteTips"
text=
"立即到账"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
textColor=
"0xffffff"
size=
"18"
fontFamily=
"Helvetica"
/>
</e:Group>
</e:Group>
<e:Group
id=
"turnTableGroup"
x=
"567.36"
y=
"318.43"
>
<e:Button
id=
"turnTableBtn"
label=
""
x=
"33.36"
y=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"map大转盘_png"
source.down=
"map大转盘_png"
source.disabled=
"map大转盘_png"
/>
<e:Label
id=
"labelDisplay"
horizontalCenter=
"0"
verticalCenter=
"0"
/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
x=
"6"
y=
"10.24"
>
<e:Image
id=
"turnTableTipsBg"
source=
"invite_txtbg_png"
y=
"0"
touchEnabled=
"false"
/>
<e:Label
id=
"turnTableTips"
text=
"立即到"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
textColor=
"0xFFFFFF"
size=
"18"
fontFamily=
"Helvetica"
/>
</e:Group>
</e:Group>
<e:Group
id=
"scratchGroup"
y=
"476"
right=
"18"
>
<e:Button
id=
"scratchBtn"
label=
""
y=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"map刮现金红包_png"
source.down=
"map刮现金红包_png"
source.disabled=
"map刮现金红包_png"
/>
<e:Label
id=
"labelDisplay"
horizontalCenter=
"0"
verticalCenter=
"0"
/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
x=
"-24"
>
<e:Image
id=
"scratchTipsBg"
source=
"invite_txtbg_png"
y=
"0"
touchEnabled=
"false"
/>
<e:Label
id=
"scratchTips"
text=
"立即到"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
textColor=
"0xFFFFFF"
size=
"18"
fontFamily=
"Helvetica"
/>
</e:Group>
</e:Group>
<e:Group
x=
"30"
scaleX=
"1.4"
scaleY=
"1.4"
bottom=
"23"
>
<e:Group
id=
"settingGroup"
x=
"2"
y=
"6.08"
visible=
"false"
>
<e:Image
id=
"settingbg"
source=
"设置bg_png"
y=
"0"
x=
"0"
scale9Grid=
"9,84,54,76"
height=
"231"
/>
...
...
@@ -164,33 +192,5 @@
</e:Group>
<e:Label
text=
"点击开宝箱"
y=
"791"
size=
"37"
horizontalCenter=
"0"
bold=
"true"
/>
</e:Group>
<e:Group
id=
"turnTableGroup"
x=
"567.36"
y=
"318.43"
>
<e:Button
id=
"turnTableBtn"
label=
""
x=
"33.36"
y=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"map大转盘_png"
source.down=
"map大转盘_png"
source.disabled=
"map大转盘_png"
/>
<e:Label
id=
"labelDisplay"
horizontalCenter=
"0"
verticalCenter=
"0"
/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
x=
"6"
y=
"10.24"
>
<e:Image
id=
"turnTableTipsBg"
source=
"invite_txtbg_png"
y=
"0"
touchEnabled=
"false"
/>
<e:Label
id=
"turnTableTips"
text=
"立即到"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
textColor=
"0xFFFFFF"
size=
"18"
fontFamily=
"Helvetica"
/>
</e:Group>
</e:Group>
<e:Group
id=
"scratchGroup"
y=
"476"
right=
"18"
>
<e:Button
id=
"scratchBtn"
label=
""
y=
"0"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
<e:Image
width=
"100%"
height=
"100%"
source=
"map刮现金红包_png"
source.down=
"map刮现金红包_png"
source.disabled=
"map刮现金红包_png"
/>
<e:Label
id=
"labelDisplay"
horizontalCenter=
"0"
verticalCenter=
"0"
/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group
x=
"-24"
>
<e:Image
id=
"scratchTipsBg"
source=
"invite_txtbg_png"
y=
"0"
touchEnabled=
"false"
/>
<e:Label
id=
"scratchTips"
text=
"立即到"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
textColor=
"0xFFFFFF"
size=
"18"
fontFamily=
"Helvetica"
/>
</e:Group>
</e:Group>
<w:Config
id=
"16c89f4ae1a"
/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @
bb51e54a
...
...
@@ -4,6 +4,13 @@
<e:Component
y=
"859.74"
skinName=
"ADSmallSkin"
x=
"84"
visible=
"false"
/>
<e:Image
id=
"light"
source=
"common_prizelight_png"
x=
"374.19"
y=
"253.76"
anchorOffsetX=
"375.76"
anchorOffsetY=
"327.27"
/>
<e:Image
source=
"prizePanelbg_png"
y=
"61.15"
horizontalCenter=
"0.5"
/>
<e:Image
id=
"img"
width=
"508"
height=
"225"
source=
"{data.url}"
horizontalCenter=
"0"
y=
"411.76"
visible=
"false"
/>
<e:Image
id=
"money"
source=
"signprize元宝_png"
y=
"402.2"
horizontalCenter=
"0"
scaleX=
"0.8"
scaleY=
"0.8"
visible=
"false"
/>
<e:Image
id=
"blood"
source=
"singprize体力_png"
y=
"364.8"
horizontalCenter=
"0"
visible=
"false"
/>
<e:Group
id=
"numsgroup"
x=
"396.38"
y=
"410.4"
visible=
"false"
>
<e:Image
id=
"numsbg"
source=
"signprize_numsbg_png"
x=
"0"
y=
"0"
/>
<e:Label
id=
"propnums"
text=
"X8"
size=
"22"
horizontalCenter=
"0"
verticalCenter=
"0"
verticalAlign=
"middle"
textAlign=
"center"
/>
</e:Group>
<e:Button
id=
"closeBtn"
label=
""
x=
"618"
y=
"235.25"
>
<e:skinName>
<e:Skin
states=
"up,down,disabled"
>
...
...
@@ -28,7 +35,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image
id=
"img"
y=
"429.28"
touchEnabled=
"true"
source=
"{data.img}"
width=
"512"
height=
"240"
x=
"117"
/>
<e:Image
id=
"picb"
source=
"点亮 副本 2_png"
x=
"142"
y=
"118.28"
/>
<e:Image
id=
"pica"
source=
"点亮 副本 2_png"
x=
"608"
y=
"118.28"
scaleX=
"-1"
/>
<e:Image
id=
"picc"
source=
"点亮_png"
y=
"69.28"
x=
"280"
/>
...
...
egret/src/mainScene/MainScene.ts
View file @
bb51e54a
...
...
@@ -2476,34 +2476,41 @@ export default class MainScene extends Scene {
updateMainTimerAfterGetData
();
//submit之后再判断一次home,更新倒计时
});
const
submitData
=
DataManager
.
ins
.
getData
(
'hc_submit'
).
data
;
if
(
submitData
.
prizeType
==
1
)
{
//提交成功后捞结果
NetManager
.
ins
.
getPlugOrderStatus
((
s
)
=>
{
if
(
submitData
.
option
)
{
Loading2
.
instace
.
hide
();
playSound
(
SoundType
.
sucess
);
if
(
s
)
{
const
data
=
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
);
//区分奖品
if
(
data
.
lottery
&&
data
.
lottery
.
type
!=
"thanks"
)
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
}
else
{
//失败直接显示未中奖
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
},
submitData
.
prizeResponse
.
orderNum
,
()
=>
{
return
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
).
result
==
0
});
}
else
if
(
submitData
.
prizeType
==
2
)
{
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
'prize2'
,
{
level
:
this
.
chapter
});
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
,
option
:
submitData
.
option
});
}
else
{
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
// if (submitData.prizeType == 1) {
// //提交成功后捞结果
// NetManager.ins.getPlugOrderStatus((s) => {
// Loading2.instace.hide();
// playSound(SoundType.sucess);
// if (s) {
// const data = DataManager.ins.getData('getPlugOrderStatus');
// //区分奖品
// if (data.lottery && data.lottery.type != "thanks") {
// PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter });
// } else {
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
// } else {
// //失败直接显示未中奖
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
// },
// submitData.prizeResponse.orderNum,
// () => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
// } else if (submitData.prizeType == 2) {
// Loading2.instace.hide();
// PanelCtrl.instance.show('prize2', { level: this.chapter });
// } else {
// Loading2.instace.hide();
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
}
else
{
Loading2
.
instace
.
hide
();
if
(
!
data
)
{
...
...
egret/src/mapScene/MapScene.ts
View file @
bb51e54a
...
...
@@ -773,33 +773,21 @@ export default class MapScene extends Scene {
this
[
'boxani'
].
touchEnabled
=
true
;
this
[
'boxani'
].
touchChildren
=
true
;
if
(
success
)
{
const
boxdata
=
DataManager
.
ins
.
getData
(
'hc_openTreasureBox'
).
data
;
const
hc_openTreasureBox
=
DataManager
.
ins
.
getData
(
'hc_openTreasureBox'
);
const
boxdata
=
hc_openTreasureBox
.
data
;
const
homeData
=
DataManager
.
ins
.
getData
(
'hc_home'
).
data
;
homeData
.
canReceiveTreasureBoxNum
=
boxdata
.
canReceiveTreasureBoxNum
;
homeData
.
nextRangeStarsNum
=
boxdata
.
nextRangeStarsNum
;
homeData
.
totalStarts
=
boxdata
.
totalStarts
;
homeData
.
isGetAllTreasureBox
=
boxdata
.
isGetAllTreasureBox
;
this
.
updateBox
();
const
data
=
DataManager
.
ins
.
getData
(
'hc_openTreasureBox'
).
data
;
NetManager
.
ins
.
getPlugOrderStatus
((
s
)
=>
{
if
(
s
)
{
const
data
=
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
);
//区分奖品
if
(
data
.
lottery
&&
data
.
lottery
.
type
!=
'thanks'
)
{
if
(
hc_openTreasureBox
.
success
&&
boxdata
&&
boxdata
.
option
)
{
PanelCtrl
.
instance
.
show
(
'box'
);
}
else
{
showToast
(
'哎呀!奖励与您擦肩而过!快继续闯关!'
);
}
}
else
{
showToast
(
'哎呀!奖励与您擦肩而过!快继续闯关!'
);
}
},
data
.
orderNum
,
()
=>
{
return
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
).
result
==
0
});
}
else
{
PanelCtrl
.
instance
.
show
(
'box2'
);
...
...
egret/src/panels/BackPanel.ts
View file @
bb51e54a
...
...
@@ -9,7 +9,7 @@ export default class BackPanel extends Panel {
start
(
data
)
{
super
.
start
();
this
.
showlog
();
addAdComp
(
84
,
8
06.52
,
this
,
56
)
addAdComp
(
84
,
8
48.94
,
this
,
56
)
const
backData
=
DataManager
.
ins
.
getData
(
'hc_getBackReward'
);
this
.
updateOption
(
backData
.
data
);
NetManager
.
ins
.
showLog
(
getlogItem
(
56
));
...
...
@@ -30,8 +30,10 @@ export default class BackPanel extends Panel {
}
updateOption
(
option
:
any
)
{
const
{
categoryType
,
img
,
num
,
propType
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
const
{
categoryType
,
img
,
num
,
propType
,
realValue
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x1'
;
if
(
num
)
this
[
'propnums'
].
text
=
'x'
+
num
;
switch
(
categoryType
)
{
case
2
:
...
...
@@ -46,6 +48,7 @@ export default class BackPanel extends Panel {
case
4
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'money'
].
visible
=
true
;
this
[
'propnums'
].
text
=
'x'
+
realValue
;
break
;
default
:
this
[
'img'
].
visible
=
true
;
...
...
egret/src/panels/BagPanel.ts
View file @
bb51e54a
...
...
@@ -47,14 +47,15 @@ export default class BagPanel extends Panel {
const
prop1Nums
=
getPropNums
(
PropType
.
HAMMER
);
const
prop3Nums
=
getPropNums
(
PropType
.
CHANCE_NUM
);
this
.
list
.
dataProvider
=
new
eui
.
ArrayCollection
([
{
type
:
'hammer'
,
nums
:
prop1Nums
},
{
type
:
'boom'
,
nums
:
prop2Nums
},
{
type
:
'hammer'
,
nums
:
prop1Nums
},
{
type
:
'change'
,
nums
:
prop3Nums
...
...
egret/src/panels/BoxPanel.ts
View file @
bb51e54a
...
...
@@ -12,13 +12,42 @@ export default class BoxPanel extends Panel {
},
this
);
this
.
showlog
();
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
const
itemid
=
DataManager
.
ins
.
getData
(
'getPlugOrderStatus'
).
lottery
.
itemId
;
this
.
data
.
img
=
`http://yun.duiba.com.cn/db_games/
${
window
[
'imgver'
]}
/
${
itemid
}
.png`
;
addAdComp
(
84
,
739.52
,
this
,
27
);
addAdComp
(
84
,
739.52
,
this
,
27
)
const
hc_openTreasureBox
=
DataManager
.
ins
.
getData
(
'hc_openTreasureBox'
);
const
boxdata
=
hc_openTreasureBox
.
data
;
this
.
updateOption
(
boxdata
.
option
);
}
updateOption
(
option
:
any
)
{
const
{
categoryType
,
img
,
num
,
propType
,
realValue
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x1'
;
if
(
num
)
this
[
'propnums'
].
text
=
'x'
+
num
;
switch
(
categoryType
)
{
case
2
:
this
[
'blood'
].
visible
=
true
;
this
[
'numsgroup'
].
visible
=
true
;
break
;
case
3
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'img'
].
visible
=
true
;
this
.
data
.
url
=
`turnprize_icon
${
propType
}
_png`
;
break
;
case
4
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'money'
].
visible
=
true
;
this
[
'propnums'
].
text
=
'x'
+
realValue
;
break
;
default
:
this
[
'img'
].
visible
=
true
;
this
.
data
.
url
=
img
;
break
;
}
}
showlog
()
{
NetManager
.
ins
.
showLog
(
getlogItem
(
17
));
NetManager
.
ins
.
showLog
(
getlogItem
(
27
));
...
...
egret/src/panels/ScratchPanel.ts
View file @
bb51e54a
...
...
@@ -141,7 +141,7 @@ export default class ScratchPanel extends Panel {
}
else
if
(
progress
<
0
)
{
progress
=
0
;
}
this
[
'numLabel'
].
text
=
`共
${
this
.
data
.
avatarList
.
length
}
位好友帮你刮了
${
progress
}
%`
;
this
[
'numLabel'
].
text
=
`共
${
this
.
data
.
avatarList
.
length
}
位好友帮你刮了
${
progress
.
toFixed
(
2
)
}
%`
;
this
[
"progressLabel"
].
text
=
`仅剩
${(
100
-
progress
).
toFixed
(
2
)}
%`
;
// 进度条文字
let
_width
=
this
[
"progressBg"
].
width
*
progress
/
100
;
// 宽度
let
dProgress
=
Math
.
abs
(
progress
-
this
[
"progress"
].
width
/
this
[
"progressBg"
].
width
);
// 比当前进度的差值的绝对值
...
...
egret/src/panels/TurntablePanel/Turntable.ts
View file @
bb51e54a
...
...
@@ -97,6 +97,7 @@ export default class Turntable extends Panel {
private
setBtnTouch
(
touchEnabled
:
boolean
)
{
this
.
start_btn
.
touchEnabled
=
touchEnabled
;
this
[
"closeBtn"
].
touchEnabled
=
touchEnabled
;
this
.
rulebtn
.
touchEnabled
=
touchEnabled
;
}
/**
...
...
@@ -120,6 +121,7 @@ export default class Turntable extends Panel {
NetManager
.
ins
.
hc_turnableDojoin
((
success
,
res
)
=>
{
NetManager
.
ins
.
hc_home
(()
=>
{
SceneCtrl
.
instance
.
updateScene
();
this
[
'nums'
].
text
=
`当前可用元宝:
${
getHomeData
().
wealth
}
`
;
},
window
[
'collectRuleId'
]);
Loading
.
instace
.
hide
();
// if(!success) {
...
...
@@ -153,6 +155,7 @@ export default class Turntable extends Panel {
break
;
default
:
PanelCtrl
.
instance
.
show
(
"TurntableNoPrizePanel"
,
{
type
:
3
});
break
;
}
return
;
...
...
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @
bb51e54a
...
...
@@ -35,7 +35,7 @@ export default class TurnPrizePanel extends Panel {
}
updateOption
(
option
:
any
)
{
const
{
categoryType
,
img
,
num
,
propType
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
const
{
categoryType
,
img
,
num
,
propType
,
realValue
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x1'
;
if
(
num
)
...
...
@@ -54,6 +54,7 @@ export default class TurnPrizePanel extends Panel {
case
4
:
this
[
'numsgroup'
].
visible
=
true
;
this
[
'money'
].
visible
=
true
;
this
[
'propnums'
].
text
=
'x'
+
realValue
;
break
;
default
:
this
[
'img'
].
visible
=
true
;
...
...
mock/config.js
View file @
bb51e54a
...
...
@@ -46,7 +46,7 @@ const config = {
data
:
'./happyclear/openTreasureBox.json'
},
'/customActivity/happyclear/home'
:
{
data
:
'./happyclear/home
max
.json'
data
:
'./happyclear/home.json'
},
'/customActivity/happyclear/getLevelInfo'
:
{
data
:
'./happyclear/getLevelInfo.json'
...
...
mock/happyclear/getBackReward.json
View file @
bb51e54a
...
...
@@ -2,11 +2,12 @@
"code"
:
"0000000000"
,
"data"
:{
"appItemId"
:
2322
,
"categoryType"
:
1
,
"categoryType"
:
2
,
"coinType"
:
1
,
"img"
:
"1
"
,
"img"
:
"//yun.dui88.com/images/201910/e6pmpk2pne.png
"
,
"maxValue"
:
2
,
"minValue"
:
1
,
"realValue"
:
87
,
"name"
:
"测试商品"
,
"num"
:
3
,
"propType"
:
2
,
...
...
mock/happyclear/home.json
View file @
bb51e54a
...
...
@@ -7,606 +7,6 @@
"wealth"
:
140
,
"totalStars"
:
359
,
"levels"
:
[
{
"levelNum"
:
1
,
"maxScore"
:
39870
,
"stars"
:
3
},
{
"levelNum"
:
2
,
"maxScore"
:
36770
,
"stars"
:
3
},
{
"levelNum"
:
3
,
"maxScore"
:
28800
,
"stars"
:
3
},
{
"levelNum"
:
4
,
"maxScore"
:
36340
,
"stars"
:
3
},
{
"levelNum"
:
5
,
"maxScore"
:
64750
,
"stars"
:
3
},
{
"levelNum"
:
6
,
"maxScore"
:
59590
,
"stars"
:
3
},
{
"levelNum"
:
7
,
"maxScore"
:
37810
,
"stars"
:
3
},
{
"levelNum"
:
8
,
"maxScore"
:
24050
,
"stars"
:
3
},
{
"levelNum"
:
9
,
"maxScore"
:
43210
,
"stars"
:
3
},
{
"levelNum"
:
10
,
"maxScore"
:
25630
,
"stars"
:
3
},
{
"levelNum"
:
11
,
"maxScore"
:
25420
,
"stars"
:
3
},
{
"levelNum"
:
12
,
"maxScore"
:
32580
,
"stars"
:
3
},
{
"levelNum"
:
13
,
"maxScore"
:
56700
,
"stars"
:
3
},
{
"levelNum"
:
14
,
"maxScore"
:
34450
,
"stars"
:
3
},
{
"levelNum"
:
15
,
"maxScore"
:
42080
,
"stars"
:
3
},
{
"levelNum"
:
16
,
"maxScore"
:
18990
,
"stars"
:
3
},
{
"levelNum"
:
17
,
"maxScore"
:
51180
,
"stars"
:
3
},
{
"levelNum"
:
18
,
"maxScore"
:
38390
,
"stars"
:
3
},
{
"levelNum"
:
19
,
"maxScore"
:
20160
,
"stars"
:
3
},
{
"levelNum"
:
20
,
"maxScore"
:
55860
,
"stars"
:
3
},
{
"levelNum"
:
21
,
"maxScore"
:
21630
,
"stars"
:
3
},
{
"levelNum"
:
22
,
"maxScore"
:
115670
,
"stars"
:
3
},
{
"levelNum"
:
23
,
"maxScore"
:
26840
,
"stars"
:
3
},
{
"levelNum"
:
24
,
"maxScore"
:
39310
,
"stars"
:
3
},
{
"levelNum"
:
25
,
"maxScore"
:
28010
,
"stars"
:
3
},
{
"levelNum"
:
26
,
"maxScore"
:
36710
,
"stars"
:
3
},
{
"levelNum"
:
27
,
"maxScore"
:
37610
,
"stars"
:
3
},
{
"levelNum"
:
28
,
"maxScore"
:
67430
,
"stars"
:
3
},
{
"levelNum"
:
29
,
"maxScore"
:
118210
,
"stars"
:
3
},
{
"levelNum"
:
30
,
"maxScore"
:
52800
,
"stars"
:
3
},
{
"levelNum"
:
31
,
"maxScore"
:
32060
,
"stars"
:
3
},
{
"levelNum"
:
32
,
"maxScore"
:
15000
,
"stars"
:
3
},
{
"levelNum"
:
33
,
"maxScore"
:
36350
,
"stars"
:
3
},
{
"levelNum"
:
34
,
"maxScore"
:
35930
,
"stars"
:
3
},
{
"levelNum"
:
35
,
"maxScore"
:
69590
,
"stars"
:
3
},
{
"levelNum"
:
36
,
"maxScore"
:
65520
,
"stars"
:
3
},
{
"levelNum"
:
37
,
"maxScore"
:
72220
,
"stars"
:
3
},
{
"levelNum"
:
38
,
"maxScore"
:
46450
,
"stars"
:
3
},
{
"levelNum"
:
39
,
"maxScore"
:
46340
,
"stars"
:
3
},
{
"levelNum"
:
40
,
"maxScore"
:
50220
,
"stars"
:
3
},
{
"levelNum"
:
41
,
"maxScore"
:
35080
,
"stars"
:
3
},
{
"levelNum"
:
42
,
"maxScore"
:
20690
,
"stars"
:
3
},
{
"levelNum"
:
43
,
"maxScore"
:
22950
,
"stars"
:
3
},
{
"levelNum"
:
44
,
"maxScore"
:
32270
,
"stars"
:
3
},
{
"levelNum"
:
45
,
"maxScore"
:
77730
,
"stars"
:
3
},
{
"levelNum"
:
46
,
"maxScore"
:
37680
,
"stars"
:
3
},
{
"levelNum"
:
47
,
"maxScore"
:
53230
,
"stars"
:
3
},
{
"levelNum"
:
48
,
"maxScore"
:
58830
,
"stars"
:
3
},
{
"levelNum"
:
49
,
"maxScore"
:
95480
,
"stars"
:
3
},
{
"levelNum"
:
50
,
"maxScore"
:
74370
,
"stars"
:
3
},
{
"levelNum"
:
51
,
"maxScore"
:
59300
,
"stars"
:
3
},
{
"levelNum"
:
52
,
"maxScore"
:
54770
,
"stars"
:
3
},
{
"levelNum"
:
53
,
"maxScore"
:
25710
,
"stars"
:
3
},
{
"levelNum"
:
54
,
"maxScore"
:
39220
,
"stars"
:
3
},
{
"levelNum"
:
55
,
"maxScore"
:
52860
,
"stars"
:
3
},
{
"levelNum"
:
56
,
"maxScore"
:
74730
,
"stars"
:
3
},
{
"levelNum"
:
57
,
"maxScore"
:
44770
,
"stars"
:
3
},
{
"levelNum"
:
58
,
"maxScore"
:
44610
,
"stars"
:
3
},
{
"levelNum"
:
59
,
"maxScore"
:
72310
,
"stars"
:
3
},
{
"levelNum"
:
60
,
"maxScore"
:
47880
,
"stars"
:
3
},
{
"levelNum"
:
61
,
"maxScore"
:
89810
,
"stars"
:
3
},
{
"levelNum"
:
62
,
"maxScore"
:
24420
,
"stars"
:
3
},
{
"levelNum"
:
63
,
"maxScore"
:
36960
,
"stars"
:
3
},
{
"levelNum"
:
64
,
"maxScore"
:
31840
,
"stars"
:
3
},
{
"levelNum"
:
65
,
"maxScore"
:
74220
,
"stars"
:
3
},
{
"levelNum"
:
66
,
"maxScore"
:
176910
,
"stars"
:
3
},
{
"levelNum"
:
67
,
"maxScore"
:
61010
,
"stars"
:
3
},
{
"levelNum"
:
68
,
"maxScore"
:
47900
,
"stars"
:
3
},
{
"levelNum"
:
69
,
"maxScore"
:
39940
,
"stars"
:
3
},
{
"levelNum"
:
70
,
"maxScore"
:
55620
,
"stars"
:
3
},
{
"levelNum"
:
71
,
"maxScore"
:
23480
,
"stars"
:
3
},
{
"levelNum"
:
72
,
"maxScore"
:
44670
,
"stars"
:
3
},
{
"levelNum"
:
73
,
"maxScore"
:
57750
,
"stars"
:
3
},
{
"levelNum"
:
74
,
"maxScore"
:
53350
,
"stars"
:
3
},
{
"levelNum"
:
75
,
"maxScore"
:
27430
,
"stars"
:
3
},
{
"levelNum"
:
76
,
"maxScore"
:
34370
,
"stars"
:
3
},
{
"levelNum"
:
77
,
"maxScore"
:
41730
,
"stars"
:
3
},
{
"levelNum"
:
78
,
"maxScore"
:
33080
,
"stars"
:
3
},
{
"levelNum"
:
79
,
"maxScore"
:
16860
,
"stars"
:
3
},
{
"levelNum"
:
80
,
"maxScore"
:
35460
,
"stars"
:
3
},
{
"levelNum"
:
81
,
"maxScore"
:
47380
,
"stars"
:
3
},
{
"levelNum"
:
82
,
"maxScore"
:
39230
,
"stars"
:
3
},
{
"levelNum"
:
83
,
"maxScore"
:
33710
,
"stars"
:
3
},
{
"levelNum"
:
84
,
"maxScore"
:
49520
,
"stars"
:
3
},
{
"levelNum"
:
85
,
"maxScore"
:
55970
,
"stars"
:
3
},
{
"levelNum"
:
86
,
"maxScore"
:
94160
,
"stars"
:
3
},
{
"levelNum"
:
87
,
"maxScore"
:
49370
,
"stars"
:
3
},
{
"levelNum"
:
88
,
"maxScore"
:
41570
,
"stars"
:
3
},
{
"levelNum"
:
89
,
"maxScore"
:
34480
,
"stars"
:
3
},
{
"levelNum"
:
90
,
"maxScore"
:
77170
,
"stars"
:
3
},
{
"levelNum"
:
91
,
"maxScore"
:
36230
,
"stars"
:
3
},
{
"levelNum"
:
92
,
"maxScore"
:
36890
,
"stars"
:
3
},
{
"levelNum"
:
93
,
"maxScore"
:
33800
,
"stars"
:
3
},
{
"levelNum"
:
94
,
"maxScore"
:
34200
,
"stars"
:
3
},
{
"levelNum"
:
95
,
"maxScore"
:
39460
,
"stars"
:
3
},
{
"levelNum"
:
96
,
"maxScore"
:
30800
,
"stars"
:
2
},
{
"levelNum"
:
97
,
"maxScore"
:
62330
,
"stars"
:
3
},
{
"levelNum"
:
98
,
"maxScore"
:
43080
,
"stars"
:
3
},
{
"levelNum"
:
99
,
"maxScore"
:
43850
,
"stars"
:
3
},
{
"levelNum"
:
100
,
"maxScore"
:
58060
,
"stars"
:
3
},
{
"levelNum"
:
101
,
"maxScore"
:
33440
,
"stars"
:
3
},
{
"levelNum"
:
102
,
"maxScore"
:
37070
,
"stars"
:
3
},
{
"levelNum"
:
103
,
"maxScore"
:
80120
,
"stars"
:
3
},
{
"levelNum"
:
104
,
"maxScore"
:
37370
,
"stars"
:
3
},
{
"levelNum"
:
105
,
"maxScore"
:
63770
,
"stars"
:
3
},
{
"levelNum"
:
106
,
"maxScore"
:
118590
,
"stars"
:
3
},
{
"levelNum"
:
107
,
"maxScore"
:
43040
,
"stars"
:
3
},
{
"levelNum"
:
108
,
"maxScore"
:
116110
,
"stars"
:
3
},
{
"levelNum"
:
109
,
"maxScore"
:
94310
,
"stars"
:
3
},
{
"levelNum"
:
110
,
"maxScore"
:
61970
,
"stars"
:
3
},
{
"levelNum"
:
111
,
"maxScore"
:
44820
,
"stars"
:
3
},
{
"levelNum"
:
112
,
"maxScore"
:
70240
,
"stars"
:
3
},
{
"levelNum"
:
113
,
"maxScore"
:
37160
,
"stars"
:
3
},
{
"levelNum"
:
114
,
"maxScore"
:
87000
,
"stars"
:
3
},
{
"levelNum"
:
115
,
"maxScore"
:
37340
,
"stars"
:
3
},
{
"levelNum"
:
116
,
"maxScore"
:
107460
,
"stars"
:
3
},
{
"levelNum"
:
117
,
"maxScore"
:
48130
,
"stars"
:
3
},
{
"levelNum"
:
118
,
"maxScore"
:
67190
,
"stars"
:
3
},
{
"levelNum"
:
119
,
"maxScore"
:
52010
,
"stars"
:
3
},
{
"levelNum"
:
120
,
"maxScore"
:
47440
,
"stars"
:
3
}
],
"remainProp"
:
[
{
...
...
mock/happyclear/openTreasureBox.json
View file @
bb51e54a
{
"success"
:
fals
e
,
"success"
:
tru
e
,
"code"
:
"0000000000"
,
"desc"
:
"OK"
,
"timestamp"
:
15
66558623308
,
"timestamp"
:
15
72332426229
,
"data"
:
{
"canReceiveTreasureBoxNum"
:
99
,
"nextRangeStarsNum"
:
25
,
"isGetAllTreasureBox"
:
0
,
"orderNum"
:
"1078836456709300393"
,
"totalStars"
:
12
"canReceiveTreasureBoxNum"
:
1110
,
"nextRangeStarsNum"
:
8
,
"totalStars"
:
6
,
"isGetAllTreasureBox"
:
false
,
"orderNum"
:
null
,
"option"
:
{
"id"
:
"41"
,
"day"
:
null
,
"realValue"
:
87
,
"categoryType"
:
4
,
"title"
:
"游戏次数2"
,
"rate"
:
"10"
,
"minValue"
:
null
,
"maxValue"
:
null
,
"coinType"
:
1
,
"propType"
:
2
,
"num"
:
null
,
"img"
:
"//yun.dui88.com/images/201910/e6pmpk2pne.png"
,
"appItemId"
:
null
,
"name"
:
""
,
"value"
:
""
}
}
}
\ No newline at end of file
mock/happyclear/scratchGetTaskInfo.json
View file @
bb51e54a
...
...
@@ -5,7 +5,7 @@
"timestamp"
:
1572318933388
,
"data"
:
{
"scratchCardTaskId"
:
1
,
"taskStatus"
:
1
,
"taskStatus"
:
2
,
"prizeImage"
:
"//yun.dui88.com/images/201910/e6pmpk2pne.png"
,
"currentTime"
:
1572318933366
,
"endTime"
:
1572358710000
,
...
...
mock/happyclear/submit.json
View file @
bb51e54a
...
...
@@ -4,7 +4,23 @@
"desc"
:
"OK"
,
"timestamp"
:
1566546925981
,
"data"
:{
"prizeType"
:
2
,
"option"
:
{
"id"
:
"41"
,
"day"
:
null
,
"realValue"
:
87
,
"categoryType"
:
5
,
"title"
:
"游戏次数2"
,
"rate"
:
"10"
,
"minValue"
:
null
,
"maxValue"
:
null
,
"coinType"
:
1
,
"propType"
:
2
,
"num"
:
null
,
"img"
:
"//yun.dui88.com/images/201910/e6pmpk2pne.png"
,
"appItemId"
:
null
,
"name"
:
""
,
"value"
:
""
},
"prizeResponse"
:{
"errorCode"
:
null
,
"changeMoney"
:
888
,
...
...
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