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
0b985d36
Commit
0b985d36
authored
Dec 20, 2019
by
邱旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
4c37fa2c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
12 deletions
+15
-12
MainBase.ts
egret/libs/new_wx/MainBase.ts
+2
-1
MapScene.ts
egret/src/mapScene/MapScene.ts
+10
-6
TaskCenterIcon.ts
egret/src/mapScene/icon/TaskCenterIcon.ts
+0
-1
Tool.ts
egret/src/something/Tool.ts
+2
-3
home.json
mock/happyclear/home.json
+1
-1
No files found.
egret/libs/new_wx/MainBase.ts
View file @
0b985d36
...
...
@@ -491,7 +491,8 @@ export default class MainBase extends eui.UILayer {
}
protected
async
createGameScene
()
{
window
[
'getaward'
]
=
()
=>
{
getRedBombAward
((
param
)
=>
{
console
.
log
(
param
)
})
}
window
[
'getaward'
]
=
()
=>
{
getRedBombAward
((
param
)
=>
{
console
.
log
(
param
)
})
};
localStorage
.
setItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
,
'true'
);
// 任务中心强提示,每次进入游戏只强提示一次
await
Promise
.
all
([
this
.
getAd
(),
this
.
ajaxElement
(),
...
...
egret/src/mapScene/MapScene.ts
View file @
0b985d36
...
...
@@ -208,12 +208,16 @@ export default class MapScene extends Scene {
}
// 任务中心可领奖强提示
const
taskInfoRes
=
DataManager
.
ins
.
getData
(
NetName
.
GET_TASKINFO
);
if
(
taskInfoRes
&&
taskInfoRes
.
data
&&
taskInfoRes
.
data
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
taskInfoRes
.
data
.
length
;
i
++
)
{
if
(
taskInfoRes
.
data
[
i
].
count
>
0
)
{
panels
.
push
(
'task'
);
break
;
let
canShow
=
localStorage
.
getItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
);
if
(
canShow
==
'true'
){
const
taskInfoRes
=
DataManager
.
ins
.
getData
(
NetName
.
GET_TASKINFO
);
if
(
taskInfoRes
&&
taskInfoRes
.
data
&&
taskInfoRes
.
data
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
taskInfoRes
.
data
.
length
;
i
++
)
{
if
(
taskInfoRes
.
data
[
i
].
count
>
0
)
{
panels
.
push
(
'task'
);
localStorage
.
setItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
,
'false'
);
break
;
}
}
}
}
...
...
egret/src/mapScene/icon/TaskCenterIcon.ts
View file @
0b985d36
...
...
@@ -2,7 +2,6 @@ import IconBase from "./IconBase";
import
PanelCtrl
from
"../../../libs/new_wx/ctrls/panelCtrl"
;
import
{
NetManager
}
from
"../../../libs/tw/manager/NetManager"
;
import
{
GDispatcher
}
from
"../../../libs/tc/util/GDispatcher"
;
import
{
getLadderGap
}
from
"../../playScene/utils"
;
import
{
getlogItem
}
from
"../../Main"
;
export
default
class
TaskCenterIcon
extends
IconBase
{
...
...
egret/src/something/Tool.ts
View file @
0b985d36
import
{
ChapterData
}
from
"./interface/ChapterData"
;
import
{
Element
}
from
"./class/Element"
;
import
{
Lattice
}
from
"./class/Lattice"
;
import
{
ElementType
,
FiveBaseElementTypes
}
from
"./enum/ElementType"
;
import
{
PassType
}
from
"./enum/PassType"
;
import
{
EffectType
}
from
"./enum/EffectType"
;
import
{
Pool
}
from
"./Pool"
;
import
{
RecoverName
}
from
"./enum/RecoverName"
;
...
...
@@ -296,7 +294,8 @@ export class Tool {
if
(
this
.
judgeFall
(
lat
)
&&
!
lat
.
element
.
hasState
(
StateType
.
HAIRBALLBLACK
)
&&
!
lat
.
element
.
hasState
(
StateType
.
HAIRBALLGREY
)
&&
!
lat
.
element
.
hasState
(
StateType
.
HAIRBALLBROWN
)
!
lat
.
element
.
hasState
(
StateType
.
HAIRBALLBROWN
)
&&
lat
.
element
.
type
!=
ElementType
.
FESTIVALELE_SMALL
)
{
return
true
}
...
...
mock/happyclear/home.json
View file @
0b985d36
...
...
@@ -1136,7 +1136,7 @@
"remainProp"
:
[
{
"type"
:
2
,
"num"
:
0
"num"
:
2
},
{
"type"
:
3
,
...
...
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