Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaoleTuia
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
王剑峰
xiaoxiaoleTuia
Commits
924d532c
Commit
924d532c
authored
Mar 04, 2020
by
张华挺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
getIconAward
parent
2e812ba8
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
32 deletions
+33
-32
build.js
build.js
+2
-2
MainScene.ts
egret/src/mainScene/MainScene.ts
+1
-3
MapScene.ts
egret/src/mapScene/MapScene.ts
+1
-1
FailedPanel.ts
egret/src/panels/FailedPanel.ts
+1
-1
SignPanel.ts
egret/src/panels/SignPanel.ts
+1
-1
SignPrizePanel.ts
egret/src/panels/SignPrizePanel.ts
+1
-1
gotoNextLevel.ts
egret/src/panels/gotoNextLevel.ts
+1
-1
getConfig.json
mock/tuia/getConfig.json
+25
-22
No files found.
build.js
View file @
924d532c
...
@@ -23,6 +23,6 @@ else if (cmd === 'build' && process.argv[3] === 'prod2') {
...
@@ -23,6 +23,6 @@ else if (cmd === 'build' && process.argv[3] === 'prod2') {
if
(
process
.
argv
[
4
]
===
'exml'
)
if
(
process
.
argv
[
4
]
===
'exml'
)
cmd
=
'buildProdEXML'
;
cmd
=
'buildProdEXML'
;
}
}
//
build[cmd]('egret');
build
[
cmd
](
'egret'
);
build
[
'notinypng'
](
'egret'
);
//
build['notinypng']('egret');
console
.
log
();
console
.
log
();
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @
924d532c
...
@@ -934,9 +934,7 @@ export default class MainScene extends Scene {
...
@@ -934,9 +934,7 @@ export default class MainScene extends Scene {
}
}
onTap_quitBtn
()
{
onTap_quitBtn
()
{
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
signConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
5
)
let
signConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
5
)
/* eslint-disable-next-line */
debugger
if
(
signConfigData
.
length
)
{
if
(
signConfigData
.
length
)
{
if
(
signConfigData
[
0
].
index
===
0
)
{
if
(
signConfigData
[
0
].
index
===
0
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TTPauseScreen"
],
3
)
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TTPauseScreen"
],
3
)
...
...
egret/src/mapScene/MapScene.ts
View file @
924d532c
...
@@ -58,7 +58,7 @@ export default class MapScene extends Scene {
...
@@ -58,7 +58,7 @@ export default class MapScene extends Scene {
this
[
"tuiaGroup"
].
visible
=
false
;
this
[
"tuiaGroup"
].
visible
=
false
;
this
[
"newTuiaGroup"
].
visible
=
false
;
this
[
"newTuiaGroup"
].
visible
=
false
;
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
iconConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
1
)
let
iconConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
1
)
if
(
iconConfigData
.
length
)
{
if
(
iconConfigData
.
length
)
{
const
index
=
iconConfigData
[
0
].
index
const
index
=
iconConfigData
[
0
].
index
switch
(
index
)
{
switch
(
index
)
{
...
...
egret/src/panels/FailedPanel.ts
View file @
924d532c
...
@@ -51,7 +51,7 @@ export default class FailedPanel extends Panel {
...
@@ -51,7 +51,7 @@ export default class FailedPanel extends Panel {
}
}
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
fileConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
3
)
let
fileConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
3
)
if
(
fileConfigData
.
length
&&
fileConfigData
[
0
].
index
===
0
)
{
if
(
fileConfigData
.
length
&&
fileConfigData
[
0
].
index
===
0
)
{
// 增加重新闯关倒计时
// 增加重新闯关倒计时
let
time
=
3
let
time
=
3
...
...
egret/src/panels/SignPanel.ts
View file @
924d532c
...
@@ -62,7 +62,7 @@ export default class SignPanel extends Panel {
...
@@ -62,7 +62,7 @@ export default class SignPanel extends Panel {
// showToast('签到成功!快去闯关吧~');
// showToast('签到成功!快去闯关吧~');
// PanelCtrl.instance.show('signPrize');
// PanelCtrl.instance.show('signPrize');
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
signConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
6
)
let
signConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
6
)
if
(
signConfigData
.
length
&&
signConfigData
[
0
].
index
===
1
)
{
if
(
signConfigData
.
length
&&
signConfigData
[
0
].
index
===
1
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TASignScreen"
],
3
)
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TASignScreen"
],
3
)
window
[
"finishScreenShowSignPrize"
]
=
window
[
'bridge'
][
"finishScreenShowSignPrize"
]
=
PanelCtrl
.
instance
.
addToShowPanels
(
'signPrize'
);
window
[
"finishScreenShowSignPrize"
]
=
window
[
'bridge'
][
"finishScreenShowSignPrize"
]
=
PanelCtrl
.
instance
.
addToShowPanels
(
'signPrize'
);
...
...
egret/src/panels/SignPrizePanel.ts
View file @
924d532c
...
@@ -49,7 +49,7 @@ export default class SignPrizePanel extends Panel {
...
@@ -49,7 +49,7 @@ export default class SignPrizePanel extends Panel {
NetManager
.
ins
.
showLog
(
getlogItem
(
7
))
NetManager
.
ins
.
showLog
(
getlogItem
(
7
))
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
signConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
6
)
let
signConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
6
)
if
(
signConfigData
.
length
&&
signConfigData
[
0
].
index
===
1
)
{
if
(
signConfigData
.
length
&&
signConfigData
[
0
].
index
===
1
)
{
// 因为除了插屏了,不需要翻倍
// 因为除了插屏了,不需要翻倍
this
[
'close2Btn'
].
visible
=
true
;
this
[
'close2Btn'
].
visible
=
true
;
...
...
egret/src/panels/gotoNextLevel.ts
View file @
924d532c
...
@@ -12,7 +12,7 @@ export const gotoNextLevel = (currentLevel?) => {
...
@@ -12,7 +12,7 @@ export const gotoNextLevel = (currentLevel?) => {
}
}
const
onMapScene
=
SceneCtrl
.
instance
.
currentScene
instanceof
MapScene
;
const
onMapScene
=
SceneCtrl
.
instance
.
currentScene
instanceof
MapScene
;
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
startConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
2
)
let
startConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
2
)
let
startPanelType
=
'StartPanel'
let
startPanelType
=
'StartPanel'
if
(
startConfigData
.
length
&&
startConfigData
[
0
].
index
===
0
)
startPanelType
=
'StartPanelNew'
if
(
startConfigData
.
length
&&
startConfigData
[
0
].
index
===
0
)
startPanelType
=
'StartPanelNew'
...
...
mock/tuia/getConfig.json
View file @
924d532c
...
@@ -3,26 +3,29 @@
...
@@ -3,26 +3,29 @@
"code"
:
"0000000000"
,
"code"
:
"0000000000"
,
"desc"
:
"OK"
,
"desc"
:
"OK"
,
"timestamp"
:
1582701970753
,
"timestamp"
:
1582701970753
,
"data"
:
[
"data"
:{
{
"list"
:[
"id"
:
1
,
{
"index"
:
0
"id"
:
1
,
},
"index"
:
2
{
},
"id"
:
2
,
{
"index"
:
0
"id"
:
2
,
},
"index"
:
1
{
},
"id"
:
3
,
{
"index"
:
0
"id"
:
3
,
},
"index"
:
1
{
},
"id"
:
5
,
{
"index"
:
0
"id"
:
5
,
},
"index"
:
1
{
},
"id"
:
6
,
{
"index"
:
0
"id"
:
6
,
}
"index"
:
1
]
}
],
"num"
:
3
}
}
}
\ 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