Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dfzx_ac2
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
dfzx_ac2
Commits
c58b3a1c
Commit
c58b3a1c
authored
Mar 24, 2021
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
31a85359
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
form.component.html
form/src/app/form/form.component.html
+7
-1
form.component.ts
form/src/app/form/form.component.ts
+6
-0
Scene.fire
play/assets/tmpGame/scene/Scene.fire
+3
-3
GameLogic.js
play/assets/tmpGame/script/GameLogic.js
+4
-1
No files found.
form/src/app/form/form.component.html
View file @
c58b3a1c
...
...
@@ -122,7 +122,10 @@
</div>
</div>
</div>
<button
*
ngIf=
"item.correct.length>1"
style=
"margin-top: 10px; position: absolute; bottom: 10px; right: 10px;;"
nz-button
nzType=
"danger"
(
click
)="
deleteChoice
(
item
.
correct
,
choiceIndex
)"
>
<button
[
disabled
]="(
item
.
correct
.
length
+
item
.
incorrect
.
length
)
>
=30" style="margin-top: 10px; position: absolute; bottom: 10px; right: 100px;" nz-button (click)="copyItem(item.correct, choiceIndex)" >
<span>
复制此项
</span>
</button>
<button
[
disabled
]="
item
.
correct
.
length=
=1"
style=
"margin-top: 10px; position: absolute; bottom: 10px; right: 10px;;"
nz-button
nzType=
"danger"
(
click
)="
deleteChoice
(
item
.
correct
,
choiceIndex
)"
>
<span>
删除此选项
</span>
</button>
</div>
...
...
@@ -170,6 +173,9 @@
</div>
</div>
</div>
<button
[
disabled
]="(
item
.
correct
.
length
+
item
.
incorrect
.
length
)
>
=30" style="margin-top: 10px; position: absolute; bottom: 10px; right: 100px;" nz-button (click)="copyItem(item.incorrect, choiceIndex)" >
<span>
复制此项
</span>
</button>
<button
style=
"margin-top: 10px; position: absolute; bottom: 10px; right: 10px;;"
nz-button
nzType=
"danger"
(
click
)="
deleteChoice
(
item
.
incorrect
,
choiceIndex
)"
>
<span>
删除此选项
</span>
</button>
...
...
form/src/app/form/form.component.ts
View file @
c58b3a1c
...
...
@@ -126,6 +126,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this
.
save
()
}
copyItem
(
items
,
index
)
{
let
copy
=
JSON
.
parse
(
JSON
.
stringify
(
items
[
index
]))
items
.
push
(
copy
)
this
.
save
()
}
getDefaultPicArr
()
{
let
arr
=
[];
return
arr
;
...
...
play/assets/tmpGame/scene/Scene.fire
View file @
c58b3a1c
...
...
@@ -210,7 +210,7 @@
"array": [
0,
0,
342.2532501472093
,
497.96460717605225
,
0,
0,
0,
...
...
@@ -1889,7 +1889,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
62
0,
59
0,
280,
0,
0,
...
...
@@ -1958,7 +1958,7 @@
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right":
2
0,
"_right":
5
0,
"_top": 80,
"_bottom": 0,
"_verticalCenter": 0,
...
...
play/assets/tmpGame/script/GameLogic.js
View file @
c58b3a1c
...
...
@@ -101,7 +101,7 @@ export default class GameLogic {
// }})
node
=
this
.
g_cartoon
.
getNodeByPath
(
`Canvas/lion`
)
node
.
x
=
cc
.
winSize
.
width
/
2
-
1
4
0
node
.
x
=
cc
.
winSize
.
width
/
2
-
1
7
0
node
.
y
=
-
cc
.
winSize
.
height
/
2
+
120
this
.
m_bubblesAll
.
push
({
node
:
node
,
move
:
{
r
:
90
,
x
:
node
.
x
,
y
:
node
.
y
,
vX
:
0
,
vY
:
0
,
enable
:
true
,
fix
:
true
,
scale
:
1
,
id
:
997
,
lastId
:
null
...
...
@@ -774,6 +774,8 @@ export default class GameLogic {
}
return
}
this
.
g_cartoon
.
playAudio
(
"
大星
"
);
if
(
!
currentStarIdx
)
{
currentStarIdx
=
0
;
}
...
...
@@ -820,6 +822,7 @@ export default class GameLogic {
.
to
(
0.8
,
{
scale
:
0
},
{
easing
:
'
quadOut
'
})
.
call
(()
=>
{
// this.checkGameEnd();
this
.
g_cartoon
.
playAudio
(
"
题数
"
);
if
(
callback
)
{
callback
()
}
...
...
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