Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
east-10
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
template admin
east-10
Commits
87ff3e99
Commit
87ff3e99
authored
4 years ago
by
linzhiguo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 选项图片添加到分组中恢复原大
parent
769ca353
master
v23
v22
v21
v20
v19
v18
v17
v16
v15
v14
v13
v12
v11
v10
v9
v8
v7
v6
v5
v4
v3
v2
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
kind.js
play/assets/scene/script/kind.js
+16
-12
option.js
play/assets/scene/script/option.js
+4
-2
No files found.
play/assets/scene/script/kind.js
View file @
87ff3e99
...
@@ -106,24 +106,28 @@ cc.Class({
...
@@ -106,24 +106,28 @@ cc.Class({
this
.
show_node
.
active
=
true
;
this
.
show_node
.
active
=
true
;
this
.
playAnimation
(()
=>
{
this
.
playAnimation
(()
=>
{
this
.
show_node
.
removeAllChildren
();
this
.
show_node
.
removeAllChildren
();
let
node
=
cc
.
instantiate
(
ot
);
let
node
=
cc
.
instantiate
(
cc
.
find
(
'
res/option_item
'
)
);
let
option
=
node
.
getComponent
(
cc
.
js
.
getClassByName
(
'
WordOption
'
));
let
option
=
node
.
getComponent
(
cc
.
js
.
getClassByName
(
'
WordOption
'
));
option
.
copyValues
(
item
);
option
.
pic
.
width
=
item
.
pic
.
width
;
option
.
pic
.
width
=
item
.
pic
.
width
;
option
.
pic
.
height
=
item
.
pic
.
height
;
option
.
pic
.
height
=
item
.
pic
.
height
;
this
.
layout
.
node
.
addChild
(
node
);
this
.
layout
.
node
.
addChild
(
node
);
option
.
adjustPicSize
();
option
.
adjustPicSize
();
option
.
finished
();
option
.
finished
();
node
.
width
/=
3
;
let
sr
=
2
/
3
;
node
.
height
/=
3
;
node
.
width
*=
sr
;
node
.
opacity
=
0
;
node
.
height
*=
sr
;
cc
.
tween
(
node
)
node
.
scale
*=
sr
;
.
to
(
0.5
,
{
opacity
:
255
})
// node.opacity = 0;
.
call
(()
=>
{
option
.
adjustPicSize
();
option
.
adjustPicSize
();
console
.
log
(
option
);
// cc.tween(node)
cb
&&
cb
();
// .to(0.5, {opacity:255})
})
// .call(()=>{
.
start
();
// option.adjustPicSize();
// console.log(option);
// cb && cb();
// })
// .start();
this
.
show_node
.
active
=
false
;
this
.
show_node
.
active
=
false
;
this
.
animate_node
.
active
=
false
;
this
.
animate_node
.
active
=
false
;
});
});
...
...
This diff is collapsed.
Click to expand it.
play/assets/scene/script/option.js
View file @
87ff3e99
...
@@ -117,12 +117,14 @@ cc.Class({
...
@@ -117,12 +117,14 @@ cc.Class({
},
},
finished
(){
finished
(){
if
(
this
.
_type
==
0
){
this
.
word_finish
.
active
=
false
;
this
.
pic_finish
.
active
=
false
;
this
.
pic_node
.
getComponent
(
cc
.
Sprite
).
enabled
=
false
;
this
.
pic_node
.
getComponent
(
cc
.
Sprite
).
enabled
=
false
;
this
.
word_node
.
getComponent
(
cc
.
Sprite
).
enabled
=
false
;
if
(
this
.
_type
==
0
){
this
.
pic_finish
.
active
=
true
;
this
.
pic_finish
.
active
=
true
;
}
}
else
{
else
{
this
.
word_node
.
getComponent
(
cc
.
Sprite
).
enabled
=
false
;
this
.
word_finish
.
active
=
true
;
this
.
word_finish
.
active
=
true
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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