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
3cb2abd2
Commit
3cb2abd2
authored
Mar 04, 2020
by
张华挺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
降级处理
parent
924d532c
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
69 additions
and
42 deletions
+69
-42
output.js
egret/bin-release/output.js
+1
-1
output_develop.js
egret/bin-release/output_develop.js
+1
-1
PrizePanel.ts
egret/libs/new_wx/components/PrizePanel.ts
+20
-0
MainScene.ts
egret/src/mainScene/MainScene.ts
+14
-9
MapScene.ts
egret/src/mapScene/MapScene.ts
+3
-2
FailedPanel.ts
egret/src/panels/FailedPanel.ts
+2
-1
SignPanel.ts
egret/src/panels/SignPanel.ts
+2
-1
SignPrizePanel.ts
egret/src/panels/SignPrizePanel.ts
+2
-1
gotoNextLevel.ts
egret/src/panels/gotoNextLevel.ts
+2
-1
getConfig.json
mock/tuia/getConfig.json
+22
-25
No files found.
egret/bin-release/output.js
View file @
3cb2abd2
This diff is collapsed.
Click to expand it.
egret/bin-release/output_develop.js
View file @
3cb2abd2
This diff is collapsed.
Click to expand it.
egret/libs/new_wx/components/PrizePanel.ts
View file @
3cb2abd2
...
@@ -10,6 +10,7 @@ import { handleVideo } from "../../../src/myVideo/videoCtrl";
...
@@ -10,6 +10,7 @@ import { handleVideo } from "../../../src/myVideo/videoCtrl";
import
handleInspireVideo
from
"../../../src/inspireVideo"
;
import
handleInspireVideo
from
"../../../src/inspireVideo"
;
import
Loading
from
"./Loading"
;
import
Loading
from
"./Loading"
;
import
{
showToast
}
from
"../ctrls/toastCtrl"
;
import
{
showToast
}
from
"../ctrls/toastCtrl"
;
export
default
class
PrizePanel
extends
Panel
{
export
default
class
PrizePanel
extends
Panel
{
_level
;
_level
;
...
@@ -47,6 +48,7 @@ export default class PrizePanel extends Panel {
...
@@ -47,6 +48,7 @@ export default class PrizePanel extends Panel {
start
(
data
)
{
start
(
data
)
{
super
.
start
();
super
.
start
();
this
.
initTTScreen
()
this
.
_level
=
parseInt
(
data
.
level
+
''
);
this
.
_level
=
parseInt
(
data
.
level
+
''
);
this
[
'lvTxt'
].
text
=
`关卡
${
this
.
_level
}
`
this
[
'lvTxt'
].
text
=
`关卡
${
this
.
_level
}
`
...
@@ -110,6 +112,24 @@ export default class PrizePanel extends Panel {
...
@@ -110,6 +112,24 @@ export default class PrizePanel extends Panel {
},
this
)
},
this
)
}
}
initTTScreen
()
{
// 插屏互动已经调用的次数
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
surplusNum
=
configData
.
data
.
num
if
(
surplusNum
&&
surplusNum
<=
3
)
{
// 每天在通过成功后只出3次插屏互动
NetManager
.
ins
.
getUserConfig
(()
=>
{})
const
signConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
5
)
if
(
signConfigData
.
length
)
{
if
(
signConfigData
[
0
].
index
===
0
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TTPauseScreen"
],
3
)
}
else
if
(
signConfigData
[
0
].
index
===
1
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TAPauseScreen"
],
3
)
}
}
}
}
async
setStar
(
nums
:
number
)
{
async
setStar
(
nums
:
number
)
{
this
[
'pic1'
].
visible
=
this
[
'pic2'
].
visible
=
this
[
'pic3'
].
visible
=
false
;
this
[
'pic1'
].
visible
=
this
[
'pic2'
].
visible
=
this
[
'pic3'
].
visible
=
false
;
// this['light'].visible = false;
// this['light'].visible = false;
...
...
egret/src/mainScene/MainScene.ts
View file @
3cb2abd2
...
@@ -933,17 +933,22 @@ export default class MainScene extends Scene {
...
@@ -933,17 +933,22 @@ 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
.
list
.
filter
(
item
=>
item
.
id
===
5
)
if
(
!
configData
.
data
.
list
)
{
if
(
signConfigData
.
length
)
{
let
signConfigData
=
configData
.
data
.
filter
(
item
=>
item
.
id
===
5
)
if
(
signConfigData
[
0
].
index
===
0
)
{
if
(
signConfigData
.
length
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TTPauseScreen"
],
3
)
if
(
signConfigData
[
0
].
index
===
0
)
{
}
else
if
(
signConfigData
[
0
].
index
===
1
)
{
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TTPauseScreen"
],
3
)
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TAPauseScreen"
],
3
)
}
else
if
(
signConfigData
[
0
].
index
===
1
)
{
}
window
[
'bridge'
]
&&
window
[
'bridge'
][
"showGamerAd"
]
&&
window
[
'bridge'
][
"showGamerAd"
](
window
[
"TAPauseScreen"
],
3
)
wait
(
300
).
then
(()
=>
{
}
wait
(
300
).
then
(()
=>
{
PanelCtrl
.
instance
.
show
(
"quit"
,
{
level
:
this
.
chapter
});
})
}
else
{
PanelCtrl
.
instance
.
show
(
"quit"
,
{
level
:
this
.
chapter
});
PanelCtrl
.
instance
.
show
(
"quit"
,
{
level
:
this
.
chapter
});
}
)
}
}
else
{
}
else
{
PanelCtrl
.
instance
.
show
(
"quit"
,
{
level
:
this
.
chapter
});
PanelCtrl
.
instance
.
show
(
"quit"
,
{
level
:
this
.
chapter
});
}
}
...
...
egret/src/mapScene/MapScene.ts
View file @
3cb2abd2
...
@@ -58,7 +58,8 @@ export default class MapScene extends Scene {
...
@@ -58,7 +58,8 @@ 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
.
list
.
filter
(
item
=>
item
.
id
===
1
)
const
configDetData
=
configData
.
data
.
list
?
configData
.
data
.
list
:
configData
.
data
let
iconConfigData
=
configDetData
.
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
)
{
...
@@ -204,7 +205,7 @@ export default class MapScene extends Scene {
...
@@ -204,7 +205,7 @@ export default class MapScene extends Scene {
}
else
{
}
else
{
target
=
homeData
.
levels
.
length
+
1
;
target
=
homeData
.
levels
.
length
+
1
;
}
}
let
startConfigData
=
configD
ata
.
d
ata
.
filter
(
item
=>
item
.
id
===
2
)
let
startConfigData
=
configD
etD
ata
.
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'
for
(
const
key
in
MapScene
.
iconHash
)
{
for
(
const
key
in
MapScene
.
iconHash
)
{
...
...
egret/src/panels/FailedPanel.ts
View file @
3cb2abd2
...
@@ -51,7 +51,8 @@ export default class FailedPanel extends Panel {
...
@@ -51,7 +51,8 @@ export default class FailedPanel extends Panel {
}
}
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
const
configData
=
DataManager
.
ins
.
getData
(
'getConfig'
)
let
fileConfigData
=
configData
.
data
.
list
.
filter
(
item
=>
item
.
id
===
3
)
const
configDetData
=
configData
.
data
.
list
?
configData
.
data
.
list
:
configData
.
data
const
fileConfigData
=
configDetData
.
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 @
3cb2abd2
...
@@ -62,7 +62,8 @@ export default class SignPanel extends Panel {
...
@@ -62,7 +62,8 @@ 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
.
list
.
filter
(
item
=>
item
.
id
===
6
)
const
configDetData
=
configData
.
data
.
list
?
configData
.
data
.
list
:
configData
.
data
let
signConfigData
=
configDetData
.
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 @
3cb2abd2
...
@@ -49,7 +49,8 @@ export default class SignPrizePanel extends Panel {
...
@@ -49,7 +49,8 @@ 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
.
list
.
filter
(
item
=>
item
.
id
===
6
)
const
configDetData
=
configData
.
data
.
list
?
configData
.
data
.
list
:
configData
.
data
let
signConfigData
=
configDetData
.
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 @
3cb2abd2
...
@@ -12,7 +12,8 @@ export const gotoNextLevel = (currentLevel?) => {
...
@@ -12,7 +12,8 @@ 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
.
list
.
filter
(
item
=>
item
.
id
===
2
)
const
configDetData
=
configData
.
data
.
list
?
configData
.
data
.
list
:
configData
.
data
let
startConfigData
=
configDetData
.
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 @
3cb2abd2
...
@@ -3,29 +3,26 @@
...
@@ -3,29 +3,26 @@
"code"
:
"0000000000"
,
"code"
:
"0000000000"
,
"desc"
:
"OK"
,
"desc"
:
"OK"
,
"timestamp"
:
1582701970753
,
"timestamp"
:
1582701970753
,
"data"
:{
"data"
:[
"list"
:[
{
{
"id"
:
1
,
"id"
:
1
,
"index"
:
2
"index"
:
2
},
},
{
{
"id"
:
2
,
"id"
:
2
,
"index"
:
1
"index"
:
1
},
},
{
{
"id"
:
3
,
"id"
:
3
,
"index"
:
1
"index"
:
1
},
},
{
{
"id"
:
5
,
"id"
:
5
,
"index"
:
1
"index"
:
1
},
},
{
{
"id"
:
6
,
"id"
:
6
,
"index"
:
1
"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