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
0d57fce6
Commit
0d57fce6
authored
Nov 21, 2020
by
qiuxu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复了一月份留下的bug
parent
d07aca85
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
29 deletions
+62
-29
workspace.xml
.idea/workspace.xml
+37
-19
ShopScene.ts
egret/src/Scenes/ShopScene/ShopScene.ts
+1
-1
mergeQuery.json
mock/projectX/mergeQuery.json
+24
-9
No files found.
.idea/workspace.xml
View file @
0d57fce6
This diff is collapsed.
Click to expand it.
egret/src/Scenes/ShopScene/ShopScene.ts
View file @
0d57fce6
...
@@ -225,7 +225,7 @@ export default class ShopScene extends Scene {
...
@@ -225,7 +225,7 @@ export default class ShopScene extends Scene {
if
(
!
_d
.
success
)
continue
;
if
(
!
_d
.
success
)
continue
;
for
(
let
i
=
0
;
i
<
=
_d
.
data
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
_d
.
data
.
length
;
i
++
)
{
if
(
_d
.
data
[
i
].
prizeId
==
'thanks'
)
{
if
(
_d
.
data
[
i
].
prizeId
==
'thanks'
)
{
_d
.
data
.
splice
(
i
,
1
);
_d
.
data
.
splice
(
i
,
1
);
}
}
...
...
mock/projectX/mergeQuery.json
View file @
0d57fce6
{
{
"data"
:
{
"data"
:
{
"ru_item_1"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.duiba.com.cn/polaris/100_100s.67c4f9ad32da23d0b5f838b48cbda0983591f4d9.jpg
\"
,
\"
id
\"
:
\"
odd16ea0b
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
欢趣农场实物1_@_介绍一下这个商品真的很值很值很值很值很值很值很值很值很值很值很值很值,买了不会后悔的赶紧兑换吧
\"
,
\"
prizeId
\"
:
\"
sss_item_1
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
34024
\"
,
\"
refType
\"
:
\"
object
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_10"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_2"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.duiba.com.cn/polaris/100_100s.67c4f9ad32da23d0b5f838b48cbda0983591f4d9.jpg
\"
,
\"
id
\"
:
\"
odd16ea0b
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
欢趣农场实物1_@_介绍一下这个商品真的很值很值很值很值很值很值很值很值很值很值很值很值,买了不会后悔的赶紧兑换吧
\"
,
\"
prizeId
\"
:
\"
sss_item_2
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
34024
\"
,
\"
refType
\"
:
\"
object
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_20"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_3"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.duiba.com.cn/polaris/100-100(4).42ece1fc6b6906e343b419e9d445a3f96581d6f0.jpg
\"
,
\"
id
\"
:
\"
oca9a51f6
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
欢趣农场实物2_@_这个商品是限量的,同志们冲啊!!123!@$ASDsdfsdf
\"
,
\"
prizeId
\"
:
\"
sss_item_3
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
34025
\"
,
\"
refType
\"
:
\"
object
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_1"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_4"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.duiba.com.cn/polaris/100-100.29be0c52b59853280da74d8d28fccb90bba690c7.png
\"
,
\"
id
\"
:
\"
oc47f0131
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3_@_欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3欢趣农场实物3
\"
,
\"
prizeId
\"
:
\"
sss_item_4
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
34026
\"
,
\"
refType
\"
:
\"
object
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_3"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/virtual-250-250.png
\"
,
\"
id
\"
:
\"
o61798fa8
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
测试2
\"
,
\"
prizeId
\"
:
\"
sss_11
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
79123
\"
,
\"
refType
\"
:
\"
virtual
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_5"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/object-250-250.png
\"
,
\"
id
\"
:
\"
ob5b4b54c
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
欢趣农场实物4
\"
,
\"
prizeId
\"
:
\"
sss_item_5
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
34027
\"
,
\"
refType
\"
:
\"
object
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
"ru_item_2"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/virtual-250-250.png
\"
,
\"
id
\"
:
\"
o8a1b2c58
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
测试1
\"
,
\"
prizeId
\"
:
\"
sss_10
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
79122
\"
,
\"
refType
\"
:
\"
virtual
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
},
"ru_item_5"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/virtual-250-250.png
\"
,
\"
id
\"
:
\"
o83e0c820
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
测试测试
\"
,
\"
prizeId
\"
:
\"
sss_9
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
79120
\"
,
\"
refType
\"
:
\"
virtual
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"success"
:
true
"ru_item_4"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/virtual-250-250.png
\"
,
\"
id
\"
:
\"
oc052c717
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
五元立减金测试
\"
,
\"
prizeId
\"
:
\"
sss_7
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
79111
\"
,
\"
refType
\"
:
\"
virtual
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
}
"ru_item_19"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_7"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_6"
:
"{
\"
data
\"
:[{
\"
icon
\"
:
\"
//yun.dui88.com/projectxh5/virtual-250-250.png
\"
,
\"
id
\"
:
\"
o16c75313
\"
,
\"
index
\"
:1,
\"
name
\"
:
\"
立减金测试
\"
,
\"
prizeId
\"
:
\"
sss_14
\"
,
\"
prizeType
\"
:2,
\"
refId
\"
:
\"
79157
\"
,
\"
refType
\"
:
\"
virtual
\"
},{
\"
icon
\"
:
\"
//yun.duiba.com.cn/db-m/app/turntable/circle/images/prize/谢谢参与_6311f27.png
\"
,
\"
id
\"
:
\"
thanks
\"
,
\"
index
\"
:2,
\"
name
\"
:
\"
谢谢参与
\"
,
\"
prizeId
\"
:
\"
thanks
\"
,
\"
prizeType
\"
:0}],
\"
success
\"
:true}"
,
"ru_item_9"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_16"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_8"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_15"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_18"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_17"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_12"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_11"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_14"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
,
"ru_item_13"
:
"{
\"
data
\"
:[],
\"
success
\"
:true}"
},
"success"
:
true
}
\ 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