Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vestergaard fredrik - fvesterg
Sunrise Game
Commits
19c9efd9
Commit
19c9efd9
authored
Nov 08, 2020
by
Freddy
Browse files
Safety Commit Optimizing UI
parent
abd87359
Changes
33
Expand all
Hide whitespace changes
Inline
Side-by-side
SunriseGame/Assembly-CSharp.csproj
View file @
19c9efd9
This diff is collapsed.
Click to expand it.
SunriseGame/Assets/
Prefabs/Johny/Animations/fille
r.meta
→
SunriseGame/Assets/
Edito
r.meta
View file @
19c9efd9
fileFormatVersion: 2
guid: b2a521ccde4e8b141be4a0bda5a1f867
guid: e365664f7915c2a4d8c717c1ea4c691d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
...
...
SunriseGame/Assets/Editor/Johnny.colors
0 → 100644
View file @
19c9efd9
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&1
MonoBehaviour
:
m_ObjectHideFlags
:
52
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
12323
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_Name
:
m_EditorClassIdentifier
:
m_Presets
:
-
m_Name
:
m_Color
:
{
r
:
0.78039217
,
g
:
0.89411765
,
b
:
0.84705883
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.8862745
,
g
:
0.93333334
,
b
:
0.8156863
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.95686275
,
g
:
0.9607843
,
b
:
0.8117647
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.78039217
,
g
:
0.84705883
,
b
:
0.90588236
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.8156863
,
g
:
0.9098039
,
b
:
0.98039216
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.60784316
,
g
:
0.8156863
,
b
:
0.7294118
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.79607844
,
g
:
0.8784314
,
b
:
0.6745098
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.9254902
,
g
:
0.92941177
,
b
:
0.6509804
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.60784316
,
g
:
0.7176471
,
b
:
0.80784315
,
a
:
1
}
-
m_Name
:
m_Color
:
{
r
:
0.6745098
,
g
:
0.83137256
,
b
:
0.9490196
,
a
:
1
}
SunriseGame/Assets/Editor/Johnny.colors.meta
0 → 100644
View file @
19c9efd9
fileFormatVersion: 2
guid: 8eec7a263b18c0a4db1cce11c6cce197
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
SunriseGame/Assets/Materials/StarSwipe.mat
View file @
19c9efd9
...
...
@@ -60,7 +60,7 @@ Material:
-
_Cutoff
:
0.5
-
_DetailNormalMapScale
:
1
-
_DstBlend
:
0
-
_EffectTime
:
0.8283116
-
_EffectTime
:
1
-
_EffectTurn
:
90
-
_GlossMapScale
:
1
-
_Glossiness
:
0.5
...
...
@@ -70,6 +70,7 @@ Material:
-
_OcclusionStrength
:
1
-
_Parallax
:
0.02
-
_Points
:
36
-
_ReplaceThreshold
:
0.5
-
_ScreenRatio
:
0.5625
-
_ScreenWidth
:
1080
-
_SmoothnessTextureChannel
:
0
...
...
@@ -81,8 +82,8 @@ Material:
-
_ZWrite
:
1
m_Colors
:
-
_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_Color1
:
{
r
:
0.
3
,
g
:
0.5799989
,
b
:
1
,
a
:
1
}
-
_Color2
:
{
r
:
0.8
599988
,
g
:
1
,
b
:
0.3
,
a
:
1
}
-
_Color1
:
{
r
:
0.
8599998
,
g
:
1
,
b
:
0.3
,
a
:
1
}
-
_Color2
:
{
r
:
0.8
6000013
,
g
:
0.3
,
b
:
1
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
-
_ReplaceColor
:
{
r
:
1
,
g
:
0
,
b
:
1
,
a
:
1
}
-
_Screen
:
{
r
:
528.90173
,
g
:
1359.5376
,
b
:
0
,
a
:
0
}
-
_Screen
:
{
r
:
378.3968
,
g
:
69.25852
,
b
:
0
,
a
:
0
}
SunriseGame/Assets/Prefabs/Johny/Animations/Idle.anim
0 → 100644
View file @
19c9efd9
This diff is collapsed.
Click to expand it.
SunriseGame/Assets/Prefabs/Johny/Animations/Idle.anim.meta
0 → 100644
View file @
19c9efd9
fileFormatVersion: 2
guid: d726a1e7ddce048b7b31160edf86bb8e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
SunriseGame/Assets/Prefabs/Johny/Animations/JonnyAnimator.controller
0 → 100644
View file @
19c9efd9
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Jonny (1)
serializedVersion
:
5
m_AnimatorParameters
:
[]
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
3800514289622723425
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&3361459210426100976
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
New Animation
0
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
d726a1e7ddce048b7b31160edf86bb8e
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&3800514289622723425
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
6511463016758589719
}
m_Position
:
{
x
:
340
,
y
:
70
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
3361459210426100976
}
m_Position
:
{
x
:
350
,
y
:
200
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
6511463016758589719
}
---
!u!1102
&6511463016758589719
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
New Animation
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
d726a1e7ddce048b7b31160edf86bb8e
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
SunriseGame/Assets/Prefabs/Johny/Animations/JonnyAnimator.controller.meta
0 → 100644
View file @
19c9efd9
fileFormatVersion: 2
guid: c0bfba91a10234288a54d1bffa42ddc9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
SunriseGame/Assets/Prefabs/Johny/Animations/filler
deleted
100644 → 0
View file @
abd87359
SunriseGame/Assets/Prefabs/Johny/Jonny (1).prefab
0 → 100644
View file @
19c9efd9
This diff is collapsed.
Click to expand it.
SunriseGame/Assets/Prefabs/Johny/Jonny (1).prefab.meta
0 → 100644
View file @
19c9efd9
fileFormatVersion: 2
guid: a9608e299907c468e8d7a5d391130ca3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
SunriseGame/Assets/Prefabs/Johny/Textures/Jonnny.png
0 → 100644
View file @
19c9efd9
108 KB
SunriseGame/Assets/Prefabs/Johny/Textures/Jonnny.png.meta
0 → 100644
View file @
19c9efd9
fileFormatVersion: 2
guid: 5d4f3a85d52d142e5a4db2fe9da91564
TextureImporter:
internalIDToNameTable:
- first:
213: -7782159248285995603
second: Glasses
- first:
213: 7944983935325112857
second: Shirt
- first:
213: -6183654289357230725
second: Beard
- first:
213: 855313452706386941
second: Jonnny
- first:
213: -2851523241730315090
second: Jonnny_0
- first:
213: -6854045103918901026
second: Jonnny_1
- first:
213: -717206260068064555
second: Jonnny_2
- first:
213: -5674540101099257832
second: Jonnny_3
- first:
213: -2872744389496238552
second: Jonnny_4
- first:
213: 8413182066015715485
second: Jonnny_5
- first:
213: 6207625788518950853
second: Jonnny_6
- first:
213: -301654812205343000
second: Jonnny_7
- first:
213: 1569588850886989277
second: Jonnny_8
- first:
213: -8435567579724510007
second: Jonnny_9
- first:
213: 5357564568513088894
second: Jonnny_10
- first:
213: 7732274991645016200
second: Jonnny_11
- first:
213: -5942911627491724083
second: Jonnny_12
- first:
213: -469135368049128890
second: Jonnny_13
- first:
213: 1679061879587657741
second: Jonnny_14
- first:
213: 8437513787768927669
second: Jonnny_15
- first:
213: 3842274282553574026
second: Jonnny_16
- first:
213: 6217124070674607757
second: Jonnny_17
- first:
213: -5449498129133191081
second: Jonnny_18
- first:
213: -1343830978635254728
second: Jonnny_19
- first:
213: -1934324749190371695
second: Jonnny_20
- first:
213: 70449014803349738
second: Jonnny_21
- first:
213: -3159915978401351963
second: Jonnny_22
- first:
213: 144017768283768199
second: Jonnny_23
- first:
213: 146908582787250654
second: Jonnny_24
- first:
213: 704610090020995127
second: Jonnny_25
- first:
213: -6377865143753674124
second: Jonnny_26
- first:
213: 1747439041573181519
second: Jonnny_27
- first:
213: 3368150024360554064
second: Jonnny_28
- first:
213: -5367658756674912146
second: Jonnny_29
- first:
213: 2220750888387327973
second: Jonnny_30
- first:
213: 6184894657111125195
second: Jonnny_31
- first:
213: 6277542619361834722
second: Jonnny_32
- first:
213: -4320232570304794857
second: Jonnny_33
- first:
213: 3824311938364249536
second: Jonnny_34
- first:
213: -1818031747536955199
second: Jonnny_35
- first:
213: -2347640957691839083
second: Jonnny_36
- first:
213: 1956923053628728104
second: Jonnny_37
- first:
213: -5742731946291034450
second: Jonnny_38
- first:
213: -4957328449600142190
second: Jonnny_39
- first:
213: -1107041629821617859
second: Jonnny_40
- first:
213: 6868882189165844108
second: Jonnny_41
- first:
213: -5307676540820251371
second: Jonnny_42
- first:
213: -1434839247992800021
second: Jonnny_43
- first:
213: -4847065148098416040
second: Jonnny_44
- first:
213: 5137125333521965286
second: Jonnny_45
- first:
213: -8546721705064583273
second: Jonnny_46
externalObjects: {}
serializedVersion: 11
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: 2
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
applyGammaDecoding: 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
- serializedVersion: 3
buildTarget: WebGL
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:
- serializedVersion: 2
name: Glasses
rect:
serializedVersion: 2
x: 63
y: 762
width: 82
height: 48
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dad64643567300490800000000000000
internalID: -7782159248285995603
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Shirt
rect:
serializedVersion: 2
x: 51
y: 522
width: 141
height: 129
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 91a0d3b7bc0424e60800000000000000
internalID: 7944983935325112857
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Beard
rect:
serializedVersion: 2
x: 79
y: 341
width: 84
height: 105
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b7daa0daf2f3f2aa0800000000000000
internalID: -6183654289357230725
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Jonnny
rect:
serializedVersion: 2
x: 225
y: 222
width: 258
height: 598
alignment: 9
pivot: {x: 0.53374404, y: 0.50291175}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: df35d28bd0faedb00800000000000000
internalID: 855313452706386941
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 72de77ca4307749ed80174c24a35a4d4
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
SunriseGame/Assets/Prefabs/Johny/Textures/Jonny.png
0 → 100644
View file @
19c9efd9
80.4 KB
SunriseGame/Assets/Prefabs/Johny/Textures/Jonny.png.meta
0 → 100644
View file @
19c9efd9
This diff is collapsed.
Click to expand it.
SunriseGame/Assets/Prefabs/Johny/Textures/filler
deleted
100644 → 0
View file @
abd87359
SunriseGame/Assets/Prefabs/UI.prefab
View file @
19c9efd9
This diff is collapsed.
Click to expand it.
SunriseGame/Assets/Scenes/SampleScene.unity
View file @
19c9efd9
...
...
@@ -121,6 +121,155 @@ NavMeshSettings:
debug
:
m_Flags
:
0
m_NavMeshData
:
{
fileID
:
0
}
---
!u!1001
&108340264
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
4304730650516509807
,
guid
:
e86738adc72125e40bc2e4b5f1439932
,
type
:
3
}
propertyPath
:
openPosition.y
value
:
130
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4304730650516509807
,
guid
:
e86738adc72125e40bc2e4b5f1439932
,
type
:
3
}
propertyPath
:
closePosition.x