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
9039d432
Commit
9039d432
authored
Oct 29, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d2fe0438
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
17 deletions
+9
-17
index.html
egret/index.html
+1
-1
main2.tmproject
egret/resource/TextureMerger/main2.tmproject
+1
-1
Turntable.ts
egret/src/panels/TurntablePanel/Turntable.ts
+3
-3
TurntablePrizePanel.ts
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
+3
-1
turnabledojoin.json
mock/happyclear/turnabledojoin.json
+1
-11
No files found.
egret/index.html
View file @
9039d432
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<script
src=
"libs/zepto.min.js"
></script>
<script
src=
"libs/zepto.min.js"
></script>
<script
src=
"libs/security.js"
></script>
<script
src=
"libs/security.js"
></script>
<script
src=
"libs/downloadApp.js"
></script>
<script
src=
"libs/downloadApp.js"
></script>
<script
src=
"libs/svga.egret.min.js"
></script>
<script
src=
"libs/svga.egret.min
2
.js"
></script>
<script
src=
"libs/aes.js"
></script>
<script
src=
"libs/aes.js"
></script>
<script
src=
"libs/pad-zeropadding.js"
></script>
<script
src=
"libs/pad-zeropadding.js"
></script>
<!-- //线上不需要 -->
<!-- //线上不需要 -->
...
...
egret/resource/TextureMerger/main2.tmproject
View file @
9039d432
This diff is collapsed.
Click to expand it.
egret/src/panels/TurntablePanel/Turntable.ts
View file @
9039d432
...
@@ -165,9 +165,9 @@ export default class Turntable extends Panel {
...
@@ -165,9 +165,9 @@ export default class Turntable extends Panel {
PanelCtrl
.
instance
.
show
(
"TurntableNoPrizePanel"
,
{
type
:
3
});
PanelCtrl
.
instance
.
show
(
"TurntableNoPrizePanel"
,
{
type
:
3
});
}
else
{
}
else
{
loadSvga
(
getResPath
()
+
'resource/assets/svgas/turnprize.svga'
).
then
(
async
(
mv
:
any
)
=>
{
loadSvga
(
getResPath
()
+
'resource/assets/svgas/turnprize.svga'
).
then
(
async
(
mv
:
any
)
=>
{
let
_data
=
Utils
.
deepClone
(
data
);
//
let _data = Utils.deepClone(data);
_
data
.
mv
=
mv
;
data
.
mv
=
mv
;
PanelCtrl
.
instance
.
show
(
'TurnPrizePanel'
,
_
data
);
PanelCtrl
.
instance
.
show
(
'TurnPrizePanel'
,
data
);
});
});
}
}
});
});
...
...
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @
9039d432
...
@@ -37,7 +37,9 @@ export default class TurnPrizePanel extends Panel {
...
@@ -37,7 +37,9 @@ export default class TurnPrizePanel extends Panel {
updateOption
(
option
:
any
)
{
updateOption
(
option
:
any
)
{
const
{
categoryType
,
img
,
num
,
propType
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
const
{
categoryType
,
img
,
num
,
propType
}
=
option
;
// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this
[
'propnums'
].
text
=
'x'
+
num
;
this
[
'propnums'
].
text
=
'x1'
;
if
(
num
)
this
[
'propnums'
].
text
=
'x'
+
num
;
switch
(
categoryType
)
{
switch
(
categoryType
)
{
case
2
:
case
2
:
this
[
'blood'
].
visible
=
true
;
this
[
'blood'
].
visible
=
true
;
...
...
mock/happyclear/turnabledojoin.json
View file @
9039d432
{
{
"success"
:
true
,
"code"
:
"0000000000"
,
"desc"
:
"OK"
,
"timestamp"
:
1572269035379
,
"data"
:{
"isScratchCard"
:
false
,
"option"
:{
"id"
:
""
,
"day"
:
null
,
"categoryType"
:
3
,
"title"
:
"11"
,
"rate"
:
"11"
,
"minValue"
:
null
,
"maxValue"
:
null
,
"coinType"
:
null
,
"propType"
:
2
,
"num"
:
null
,
"img"
:
""
,
"appItemId"
:
null
,
"name"
:
""
,
"value"
:
""
},
"orderNum"
:
null
}}
"success"
:
true
,
\ No newline at end of file
"code"
:
"0000000000"
,
"desc"
:
"OK"
,
"timestamp"
:
1572262646931
,
"data"
:
{
"isScratchCard"
:
false
,
"option"
:
null
,
"orderNum"
:
null
}
}
\ No newline at end of file
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