Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
3
3D Fruit
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
wanqing
3D Fruit
Commits
30b2eb8d
Commit
30b2eb8d
authored
Jun 08, 2021
by
Yuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
于:主场景调整/材质球调整/关卡2D水碰撞盒调整
parent
ff89103c
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
2967 additions
and
2620 deletions
+2967
-2620
DemoScenes.unity
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
+1298
-955
Orange_Whole_Mat.mat
..._Models/Food - Fruits Pack/Materials/Orange_Whole_Mat.mat
+2
-2
Strawberry_Whole_Mat.mat
...els/Food - Fruits Pack/Materials/Strawberry_Whole_Mat.mat
+2
-2
ORANGE-YELLOW 1.mat
3D Fruit/Assets/#C3_Materials/ORANGE-YELLOW 1.mat
+2
-2
Toon_Lit Glass 1.mat
3D Fruit/Assets/#C3_Materials/Toon_Lit Glass 1.mat
+9
-9
Toon_Lit Glass.mat
3D Fruit/Assets/#C3_Materials/Toon_Lit Glass.mat
+6
-6
Level0.prefab
3D Fruit/Assets/Res/Levels/Level0.prefab
+7
-5
Level1.prefab
3D Fruit/Assets/Res/Levels/Level1.prefab
+900
-899
Level3.prefab
3D Fruit/Assets/Res/Levels/Level3.prefab
+741
-740
No files found.
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @
30b2eb8d
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/#C1_Models/Food - Fruits Pack/Materials/Orange_Whole_Mat.mat
View file @
30b2eb8d
...
...
@@ -32,6 +32,6 @@ Material:
-
_RimMin
:
0.5
m_Colors
:
-
_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_HColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_HColor
:
{
r
:
0.8301887
,
g
:
0.8301887
,
b
:
0.8301887
,
a
:
1
}
-
_RimColor
:
{
r
:
0.8
,
g
:
0.8
,
b
:
0.8
,
a
:
0.6
}
-
_SColor
:
{
r
:
0.
6792453
,
g
:
0.6792453
,
b
:
0.6792453
,
a
:
1
}
-
_SColor
:
{
r
:
0.
16037738
,
g
:
0.16037738
,
b
:
0.16037738
,
a
:
1
}
3D Fruit/Assets/#C1_Models/Food - Fruits Pack/Materials/Strawberry_Whole_Mat.mat
View file @
30b2eb8d
...
...
@@ -32,6 +32,6 @@ Material:
-
_RimMin
:
0.5
m_Colors
:
-
_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_HColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_HColor
:
{
r
:
0.8396226
,
g
:
0.8396226
,
b
:
0.8396226
,
a
:
1
}
-
_RimColor
:
{
r
:
0.8
,
g
:
0.8
,
b
:
0.8
,
a
:
0.6
}
-
_SColor
:
{
r
:
0
.5566038
,
g
:
0.5539783
,
b
:
0.5539783
,
a
:
1
}
-
_SColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
3D Fruit/Assets/#C3_Materials/ORANGE-YELLOW 1.mat
View file @
30b2eb8d
...
...
@@ -79,5 +79,5 @@ Material:
m_Colors
:
-
_Color
:
{
r
:
0.6132076
,
g
:
0.35025203
,
b
:
0.112807065
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
-
_HColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_SColor
:
{
r
:
0.
3
,
g
:
0.3
,
b
:
0.
3
,
a
:
1
}
-
_HColor
:
{
r
:
0.6792453
,
g
:
0.6792453
,
b
:
0.6792453
,
a
:
1
}
-
_SColor
:
{
r
:
0.
1792453
,
g
:
0.1792453
,
b
:
0.179245
3
,
a
:
1
}
3D Fruit/Assets/#C3_Materials/Toon_Lit Glass 1.mat
View file @
30b2eb8d
...
...
@@ -20,17 +20,17 @@ Material:
serializedVersion
:
3
m_TexEnvs
:
[]
m_Floats
:
-
_FresnelInner
:
0.
707
-
_FresnelInner
:
0.
669
-
_Offset
:
0.309
-
_Offset2
:
0.
173
-
_OutRimCutoff
:
0
-
_RimPower
:
0.9
8
-
_RimPower2
:
0.
83
-
_SpecOffset
:
0.8
54
-
_SpecSize
:
0.88
4
-
_Offset2
:
0.
309
-
_OutRimCutoff
:
0
.491
-
_RimPower
:
1.1
8
-
_RimPower2
:
0.
9
-
_SpecOffset
:
0.8
18
-
_SpecSize
:
0.88
3
-
_SpecSize2
:
0.999
m_Colors
:
-
_Color
:
{
r
:
0.06652723
,
g
:
0.12099328
,
b
:
0.122641504
,
a
:
0.105882354
}
-
_RimColor
:
{
r
:
0.
6037736
,
g
:
0.5838377
,
b
:
0.5838377
,
a
:
1
}
-
_RimColor2
:
{
r
:
0.3292097
,
g
:
0.509434
,
b
:
0.500031
,
a
:
1
}
-
_RimColor
:
{
r
:
0.
5849056
,
g
:
0.5849056
,
b
:
0.5849056
,
a
:
0.34901962
}
-
_RimColor2
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
0.90588236
}
-
_SColor
:
{
r
:
0.5849056
,
g
:
0.5849056
,
b
:
0.5849056
,
a
:
0.13333334
}
3D Fruit/Assets/#C3_Materials/Toon_Lit Glass.mat
View file @
30b2eb8d
...
...
@@ -20,15 +20,15 @@ Material:
serializedVersion
:
3
m_TexEnvs
:
[]
m_Floats
:
-
_FresnelInner
:
0.
707
-
_Offset
:
0
-
_Offset2
:
0
.173
-
_FresnelInner
:
0.
145
-
_Offset
:
0
.735
-
_Offset2
:
0
-
_OutRimCutoff
:
0
-
_RimPower
:
1.
38
-
_RimPower2
:
0.8
6
-
_RimPower
:
1.
43
-
_RimPower2
:
0.8
1
-
_SpecOffset
:
0.861
-
_SpecSize
:
0.932
-
_SpecSize2
:
0.
999
-
_SpecSize2
:
0.
86
m_Colors
:
-
_Color
:
{
r
:
0.12726948
,
g
:
0.18867922
,
b
:
0.18778922
,
a
:
0.2
}
-
_RimColor
:
{
r
:
0.49
,
g
:
0.94
,
b
:
0.64
,
a
:
1
}
...
...
3D Fruit/Assets/Res/Levels/Level0.prefab
View file @
30b2eb8d
...
...
@@ -1659,7 +1659,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1617316875549926354
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0.9
,
y
:
-19
.51
,
z
:
0
}
m_LocalPosition
:
{
x
:
0.9
,
y
:
-19
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1602968701845464429
}
...
...
@@ -4711,7 +4711,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4267377010755833333
}
m_LocalRotation
:
{
x
:
0
,
y
:
1
,
z
:
0
,
w
:
0
}
m_LocalPosition
:
{
x
:
-4
.57
,
y
:
-14.4
,
z
:
0
}
m_LocalPosition
:
{
x
:
-4
,
y
:
-14.4
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1602968701845464429
}
...
...
@@ -4743,7 +4743,8 @@ PolygonCollider2D:
m_Points
:
m_Paths
:
-
-
{
x
:
-1.5402699
,
y
:
-0.2456665
}
-
{
x
:
-1.3993404
,
y
:
3.961506
}
-
{
x
:
-0.3876891
,
y
:
6.206956
}
-
{
x
:
-0.54668427
,
y
:
6.395197
}
-
{
x
:
-2.238971
,
y
:
4.119561
}
-
{
x
:
-2.2824092
,
y
:
4.180665
}
-
{
x
:
-2.3571496
,
y
:
1.63865
}
...
...
@@ -5750,6 +5751,7 @@ MonoBehaviour:
m_orange
:
{
fileID
:
2197235679629580728
}
m_fish
:
{
fileID
:
8500860620660856442
}
m_egg
:
{
fileID
:
5230852199521953635
}
m_five
:
{
fileID
:
0
}
m_effectPos
:
{
fileID
:
0
}
m_maskTrans
:
{
fileID
:
8220649301570761060
}
---
!u!1
&4758281453930290115
...
...
@@ -6714,7 +6716,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5756065276142488297
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
4
.57
,
y
:
-14.4
,
z
:
0
}
m_LocalPosition
:
{
x
:
4
,
y
:
-14.4
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1602968701845464429
}
...
...
@@ -6746,7 +6748,7 @@ PolygonCollider2D:
m_Points
:
m_Paths
:
-
-
{
x
:
-1.5402699
,
y
:
-0.2456665
}
-
{
x
:
-
1.3993404
,
y
:
3.961506
}
-
{
x
:
-
0.814214
,
y
:
6.3237934
}
-
{
x
:
-2.238971
,
y
:
4.119561
}
-
{
x
:
-2.2824092
,
y
:
4.180665
}
-
{
x
:
-2.3571496
,
y
:
1.63865
}
...
...
3D Fruit/Assets/Res/Levels/Level1.prefab
View file @
30b2eb8d
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/Res/Levels/Level3.prefab
View file @
30b2eb8d
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