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
e2c59129
Commit
e2c59129
authored
Dec 13, 2021
by
Hà Trung (NEGAXY)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TrungHm: Fix Sounds
parent
2fd7e2a5
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
128 additions
and
6 deletions
+128
-6
collect_truck_1.wav
Assets/Game Resources/Sounds/collect_truck_1.wav
+0
-0
collect_truck_1.wav.meta
Assets/Game Resources/Sounds/collect_truck_1.wav.meta
+22
-0
collect_truck_2.wav
Assets/Game Resources/Sounds/collect_truck_2.wav
+0
-0
collect_truck_2.wav.meta
Assets/Game Resources/Sounds/collect_truck_2.wav.meta
+22
-0
collect_truck_3.wav
Assets/Game Resources/Sounds/collect_truck_3.wav
+0
-0
collect_truck_3.wav.meta
Assets/Game Resources/Sounds/collect_truck_3.wav.meta
+22
-0
collect_truck_4.wav
Assets/Game Resources/Sounds/collect_truck_4.wav
+0
-0
collect_truck_4.wav.meta
Assets/Game Resources/Sounds/collect_truck_4.wav.meta
+22
-0
OST.cs
Assets/OSG Infinity Square Space/Player/Scripts/OST.cs
+11
-3
main.unity
Assets/OSG Infinity Square Space/Scenes/main.unity
+27
-2
IngameCollection_GuiFx.cs
Assets/Scripts/IngameCollection_GuiFx.cs
+2
-1
No files found.
Assets/Game Resources/Sounds/collect_truck_1.wav
0 → 100644
View file @
e2c59129
File added
Assets/Game Resources/Sounds/collect_truck_1.wav.meta
0 → 100644
View file @
e2c59129
fileFormatVersion: 2
guid: f4619d2d2a11b514396953c6b830e96a
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sounds/collect_truck_2.wav
0 → 100644
View file @
e2c59129
File added
Assets/Game Resources/Sounds/collect_truck_2.wav.meta
0 → 100644
View file @
e2c59129
fileFormatVersion: 2
guid: 41ca13291e693154f9c52cc61fa8f0b1
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sounds/collect_truck_3.wav
0 → 100644
View file @
e2c59129
File added
Assets/Game Resources/Sounds/collect_truck_3.wav.meta
0 → 100644
View file @
e2c59129
fileFormatVersion: 2
guid: 6fd6029be6f5306469f556ed61426750
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sounds/collect_truck_4.wav
0 → 100644
View file @
e2c59129
File added
Assets/Game Resources/Sounds/collect_truck_4.wav.meta
0 → 100644
View file @
e2c59129
fileFormatVersion: 2
guid: ef3ab772f1ada74439fe655b4c3f1a06
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/OSG Infinity Square Space/Player/Scripts/OST.cs
View file @
e2c59129
...
...
@@ -16,7 +16,7 @@ public class OST : MonoBehaviour
public
AudioClip
dragonSound
;
public
AudioClip
narutoSound
;
public
AudioClip
squidPunch
;
public
AudioClip
collect
;
public
AudioClip
[]
collects
;
//--------------
static
WaitForSeconds
delay0
=
new
WaitForSeconds
(
5
);
...
...
@@ -42,10 +42,18 @@ public class OST : MonoBehaviour
StartCoroutine
(
CheckSoundCO
());
//--------------
}
private
float
delaySpawn
=
0f
;
private
void
Update
()
{
delaySpawn
=
Mathf
.
Max
(
0f
,
delaySpawn
-
Time
.
deltaTime
);
}
public
void
PlayCollectSound
()
{
audioSource1
.
PlayOneShot
(
collect
);
if
(
delaySpawn
==
0f
)
{
audioSource1
.
PlayOneShot
(
collects
[
Random
.
Range
(
0
,
collects
.
Length
)]);
delaySpawn
=
0.1f
;
}
}
public
void
PlaySelectWeapon
()
{
...
...
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @
e2c59129
...
...
@@ -26990,11 +26990,36 @@ PrefabInstance:
propertyPath: deselectWeapon
value:
objectReference: {fileID: 8300000, guid: 299901ee114b3a449837069435cdeb1f, type: 3}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: collects.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: sounds.Array.data[5]
value:
objectReference: {fileID: 8300000, guid: 2f8b102b2ff075a46be7cfb9809dd431, type: 3}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: collects.Array.data[0]
value:
objectReference: {fileID: 8300000, guid: ef3ab772f1ada74439fe655b4c3f1a06, type: 3}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: collects.Array.data[1]
value:
objectReference: {fileID: 8300000, guid: f4619d2d2a11b514396953c6b830e96a, type: 3}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: collects.Array.data[2]
value:
objectReference: {fileID: 8300000, guid: 41ca13291e693154f9c52cc61fa8f0b1, type: 3}
- target: {fileID: 5066009898101288189, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: collects.Array.data[3]
value:
objectReference: {fileID: 8300000, guid: 6fd6029be6f5306469f556ed61426750, type: 3}
- target: {fileID: 5313785517148740864, guid: 4c33e04fd77f2194bb2e29ce4f03f5a0,
type: 3}
propertyPath: m_Name
...
...
@@ -45175,7 +45200,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 469985644, guid: 24f4214e71ba46046859b31f7dec5af4, type: 3}
propertyPath: m_LocalPosition.x
value: -0.0000000
30583724
value: -0.0000000
52935466
objectReference: {fileID: 0}
- target: {fileID: 469985645, guid: 24f4214e71ba46046859b31f7dec5af4, type: 3}
propertyPath: m_Follow
...
...
@@ -45249,7 +45274,7 @@ PrefabInstance:
- target: {fileID: 7421222009779415704, guid: 24f4214e71ba46046859b31f7dec5af4,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.0000000
30583724
value: -0.0000000
52935466
objectReference: {fileID: 0}
- target: {fileID: 7421222010078394949, guid: 24f4214e71ba46046859b31f7dec5af4,
type: 3}
Assets/Scripts/IngameCollection_GuiFx.cs
View file @
e2c59129
...
...
@@ -49,7 +49,7 @@ public class IngameCollection_GuiFx : MonoBehaviour
elements
[
i
].
transform
.
DOScale
(
Vector3
.
one
,
0.7f
);
elements
[
i
].
transform
.
DOLocalMove
(
pos
,
0.7f
).
SetEase
(
Ease
.
OutQuad
);
}
OST
.
instance
.
PlayCollectSound
();
yield
return
new
WaitForSeconds
(
0.3f
);
foreach
(
Image
rect
in
elements
)
{
...
...
@@ -57,6 +57,7 @@ public class IngameCollection_GuiFx : MonoBehaviour
rect
.
transform
.
DOMove
(
target
,
0.5f
).
SetEase
(
Ease
.
InQuad
).
OnComplete
(()
=>
{
rect
.
gameObject
.
SetActive
(
false
);
OST
.
instance
.
PlayCollectSound
();
//IndieGame.Manager.EffectManager.Instance.SpawnCollectionSound(transform.position);
StarSystem
.
instance
.
planet
.
explosionCount
.
IncreaseInitChildCount
();
});
...
...
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