Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
man-in-the-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Boards
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
MIM
man-in-the-mirror
Commits
bf7df9ae
Commit
bf7df9ae
authored
Aug 11, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
설명버튼에 마우스 올리면 설명 다시 볼수 있음
parent
6af970b5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
315 additions
and
78 deletions
+315
-78
outline_description_white_18dp.png
Assets/Resources/outline_description_white_18dp.png
+0
-0
outline_description_white_18dp.png.meta
Assets/Resources/outline_description_white_18dp.png.meta
+103
-0
PlayStage.unity
Assets/Scenes/PlayStage.unity
+198
-77
CommentUIGenerator.cs
Assets/Scripts/UIs/CommentUIGenerator.cs
+14
-1
No files found.
Assets/Resources/outline_description_white_18dp.png
0 → 100644
View file @
bf7df9ae
188 Bytes
Assets/Resources/outline_description_white_18dp.png.meta
0 → 100644
View file @
bf7df9ae
fileFormatVersion: 2
guid: 45ecb1935e915104ab73f0fc799922f9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/PlayStage.unity
View file @
bf7df9ae
...
...
@@ -354,9 +354,6 @@ MonoBehaviour:
truthBullet
:
{
fileID
:
21300000
,
guid
:
da1238d2a4e94964ebf1342f4d6e0566
,
type
:
3
}
falseBullet
:
{
fileID
:
21300000
,
guid
:
5b8abae75960dba45b4ce321789ff176
,
type
:
3
}
mirrBullet
:
{
fileID
:
21300000
,
guid
:
8265bee63b2be3c478c2f9fc665742a7
,
type
:
3
}
truthBulletHelp
:
{
fileID
:
21300000
,
guid
:
158939274e244944a826fd5cb93f08d7
,
type
:
3
}
falseBulletHelp
:
{
fileID
:
21300000
,
guid
:
c4f1d246aa2777e40adab53440307926
,
type
:
3
}
mirrBulletHelp
:
{
fileID
:
21300000
,
guid
:
ead38dd2223dbe843967cf2c14c6930b
,
type
:
3
}
---
!u!114
&158856774
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
@@ -372,6 +369,7 @@ MonoBehaviour:
commentUI
:
{
fileID
:
1547091489
}
comment
:
{
fileID
:
342512063
}
commentString
:
descBtn
:
{
fileID
:
1472222827
}
isViewed
:
0
---
!u!1
&170076733
GameObject
:
...
...
@@ -752,41 +750,6 @@ CanvasRenderer:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
342512061
}
m_CullTransparentMesh
:
0
---
!u!84
&381835129
RenderTexture
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_ImageContentsHash
:
serializedVersion
:
2
Hash
:
00000000000000000000000000000000
m_ForcedFallbackFormat
:
4
m_DownscaleFallback
:
0
serializedVersion
:
3
m_Width
:
1920
m_Height
:
1080
m_AntiAliasing
:
1
m_MipCount
:
-1
m_DepthFormat
:
1
m_ColorFormat
:
4
m_MipMap
:
0
m_GenerateMips
:
1
m_SRGB
:
1
m_UseDynamicScale
:
0
m_BindMS
:
0
m_EnableCompatibleFormat
:
1
m_TextureSettings
:
serializedVersion
:
2
m_FilterMode
:
1
m_Aniso
:
1
m_MipBias
:
0
m_WrapU
:
1
m_WrapV
:
1
m_WrapW
:
1
m_Dimension
:
2
m_VolumeDepth
:
1
---
!u!1
&448150607
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1025,8 +988,8 @@ MonoBehaviour:
sourceCamera
:
{
fileID
:
534669904
}
outlineCamera
:
{
fileID
:
1548020010
}
outlineShaderMaterial
:
{
fileID
:
0
}
renderTexture
:
{
fileID
:
381835129
}
extraRenderTexture
:
{
fileID
:
1
899748492
}
renderTexture
:
{
fileID
:
1115576733
}
extraRenderTexture
:
{
fileID
:
1
037169659
}
---
!u!1
&666076611
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1399,6 +1362,76 @@ RectTransform:
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
0
,
y
:
0
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!84
&1037169659
RenderTexture
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_ImageContentsHash
:
serializedVersion
:
2
Hash
:
00000000000000000000000000000000
m_ForcedFallbackFormat
:
4
m_DownscaleFallback
:
0
serializedVersion
:
3
m_Width
:
1920
m_Height
:
1080
m_AntiAliasing
:
1
m_MipCount
:
-1
m_DepthFormat
:
1
m_ColorFormat
:
4
m_MipMap
:
0
m_GenerateMips
:
1
m_SRGB
:
1
m_UseDynamicScale
:
0
m_BindMS
:
0
m_EnableCompatibleFormat
:
1
m_TextureSettings
:
serializedVersion
:
2
m_FilterMode
:
1
m_Aniso
:
1
m_MipBias
:
0
m_WrapU
:
1
m_WrapV
:
1
m_WrapW
:
1
m_Dimension
:
2
m_VolumeDepth
:
1
---
!u!84
&1115576733
RenderTexture
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_ImageContentsHash
:
serializedVersion
:
2
Hash
:
00000000000000000000000000000000
m_ForcedFallbackFormat
:
4
m_DownscaleFallback
:
0
serializedVersion
:
3
m_Width
:
1920
m_Height
:
1080
m_AntiAliasing
:
1
m_MipCount
:
-1
m_DepthFormat
:
1
m_ColorFormat
:
4
m_MipMap
:
0
m_GenerateMips
:
1
m_SRGB
:
1
m_UseDynamicScale
:
0
m_BindMS
:
0
m_EnableCompatibleFormat
:
1
m_TextureSettings
:
serializedVersion
:
2
m_FilterMode
:
1
m_Aniso
:
1
m_MipBias
:
0
m_WrapU
:
1
m_WrapV
:
1
m_WrapW
:
1
m_Dimension
:
2
m_VolumeDepth
:
1
---
!u!1
&1205101239
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1478,6 +1511,128 @@ CanvasRenderer:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1205101239
}
m_CullTransparentMesh
:
0
---
!u!1
&1472222827
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1472222828
}
-
component
:
{
fileID
:
1472222831
}
-
component
:
{
fileID
:
1472222830
}
-
component
:
{
fileID
:
1472222829
}
m_Layer
:
5
m_Name
:
DescButton
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!224
&1472222828
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1472222827
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1.2
,
y
:
1.2
,
z
:
1.2
}
m_Children
:
[]
m_Father
:
{
fileID
:
1607829338
}
m_RootOrder
:
2
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
:
-899
,
y
:
-350
}
m_SizeDelta
:
{
x
:
100
,
y
:
100
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1472222829
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1472222827
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-1862395651
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Delegates
:
-
eventID
:
0
callback
:
m_PersistentCalls
:
m_Calls
:
-
m_Target
:
{
fileID
:
158856774
}
m_MethodName
:
ViewComment
m_Mode
:
1
m_Arguments
:
m_ObjectArgument
:
{
fileID
:
0
}
m_ObjectArgumentAssemblyTypeName
:
UnityEngine.Object, UnityEngine
m_IntArgument
:
0
m_FloatArgument
:
0
m_StringArgument
:
m_BoolArgument
:
0
m_CallState
:
2
m_TypeName
:
UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
eventID
:
1
callback
:
m_PersistentCalls
:
m_Calls
:
-
m_Target
:
{
fileID
:
158856774
}
m_MethodName
:
HideComment
m_Mode
:
1
m_Arguments
:
m_ObjectArgument
:
{
fileID
:
0
}
m_ObjectArgumentAssemblyTypeName
:
UnityEngine.Object, UnityEngine
m_IntArgument
:
0
m_FloatArgument
:
0
m_StringArgument
:
m_BoolArgument
:
0
m_CallState
:
2
m_TypeName
:
UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
---
!u!114
&1472222830
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1472222827
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
21300000
,
guid
:
45ecb1935e915104ab73f0fc799922f9
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
---
!u!222
&1472222831
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1472222827
}
m_CullTransparentMesh
:
0
---
!u!1
&1516940100
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1758,7 +1913,7 @@ Camera:
serializedVersion
:
2
m_Bits
:
0
m_RenderingPath
:
1
m_TargetTexture
:
{
fileID
:
381835129
}
m_TargetTexture
:
{
fileID
:
1115576733
}
m_TargetDisplay
:
0
m_TargetEye
:
3
m_HDR
:
0
...
...
@@ -1811,6 +1966,7 @@ RectTransform:
m_Children
:
-
{
fileID
:
1745203030
}
-
{
fileID
:
2123597350
}
-
{
fileID
:
1472222828
}
m_Father
:
{
fileID
:
158856772
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -2046,7 +2202,7 @@ GameObject:
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
m_IsActive
:
0
---
!u!224
&1839944656
RectTransform
:
m_ObjectHideFlags
:
0
...
...
@@ -2103,41 +2259,6 @@ CanvasRenderer:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1839944655
}
m_CullTransparentMesh
:
0
---
!u!84
&1899748492
RenderTexture
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_ImageContentsHash
:
serializedVersion
:
2
Hash
:
00000000000000000000000000000000
m_ForcedFallbackFormat
:
4
m_DownscaleFallback
:
0
serializedVersion
:
3
m_Width
:
1920
m_Height
:
1080
m_AntiAliasing
:
1
m_MipCount
:
-1
m_DepthFormat
:
1
m_ColorFormat
:
4
m_MipMap
:
0
m_GenerateMips
:
1
m_SRGB
:
1
m_UseDynamicScale
:
0
m_BindMS
:
0
m_EnableCompatibleFormat
:
1
m_TextureSettings
:
serializedVersion
:
2
m_FilterMode
:
1
m_Aniso
:
1
m_MipBias
:
0
m_WrapU
:
1
m_WrapV
:
1
m_WrapW
:
1
m_Dimension
:
2
m_VolumeDepth
:
1
---
!u!1
&1928700960
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/Scripts/UIs/CommentUIGenerator.cs
View file @
bf7df9ae
...
...
@@ -8,6 +8,7 @@ public class CommentUIGenerator : MonoBehaviour
public
GameObject
commentUI
;
public
Text
comment
;
public
string
commentString
=
""
;
public
GameObject
descBtn
;
public
bool
isViewed
=
false
;
private
Coroutine
currentFadeOut
;
...
...
@@ -17,15 +18,27 @@ public class CommentUIGenerator : MonoBehaviour
commentString
=
commentStr
;
comment
.
text
=
commentString
;
commentUI
.
SetActive
(
true
);
descBtn
.
SetActive
(
true
);
currentFadeOut
=
StartCoroutine
(
FadeOut
());
}
public
void
ViewComment
()
{
StopCoroutine
(
currentFadeOut
);
if
(!
isViewed
)
{
StopCoroutine
(
currentFadeOut
);
commentUI
.
GetComponent
<
Image
>().
color
=
new
Color
(
0.2358491f
,
0.2358491f
,
0.2358491f
,
1
);
comment
.
color
=
new
Color
(
1
,
1
,
1
,
1
);
}
commentUI
.
SetActive
(
true
);
isViewed
=
true
;
}
public
void
HideComment
()
{
commentUI
.
SetActive
(
false
);
}
IEnumerator
FadeOut
()
{
yield
return
new
WaitForSeconds
(
5f
);
...
...
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