Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
DG_FAF
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
DG_FAF
Commits
dd0ffbff
Commit
dd0ffbff
authored
Apr 17, 2023
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复选择器画图时背景不消失的问题
parent
f63617dd
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
11 deletions
+14
-11
DrawingBoard_DG_FAF.ts
assets/DG_FAF/prefabs/DrawingBoard/DrawingBoard_DG_FAF.ts
+6
-3
myVideoControlScript_DG_FAF.js
...prefabs/VideoControlBar/js/myVideoControlScript_DG_FAF.js
+1
-1
DG_FAF.ts
assets/DG_FAF/scene/DG_FAF.ts
+1
-1
main-es2015.js
form/main-es2015.js
+1
-1
main-es2015.js.map
form/main-es2015.js.map
+1
-1
main-es5.js
form/main-es5.js
+1
-1
main-es5.js.map
form/main-es5.js.map
+1
-1
form.component.html
form_angular/src/app/form/form.component.html
+2
-2
No files found.
assets/DG_FAF/prefabs/DrawingBoard/DrawingBoard_DG_FAF.ts
View file @
dd0ffbff
...
@@ -116,6 +116,10 @@ export default class DrawingBoard extends cc.Component {
...
@@ -116,6 +116,10 @@ export default class DrawingBoard extends cc.Component {
{
'
resName
'
:
'
color_black
'
,
'
color
'
:
'
#000000
'
}
{
'
resName
'
:
'
color_black
'
,
'
color
'
:
'
#000000
'
}
];
];
const
paletteBtn
=
cc
.
find
(
"
ToolBox/Palette
"
,
this
.
node
)
const
btnColors
=
cc
.
find
(
"
ToolBox/Palette/btnColors
"
,
this
.
node
)
const
bgPalette
=
cc
.
find
(
"
ToolBox/Palette/bgPalette
"
,
this
.
node
)
const
eraserBtn
=
cc
.
find
(
"
ToolBox/Eraser
"
,
this
.
node
)
const
eraserBtn
=
cc
.
find
(
"
ToolBox/Eraser
"
,
this
.
node
)
const
eraserIconNormal
=
cc
.
find
(
"
normal
"
,
eraserBtn
)
const
eraserIconNormal
=
cc
.
find
(
"
normal
"
,
eraserBtn
)
const
eraserIconActive
=
cc
.
find
(
"
active
"
,
eraserBtn
)
const
eraserIconActive
=
cc
.
find
(
"
active
"
,
eraserBtn
)
...
@@ -178,9 +182,6 @@ export default class DrawingBoard extends cc.Component {
...
@@ -178,9 +182,6 @@ export default class DrawingBoard extends cc.Component {
this
.
node
.
emit
(
"
onPaintingEnd
"
);
this
.
node
.
emit
(
"
onPaintingEnd
"
);
})
})
const
paletteBtn
=
cc
.
find
(
"
ToolBox/Palette
"
,
this
.
node
)
const
btnColors
=
cc
.
find
(
"
ToolBox/Palette/btnColors
"
,
this
.
node
)
const
bgPalette
=
cc
.
find
(
"
ToolBox/Palette/bgPalette
"
,
this
.
node
)
paletteBtn
.
on
(
"
click
"
,
()
=>
{
paletteBtn
.
on
(
"
click
"
,
()
=>
{
this
.
openPalette
=
!
this
.
openPalette
;
this
.
openPalette
=
!
this
.
openPalette
;
btnColors
.
active
=
this
.
openPalette
;
btnColors
.
active
=
this
.
openPalette
;
...
@@ -224,8 +225,10 @@ export default class DrawingBoard extends cc.Component {
...
@@ -224,8 +225,10 @@ export default class DrawingBoard extends cc.Component {
// 如果调色板开打状态 则关闭
// 如果调色板开打状态 则关闭
if
(
this
.
openPalette
)
{
if
(
this
.
openPalette
)
{
const
bgPalette
=
cc
.
find
(
"
ToolBox/Palette/bgPalette
"
,
this
.
node
)
const
btnColors
=
cc
.
find
(
"
ToolBox/Palette/btnColors
"
,
this
.
node
)
const
btnColors
=
cc
.
find
(
"
ToolBox/Palette/btnColors
"
,
this
.
node
)
this
.
openPalette
=
false
;
this
.
openPalette
=
false
;
bgPalette
.
active
=
false
;
btnColors
.
active
=
false
;
btnColors
.
active
=
false
;
}
}
...
...
assets/DG_FAF/prefabs/VideoControlBar/js/myVideoControlScript_DG_FAF.js
View file @
dd0ffbff
...
@@ -79,7 +79,7 @@ cc.Class({
...
@@ -79,7 +79,7 @@ cc.Class({
this
.
posYHide
=
-
deviceSize
.
height
/
2
-
this
.
node
.
height
/
2
-
50
;
this
.
posYHide
=
-
deviceSize
.
height
/
2
-
this
.
node
.
height
/
2
-
50
;
this
.
node
.
x
=
0
this
.
node
.
x
=
0
this
.
node
.
y
=
this
.
posY
Show
;
this
.
node
.
y
=
this
.
posY
Hide
;
this
.
setProgress
(
0
);
this
.
setProgress
(
0
);
},
},
...
...
assets/DG_FAF/scene/DG_FAF.ts
View file @
dd0ffbff
...
@@ -106,12 +106,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
...
@@ -106,12 +106,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
this
.
initMiddleLayer
();
// 中间层相关
this
.
initMiddleLayer
();
// 中间层相关
this
.
initEventListener
();
// 事件监听
this
.
initEventListener
();
// 事件监听
this
.
initHeaderAndFooter
();
// 顶部和底部图片
this
.
initHeaderAndFooter
();
// 顶部和底部图片
this
.
initVideoPlayerLayer
();
// 视频播放层
await
this
.
initHotZoneBg
();
// 初始化背景
await
this
.
initHotZoneBg
();
// 初始化背景
this
.
initHotZoneItem
();
// 初始化热区数据
this
.
initHotZoneItem
();
// 初始化热区数据
this
.
initScorePanel
();
this
.
initScorePanel
();
this
.
initActionButton
();
this
.
initActionButton
();
this
.
initScoreShow
();
this
.
initScoreShow
();
this
.
initVideoPlayerLayer
();
// 视频播放层
this
.
enableScroll
();
// 启用页面滚动
this
.
enableScroll
();
// 启用页面滚动
this
.
startTimestamp
=
new
Date
().
getTime
();
this
.
startTimestamp
=
new
Date
().
getTime
();
}
}
...
...
form/main-es2015.js
View file @
dd0ffbff
This diff is collapsed.
Click to expand it.
form/main-es2015.js.map
View file @
dd0ffbff
This diff is collapsed.
Click to expand it.
form/main-es5.js
View file @
dd0ffbff
This diff is collapsed.
Click to expand it.
form/main-es5.js.map
View file @
dd0ffbff
This diff is collapsed.
Click to expand it.
form_angular/src/app/form/form.component.html
View file @
dd0ffbff
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
<nz-select
[(
ngModel
)]="
it
.
hotZoneType
"
style=
"width: 300px;"
(
ngModelChange
)="
save
()"
>
<nz-select
[(
ngModel
)]="
it
.
hotZoneType
"
style=
"width: 300px;"
(
ngModelChange
)="
save
()"
>
<nz-option
[
nzValue
]="
TEXT_SELECT
"
nzLabel=
"文字选项"
></nz-option>
<nz-option
[
nzValue
]="
TEXT_SELECT
"
nzLabel=
"文字选项"
></nz-option>
<nz-option
[
nzValue
]="
AUDIO_PLAY
"
nzLabel=
"播放音频"
></nz-option>
<nz-option
[
nzValue
]="
AUDIO_PLAY
"
nzLabel=
"播放音频"
></nz-option>
<nz-option
[
nzValue
]="
VIDEO_PLAY
"
nzLabel=
"播放视频
(开发中)
"
></nz-option>
<nz-option
[
nzValue
]="
VIDEO_PLAY
"
nzLabel=
"播放视频"
></nz-option>
<nz-option
[
nzValue
]="
HOT_ZONE_RADIO
"
nzLabel=
"热区选项(单选)"
></nz-option>
<nz-option
[
nzValue
]="
HOT_ZONE_RADIO
"
nzLabel=
"热区选项(单选)"
></nz-option>
<nz-option
[
nzValue
]="
HOT_ZONE_CHECKBOX
"
nzLabel=
"热区选项(多选)"
></nz-option>
<nz-option
[
nzValue
]="
HOT_ZONE_CHECKBOX
"
nzLabel=
"热区选项(多选)"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT
"
nzLabel=
"文字输入"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT
"
nzLabel=
"文字输入"
></nz-option>
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<nz-option
[
nzValue
]="
PRONUNCIATION_ASSESSMENT
"
nzLabel=
"语音评测"
></nz-option>
<nz-option
[
nzValue
]="
PRONUNCIATION_ASSESSMENT
"
nzLabel=
"语音评测"
></nz-option>
<nz-option
[
nzValue
]="
CONNECTION_CHOICE
"
nzLabel=
"连线选择题"
></nz-option>
<nz-option
[
nzValue
]="
CONNECTION_CHOICE
"
nzLabel=
"连线选择题"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT_GROUP
"
nzLabel=
"文字输入组"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT_GROUP
"
nzLabel=
"文字输入组"
></nz-option>
<nz-option
[
nzValue
]="
DRAWING
"
nzLabel=
"涂色题
(开发中)
"
></nz-option>
<nz-option
[
nzValue
]="
DRAWING
"
nzLabel=
"涂色题"
></nz-option>
<nz-option
[
nzValue
]="
IMAGE_SELECT
"
nzLabel=
"图片选项"
nzDisabled
></nz-option>
<nz-option
[
nzValue
]="
IMAGE_SELECT
"
nzLabel=
"图片选项"
nzDisabled
></nz-option>
</nz-select>
</nz-select>
<label
*
ngIf=
"it.hotZoneType == TEXT_SELECT"
nz-checkbox
[(
ngModel
)]="
it
.
useSelectOptionList
"
(
ngModelChange
)="
handleUserSelectOptionListChange
(
it
)"
style=
"margin-left: 10px;"
>
使用独立选项清单
</label>
<label
*
ngIf=
"it.hotZoneType == TEXT_SELECT"
nz-checkbox
[(
ngModel
)]="
it
.
useSelectOptionList
"
(
ngModelChange
)="
handleUserSelectOptionListChange
(
it
)"
style=
"margin-left: 10px;"
>
使用独立选项清单
</label>
...
...
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