Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
ac70cdfd
Commit
ac70cdfd
authored
Jan 19, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
플레이어 레이어 고치고 빌드함
parent
a7e38cce
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
341 additions
and
207 deletions
+341
-207
Player.prefab
Assets/Prefabs/Characters/Player.prefab
+166
-10
Player.prefab.meta
Assets/Prefabs/Characters/Player.prefab.meta
+1
-1
LifeStoneTestUI.prefab
Assets/Prefabs/UI/LifeStoneTestUI.prefab
+1
-1
PlayScene.unity
Assets/Scenes/PlayScene.unity
+169
-193
GraphicsSettings.asset
ProjectSettings/GraphicsSettings.asset
+2
-0
ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+1
-1
UnityConnectSettings.asset
ProjectSettings/UnityConnectSettings.asset
+1
-1
No files found.
Assets/Prefabs/Characters/Player.prefab
View file @
ac70cdfd
...
...
@@ -9,45 +9,201 @@ Prefab:
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1
420240384049674
}
m_RootGameObject
:
{
fileID
:
1
623439448163086
}
m_IsPrefabAsset
:
1
---
!u!1
&1
420240384049674
---
!u!1
&1
623439448163086
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4763351520509106
}
-
component
:
{
fileID
:
114980127291510386
}
-
component
:
{
fileID
:
4549734214569802
}
-
component
:
{
fileID
:
212187280661781960
}
-
component
:
{
fileID
:
114294925164316638
}
-
component
:
{
fileID
:
50325917162965942
}
-
component
:
{
fileID
:
61019994424895448
}
-
component
:
{
fileID
:
114906702720267008
}
-
component
:
{
fileID
:
95992411616135034
}
m_Layer
:
0
m_Name
:
Player
m_TagString
:
Untagged
m_TagString
:
Player
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4
763351520509106
---
!u!4
&4
549734214569802
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1
420240384049674
}
m_GameObject
:
{
fileID
:
1
623439448163086
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalPosition
:
{
x
:
2
,
y
:
1.8
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114980127291510386
---
!u!50
&50325917162965942
Rigidbody2D
:
serializedVersion
:
4
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1623439448163086
}
m_BodyType
:
0
m_Simulated
:
1
m_UseFullKinematicContacts
:
0
m_UseAutoMass
:
0
m_Mass
:
1
m_LinearDrag
:
0
m_AngularDrag
:
0.05
m_GravityScale
:
2
m_Material
:
{
fileID
:
0
}
m_Interpolate
:
0
m_SleepingMode
:
1
m_CollisionDetection
:
1
m_Constraints
:
4
---
!u!61
&61019994424895448
BoxCollider2D
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1623439448163086
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
6200000
,
guid
:
90e689a435f304c469db49daef28ed89
,
type
:
2
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
-0.1
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0.5
,
y
:
0.5
}
oldSize
:
{
x
:
0.78125
,
y
:
1.6875
}
newSize
:
{
x
:
0.78125
,
y
:
1.5625
}
adaptiveTilingThreshold
:
0.5
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
0.7
,
y
:
1.4
}
m_EdgeRadius
:
0
---
!u!95
&95992411616135034
Animator
:
serializedVersion
:
3
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1623439448163086
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
f296ed247a14fdc47aaf4e337d976d96
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!114
&114294925164316638
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1
420240384049674
}
m_GameObject
:
{
fileID
:
1
623439448163086
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
f289cad4933d4bf42ae5c82c57bd88e4
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
maxSpeed
:
5
maxDashSpeed
:
10
accerlation
:
1200
jumpSpeed
:
10
ropeSpeed
:
3
doubleJumpSpeed
:
10
dashAccerlation
:
2000
isDashing
:
0
platformArray
:
[]
horizontal
:
0
horizontalRaw
:
0
dashStart
:
0
groundLayer
:
serializedVersion
:
2
m_Bits
:
256
ropeLayer
:
serializedVersion
:
2
m_Bits
:
512
platformLayer
:
serializedVersion
:
2
m_Bits
:
2048
outerwallLayer
:
serializedVersion
:
2
m_Bits
:
4096
ropeDistance
:
0.3
rayDistance
:
1
ropeUp
:
0.6
ropeDown
:
0.7
---
!u!114
&114906702720267008
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1623439448163086
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d7635365ab870ce46bd38a4af729df1b
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
LCUI
:
{
fileID
:
0
}
ttx
:
0
tty
:
0
---
!u!212
&212187280661781960
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1623439448163086
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
-2078941185
m_SortingLayer
:
7
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
bae70a52c1619cd478cb9d32f0cb7083
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.78125
,
y
:
1.5625
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
Assets/Prefabs/Characters/Player.prefab.meta
View file @
ac70cdfd
fileFormatVersion: 2
guid:
eee5e95837869204b89ebdea980073f1
guid:
3d077a5f727dd1e4780e9265ed26e036
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
...
...
Assets/Prefabs/UI/LifeStoneTestUI.prefab
View file @
ac70cdfd
...
...
@@ -1522,7 +1522,7 @@ MonoBehaviour:
amethystText
:
{
fileID
:
1131904414142090
}
destroyText
:
{
fileID
:
1544257982062636
}
rowText
:
{
fileID
:
1493485493152988
}
ui
:
{
fileID
:
0
}
ui
:
{
fileID
:
1939101680453256
,
guid
:
c179f0931cfabec428a868a6edc543b0
,
type
:
2
}
---
!u!114
&114653312054727740
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
Assets/Scenes/PlayScene.unity
View file @
ac70cdfd
This diff is collapsed.
Click to expand it.
ProjectSettings/GraphicsSettings.asset
View file @
ac70cdfd
...
...
@@ -31,6 +31,8 @@ GraphicsSettings:
m_AlwaysIncludedShaders
:
-
{
fileID
:
10753
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
10770
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
17000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
16000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_PreloadedShaders
:
[]
m_SpritesDefaultMaterial
:
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
...
...
ProjectSettings/ProjectSettings.asset
View file @
ac70cdfd
...
...
@@ -12,7 +12,7 @@ PlayerSettings:
targetDevice
:
2
useOnDemandResources
:
0
accelerometerFrequency
:
60
companyName
:
DefaultCompany
companyName
:
Oenos
productName
:
Tetra Tower
defaultCursor
:
{
fileID
:
0
}
cursorHotspot
:
{
x
:
0
,
y
:
0
}
...
...
ProjectSettings/UnityConnectSettings.asset
View file @
ac70cdfd
...
...
@@ -3,7 +3,7 @@
---
!u!310
&1
UnityConnectSettings
:
m_ObjectHideFlags
:
0
m_Enabled
:
0
m_Enabled
:
1
m_TestMode
:
0
m_TestEventUrl
:
m_TestConfigUrl
:
...
...
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