Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
comparetree
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
comparetree
Commits
b6dc43d5
Commit
b6dc43d5
authored
Jun 16, 2021
by
Tt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
16c75716
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
792 additions
and
955 deletions
+792
-955
form.component.css
form/src/app/form/form.component.css
+14
-0
form.component.html
form/src/app/form/form.component.html
+21
-21
BRLNSDB.TTF
play/assets/scene/fonts/BRLNSDB.TTF
+0
-0
GOTHICB.TTF
play/assets/scene/fonts/GOTHICB.TTF
+0
-0
GOTHICB.TTF.meta
play/assets/scene/fonts/GOTHICB.TTF.meta
+5
-0
MMTextBookBold.ttf
play/assets/scene/fonts/MMTextBookBold.ttf
+0
-0
MMTextBookBold.ttf.meta
play/assets/scene/fonts/MMTextBookBold.ttf.meta
+5
-0
ahronbd.ttf
play/assets/scene/fonts/ahronbd.ttf
+0
-0
ahronbd.ttf.meta
play/assets/scene/fonts/ahronbd.ttf.meta
+5
-0
data.js
play/assets/scene/scene/data.js
+47
-47
gameManager.js
play/assets/scene/scene/gameManager.js
+14
-202
resizeWidget.js
play/assets/scene/scene/resizeWidget.js
+27
-13
scene.fire
play/assets/scene/scene/scene.fire
+518
-601
scene.js
play/assets/scene/scene/scene.js
+133
-68
title_bg.png
play/assets/scene/textures/compare/bg/title_bg.png
+0
-0
title_bg.png.meta
play/assets/scene/textures/compare/bg/title_bg.png.meta
+3
-3
No files found.
form/src/app/form/form.component.css
View file @
b6dc43d5
...
@@ -105,6 +105,20 @@
...
@@ -105,6 +105,20 @@
}
}
.box-son-0
{
border
:
1px
solid
gray
;
width
:
100%
;
text-align
:
center
;
border-left
:
0px
;
border-right
:
0px
;
border-bottom
:
0px
;
}
.box-son-1
{
border
:
1px
0px
0px
0px
solid
gray
;
width
:
100%
;
text-align
:
left
;
}
...
...
form/src/app/form/form.component.html
View file @
b6dc43d5
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
<div
*
ngFor=
"let biaoti of picArr; let a = index"
>
<div
*
ngFor=
"let biaoti of picArr; let a = index"
>
<div
class=
"box-dbt-0"
>
<div
class=
"box-dbt-0"
>
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
center
;"
>
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
left
;"
>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
标题:
</span>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
标题:
</span>
<input
[(
ngModel
)]="
biaoti
.
title
"
type=
"text"
<input
[(
ngModel
)]="
biaoti
.
title
"
type=
"text"
style=
"width:
2
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
style=
"width:
10
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
</div>
</div>
</div>
</div>
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
<div
*
ngFor=
"let zhulei of biaoti.child; let b = index"
>
<div
*
ngFor=
"let zhulei of biaoti.child; let b = index"
>
<div
class=
"box-lbt-0"
>
<div
class=
"box-lbt-0"
>
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
center
;"
>
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
left
;"
>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
主类:
</span>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
主类:
</span>
<input
[(
ngModel
)]="
zhulei
.
title
"
type=
"text"
<input
[(
ngModel
)]="
zhulei
.
title
"
type=
"text"
style=
"width:
2
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
style=
"width:
10
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
</div>
</div>
</div>
</div>
...
@@ -26,48 +26,46 @@
...
@@ -26,48 +26,46 @@
<div
*
ngFor=
"let fenlei of zhulei.child; let c = index"
>
<div
*
ngFor=
"let fenlei of zhulei.child; let c = index"
>
<div
class=
"box-lbt-0"
>
<div
class=
"box-lbt-0"
>
<div
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;"
>
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: center;"
>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
分类{{c+1}}:
</span>
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
分类{{c+1}}:
</span>
<input
[(
ngModel
)]="
fenlei
.
title
"
type=
"text"
<input
[(
ngModel
)]="
fenlei
.
title
"
type=
"text"
style=
"width:
2
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
style=
"width:
10
00px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
</div>
</div>
</div>
</div>
<div
class=
"box-lbt-1"
>
<div
class=
"box-lbt-1"
>
<div
*
ngFor=
"let sonlei of fenlei.child; let d = index"
>
<div
*
ngFor=
"let sonlei of fenlei.child; let d = index"
>
<div
class=
"box-lbt-0"
>
<div
class=
"box-son-0"
>
<div
style=
"width: 50%;margin-left: 25%;"
>
<div>
<div
<div
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
center
;"
>
style=
"width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align:
left
;"
>
<span
<span
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
分类{{c+1}}-子类{{d+1}}:
</span>
style=
"font-weight: 700; font-size: 30px; vertical-align:middle;"
>
分类{{c+1}}-子类{{d+1}}:
</span>
<input
[(
ngModel
)]="
sonlei
.
title
"
type=
"text"
style=
"width: 200px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
<button
style=
"margin-left: 30px;"
nz-button
nzType=
"danger"
(
click
)="
deleteSon
(
a
,
b
,
c
,
d
)"
>
<button
style=
"margin-left: 30px;"
nz-button
nzType=
"danger"
(
click
)="
deleteSon
(
a
,
b
,
c
,
d
)"
>
<span>
删除
</span>
<span>
删除
</span>
</button>
</button>
<input
[(
ngModel
)]="
sonlei
.
title
"
type=
"text"
style=
"width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;"
/>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"box-
lbt
-1"
>
<div
class=
"box-
son
-1"
>
<div
class=
"group-item"
>
<div
class=
"group-item"
>
<div
*
ngFor=
"let it of sonlei.child; let e = index"
>
<div
*
ngFor=
"let it of sonlei.child; let e = index"
>
<div
class=
"border"
>
<div
class=
"border"
>
<div
style=
"width: 100%; align-items:center;"
>
<div
style=
"width: 100%; align-items:center;"
>
<span
style=
"font-weight: 500; font-size: 27px; color: red; "
>
选项{{e+1}}
</span>
<div
class=
"item-box"
style=
"width: 50%;height:200px; margin-left: 25%; margin-top: 10%;"
>
<div
class=
"item-box"
style=
"width: 50%;height:200px; margin-left: 25%; margin-top: 10%;"
>
<span>
文字
</span>
<span>
文字
</span>
<input
style=
"width: 80%; margin-bottom: 0.5vw"
type=
"text
"
<input
style=
"width: 80%; margin-bottom: 0.5vw"
type=
"text"
nz-input
placeholder=
"
"
nz-input
placeholder=
""
[(
ngModel
)]="
it
.
title
"
(
blur
)="
saveItem
()"
>
[(
ngModel
)]="
it
.
title
"
(
blur
)="
saveItem
()"
>
<span>
图片
</span>
<span>
图片
</span>
<app-upload-image-with-preview
style=
"width: 100%"
<app-upload-image-with-preview
style=
"width: 100%"
[
picUrl
]="
it
.
pic_url
"
[
picUrl
]="
it
.
pic_url
"
(
imageUploaded
)="
onImageUploadSuccessByItem
($
event
,
it
)"
>
(
imageUploaded
)="
onImageUploadSuccessByItem
($
event
,
it
)"
>
</app-upload-image-with-preview>
</app-upload-image-with-preview>
<!-- <div style="display: flex; justify-items: center; padding-top: 10px">
<!-- <div style="display: flex; justify-items: center; padding-top: 10px">
...
@@ -109,14 +107,16 @@
...
@@ -109,14 +107,16 @@
</div>
</div>
<div
class=
"box-lbt-2"
>
<div
class=
"box-lbt-2"
>
<button
*
ngIf=
"picArr[a].child[b].child[c].child.length >= 4 || picArr[a].child[b].child[0].child.length + picArr[a].child[b].child[1].child.length >=6"
<button
*
ngIf=
"picArr[a].child[b].child[c].child.length >= 4 || picArr[a].child[b].child[0].child.length + picArr[a].child[b].child[1].child.length >=6"
style=
"width: 100%; height: 100%; border-radius: 25px; "
disabled
nz-button
nzType=
"solid"
style=
"width: 100%; height: 100%; border-radius: 25px; "
disabled
nz-button
nzType=
"solid"
(
click
)="
addSon
(
a
,
b
,
c
)"
>
(
click
)="
addSon
(
a
,
b
,
c
)"
>
<i
nz-icon
nzType=
"plus-circle"
></i>
<i
nz-icon
nzType=
"plus-circle"
></i>
<span
style=
"font-size: 20px;"
>
增加子类
</span>
<span
style=
"font-size: 20px;"
>
增加子类
</span>
</button>
</button>
<button
*
ngIf=
"picArr[a].child[b].child[c].child.length < 4 && picArr[a].child[b].child[0].child.length + picArr[a].child[b].child[1].child.length <6"
<button
*
ngIf=
"picArr[a].child[b].child[c].child.length < 4 && picArr[a].child[b].child[0].child.length + picArr[a].child[b].child[1].child.length <6"
style=
"width: 100%; height: 100%; border-radius: 25px; "
nz-button
nzType=
"solid"
style=
"width: 100%; height: 100%; border-radius: 25px; "
nz-button
nzType=
"solid"
(
click
)="
addSon
(
a
,
b
,
c
)"
>
(
click
)="
addSon
(
a
,
b
,
c
)"
>
<i
nz-icon
nzType=
"plus-circle"
></i>
<i
nz-icon
nzType=
"plus-circle"
></i>
...
...
play/assets/scene/fonts/BRLNSDB.TTF
deleted
100644 → 0
View file @
16c75716
File deleted
play/assets/scene/fonts/GOTHICB.TTF
0 → 100644
View file @
b6dc43d5
File added
play/assets/scene/fonts/
BRLNSD
B.TTF.meta
→
play/assets/scene/fonts/
GOTHIC
B.TTF.meta
View file @
b6dc43d5
{
{
"ver": "1.1.0",
"ver": "1.1.0",
"uuid": "
c551970e-b095-45f3-9f1d-25cde8b8deb1
",
"uuid": "
f792997f-f029-4df1-9adb-5e28c3e1a1c4
",
"subMetas": {}
"subMetas": {}
}
}
\ No newline at end of file
play/assets/scene/fonts/MMTextBookBold.ttf
0 → 100644
View file @
b6dc43d5
File added
play/assets/scene/fonts/MMTextBookBold.ttf.meta
0 → 100644
View file @
b6dc43d5
{
"ver": "1.1.0",
"uuid": "5d8c6a7f-89af-4150-a1e1-c687492e05c3",
"subMetas": {}
}
\ No newline at end of file
play/assets/scene/fonts/ahronbd.ttf
0 → 100644
View file @
b6dc43d5
File added
play/assets/scene/fonts/ahronbd.ttf.meta
0 → 100644
View file @
b6dc43d5
{
"ver": "1.1.0",
"uuid": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89",
"subMetas": {}
}
\ No newline at end of file
play/assets/scene/scene/data.js
View file @
b6dc43d5
This diff is collapsed.
Click to expand it.
play/assets/scene/scene/gameManager.js
View file @
b6dc43d5
This diff is collapsed.
Click to expand it.
play/assets/scene/scene/resizeWidget.js
View file @
b6dc43d5
class
CalculativeResize
{
class
CalculativeResize
{
static
resizeInfo
()
{
static
resizeInfo
()
{
//0.设计尺寸
//0.设计尺寸
let
baseSize
=
cc
.
size
(
1
920
,
108
0
);
let
baseSize
=
cc
.
size
(
1
280
,
72
0
);
//1.获取屏幕尺寸
//1.获取屏幕尺寸
let
canvasSize
=
cc
.
view
.
getCanvasSize
();
let
canvasSize
=
cc
.
view
.
getCanvasSize
();
//2.将屏幕宽高 以高度对齐的方式 换算出场景 宽度
//2.将屏幕宽高 以高度对齐的方式 换算出场景 宽度
let
sumSize
=
cc
.
size
(
canvasSize
.
width
*
baseSize
.
height
/
canvasSize
.
height
,
baseSize
.
height
)
let
sumSize
W
=
cc
.
size
(
canvasSize
.
width
*
baseSize
.
height
/
canvasSize
.
height
,
baseSize
.
height
)
//3.计算场景宽度与设计宽度比率
//3.计算场景宽度与设计宽度比率
let
scaleX
=
sumSize
.
width
/
baseSize
.
width
;
let
scaleX
=
sumSizeW
.
width
/
baseSize
.
width
;
let
posX
=
sumSize
.
width
-
baseSize
.
width
;
//高屏幕适配
//高屏幕适配
if
(
scaleX
<=
1
)
{
if
(
scaleX
<=
1
)
{
let
sumSize
=
cc
.
size
(
baseSize
.
width
,
canvasSize
.
height
*
baseSize
.
width
/
canvasSize
.
width
)
let
sumSizeY
=
cc
.
size
(
baseSize
.
width
,
canvasSize
.
height
*
(
baseSize
.
width
/
canvasSize
.
width
))
let
scaleY
=
sumSize
.
height
/
baseSize
.
height
;
let
scaleY
=
sumSizeY
.
height
/
baseSize
.
height
;
let
posY
=
sumSize
.
height
-
baseSize
.
height
;
let
posY
=
sumSizeY
.
height
-
baseSize
.
height
;
// let posY = sumSize.height * (1 - 1 / scaleX);
return
{
return
{
scaleX
:
1
,
scaleY
:
scaleY
,
posX
:
0
,
orgX
:
0
,
posY
:
posY
,
orgY
:
-
posY
/
2
}
scaleX
:
1
,
posX
:
0
,
moveX
:
0
,
scaleY
:
scaleY
,
posY
:
posY
,
moveY
:
-
posY
/
2
}
}
else
{
let
posX
=
sumSizeW
.
width
-
baseSize
.
width
;
//需要拓展的宽度缩放比
return
{
scaleX
:
scaleX
,
posX
:
posX
,
moveX
:
-
posX
/
2
,
scaleY
:
1
,
posY
:
0
,
moveY
:
0
};
}
}
//需要拓展的宽度缩放比
return
{
scaleX
:
scaleX
,
scaleY
:
1
,
posX
:
posX
,
orgX
:
-
posX
/
2
,
posY
:
0
,
orgY
:
0
};
}
}
}
}
//关于齐刘海的适配方案。
//关于齐刘海的适配方案。
...
@@ -122,11 +136,11 @@ cc.Class({
...
@@ -122,11 +136,11 @@ cc.Class({
//动态上移
//动态上移
if
(
this
.
p_top
==
1
)
{
if
(
this
.
p_top
==
1
)
{
this
.
node
.
y
=
nodeY
+
posY
/
2
*
0.75
this
.
node
.
y
=
nodeY
+
posY
/
2
}
}
//动态下移
//动态下移
if
(
this
.
p_bottom
==
1
)
{
if
(
this
.
p_bottom
==
1
)
{
this
.
node
.
y
=
nodeY
-
posY
/
2
*
0.75
this
.
node
.
y
=
nodeY
-
posY
/
2
}
}
},
},
...
...
play/assets/scene/scene/scene.fire
View file @
b6dc43d5
This diff is collapsed.
Click to expand it.
play/assets/scene/scene/scene.js
View file @
b6dc43d5
This diff is collapsed.
Click to expand it.
play/assets/scene/textures/compare/bg/title_bg.png
View replaced file @
16c75716
View file @
b6dc43d5
7.42 KB
|
W:
|
H:
16.8 KB
|
W:
|
H:
2-up
Swipe
Onion skin
play/assets/scene/textures/compare/bg/title_bg.png.meta
View file @
b6dc43d5
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
"genMipmaps": false,
"genMipmaps": false,
"packable": true,
"packable": true,
"width": 502,
"width": 502,
"height":
115
,
"height":
76
,
"platformSettings": {},
"platformSettings": {},
"subMetas": {
"subMetas": {
"title_bg": {
"title_bg": {
...
@@ -23,9 +23,9 @@
...
@@ -23,9 +23,9 @@
"trimX": 0,
"trimX": 0,
"trimY": 0,
"trimY": 0,
"width": 502,
"width": 502,
"height":
115
,
"height":
76
,
"rawWidth": 502,
"rawWidth": 502,
"rawHeight":
115
,
"rawHeight":
76
,
"borderTop": 0,
"borderTop": 0,
"borderBottom": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderLeft": 0,
...
...
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