Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change audio button and shiled(door) #144

Merged
merged 1 commit into from
Dec 21, 2024
Merged

chore: change audio button and shiled(door) #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Assets/Fantasy Sfx/Mp3/search/button.mp3
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Fantasy Sfx/Mp3/search/button.mp3.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Fantasy Sfx/Mp3/search/close.mp3
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Fantasy Sfx/Mp3/search/close.mp3.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Fantasy Sfx/Mp3/search/open.mp3
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Fantasy Sfx/Mp3/search/open.mp3.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/SWPPT3/Prefabs/Puzzle/Button.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -1235528271599055872, guid: 6280190b476bd43cabe8b653ca9ded11,
type: 2}
m_audioClip: {fileID: 8300000, guid: 1689b1b8a5075405f9fcb328f0d532a0, type: 3}
m_audioClip: {fileID: 8300000, guid: dc324e834e03044bfb7ce867be326251, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/SWPPT3/Prefabs/Puzzle/Button_Stone.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -1235528271599055872, guid: 6280190b476bd43cabe8b653ca9ded11,
type: 2}
m_audioClip: {fileID: 8300000, guid: d4a7952ebb861462b92df5cdbb5177e0, type: 3}
m_audioClip: {fileID: 8300000, guid: dc324e834e03044bfb7ce867be326251, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Expand Down
102 changes: 100 additions & 2 deletions Assets/SWPPT3/Prefabs/Puzzle/Shield.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GameObject:
- component: {fileID: 6967512372165788986}
- component: {fileID: 8519930249369358979}
- component: {fileID: 9054789786534664684}
- component: {fileID: 3237021867211686311}
- component: {fileID: -1174854991837830296}
m_Layer: 0
m_Name: Shield
Expand Down Expand Up @@ -148,7 +149,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -1235528271599055872, guid: 6280190b476bd43cabe8b653ca9ded11,
type: 2}
m_audioClip: {fileID: 8300000, guid: ca056d4afe5e74498a0798f16e0e866d, type: 3}
m_audioClip: {fileID: 8300000, guid: 4f205a62268514e1d9e7c09064fe009f, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Expand Down Expand Up @@ -234,6 +235,103 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!82 &3237021867211686311
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8056305843128070131}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -1235528271599055872, guid: 6280190b476bd43cabe8b653ca9ded11,
type: 2}
m_audioClip: {fileID: 8300000, guid: 4dc240e2cf3aa4f70a01c33d947092ee, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &-1174854991837830296
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -248,4 +346,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
_statefulProp: {fileID: 8519930249369358979}
activeSource: {fileID: 9054789786534664684}
deActiveSource: {fileID: 9054789786534664684}
deActiveSource: {fileID: 3237021867211686311}
10 changes: 2 additions & 8 deletions Assets/SWPPT3/Scripts/Main/Prop/Shield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,11 @@ public class Shield : StateDst
[SerializeField]
private Animator animator;

private void Awake()
{
State = true;
}

protected override void OnSourceStateChanged(StateSource src, bool state)
{
state = !state;
State = state;
collider.enabled = state;
animator.SetBool("IsClosed",state);
collider.enabled = !State;
animator.SetBool("IsClosed",!State);
}
}
}
Loading