Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GalaxySmash
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
Hà Trung (NEGAXY)
GalaxySmash
Commits
0fe07f1c
Commit
0fe07f1c
authored
Jan 23, 2022
by
Trương Khoa (NEGAXY)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Khoatv: fix planet menu
parent
5277fbcc
Changes
22
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
44 additions
and
905 deletions
+44
-905
Planet 0.asset
Assets/Game Resources/Data/PlanetData/Planet 0.asset
+1
-1
Planet 1.asset
Assets/Game Resources/Data/PlanetData/Planet 1.asset
+1
-1
Planet 10.asset
Assets/Game Resources/Data/PlanetData/Planet 10.asset
+1
-1
Planet 11.asset
Assets/Game Resources/Data/PlanetData/Planet 11.asset
+1
-1
Planet 12.asset
Assets/Game Resources/Data/PlanetData/Planet 12.asset
+1
-1
Planet 13.asset
Assets/Game Resources/Data/PlanetData/Planet 13.asset
+1
-1
Planet 14.asset
Assets/Game Resources/Data/PlanetData/Planet 14.asset
+2
-2
Planet 15.asset
Assets/Game Resources/Data/PlanetData/Planet 15.asset
+2
-2
Planet 16.asset
Assets/Game Resources/Data/PlanetData/Planet 16.asset
+2
-2
Planet 2.asset
Assets/Game Resources/Data/PlanetData/Planet 2.asset
+1
-1
Planet 3.asset
Assets/Game Resources/Data/PlanetData/Planet 3.asset
+1
-1
Planet 4.asset
Assets/Game Resources/Data/PlanetData/Planet 4.asset
+1
-1
Planet 5.asset
Assets/Game Resources/Data/PlanetData/Planet 5.asset
+1
-1
Planet 6.asset
Assets/Game Resources/Data/PlanetData/Planet 6.asset
+1
-1
Planet 7.asset
Assets/Game Resources/Data/PlanetData/Planet 7.asset
+1
-1
Planet 8.asset
Assets/Game Resources/Data/PlanetData/Planet 8.asset
+1
-1
Planet 9.asset
Assets/Game Resources/Data/PlanetData/Planet 9.asset
+1
-1
baseMat.mat
Assets/Game Resources/New Planets/baseMat.mat
+1
-1
Sphere_Planet.prefab
...ame Resources/Prefabs/Sample Planets/Sphere_Planet.prefab
+18
-879
SamplePlanet.cs
Assets/Scripts/SamplePlanet.cs
+2
-2
Ship_1_Engines.mat
.../SpaceJourney/Elements/Ships/Materials/Ship_1_Engines.mat
+1
-1
EditorUserSettings.asset
UserSettings/EditorUserSettings.asset
+2
-2
No files found.
Assets/Game Resources/Data/PlanetData/Planet 0.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Earth
description
:
health
:
0
elementId
:
0
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
8a4d3ee4c55603b478c8c57a66a47c56
,
type
:
3
}
atmosphereColor
:
{
r
:
0
,
g
:
30840.47
,
b
:
262144
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 1.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Hamburger
description
:
health
:
0
elementId
:
1
elementId
:
-
1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
af51c854365c73c4f9e340fc26234e11
,
type
:
3
}
atmosphereColor
:
{
r
:
257003.92
,
g
:
158314.42
,
b
:
0
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 10.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Ice Age
description
:
health
:
0
elementId
:
10
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
400fc362c46131d46b49c5921b79acbd
,
type
:
3
}
atmosphereColor
:
{
r
:
262144
,
g
:
11308.173
,
b
:
11308.173
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 11.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Amethyst
description
:
health
:
0
elementId
:
1
1
elementId
:
-
1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
e4dc0f37c95be314491b74473cfb7d3f
,
type
:
3
}
atmosphereColor
:
{
r
:
40092.613
,
g
:
230275.52
,
b
:
0
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 12.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Stonehedge
description
:
health
:
0
elementId
:
12
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
824d23d8fc9f5bf4c9729c1059ee6c1f
,
type
:
3
}
atmosphereColor
:
{
r
:
262144
,
g
:
4112.063
,
b
:
124389.9
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 13.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Fantasy 1
description
:
health
:
0
elementId
:
13
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
997d8bc04dc626949b0d1a000da65b6f
,
type
:
3
}
atmosphereColor
:
{
r
:
51400.785
,
g
:
35980.55
,
b
:
121305.85
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 14.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Fantasy 2
description
:
health
:
0
elementId
:
14
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
6b824d784a7574547b8807189202c130
,
type
:
3
}
atmosphereColor
:
{
r
:
121305.836
,
g
:
36201.22
,
b
:
104490.51
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
@@ -23,5 +23,5 @@ MonoBehaviour:
coreMat
:
{
fileID
:
0
}
planetShape
:
{
fileID
:
7814626328265554798
,
guid
:
0631b71b3eb789a43a637c5708cdac8f
,
type
:
3
}
samplePlanet
:
{
fileID
:
1071792754445631600
,
guid
:
43e1574360bb0cd4a8b963316728befe
,
samplePlanet
:
{
fileID
:
6928496034449465639
,
guid
:
67cc2b728588eb14f958d8eb03d2db54
,
type
:
3
}
Assets/Game Resources/Data/PlanetData/Planet 15.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Fantasy 3
description
:
health
:
0
elementId
:
15
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
02699ff6443563e46a4d71f77378e652
,
type
:
3
}
atmosphereColor
:
{
r
:
51400.785
,
g
:
35980.55
,
b
:
121305.85
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
@@ -23,5 +23,5 @@ MonoBehaviour:
coreMat
:
{
fileID
:
0
}
planetShape
:
{
fileID
:
2667856908064860720
,
guid
:
4fe5d748120a7034ebd3dd5e766594cb
,
type
:
3
}
samplePlanet
:
{
fileID
:
3502749531008742792
,
guid
:
33975cd33967ee543b9aa85977ff6928
,
samplePlanet
:
{
fileID
:
6928496034449465639
,
guid
:
67cc2b728588eb14f958d8eb03d2db54
,
type
:
3
}
Assets/Game Resources/Data/PlanetData/Planet 16.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
HE-01
description
:
health
:
0
elementId
:
16
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
05a030287f087c94e9f0597557526b27
,
type
:
3
}
atmosphereColor
:
{
r
:
121305.836
,
g
:
65892.16
,
b
:
36201.22
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
@@ -23,5 +23,5 @@ MonoBehaviour:
coreMat
:
{
fileID
:
0
}
planetShape
:
{
fileID
:
2899638119750606080
,
guid
:
93d32304ff6baf04db76c0498db549ba
,
type
:
3
}
samplePlanet
:
{
fileID
:
5864633486128767390
,
guid
:
67729f88d2fb3f543bbb05fd7e0be3c7
,
samplePlanet
:
{
fileID
:
6928496034449465639
,
guid
:
67cc2b728588eb14f958d8eb03d2db54
,
type
:
3
}
Assets/Game Resources/Data/PlanetData/Planet 2.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Cheese
description
:
health
:
0
elementId
:
2
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
45df769cb78289d41997ded152cb364e
,
type
:
3
}
atmosphereColor
:
{
r
:
178874.73
,
g
:
195322.98
,
b
:
196351
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 3.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Ice Cream
description
:
health
:
0
elementId
:
3
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
e331e4f3491a97244823912318cbf272
,
type
:
3
}
atmosphereColor
:
{
r
:
219995.36
,
g
:
219995.36
,
b
:
219995.36
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 4.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Winter
description
:
health
:
0
elementId
:
4
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
c318168a19467f045ba7d11d49669768
,
type
:
3
}
atmosphereColor
:
{
r
:
1028.0157
,
g
:
80185.23
,
b
:
262144
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 5.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Milk
description
:
health
:
0
elementId
:
5
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
2d7f011c8be5ed9469f9c3255c46c632
,
type
:
3
}
atmosphereColor
:
{
r
:
181958.78
,
g
:
134670.06
,
b
:
262144
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 6.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Space Station
description
:
health
:
0
elementId
:
6
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
0a082f1385aa8c64095f182ad7bda144
,
type
:
3
}
atmosphereColor
:
{
r
:
262144
,
g
:
250835.83
,
b
:
55512.848
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 7.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Santa Planet
description
:
health
:
0
elementId
:
7
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
fd4890254f87bf54c82c613ae9cb0f85
,
type
:
3
}
atmosphereColor
:
{
r
:
0
,
g
:
50886.777
,
b
:
131072
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 8.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Lava
description
:
health
:
0
elementId
:
8
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
5e6278087b1b8cd41b7a12bbf90739e3
,
type
:
3
}
atmosphereColor
:
{
r
:
262144
,
g
:
80185.23
,
b
:
16448.252
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/Data/PlanetData/Planet 9.asset
View file @
0fe07f1c
...
...
@@ -15,7 +15,7 @@ MonoBehaviour:
name
:
Toxic
description
:
health
:
0
elementId
:
9
elementId
:
-1
overlayTexture
:
{
fileID
:
2800000
,
guid
:
da373a8fe88900a4fa93f177c212bf09
,
type
:
3
}
atmosphereColor
:
{
r
:
262144
,
g
:
33386.266
,
b
:
259748.6
,
a
:
1
}
satelliteTexure
:
{
fileID
:
0
}
...
...
Assets/Game Resources/New Planets/baseMat.mat
View file @
0fe07f1c
...
...
@@ -58,7 +58,7 @@ Material:
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_MainTex
:
m_Texture
:
{
fileID
:
2800000
,
guid
:
8a4d3ee4c55603b478c8c57a66a47c56
,
type
:
3
}
m_Texture
:
{
fileID
:
2800000
,
guid
:
c318168a19467f045ba7d11d49669768
,
type
:
3
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_MetallicGlossMap
:
...
...
Assets/Game Resources/Prefabs/Sample Planets/Sphere_Planet.prefab
View file @
0fe07f1c
This diff is collapsed.
Click to expand it.
Assets/Scripts/SamplePlanet.cs
View file @
0fe07f1c
...
...
@@ -13,8 +13,8 @@ public class SamplePlanet : MonoBehaviour
public
List
<
GameObject
>
elements
=
new
List
<
GameObject
>();
public
void
SetState
(
bool
_destroyed
)
{
meshRenderer
.
enabled
=
!
_destroyed
;
destroyed
.
SetActive
(
_destroyed
);
meshRenderer
.
enabled
=
true
;
//
destroyed.SetActive(_destroyed);
if
(
_destroyed
)
{
elements
.
ForEach
(
a
=>
a
.
SetActive
(
false
));
...
...
Assets/SpaceJourney/Elements/Ships/Materials/Ship_1_Engines.mat
View file @
0fe07f1c
...
...
@@ -97,7 +97,7 @@ Material:
-
_Glossiness
:
0
-
_InvFade
:
3
-
_LightingEnabled
:
1
-
_Metallic
:
1.0000001
-
_Metallic
:
0
-
_Mode
:
4
-
_Mult
:
1
-
_OcclusionStrength
:
1
...
...
UserSettings/EditorUserSettings.asset
View file @
0fe07f1c
...
...
@@ -27,10 +27,10 @@ EditorUserSettings:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c730d07fc28440d0a36fe06471ef8021e12
flags
:
0
RecentlyUsedScenePath-7
:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
10de239
4a2b0f36e613
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
403e632
4a2b0f36e613
flags
:
0
RecentlyUsedScenePath-8
:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
403e632
4a2b0f36e613
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
10de239
4a2b0f36e613
flags
:
0
RecentlyUsedScenePath-9
:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
...
...
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