Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
WidowmakerSimulator
Project
Project
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
15박보승
WidowmakerSimulator
Commits
b0247b78
Commit
b0247b78
authored
Oct 07, 2019
by
15박보승
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
맵밖으로 나갈시 타이머 ui 구현
parent
252c6577
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
0 deletions
+94
-0
SampleScene.unity
Grapplers/Assets/Scenes/SampleScene.unity
+81
-0
IngameUIManager.cs
Grapplers/Assets/Scripts/IngameUIManager.cs
+12
-0
PlayerController.cs
Grapplers/Assets/Scripts/PlayerController.cs
+1
-0
No files found.
Grapplers/Assets/Scenes/SampleScene.unity
View file @
b0247b78
...
...
@@ -452,6 +452,85 @@ Transform:
m_Father: {fileID: 235153515}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &62669406
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 62669407}
- component: {fileID: 62669409}
- component: {fileID: 62669408}
m_Layer: 5
m_Name: OutOfMapWarningText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &62669407
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62669406}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 413298776}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -50, y: -20}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 1, y: 1}
--- !u!114 &62669408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62669406}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 5
m_MaxSize: 50
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 10
--- !u!222 &62669409
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62669406}
m_CullTransparentMesh: 0
--- !u!1 &109917889
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -1132,6 +1211,7 @@ RectTransform:
- {fileID: 1169779395}
- {fileID: 1271003726}
- {fileID: 2022730065}
- {fileID: 62669407}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...
...
@@ -1165,6 +1245,7 @@ MonoBehaviour:
comboUI: {fileID: 2022730064}
comboText: {fileID: 568411866}
damageText: {fileID: 109917891}
OutOfMapWarningUI: {fileID: 62669408}
--- !u!1 &477462021
GameObject:
m_ObjectHideFlags: 0
...
...
Grapplers/Assets/Scripts/IngameUIManager.cs
View file @
b0247b78
...
...
@@ -36,6 +36,10 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
private
Text
damageText
;
private
Coroutine
disableComboRoutine
;
[
SerializeField
]
private
Text
OutOfMapWarningUI
;
public
void
UpdateTargetLockedUIs
(
Vector3
[]
pos
)
{
int
tmp
,
i
=
0
;
...
...
@@ -132,4 +136,12 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
yield
return
new
WaitForSeconds
(
sec
);
ui
.
SetActive
(
false
);
}
public
void
UpdateOutOfMapWarningUI
(
float
remainTime
)
{
if
(
remainTime
>=
10
)
OutOfMapWarningUI
.
text
=
""
;
else
OutOfMapWarningUI
.
text
=
string
.
Format
(
"{0:F1}"
,
remainTime
);
}
}
Grapplers/Assets/Scripts/PlayerController.cs
View file @
b0247b78
...
...
@@ -108,6 +108,7 @@ public class PlayerController : MonoBehaviour
}
else
outOfMapTimer
=
10
;
IngameUIManager
.
inst
.
UpdateOutOfMapWarningUI
(
outOfMapTimer
);
}
private
void
LateUpdate
()
...
...
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