Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
2
2016
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
황호기
2016
Commits
25de06e5
Commit
25de06e5
authored
Feb 25, 2016
by
문경훈
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sound added + stage text modified
parent
98d99f5c
Pipeline
#560
skipped
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
5 deletions
+48
-5
Assets/Audio/shukuji_long_v1.wav
Assets/Audio/shukuji_long_v1.wav
+0
-0
Assets/Audio/shukuji_long_v1.wav.meta
Assets/Audio/shukuji_long_v1.wav.meta
+22
-0
Assets/Audio/shukuji_outro.wav
Assets/Audio/shukuji_outro.wav
+0
-0
Assets/Audio/shukuji_outro.wav.meta
Assets/Audio/shukuji_outro.wav.meta
+22
-0
Assets/Scripts/GanSeokGi.cs
Assets/Scripts/GanSeokGi.cs
+3
-4
Assets/Scripts/StageLoad.cs
Assets/Scripts/StageLoad.cs
+1
-1
No files found.
Assets/Audio/shukuji_long_v1.wav
0 → 100644
View file @
25de06e5
File added
Assets/Audio/shukuji_long_v1.wav.meta
0 → 100644
View file @
25de06e5
fileFormatVersion: 2
guid: 54d95a759da17c4489c3d8291656c122
timeCreated: 1456374297
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Audio/shukuji_outro.wav
0 → 100644
View file @
25de06e5
File added
Assets/Audio/shukuji_outro.wav.meta
0 → 100644
View file @
25de06e5
fileFormatVersion: 2
guid: cf97a354049ec5f41926f56fa871cf4b
timeCreated: 1456374298
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/GanSeokGi.cs
View file @
25de06e5
...
...
@@ -5,10 +5,9 @@ using System.Collections.Generic;
public
class
GanSeokGi
:
Boss
{
public
Animator
nationAnim
;
/*
public
AudioClip
simYoung
;
public
AudioClip
shukuchi
;
*/
Camera
mainCamera
;
GameObject
canvasWrapper
;
...
...
@@ -44,7 +43,7 @@ public class GanSeokGi : Boss {
isOverthrew
=
true
;
nationAnim
.
SetTrigger
(
"Overthrow"
);
SayLine
(
3
);
//
GetComponent<AudioSource>().PlayOneShot(shukuchi);
GetComponent
<
AudioSource
>().
PlayOneShot
(
shukuchi
);
yield
return
StartCoroutine
(
WaitForRealSeconds
(
3.8f
));
// animation time - 0.2f
mainCamera
.
transform
.
rotation
*=
Quaternion
.
Euler
(
0
,
0
,
180f
);
...
...
@@ -57,7 +56,7 @@ public class GanSeokGi : Boss {
IEnumerator
Propaganda
()
{
SayLine
(
1
);
//
GetComponent<AudioSource>().PlayOneShot(simYoung);
GetComponent
<
AudioSource
>().
PlayOneShot
(
simYoung
);
for
(
int
i
=
0
;
i
<
mainLogic
.
activeUnitList
.
Count
;
i
++)
{
if
(
Random
.
Range
(
0f
,
1f
)
<
0.1f
)
...
...
Assets/Scripts/StageLoad.cs
View file @
25de06e5
...
...
@@ -33,7 +33,7 @@ public class StageLoad : MonoBehaviour
"2016."
,
"축하합니다! 당신은 초대 주석의 탄신일을 외웠다!"
,
"축하합니다! 당신은 2kb님의 탄신일을 외웠다!"
,
"축하합니다! 당신은 이
정의/일
석기의 탄신일을 외웠다!"
,
"축하합니다! 당신은 이
정의/간
석기의 탄신일을 외웠다!"
,
"경고 : 이 선택은 당신의 삶을 지옥으로 만들 것입니다. 이대로 진행하시겠습니까?"
};
stageButton
=
stageList
.
GetComponentsInChildren
<
Button
>();
...
...
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