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
3574c23a
Commit
3574c23a
authored
Dec 11, 2021
by
Trương Khoa (NEGAXY)
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.147.34.20:30081/trung.ha/galaxysmash
parents
e03b70d5
1a34547b
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
468 additions
and
10 deletions
+468
-10
RankRewardPopup.prefab
Assets/Game Resources/Prefabs/RankRewardPopup.prefab
+14
-0
getammo.asset
Assets/Localization/getammo.asset
+32
-0
getammo.asset.meta
Assets/Localization/getammo.asset.meta
+8
-0
getmoretime.asset
Assets/Localization/getmoretime.asset
+32
-0
getmoretime.asset.meta
Assets/Localization/getmoretime.asset.meta
+8
-0
moretime.asset
Assets/Localization/moretime.asset
+31
-0
moretime.asset.meta
Assets/Localization/moretime.asset.meta
+8
-0
outofammo.asset
Assets/Localization/outofammo.asset
+29
-0
outofammo.asset.meta
Assets/Localization/outofammo.asset.meta
+8
-0
youpromote.asset
Assets/Localization/youpromote.asset
+32
-0
youpromote.asset.meta
Assets/Localization/youpromote.asset.meta
+8
-0
youreceived.asset
Assets/Localization/youreceived.asset
+29
-0
youreceived.asset.meta
Assets/Localization/youreceived.asset.meta
+8
-0
firstloading.unity
Assets/OSG Infinity Square Space/Scenes/firstloading.unity
+117
-1
main.unity
Assets/OSG Infinity Square Space/Scenes/main.unity
+41
-3
TutorialManager.cs
Assets/Scripts/TutorialManager.cs
+42
-0
TutorialManager.cs.meta
Assets/Scripts/TutorialManager.cs.meta
+11
-0
HomeScreen.cs
Assets/Scripts/UI/HomeScreen.cs
+0
-1
RankUI.cs
Assets/Scripts/UI/RankUI.cs
+10
-5
No files found.
Assets/Game Resources/Prefabs/RankRewardPopup.prefab
View file @
3574c23a
...
...
@@ -1411,6 +1411,7 @@ GameObject:
-
component
:
{
fileID
:
2901800396522636964
}
-
component
:
{
fileID
:
6519409804576558141
}
-
component
:
{
fileID
:
620261449777979345
}
-
component
:
{
fileID
:
7068979905083757093
}
m_Layer
:
5
m_Name
:
Text (TMP)
m_TagString
:
Untagged
...
...
@@ -1535,6 +1536,19 @@ MonoBehaviour:
m_hasFontAssetChanged
:
0
m_baseMaterial
:
{
fileID
:
0
}
m_maskOffset
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
---
!u!114
&7068979905083757093
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4003644880009159317
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
50fd61b7673ae9e489895fd51ac74e0b
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
textData
:
{
fileID
:
11400000
,
guid
:
6881dd9ae2faa3a4f8b0886095070879
,
type
:
2
}
---
!u!1
&4049854500255467418
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/Localization/getammo.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
getammo
m_EditorClassIdentifier
:
key
:
getammo
en
:
What ad to get ammo
vi
:
"
Xem
\u0111\u1EC3
nh
\u1EAD
n
v
\u0169
kh
\xED
"
ko
:
"
\uC5B4\uB5A4
\uAD11\uACE0\uAC00
\uD0C4\uC57D\uC744
\uC5BB\uC744
\uC218
\uC788\uC2B5\uB2C8\uB2E4
"
ja
:
"
\u5F3E\u85AC\u3092\u624B\u306B\u5165\u308C\u308B\u5E83\u544A
"
fr
:
Quelle annonce pour obtenir des munitions
de
:
Welche Anzeige soll Munition bekommen?
pt
:
"
Que
an
\xFA
ncio
para
obter
muni
\xE7\xE3
o"
hi
:
"
AMMO
\u0915\u094B
\u092A\u093E\u0928\u0947
\u0915\u0947
\u0932\u093F\u090F
\u0915\u094D\u092F\u093E
\u0935\u093F\u091C\u094D\u091E\u093E\u092A\u0928
\u0939\u0948
"
ar
:
"
\u0645\u0627
\u0627\u0644\u0625\u0639\u0644\u0627\u0646
\u0644\u0644\u062D\u0635\u0648\u0644
\u0639\u0644\u0649
\u0627\u0644\u0630\u062E\u064A\u0631\u0629
"
ru
:
"
\u041A\u0430\u043A\u0430\u044F
\u0440\u0435\u043A\u043B\u0430\u043C\u0430
\u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C
\u0431\u043E\u0435\u043F\u0440\u0438\u043F\u0430\u0441\u044B
"
it
:
Che annuncio ottenere munizioni
es
:
"
Qu
\xE9
anuncio
para
conseguir
munici
\xF3
n"
zh
:
"
\u4EC0\u4E48\u5E7F\u544A\u83B7\u5F97\u5F39\u836F
"
th
:
"
\u0E42\u0E06\u0E29\u0E13\u0E32\u0E2D\u0E30\u0E44\u0E23\u0E17\u0E35\u0E48\u0E08\u0E30\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E01\u0E23\u0E30\u0E2A\u0E38\u0E19
"
Assets/Localization/getammo.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 885bc98960cde8d46b844ec4f9a0888e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Localization/getmoretime.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
getmoretime
m_EditorClassIdentifier
:
key
:
getmoretime
en
:
GET MORE TIME
vi
:
"
TH
\xCA
M
TH
\u1EDC
I
GIAN"
ko
:
"
\uB354
\uB9CE\uC740
\uC2DC\uAC04\uC744
\uBCF4\uB0C5\uB2C8\uB2E4
"
ja
:
"
\u3082\u3063\u3068\u6642\u9593\u3092\u5165\u624B\u3057\u3066\u304F\u3060\u3055\u3044
"
fr
:
Avoir plus de temps
de
:
Mehr Zeit bekommen.
pt
:
Obtenha mais tempo
hi
:
"
\u0905\u0927\u093F\u0915
\u0938\u092E\u092F
\u092A\u094D\u0930\u093E\u092A\u094D\u0924
\u0915\u0930\u0947\u0902
"
ar
:
"
\u0627\u0644\u062D\u0635\u0648\u0644
\u0639\u0644\u0649
\u0627\u0644\u0645\u0632\u064A\u062F
\u0645\u0646
\u0627\u0644\u0648\u0642\u062A
"
ru
:
"
\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C
\u0431\u043E\u043B\u044C\u0448\u0435
\u0432\u0440\u0435\u043C\u0435\u043D\u0438
"
it
:
"
Ottenere
pi
\xF9
tempo"
es
:
"
Tener
m
\xE1
s
tiempo"
zh
:
"
\u83B7\u5F97\u66F4\u591A\u65F6\u95F4
"
th
:
"
\u0E23\u0E31\u0E1A\u0E40\u0E27\u0E25\u0E32\u0E21\u0E32\u0E01\u0E02\u0E36\u0E49\u0E19
"
Assets/Localization/getmoretime.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 6a27d43c9723b164e9a5d6d4aade43f3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Localization/moretime.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
moretime
m_EditorClassIdentifier
:
key
:
moretime
en
:
You need more time?
vi
:
"
B
\u1EA1
n
c
\u1EA7
n
th
\xEA
m
th
\u1EDD
i
gian?"
ko
:
"
\uB354
\uB9CE\uC740
\uC2DC\uAC04\uC774
\uD544\uC694\uD569\uB2C8\uAE4C
?"
ja
:
"
\u3082\u3063\u3068\u6642\u9593\u304C\u304B\u304B\u308A\u307E\u3059\u304B\uFF1F
"
fr
:
Vous avez besoin de plus de temps?
de
:
Du brauchst mehr Zeit?
pt
:
"
Voc
\xEA
precisa
de
mais
tempo?"
hi
:
"
\u0906\u092A\u0915\u094B
\u0905\u0927\u093F\u0915
\u0938\u092E\u092F
\u091A\u093E\u0939\u093F\u090F
?"
ar
:
"
\u062A\u062D\u062A\u0627\u062C
\u0627\u0644\u0645\u0632\u064A\u062F
\u0645\u0646
\u0627\u0644\u0648\u0642\u062A\u061F
"
ru
:
"
\u0412\u0430\u043C
\u043D\u0443\u0436\u043D\u043E
\u0431\u043E\u043B\u044C\u0448\u0435
\u0432\u0440\u0435\u043C\u0435\u043D\u0438
?"
it
:
"
Hai
bisogno
di
pi
\xF9
tempo?"
es
:
"
\xBF
Necesitas
m
\xE1
s
tiempo?"
zh
:
"
\u4F60\u9700\u8981\u66F4\u591A\u65F6\u95F4\u5417\uFF1F
"
th
:
"
\u0E04\u0E38\u0E13\u0E15\u0E49\u0E2D\u0E07\u0E01\u0E32\u0E23\u0E40\u0E27\u0E25\u0E32\u0E21\u0E32\u0E01\u0E02\u0E36\u0E49\u0E19
?"
Assets/Localization/moretime.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 5a91021719185214b99109498527b9d0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Localization/outofammo.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
outofammo
m_EditorClassIdentifier
:
key
:
outofammo
en
:
OUT OF AMMO
vi
:
"
H
\u1EBE
T
\u0110\u1EA0
N"
ko
:
"
\uD0C4\uC57D\uC5D0\uC11C
\uBC97\uC5B4\uB09C\uB2E4
"
ja
:
"
\u5F3E\u85AC\u304B\u3089
"
fr
:
"
\xC0
COURT
DE
MUNITIONS"
de
:
KEINE MUNITION MEHR
pt
:
"
SEM
MUNI
\xC7\xC3
O"
hi
:
"
\u092C\u093E\u0930\u0942\u0926
\u0938\u0947
\u092C\u093E\u0939\u0930
"
ar
:
"
\u062E\u0627\u0631\u062C
\u0627\u0644\u0630\u062E\u064A\u0631\u0629
"
ru
:
"
\u041D\u0415\u0422
\u041F\u0410\u0422\u0420\u041E\u041D\u041E\u0412
"
it
:
MUNIZIONI FINITE
es
:
SIN MUNICIONES
zh
:
"
\u4ECE\u5F39\u836F\u4E2D
"
th
:
"
\u0E2D\u0E2D\u0E01\u0E21\u0E32\u0E08\u0E32\u0E01\u0E01\u0E23\u0E30\u0E2A\u0E38\u0E19
"
Assets/Localization/outofammo.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 6fc385599f84ad84599a14d4edbd3f7d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Localization/youpromote.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
youpromote
m_EditorClassIdentifier
:
key
:
youpromote
en
:
You've been promoted to
vi
:
"
B
\u1EA1
n
\u0111\xE3
\u0111\u01B0\u1EE3
c
th
\u0103
ng
c
\u1EA5
p"
ko
:
"
\uB2F9\uC2E0\uC740
\uD64D\uBCF4\uB418\uC5C8\uC2B5\uB2C8\uB2E4
"
ja
:
"
\u3042\u306A\u305F\u306F\u5BA3\u4F1D\u3055\u308C\u307E\u3057\u305F
"
fr
:
"
Vous
avez
\xE9
t
\xE9
promu"
de
:
"
Sie
wurden
bef
\xF6
rdert"
pt
:
"
Voc
\xEA
foi
promovido
a"
hi
:
"
\u0906\u092A\u0915\u094B
\u092A\u0926\u094B\u0928\u094D\u0928\u0924
\u0915\u093F\u092F\u093E
\u0917\u092F\u093E
\u0939\u0948
"
ar
:
"
\u0644\u0642\u062F
\u062A\u0645\u062A
\u062A\u0631\u0642\u064A\u062A\u0647
\u0625\u0644\u0649
"
ru
:
"
\u0412\u044B
\u0431\u044B\u043B\u0438
\u043F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044B
\u043A
"
it
:
Sei stato promosso a
es
:
Has sido promovido a
zh
:
"
\u4F60\u5DF2\u7ECF\u88AB\u664B\u5347\u4E3A
"
th
:
"
\u0E04\u0E38\u0E13\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E01\u0E32\u0E23\u0E40\u0E25\u0E37\u0E48\u0E2D\u0E19\u0E15\u0E33\u0E41\u0E2B\u0E19\u0E48\u0E07\u0E43\u0E2B\u0E49\u0E40\u0E1B\u0E47\u0E19
"
Assets/Localization/youpromote.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 4ff0b1e437c02794d8b653d0dd0eadc5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Localization/youreceived.asset
0 → 100644
View file @
3574c23a
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e34fbc00d16be9f4db7ad7b247a8462e
,
type
:
3
}
m_Name
:
youreceived
m_EditorClassIdentifier
:
key
:
youreceived
en
:
You received
vi
:
"
B
\u1EA1
n
\u0111\xE3
nh
\u1EAD
n
\u0111\u01B0\u1EE3
c"
ko
:
"
\uB108\uB294
\uBC1B\uC558\uB2E4
"
ja
:
"
\u3042\u306A\u305F\u306F\u53D7\u3051\u53D6\u3063\u305F
"
fr
:
"
Tu
as
re
\xE7
u"
de
:
Sie erhielten
pt
:
"
Voc
\xEA
recebeu"
hi
:
"
\u0906\u092A
\u0915\u094B
\u092E\u093F\u0932\u093E
"
ar
:
"
\u0627\u0633\u062A\u0644\u0645\u062A
"
ru
:
"
\u0412\u044B
\u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0438
"
it
:
Hai ricevuto
es
:
Recibiste
zh
:
"
\u4F60\u6536\u5230
"
th
:
"
\u0E04\u0E38\u0E13\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A
"
Assets/Localization/youreceived.asset.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 6881dd9ae2faa3a4f8b0886095070879
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/OSG Infinity Square Space/Scenes/firstloading.unity
View file @
3574c23a
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0.446578
98
,
g
:
0.4964133
,
b
:
0.5748178
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.446578
26
,
g
:
0.49641263
,
b
:
0.57481676
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
LightmapSettings
:
...
...
@@ -737,6 +737,121 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
textData
:
{
fileID
:
11400000
,
guid
:
df573dcaf6e90614a8ffe9ece31d6725
,
type
:
2
}
---
!u!1
&807943467
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
807943468
}
-
component
:
{
fileID
:
807943470
}
-
component
:
{
fileID
:
807943469
}
-
component
:
{
fileID
:
807943472
}
-
component
:
{
fileID
:
807943471
}
m_Layer
:
5
m_Name
:
Tutorials
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!224
&807943468
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
807943467
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1657161557
}
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
1
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
0
,
y
:
0
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&807943469
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
807943467
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
fe87c0e1cc204ed48ad3b37840f39efc
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
0.5686275
}
m_RaycastTarget
:
1
m_RaycastPadding
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_Maskable
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_Sprite
:
{
fileID
:
0
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
---
!u!222
&807943470
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
807943467
}
m_CullTransparentMesh
:
1
---
!u!114
&807943471
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
807943467
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
dc42784cf147c0c48a680349fa168899
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_IgnoreReversedGraphics
:
1
m_BlockingObjects
:
0
m_BlockingMask
:
serializedVersion
:
2
m_Bits
:
4294967295
---
!u!223
&807943472
Canvas
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
807943467
}
m_Enabled
:
1
serializedVersion
:
3
m_RenderMode
:
2
m_Camera
:
{
fileID
:
0
}
m_PlaneDistance
:
100
m_PixelPerfect
:
1
m_ReceivesEvents
:
1
m_OverrideSorting
:
1
m_OverridePixelPerfect
:
0
m_SortingBucketNormalizedSize
:
0
m_AdditionalShaderChannelsFlag
:
0
m_SortingLayerID
:
0
m_SortingOrder
:
1
m_TargetDisplay
:
0
---
!u!1
&856291175
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1209,6 +1324,7 @@ RectTransform:
-
{
fileID
:
1681159605
}
-
{
fileID
:
458946184
}
-
{
fileID
:
1670763947
}
-
{
fileID
:
807943468
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @
3574c23a
...
...
@@ -55214,12 +55214,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838650}
m_Enabled:
1
m_Enabled:
0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID:
0
}
textData: {fileID:
11400000, guid: 6a27d43c9723b164e9a5d6d4aade43f3, type: 2
}
--- !u!1 &3504742970542838655 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742970341649912, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
...
...
@@ -55257,7 +55257,45 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 0}
textData: {fileID: 11400000, guid: 6fc385599f84ad84599a14d4edbd3f7d, type: 2}
--- !u!1 &3504742970542838659 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742971821292307, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3504742970542838660
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838659}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 5a91021719185214b99109498527b9d0, type: 2}
--- !u!1 &3504742970542838661 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742971512710954, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3504742970542838662
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838661}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 885bc98960cde8d46b844ec4f9a0888e, type: 2}
--- !u!198 &3577048474464131065
ParticleSystem:
m_ObjectHideFlags: 0
Assets/Scripts/TutorialManager.cs
0 → 100644
View file @
3574c23a
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
UnityEngine.UI
;
public
class
TutorialManager
:
MonoBehaviour
{
public
List
<
Button
>
mainBtns
=
new
List
<
Button
>();
public
List
<
Button
>
arsBtns
=
new
List
<
Button
>();
private
int
mainIndex
=
0
;
private
int
arsIndex
=
0
;
private
List
<
Transform
>
mainRoots
=
new
List
<
Transform
>();
private
List
<
Transform
>
arsRoots
=
new
List
<
Transform
>();
private
void
Awake
()
{
mainIndex
=
0
;
arsIndex
=
0
;
for
(
int
i
=
0
;
i
<
mainBtns
.
Count
;
i
++)
mainRoots
.
Add
(
mainBtns
[
i
].
transform
);
for
(
int
i
=
0
;
i
<
arsBtns
.
Count
;
i
++)
arsRoots
.
Add
(
mainBtns
[
i
].
transform
);
}
public
void
ShowMainTut
()
{
//if(DataManager.Instance.userData.Rank == 0 && DataManager.Instance.userData.rewardStatus.reward_1_claimed)
if
(
mainIndex
<
mainBtns
.
Count
)
{
if
(
mainIndex
-
1
>=
0
)
mainBtns
[
mainIndex
-
1
].
transform
.
SetParent
(
mainRoots
[
mainIndex
-
1
]);
mainBtns
[
mainIndex
].
transform
.
SetParent
(
transform
);
mainIndex
+=
1
;
}
}
public
void
ShowArsTut
()
{
if
(
arsIndex
<
arsBtns
.
Count
)
{
if
(
arsIndex
-
1
>=
0
)
arsBtns
[
arsIndex
-
1
].
transform
.
SetParent
(
arsRoots
[
arsIndex
-
1
]);
arsBtns
[
arsIndex
].
transform
.
SetParent
(
transform
);
arsIndex
+=
1
;
}
}
}
Assets/Scripts/TutorialManager.cs.meta
0 → 100644
View file @
3574c23a
fileFormatVersion: 2
guid: 9f561f0fa78161442b88f5302f65a09f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/HomeScreen.cs
View file @
3574c23a
...
...
@@ -24,7 +24,6 @@ public class HomeScreen : MonoBehaviour
}
CheckRemoveAds
();
TimeManager
.
Instance
.
shopRewardTimer
.
Callback
+=
timerCallbackFunc
;
rankUI
.
ShowRewardNow
();
}
private
void
OnDisable
()
{
...
...
Assets/Scripts/UI/RankUI.cs
View file @
3574c23a
...
...
@@ -24,16 +24,18 @@ public class RankUI : MonoBehaviour
reward_2_claimed
=
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_2_claimed
;
reward_3_claimed
=
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_3_claimed
;
}
public
void
ShowRewardNow
()
public
bool
ShowRewardNow
()
{
DataManager
.
RankData
rankData
=
DataManager
.
Instance
.
GetCurrentRankData
();
DataManager
.
RankIcon
rankIcon
=
DataManager
.
Instance
.
GetCurrentRankIcon
();
icon
.
sprite
=
rankIcon
.
normal_icon
;
fill
.
fillAmount
=
((
float
)
DataManager
.
Instance
.
userData
.
RankValue
/
rankData
.
stars
);
rewards
[
0
].
Load
(
rankData
.
reward_1
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_1_claimed
);
rewards
[
1
].
Load
(
rankData
.
reward_2
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_2_claimed
);
rewards
[
2
].
Load
(
rankData
.
reward_3
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_3_claimed
);
bool
re_1
=
rewards
[
0
].
Load
(
rankData
.
reward_1
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_1_claimed
);
bool
re_2
=
rewards
[
1
].
Load
(
rankData
.
reward_2
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_2_claimed
);
bool
re_3
=
rewards
[
2
].
Load
(
rankData
.
reward_3
,
rankData
.
stars
,
DataManager
.
Instance
.
userData
.
rewardStatus
.
reward_3_claimed
);
current_rank
=
rankData
.
id
;
return
re_1
&&
!
re_2
&&
!
re_3
;
}
public
void
AddStarToRank
(
int
starCount
)
{
...
...
@@ -169,7 +171,7 @@ public class RankUI : MonoBehaviour
public
GameObject
notOpen
;
public
TextMeshProUGUI
star
;
public
void
Load
(
int
_starCount
,
int
_maxStars
,
bool
claimed
)
public
bool
Load
(
int
_starCount
,
int
_maxStars
,
bool
claimed
)
{
float
min_pos
=
-
415f
;
float
max_pos
=
415f
;
...
...
@@ -184,12 +186,14 @@ public class RankUI : MonoBehaviour
opened
.
SetActive
(
true
);
open
.
SetActive
(
false
);
notOpen
.
SetActive
(
false
);
return
false
;
}
else
{
opened
.
SetActive
(
false
);
open
.
SetActive
(
true
);
notOpen
.
SetActive
(
false
);
return
true
;
}
}
else
...
...
@@ -197,6 +201,7 @@ public class RankUI : MonoBehaviour
opened
.
SetActive
(
false
);
open
.
SetActive
(
false
);
notOpen
.
SetActive
(
true
);
return
false
;
}
}
}
...
...
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