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
37647745
Commit
37647745
authored
May 19, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更换icon
parent
32398aa3
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
120932 additions
and
120896 deletions
+120932
-120896
DemoScenes.unity
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
+120837
-120837
FruitView.cs
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
+60
-53
GlobalConfig.cs
3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs
+26
-2
BattleUI.prefab
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
+2
-2
Level2.prefab
3D Fruit/Assets/Res/Levels/Level2.prefab
+5
-0
ProjectSettings.asset
3D Fruit/ProjectSettings/ProjectSettings.asset
+2
-2
No files found.
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @
37647745
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @
37647745
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs
View file @
37647745
...
@@ -231,7 +231,7 @@ public class GlobalConfig
...
@@ -231,7 +231,7 @@ public class GlobalConfig
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
StrawberryObj
);
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
StrawberryObj
);
}
}
//varObj.transform.SetParent(parent);
//varObj.transform.SetParent(parent);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.
5
f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.
0
f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
for
(
int
i
=
0
;
i
<
3
;
i
++)
...
@@ -247,6 +247,18 @@ public class GlobalConfig
...
@@ -247,6 +247,18 @@ public class GlobalConfig
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
OrangeObj
);
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
OrangeObj
);
}
}
//varObj.transform.SetParent(parent);
//varObj.transform.SetParent(parent);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
GameObject
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
StrawberryObj
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.0f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
GameObject
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
OrangeObj
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
}
...
@@ -287,7 +299,7 @@ public class GlobalConfig
...
@@ -287,7 +299,7 @@ public class GlobalConfig
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
BasketBallObj
);
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
BasketBallObj
);
}
}
//varObj.transform.SetParent(parent);
//varObj.transform.SetParent(parent);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.
5
f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.
0
f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
for
(
int
i
=
0
;
i
<
3
;
i
++)
...
@@ -303,6 +315,18 @@ public class GlobalConfig
...
@@ -303,6 +315,18 @@ public class GlobalConfig
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
VolleyBallObj
);
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
VolleyBallObj
);
}
}
//varObj.transform.SetParent(parent);
//varObj.transform.SetParent(parent);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
3.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
GameObject
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
FootBallObj
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.0f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
GameObject
varObj
=
PoolManager
.
Instance
.
GetObjectFromPool
(
CacheManager
.
Instance
.
BasketBallObj
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localPosition
=
new
Vector3
(-
0.5f
+
0.5f
*
i
+
varX
,
4.5f
+
varY
,
0.0f
+
varZ
);
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
varObj
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
}
}
...
...
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @
37647745
...
@@ -1245,7 +1245,7 @@ MonoBehaviour:
...
@@ -1245,7 +1245,7 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_PersistentCalls
:
m_Calls
:
[]
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
3afc2b4c334b2134897b4ea3997bc013
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
14c5a3a3ccce523459a47a03bb1734fe
,
type
:
3
}
m_Type
:
0
m_Type
:
0
m_PreserveAspect
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillCenter
:
1
...
@@ -11718,7 +11718,7 @@ MonoBehaviour:
...
@@ -11718,7 +11718,7 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_PersistentCalls
:
m_Calls
:
[]
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
3eada229472b6054abf9a399699efe04
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
c5a907af424db2f44bffe2a7ad5ef797
,
type
:
3
}
m_Type
:
0
m_Type
:
0
m_PreserveAspect
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillCenter
:
1
...
...
3D Fruit/Assets/Res/Levels/Level2.prefab
View file @
37647745
...
@@ -36882,6 +36882,11 @@ PrefabInstance:
...
@@ -36882,6 +36882,11 @@ PrefabInstance:
propertyPath
:
m_Name
propertyPath
:
m_Name
value
:
SM_Primitive_Torus_04
value
:
SM_Primitive_Torus_04
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-927199367670048503
,
guid
:
eeac5b70c5baae8478ec17be74426a76
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
eeac5b70c5baae8478ec17be74426a76
,
type
:
3
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
eeac5b70c5baae8478ec17be74426a76
,
type
:
3
}
---
!u!1
&1514226244696436991
stripped
---
!u!1
&1514226244696436991
stripped
...
...
3D Fruit/ProjectSettings/ProjectSettings.asset
View file @
37647745
...
@@ -13,7 +13,7 @@ PlayerSettings:
...
@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources
:
0
useOnDemandResources
:
0
accelerometerFrequency
:
60
accelerometerFrequency
:
60
companyName
:
Dyspace
companyName
:
Dyspace
productName
:
Blen
t it M
atch
productName
:
Blen
d it m
atch
defaultCursor
:
{
fileID
:
0
}
defaultCursor
:
{
fileID
:
0
}
cursorHotspot
:
{
x
:
0
,
y
:
0
}
cursorHotspot
:
{
x
:
0
,
y
:
0
}
m_SplashScreenBackgroundColor
:
{
r
:
0.13725491
,
g
:
0.12156863
,
b
:
0.1254902
,
a
:
1
}
m_SplashScreenBackgroundColor
:
{
r
:
0.13725491
,
g
:
0.12156863
,
b
:
0.1254902
,
a
:
1
}
...
@@ -163,7 +163,7 @@ PlayerSettings:
...
@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio
:
1
androidSupportedAspectRatio
:
1
androidMaxAspectRatio
:
2.1
androidMaxAspectRatio
:
2.1
applicationIdentifier
:
applicationIdentifier
:
Android
:
com.Dyspace.Blen
titM
atch
Android
:
com.Dyspace.Blen
ditm
atch
buildNumber
:
{}
buildNumber
:
{}
AndroidBundleVersionCode
:
1
AndroidBundleVersionCode
:
1
AndroidMinSdkVersion
:
19
AndroidMinSdkVersion
:
19
...
...
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