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
29beb3ef
Commit
29beb3ef
authored
Jan 20, 2022
by
Trương Khoa (NEGAXY)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Khoatv: fix UI
parent
1e7aeaf9
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
929 additions
and
400 deletions
+929
-400
Interface.prefab
Assets/Game Resources/Prefabs/Interface.prefab
+904
-114
RankUpPopup.prefab
Assets/Game Resources/Prefabs/RankUpPopup.prefab
+9
-8
home.unity
Assets/OSG Infinity Square Space/Scenes/home.unity
+10
-10
main.unity
Assets/OSG Infinity Square Space/Scenes/main.unity
+3
-265
Shader Graphs_Atmosphere.mat
Assets/Shader/Atmosphere/Shader Graphs_Atmosphere.mat
+1
-1
EditorUserSettings.asset
UserSettings/EditorUserSettings.asset
+2
-2
No files found.
Assets/Game Resources/Prefabs/Interface.prefab
View file @
29beb3ef
This diff is collapsed.
Click to expand it.
Assets/Game Resources/Prefabs/RankUpPopup.prefab
View file @
29beb3ef
...
@@ -34,8 +34,8 @@ RectTransform:
...
@@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
5
03
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
5
19.2346
}
m_SizeDelta
:
{
x
:
800
,
y
:
68.75
}
m_SizeDelta
:
{
x
:
964
,
y
:
179.5308
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&4369287123480911803
---
!u!222
&4369287123480911803
CanvasRenderer
:
CanvasRenderer
:
...
@@ -65,7 +65,7 @@ MonoBehaviour:
...
@@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_PersistentCalls
:
m_Calls
:
[]
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
5bc166a10b728bd45b53a7ba4b96a8ad
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
7af93e333cb38c34fa2f5cc270ba3328
,
type
:
3
}
m_Type
:
0
m_Type
:
0
m_PreserveAspect
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillCenter
:
1
...
@@ -109,8 +109,8 @@ RectTransform:
...
@@ -109,8 +109,8 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_AnchoredPosition
:
{
x
:
13.21
,
y
:
-22.791
}
m_SizeDelta
:
{
x
:
7
00
,
y
:
700
}
m_SizeDelta
:
{
x
:
7
73.58
,
y
:
773.5801
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&1961329738182120382
---
!u!222
&1961329738182120382
CanvasRenderer
:
CanvasRenderer
:
...
@@ -140,7 +140,7 @@ MonoBehaviour:
...
@@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_PersistentCalls
:
m_Calls
:
[]
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
acb54dc7575a5a24ab828da08bc07dc6
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
1044d960ed39bc34eb4e34afcea82b11
,
type
:
3
}
m_Type
:
0
m_Type
:
0
m_PreserveAspect
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillCenter
:
1
...
@@ -677,8 +677,8 @@ MonoBehaviour:
...
@@ -677,8 +677,8 @@ MonoBehaviour:
m_OnCullStateChanged
:
m_OnCullStateChanged
:
m_PersistentCalls
:
m_PersistentCalls
:
m_Calls
:
[]
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
1
8ebb61ad1e73534593d6bf80314dc00
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
1
5b7d30bb440166479e0958739a96d6e
,
type
:
3
}
m_Type
:
0
m_Type
:
1
m_PreserveAspect
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillCenter
:
1
m_FillMethod
:
4
m_FillMethod
:
4
...
@@ -743,6 +743,7 @@ MonoBehaviour:
...
@@ -743,6 +743,7 @@ MonoBehaviour:
m_StringArgument
:
m_StringArgument
:
m_BoolArgument
:
0
m_BoolArgument
:
0
m_CallState
:
2
m_CallState
:
2
playeSoundOnclick
:
1
isScale
:
1
isScale
:
1
---
!u!1
&6839727202372235876
---
!u!1
&6839727202372235876
GameObject
:
GameObject
:
...
...
Assets/OSG Infinity Square Space/Scenes/home.unity
View file @
29beb3ef
...
@@ -33698,7 +33698,7 @@ MonoBehaviour:
...
@@ -33698,7 +33698,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 604585192}
m_GameObject: {fileID: 604585192}
m_Enabled:
1
m_Enabled:
0
m_EditorHideFlags: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_Name:
...
@@ -33711,7 +33711,7 @@ MonoBehaviour:
...
@@ -33711,7 +33711,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_OnCullStateChanged:
m_PersistentCalls:
m_PersistentCalls:
m_Calls: []
m_Calls: []
m_Sprite: {fileID:
21300000, guid: 83cc8c90d7e8e4346ae9195fc3e2ebff, type: 3
}
m_Sprite: {fileID:
0
}
m_Type: 1
m_Type: 1
m_PreserveAspect: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillCenter: 1
...
@@ -70610,7 +70610,7 @@ PrefabInstance:
...
@@ -70610,7 +70610,7 @@ PrefabInstance:
- target: {fileID: 4386202184102293614, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 4386202184102293614, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
propertyPath: m_IsActive
propertyPath: m_IsActive
value:
1
value:
0
objectReference: {fileID: 0}
objectReference: {fileID: 0}
- target: {fileID: 4386202184102293615, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 4386202184102293615, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
...
@@ -70620,7 +70620,7 @@ PrefabInstance:
...
@@ -70620,7 +70620,7 @@ PrefabInstance:
- target: {fileID: 4386202184619213227, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 4386202184619213227, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
propertyPath: m_IsActive
propertyPath: m_IsActive
value:
1
value:
0
objectReference: {fileID: 0}
objectReference: {fileID: 0}
- target: {fileID: 4386202184619213228, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 4386202184619213228, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
...
@@ -70690,7 +70690,7 @@ PrefabInstance:
...
@@ -70690,7 +70690,7 @@ PrefabInstance:
- target: {fileID: 4386202184855054681, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 4386202184855054681, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
propertyPath: m_IsActive
propertyPath: m_IsActive
value:
1
value:
0
objectReference: {fileID: 0}
objectReference: {fileID: 0}
- target: {fileID: 5381556656979312282, guid: fe9a11986c3b8004c868b91b6067dcae,
- target: {fileID: 5381556656979312282, guid: fe9a11986c3b8004c868b91b6067dcae,
type: 3}
type: 3}
...
@@ -87466,7 +87466,7 @@ MonoBehaviour:
...
@@ -87466,7 +87466,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1640837600}
m_GameObject: {fileID: 1640837600}
m_Enabled:
1
m_Enabled:
0
m_EditorHideFlags: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_Name:
...
@@ -87479,7 +87479,7 @@ MonoBehaviour:
...
@@ -87479,7 +87479,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_OnCullStateChanged:
m_PersistentCalls:
m_PersistentCalls:
m_Calls: []
m_Calls: []
m_Sprite: {fileID:
21300000, guid: 83cc8c90d7e8e4346ae9195fc3e2ebff, type: 3
}
m_Sprite: {fileID:
0
}
m_Type: 1
m_Type: 1
m_PreserveAspect: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillCenter: 1
...
@@ -92604,7 +92604,7 @@ MonoBehaviour:
...
@@ -92604,7 +92604,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1778549405}
m_GameObject: {fileID: 1778549405}
m_Enabled:
1
m_Enabled:
0
m_EditorHideFlags: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_Name:
...
@@ -92617,7 +92617,7 @@ MonoBehaviour:
...
@@ -92617,7 +92617,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_OnCullStateChanged:
m_PersistentCalls:
m_PersistentCalls:
m_Calls: []
m_Calls: []
m_Sprite: {fileID:
21300000, guid: 83cc8c90d7e8e4346ae9195fc3e2ebff, type: 3
}
m_Sprite: {fileID:
0
}
m_Type: 1
m_Type: 1
m_PreserveAspect: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillCenter: 1
...
@@ -172321,7 +172321,7 @@ RectTransform:
...
@@ -172321,7 +172321,7 @@ RectTransform:
m_GameObject: {fileID: 998675912}
m_GameObject: {fileID: 998675912}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x:
0.96000004, y: 0.96000004, z: 0.96000004
}
m_LocalScale: {x:
1, y: 1, z: 1
}
m_Children:
m_Children:
- {fileID: 998453196}
- {fileID: 998453196}
m_Father: {fileID: 709971957}
m_Father: {fileID: 709971957}
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @
29beb3ef
This diff is collapsed.
Click to expand it.
Assets/Shader/Atmosphere/Shader Graphs_Atmosphere.mat
View file @
29beb3ef
...
@@ -36,7 +36,7 @@ Material:
...
@@ -36,7 +36,7 @@ Material:
-
Vector1_037422ac7c3343b3b7493dead063f9bb
:
0.006
-
Vector1_037422ac7c3343b3b7493dead063f9bb
:
0.006
-
Vector1_7fc372182bde42b39d4fce1ca0ef8b6e
:
6.8
-
Vector1_7fc372182bde42b39d4fce1ca0ef8b6e
:
6.8
-
Vector1_dcb7b53c006f40ef9ae4c2c1d71198be
:
0.5
-
Vector1_dcb7b53c006f40ef9ae4c2c1d71198be
:
0.5
-
_Alpha
:
0.00
504
-
_Alpha
:
0.00
6
m_Colors
:
m_Colors
:
-
Color_7b883b4cd7c248a580d2475d1da9ed40
:
{
r
:
0
,
g
:
65110.777
,
b
:
259086.64
,
a
:
0
}
-
Color_7b883b4cd7c248a580d2475d1da9ed40
:
{
r
:
0
,
g
:
65110.777
,
b
:
259086.64
,
a
:
0
}
-
_AtmosphereColor
:
{
r
:
257003.92
,
g
:
158314.42
,
b
:
0
,
a
:
1
}
-
_AtmosphereColor
:
{
r
:
257003.92
,
g
:
158314.42
,
b
:
0
,
a
:
1
}
...
...
UserSettings/EditorUserSettings.asset
View file @
29beb3ef
...
@@ -30,10 +30,10 @@ EditorUserSettings:
...
@@ -30,10 +30,10 @@ EditorUserSettings:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
flags
:
0
flags
:
0
RecentlyUsedScenePath-8
:
RecentlyUsedScenePath-8
:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
10de2394a2b0f36e613
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
f0bfd2f10320e3ef603070cb81e04020517
flags
:
0
flags
:
0
RecentlyUsedScenePath-9
:
RecentlyUsedScenePath-9
:
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
f0bfd2f10320e3ef603070cb81e04020517
value
:
22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733
10de2394a2b0f36e613
flags
:
0
flags
:
0
vcSharedLogLevel
:
vcSharedLogLevel
:
value
:
0d5e400f0650
value
:
0d5e400f0650
...
...
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