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
16e4ab76
Commit
16e4ab76
authored
Dec 31, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
01bd4a11
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
17 deletions
+6
-17
PrizePanel.ts
egret/libs/new_wx/components/PrizePanel.ts
+2
-5
PrizeSkin.exml
egret/resource/skins/PrizeSkin.exml
+2
-2
MapScene.ts
egret/src/mapScene/MapScene.ts
+0
-8
submit.json
mock/happyclear/submit.json
+2
-2
No files found.
egret/libs/new_wx/components/PrizePanel.ts
View file @
16e4ab76
...
...
@@ -15,10 +15,8 @@ export default class PrizePanel extends Panel {
const
{
categoryType
,
img
,
num
,
propType
,
realValue
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x1'
;
this
[
'propnums2'
].
text
=
'x1'
;
if
(
num
)
{
this
[
'propnums'
].
text
=
'x'
+
num
;
this
[
'propnums2'
].
text
=
'x'
+
num
;
}
switch
(
categoryType
)
{
case
2
:
...
...
@@ -31,10 +29,9 @@ export default class PrizePanel extends Panel {
this
.
data
.
url2
=
`common_prop
${
propType
}
_png`
;
break
;
case
4
:
this
[
'numsgroup'
].
visible
=
false
;
this
[
'propnums2'
].
visible
=
true
;
this
[
'numsgroup'
].
visible
=
true
;
this
[
'money'
].
visible
=
true
;
this
[
'propnums
2'
].
text
=
realValue
;
this
[
'propnums
'
].
text
=
`x
${
realValue
}
`
;
break
;
default
:
this
[
'img'
].
visible
=
true
;
...
...
egret/resource/skins/PrizeSkin.exml
View file @
16e4ab76
...
...
@@ -6,8 +6,8 @@
<e:Image
source=
"prizePanelbg_png"
y=
"61.15"
scale9Grid=
"87,543,522,23"
height=
"839"
x=
"28"
/>
<e:Image
id=
"img"
width=
"508"
height=
"225"
source=
"{data.url}"
horizontalCenter=
"0"
y=
"515.76"
visible=
"false"
/>
<e:Image
id=
"img2"
horizontalCenter=
"0"
y=
"515.76"
source=
"{data.url2}"
scaleX=
"0.7"
scaleY=
"0.7"
visible=
"false"
/>
<e:Image
id=
"
money"
y=
"516.2"
scaleX=
"0.6"
scaleY=
"0.6"
source=
"common_money_png"
x=
"150
"
visible=
"false"
/>
<e:Image
id=
"
blood"
y=
"518.8"
horizontalCenter=
"1.5"
source=
"common_blood_png"
scaleX=
"0.7"
scaleY=
"0.7
"
visible=
"false"
/>
<e:Image
id=
"
blood"
y=
"520.32"
horizontalCenter=
"1.5"
source=
"common_blood_png"
scaleX=
"0.7"
scaleY=
"0.7
"
visible=
"false"
/>
<e:Image
id=
"
money"
y=
"522.61"
horizontalCenter=
"0.5"
scaleX=
"0.7"
scaleY=
"0.7"
source=
"signprize元宝_png
"
visible=
"false"
/>
<e:Group
id=
"numsgroup"
x=
"410.38"
y=
"513.4"
scaleX=
"1.5"
scaleY=
"1.5"
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"
/>
...
...
egret/src/mapScene/MapScene.ts
View file @
16e4ab76
...
...
@@ -139,14 +139,6 @@ export default class MapScene extends Scene {
async
start
(
data
?)
{
super
.
start
();
NetManager
.
ins
.
hc_submit
(()
=>
{
const
submitData
=
DataManager
.
ins
.
getData
(
'hc_submit'
).
data
;
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
1
,
option
:
submitData
.
option
})
},
1
,
1
,
''
,
''
,
''
)
this
.
addIcon
();
// 添加Icon
this
.
sendInvite
();
...
...
mock/happyclear/submit.json
View file @
16e4ab76
...
...
@@ -8,13 +8,13 @@
"id"
:
"41"
,
"day"
:
null
,
"realValue"
:
999
,
"categoryType"
:
5
,
"categoryType"
:
4
,
"title"
:
"游戏次数2"
,
"rate"
:
"10"
,
"minValue"
:
null
,
"maxValue"
:
null
,
"coinType"
:
1
,
"propType"
:
3
,
"propType"
:
2
,
"num"
:
null
,
"img"
:
"//yun.dui88.com/images/201910/e6pmpk2pne.png"
,
"appItemId"
:
null
,
...
...
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