Skip to content

G
GalaxySmash
Commit e463cf2d authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)
Browse files
Options

Merge branch 'master' of http://103.147.34.20:30081/trung.ha/galaxysmash

parents e2c59129 fef46806
Hide whitespace changes
Inline Side-by-side
Showing with 896 additions and 62 deletions
Assets/Game Resources/Fonts/Shentox 8/Shentox Bold SDF.asset
View file @ e463cf2d
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Localization/dailyreward.asset
View file @ e463cf2d
......@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
key: dailyreward
en: Daily Reward
vi: "Ph\u1EA7n th\u01B0\u1EDFng h\xE0ng ng\xE0y"
vi: "\u0110i\u1EC3m danh"
ko: "\uB9E4\uC77C \uBCF4\uC0C1"
ja: "\u6BCE\u65E5\u306E\u5831\u916C"
fr: "R\xE9compense quotidienne"
......
Assets/OSG Infinity Square Space/Scenes/home.unity
View file @ e463cf2d
......@@ -1012,6 +1012,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &30843603
MonoBehaviour:
......@@ -2908,6 +2909,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &71590136
CanvasRenderer:
......@@ -4211,6 +4213,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &90938657
MonoBehaviour:
......@@ -6946,6 +6949,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &170516214
MonoBehaviour:
......@@ -11969,6 +11973,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &178120653
MonoBehaviour:
......@@ -13013,6 +13018,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &203248288
MonoBehaviour:
......@@ -13589,6 +13595,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &220808848
GameObject:
......@@ -14351,6 +14358,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &254231437
MonoBehaviour:
......@@ -15023,6 +15031,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &266216832
GameObject:
......@@ -15618,6 +15627,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &283639029
MonoBehaviour:
......@@ -17275,6 +17285,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &344585794
GameObject:
......@@ -21916,6 +21927,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &461750543
GameObject:
......@@ -25489,6 +25501,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &546752739
MonoBehaviour:
......@@ -34083,6 +34096,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &631515956
MonoBehaviour:
......@@ -35905,6 +35919,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &652145813
MonoBehaviour:
......@@ -36339,6 +36354,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &677070239
MonoBehaviour:
......@@ -37760,6 +37776,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &708588172
MonoBehaviour:
......@@ -38381,6 +38398,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &717877545
MonoBehaviour:
......@@ -38629,6 +38647,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &722443687
GameObject:
......@@ -40829,6 +40848,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &796277106
MonoBehaviour:
......@@ -42010,6 +42030,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &823344353
GameObject:
......@@ -45412,6 +45433,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &939345780
MonoBehaviour:
......@@ -47031,6 +47053,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &979311933
CanvasRenderer:
......@@ -57361,6 +57384,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &990400541
MonoBehaviour:
......@@ -59094,6 +59118,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1039916565
MonoBehaviour:
......@@ -59908,6 +59933,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1053883258
MonoBehaviour:
......@@ -60042,6 +60068,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1056125145
MonoBehaviour:
......@@ -62084,6 +62111,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1100875057
MonoBehaviour:
......@@ -63742,6 +63770,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1130401365
MonoBehaviour:
......@@ -64294,6 +64323,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1151466178
MonoBehaviour:
......@@ -64640,6 +64670,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1157042806
MonoBehaviour:
......@@ -65740,6 +65771,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1183283073
MonoBehaviour:
......@@ -67539,6 +67571,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &1234201731
GameObject:
......@@ -68741,6 +68774,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1256235662
MonoBehaviour:
......@@ -69615,6 +69649,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &1270880112
CanvasRenderer:
......@@ -71436,6 +71471,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1310986170
MonoBehaviour:
......@@ -72685,6 +72721,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1345752261
MonoBehaviour:
......@@ -73185,6 +73222,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &1358222678
GameObject:
......@@ -73837,6 +73875,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1362758158
MonoBehaviour:
......@@ -73970,6 +74009,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1369183457
MonoBehaviour:
......@@ -74765,6 +74805,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1389035798
MonoBehaviour:
......@@ -75794,6 +75835,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1411650644
MonoBehaviour:
......@@ -76010,6 +76052,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1417991571
MonoBehaviour:
......@@ -77260,6 +77303,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &1472776469
GameObject:
......@@ -77556,6 +77600,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1474552013
MonoBehaviour:
......@@ -82563,6 +82608,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1611766992
MonoBehaviour:
......@@ -83377,6 +83423,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1624742954
MonoBehaviour:
......@@ -83612,6 +83659,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1628548441
MonoBehaviour:
......@@ -83955,6 +84003,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1635818466
MonoBehaviour:
......@@ -84856,6 +84905,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1663677691
MonoBehaviour:
......@@ -85993,6 +86043,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1684999126
MonoBehaviour:
......@@ -86259,6 +86310,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1687560286
MonoBehaviour:
......@@ -86963,6 +87015,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1709240186
MonoBehaviour:
......@@ -88461,6 +88514,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &1757033654
CanvasRenderer:
......@@ -97264,6 +97318,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &1839088391
CanvasRenderer:
......@@ -97417,6 +97472,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1842332832
MonoBehaviour:
......@@ -97664,6 +97720,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &1853357862
GameObject:
......@@ -97930,6 +97987,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1862097580
MonoBehaviour:
......@@ -98103,6 +98161,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &1864693728
GameObject:
......@@ -100814,6 +100873,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1931140902
MonoBehaviour:
......@@ -101493,6 +101553,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1947009922
MonoBehaviour:
......@@ -102493,6 +102554,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &1982183130
MonoBehaviour:
......@@ -103689,6 +103751,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &2021089077
GameObject:
......@@ -103840,6 +103903,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &2023215218
MonoBehaviour:
......@@ -104423,6 +104487,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &2044934290
MonoBehaviour:
......@@ -106015,6 +106080,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &2080399266
GameObject:
......@@ -107065,6 +107131,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &2116165464
MonoBehaviour:
......@@ -113442,6 +113509,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &1024424482819937221
CanvasRenderer:
......@@ -138047,6 +138115,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1001 &2445499172506346693
PrefabInstance:
......@@ -139963,6 +140032,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609144132542552
MonoBehaviour:
......@@ -141791,6 +141861,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144293436920
CanvasRenderer:
......@@ -142968,6 +143039,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609144320474366
MonoBehaviour:
......@@ -143141,6 +143213,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &3356609144352945605
GameObject:
......@@ -143217,6 +143290,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144352945608
CanvasRenderer:
......@@ -143789,6 +143863,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144395675356
CanvasRenderer:
......@@ -145972,6 +146047,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &3356609144503958257
GameObject:
......@@ -147443,6 +147519,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!224 &3356609144591573704
RectTransform:
......@@ -148082,6 +148159,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144625977798
CanvasRenderer:
......@@ -148660,6 +148738,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609144701981570
MonoBehaviour:
......@@ -149094,6 +149173,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144738554022
CanvasRenderer:
......@@ -149484,6 +149564,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609144759733438
MonoBehaviour:
......@@ -149732,6 +149813,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609144764139644
MonoBehaviour:
......@@ -149884,6 +149966,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144767393832
CanvasRenderer:
......@@ -150552,6 +150635,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!1 &3356609144806846613
GameObject:
......@@ -151200,6 +151284,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144855680628
CanvasRenderer:
......@@ -151931,6 +152016,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144934949492
CanvasRenderer:
......@@ -152327,6 +152413,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609144941468126
CanvasRenderer:
......@@ -154149,6 +154236,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609145170451006
MonoBehaviour:
......@@ -155526,6 +155614,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609145248887444
CanvasRenderer:
......@@ -156187,6 +156276,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609145309865800
CanvasRenderer:
......@@ -156842,6 +156932,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609145355587948
CanvasRenderer:
......@@ -157032,8 +157123,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000023931, y: -52.7}
m_SizeDelta: {x: 133.5081, y: 48.538}
m_AnchoredPosition: {x: 0.0000066757, y: -54.24461}
m_SizeDelta: {x: 120.09, y: 42.2272}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3356609145392907987
MonoBehaviour:
......@@ -157083,7 +157174,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24.9
m_fontSize: 22.35
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
......@@ -157119,7 +157210,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 0, y: 0, z: 0.39440918, w: 12.621565}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
......@@ -157924,6 +158015,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609145477194538
MonoBehaviour:
......@@ -158978,6 +159070,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609145549939198
MonoBehaviour:
......@@ -160092,6 +160185,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!114 &3356609145656740722
MonoBehaviour:
......@@ -160572,6 +160666,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609145667861066
CanvasRenderer:
......@@ -162091,6 +162186,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &3356609145800151288
CanvasRenderer:
......@@ -163044,6 +163140,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!224 &3356609145884373224
RectTransform:
......@@ -164088,6 +164185,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!224 &3356609145940433620
RectTransform:
......@@ -167379,6 +167477,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!224 &3663103612601055469
RectTransform:
......@@ -197162,6 +197261,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!23 &5219239646755220717
MeshRenderer:
......@@ -361406,6 +361506,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!224 &8109992786424628842
RectTransform:
......@@ -361974,6 +362075,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
playeSoundOnclick: 1
isScale: 1
--- !u!222 &8779058151512758821
CanvasRenderer:
Assets/Scripts/UI/UIButton.cs
View file @ e463cf2d
......@@ -64,7 +64,8 @@ public class UIButton : Button
public override void OnPointerDown(PointerEventData eventData)
{
base.OnPointerDown(eventData);
DataManager.Instance.PlayClickSound();
if (playeSoundOnclick)
DataManager.Instance.PlayClickSound();
//SoundManager.Instance.PlayButtonClicked(Camera.main.transform.position);
//IndieGame.Manager.EffectManager.Instance.SpawnSoundClickBtn();
if (isScale && this.interactable)
......@@ -84,8 +85,8 @@ public class UIButton : Button
{
base.OnPointerClick(eventData);
System.Random rd = new System.Random();
int random = rd.Next(1, 100);
int random = rd.Next(1, 100);
}
public void OnSetButtonColor(bool isInteractable)
......
Assets/SpaceJourney/Elements/Ships/Materials/Ship_1_Engines.mat
View file @ e463cf2d
......@@ -97,7 +97,7 @@ Material:
- _Glossiness: 0
- _InvFade: 3
- _LightingEnabled: 1
- _Metallic: 1.0000001
- _Metallic: 0
- _Mode: 4
- _Mult: 1
- _OcclusionStrength: 1
......
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View file @ e463cf2d
This source diff could not be displayed because it is too large. You can view the blob instead.
ProjectSettings/ProjectSettings.asset
View file @ e463cf2d
......@@ -129,7 +129,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 1.0.5
bundleVersion: 1.0.6
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......@@ -154,7 +154,7 @@ PlayerSettings:
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 8
AndroidBundleVersionCode: 9
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
......
UserSettings/EditorUserSettings.asset
View file @ e463cf2d
......@@ -27,13 +27,13 @@ EditorUserSettings:
value: 22424703114646680c031c2e153010253f57282b3e3c2f33212c5260acb37a61adc333e4e8750a150903fd280d3d0d3acd2e0c06f9451f05181ae4
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment