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
4c007df4
Commit
4c007df4
authored
May 13, 2020
by
zjz1994
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂存
parent
4d10f299
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
MainScene.ts
egret/src/mainScene/MainScene.ts
+2
-2
RedBombAlertPanel.ts
egret/src/panels/RedBombAlertPanel.ts
+7
-6
Grass.ts
egret/src/something/class/Grass.ts
+0
-1
AiControl.ts
egret/src/something/logic/AiControl.ts
+1
-1
baseinfo.json
mock/happyclear/baseinfo.json
+1
-1
No files found.
egret/src/mainScene/MainScene.ts
View file @
4c007df4
...
@@ -6516,7 +6516,7 @@ export default class MainScene extends Scene {
...
@@ -6516,7 +6516,7 @@ export default class MainScene extends Scene {
}
}
//铺草在一次掉落前,不分先后顺序
//铺草在一次掉落前,不分先后顺序
initTurf
(){
initTurf
(){
console
.
error
(
"重置消除数组"
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
recoverArr
)));
//
console.error("重置消除数组",JSON.parse(JSON.stringify(this.recoverArr)));
this
.
recoverArr
=
new
Array
();
this
.
recoverArr
=
new
Array
();
}
}
//添加新的小消除组
//添加新的小消除组
...
@@ -6570,7 +6570,7 @@ export default class MainScene extends Scene {
...
@@ -6570,7 +6570,7 @@ export default class MainScene extends Scene {
all
:
alldata
all
:
alldata
}
}
this
.
recoverArr
.
push
(
newturdata
);
this
.
recoverArr
.
push
(
newturdata
);
console
.
log
(
"新增消除数组"
,
JSON
.
parse
(
JSON
.
stringify
(
newturdata
)));
//
console.log("新增消除数组",JSON.parse(JSON.stringify(newturdata)));
this
.
solveTurf
(
turidx
,
maindata
,
alldata
);
this
.
solveTurf
(
turidx
,
maindata
,
alldata
);
}
}
/**
/**
...
...
egret/src/panels/RedBombAlertPanel.ts
View file @
4c007df4
...
@@ -78,12 +78,13 @@ export default class RedBombAlertPanel extends Panel {
...
@@ -78,12 +78,13 @@ export default class RedBombAlertPanel extends Panel {
egret
.
Tween
.
get
(
this
[
'group'
]).
to
({
alpha
:
0
},
300
);
egret
.
Tween
.
get
(
this
[
'group'
]).
to
({
alpha
:
0
},
300
);
this
.
addChild
(
mv
);
this
.
addChild
(
mv
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
if
(
this
.
showimgtype
==
1
||
this
.
showimgtype
==
2
){
// console.log('红包弹窗',this.showimgtype);
this
.
showimgtype
=
4
;
// if(this.showimgtype==1||this.showimgtype==2){
this
.
changeShowTitImg
(
this
.
showimgtype
);
// this.showimgtype = 4;
this
[
'group'
].
alpha
=
1
;
// this.changeShowTitImg(this.showimgtype);
this
[
'tips'
].
text
=
`快去另一个关卡找找吧`
;
// this['group'].alpha = 1;
}
// this['tips'].text = `快去另一个关卡找找吧`;
// }
this
.
btn
.
visible
=
true
;
this
.
btn
.
visible
=
true
;
...
...
egret/src/something/class/Grass.ts
View file @
4c007df4
...
@@ -6,7 +6,6 @@ export class Grass extends egret.Bitmap {
...
@@ -6,7 +6,6 @@ export class Grass extends egret.Bitmap {
super
();
super
();
var
texture
:
egret
.
Texture
=
RES
.
getRes
(
"ele"
+
ElementType
.
Grass
+
"_png"
);
var
texture
:
egret
.
Texture
=
RES
.
getRes
(
"ele"
+
ElementType
.
Grass
+
"_png"
);
this
.
texture
=
texture
;
this
.
texture
=
texture
;
console
.
log
(
"草的大小"
,
texture
.
textureWidth
,
texture
.
textureHeight
);
var
grasswidth
=
76
;
var
grasswidth
=
76
;
this
.
width
=
this
.
height
=
grasswidth
;
this
.
width
=
this
.
height
=
grasswidth
;
this
.
anchorOffsetX
=
grasswidth
/
2
;
this
.
anchorOffsetX
=
grasswidth
/
2
;
...
...
egret/src/something/logic/AiControl.ts
View file @
4c007df4
...
@@ -129,7 +129,7 @@ export class AiControl {
...
@@ -129,7 +129,7 @@ export class AiControl {
//打乱索引
//打乱索引
redIndexs
.
sort
(
function
()
{
return
(
0.5
-
Math
.
random
());
});
redIndexs
.
sort
(
function
()
{
return
(
0.5
-
Math
.
random
());
});
let
six
:
any
[]
=
redIndexs
.
splice
(
0
,
fesELeSmallNum
);
let
six
:
any
[]
=
redIndexs
.
splice
(
0
,
fesELeSmallNum
);
console
.
log
(
"发红包"
,
six
,
fesELeSmallNum
);
//
console.log("发红包",six,fesELeSmallNum);
//如果不足6个,就修改thisObj里的
//如果不足6个,就修改thisObj里的
if
(
six
.
length
<
fesELeSmallNum
)
{
if
(
six
.
length
<
fesELeSmallNum
)
{
thisObj
.
festivalTargetNum
=
fesELeSmallNum
;
thisObj
.
festivalTargetNum
=
fesELeSmallNum
;
...
...
mock/happyclear/baseinfo.json
View file @
4c007df4
{
{
"code"
:
"0000000000"
,
"code"
:
"0000000000"
,
"data"
:{
"data"
:{
"remain"
:
1
,
"remain"
:
3
,
"redBombSwitchTime"
:
"77798963487234"
"redBombSwitchTime"
:
"77798963487234"
},
},
"desc"
:
"OK"
,
"desc"
:
"OK"
,
...
...
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