Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
FastMail
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
wanqing
FastMail
Commits
7a128278
Commit
7a128278
authored
Jan 05, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
音效优化,第7关目标胜利优化
parent
e6acd238
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1594 additions
and
1308 deletions
+1594
-1308
SevenLevelOneTrigger.cs
...Assets/0A2_Scripts/Battle/Trigger/SevenLevelOneTrigger.cs
+24
-0
SevenLevelOneTrigger.cs.meta
...s/0A2_Scripts/Battle/Trigger/SevenLevelOneTrigger.cs.meta
+11
-0
SevenLevelTwoTrigger.cs
...Assets/0A2_Scripts/Battle/Trigger/SevenLevelTwoTrigger.cs
+54
-0
SevenLevelTwoTrigger.cs.meta
...s/0A2_Scripts/Battle/Trigger/SevenLevelTwoTrigger.cs.meta
+11
-0
BattleUI.cs
FastMail/Assets/0A2_Scripts/Battle/UI/BattleUI.cs
+1
-1
SettingPanel.cs
FastMail/Assets/0A2_Scripts/Battle/UI/SettingPanel.cs
+1
-1
AudioServices.cs
FastMail/Assets/0A2_Scripts/Services/AudioServices.cs
+1
-1
Level6.prefab
FastMail/Assets/Res/Prefabs/Levels/Level6.prefab
+1491
-1305
No files found.
FastMail/Assets/0A2_Scripts/Battle/Trigger/SevenLevelOneTrigger.cs
0 → 100644
View file @
7a128278
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
SevenLevelOneTrigger
:
MonoBehaviour
{
public
SevenLevelTwoTrigger
m_levelTwo
;
private
bool
m_bControl
=
true
;
private
void
OnTriggerEnter
(
Collider
other
)
{
if
(
other
.
gameObject
.
CompareTag
(
"Target"
)
&&
m_bControl
)
{
m_bControl
=
false
;
m_levelTwo
.
OnTriggerOne
();
GameServices
.
timerServices
.
Push
(
this
,
1.0f
,
delegate
{
if
(
m_levelTwo
.
Control
)
{
m_bControl
=
true
;
}
});
}
}
}
FastMail/Assets/0A2_Scripts/Battle/Trigger/SevenLevelOneTrigger.cs.meta
0 → 100644
View file @
7a128278
fileFormatVersion: 2
guid: 2b25b3be45f8fea47af893c4c5878f11
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
FastMail/Assets/0A2_Scripts/Battle/Trigger/SevenLevelTwoTrigger.cs
0 → 100644
View file @
7a128278
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
SevenLevelTwoTrigger
:
MonoBehaviour
{
private
bool
m_bTriggerOne
=
false
;
private
bool
m_bTriggerTwo
=
false
;
private
bool
m_bControl
=
true
;
public
bool
Control
=>
m_bControl
;
private
void
OnTriggerEnter
(
Collider
other
)
{
if
(
other
.
gameObject
.
CompareTag
(
"Target"
)
&&
!
m_bTriggerTwo
)
{
m_bTriggerTwo
=
true
;
if
(
m_bTriggerTwo
&&
m_bTriggerOne
)
{
if
(
m_bControl
)
{
m_bControl
=
false
;
BattleCtrl
.
instance
.
OnBattleWin
();
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
chainRopeView
.
CatchObjEnterTarget
();
}
}
GameServices
.
timerServices
.
Push
(
this
,
1.0f
,
delegate
{
if
(
m_bControl
)
{
m_bTriggerTwo
=
false
;
}
});
}
}
public
void
OnTriggerOne
()
{
m_bTriggerOne
=
true
;
if
(
m_bTriggerTwo
&&
m_bTriggerOne
)
{
if
(
m_bControl
)
{
m_bControl
=
false
;
BattleCtrl
.
instance
.
OnBattleWin
();
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
chainRopeView
.
CatchObjEnterTarget
();
}
}
GameServices
.
timerServices
.
Push
(
this
,
1.0f
,
delegate
{
if
(
m_bControl
)
{
m_bTriggerOne
=
false
;
}
});
}
}
FastMail/Assets/0A2_Scripts/Battle/Trigger/SevenLevelTwoTrigger.cs.meta
0 → 100644
View file @
7a128278
fileFormatVersion: 2
guid: 96b3f7c7804939e419b2a96df4f71521
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
FastMail/Assets/0A2_Scripts/Battle/UI/BattleUI.cs
View file @
7a128278
...
...
@@ -202,7 +202,7 @@ public class BattleUI : MonoBehaviour
//{
// GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
//});
GameServices
.
audioServices
.
PlayAudio
(
GameServices
.
configService
.
audioConfig
.
GetFail
());
//
GameServices.audioServices.PlayAudio(GameServices.configService.audioConfig.GetFail());
}
/// 加载关卡前调用,隐藏不需要显示的ui
public
void
OnBeforeLoadLevel
()
...
...
FastMail/Assets/0A2_Scripts/Battle/UI/SettingPanel.cs
View file @
7a128278
...
...
@@ -45,7 +45,7 @@ public class SettingPanel : MonoBehaviour
}
else
{
m_bgmImageObj
.
SetActive
(
tru
e
);
m_bgmImageObj
.
SetActive
(
fals
e
);
}
}
//震动
...
...
FastMail/Assets/0A2_Scripts/Services/AudioServices.cs
View file @
7a128278
...
...
@@ -86,7 +86,7 @@ public class AudioServices : MonoBehaviour
public
void
PlayBgm
(
AudioClip
clip
)
{
if
(
LocalRecord
.
HasKey
(
GlobalConfig
.
BgmKey
)
&&
LocalRecord
.
GetIntRecord
(
GlobalConfig
.
BgmKey
)
==
0
)
if
(
!
LocalRecord
.
HasKey
(
GlobalConfig
.
BgmKey
)
||
LocalRecord
.
GetIntRecord
(
GlobalConfig
.
BgmKey
)
==
0
)
{
return
;
}
...
...
FastMail/Assets/Res/Prefabs/Levels/Level6.prefab
View file @
7a128278
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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