Skip to content

Commit 427413a

Browse files
committed
Refresh GameScreen scene
1 parent 255c573 commit 427413a

File tree

9 files changed

+61
-71
lines changed

9 files changed

+61
-71
lines changed

SlothWars/Assets/Scenes/default_scene.unity

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,15 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80-
m_PVRFilterTypeDirect: 0
81-
m_PVRFilterTypeIndirect: 0
82-
m_PVRFilterTypeAO: 0
80+
m_PVRFiltering: 0
8381
m_PVRFilteringMode: 1
8482
m_PVRCulling: 1
8583
m_PVRFilteringGaussRadiusDirect: 1
8684
m_PVRFilteringGaussRadiusIndirect: 5
8785
m_PVRFilteringGaussRadiusAO: 2
88-
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
89-
m_PVRFilteringAtrousPositionSigmaIndirect: 2
90-
m_PVRFilteringAtrousPositionSigmaAO: 1
91-
m_ShowResolutionOverlay: 1
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
9289
m_LightingDataAsset: {fileID: 112000002, guid: d44b1c78f4b36c0438c4ee52f707dbc0,
9390
type: 2}
9491
m_UseShadowmask: 1
@@ -111,8 +108,6 @@ NavMeshSettings:
111108
manualTileSize: 0
112109
tileSize: 256
113110
accuratePlacement: 0
114-
debug:
115-
m_Flags: 0
116111
m_NavMeshData: {fileID: 0}
117112
--- !u!1001 &13375386
118113
Prefab:
@@ -1211,10 +1206,10 @@ RectTransform:
12111206
m_RootOrder: 3
12121207
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12131208
m_AnchorMin: {x: 0, y: 0}
1214-
m_AnchorMax: {x: 0.32172608, y: 0.17444418}
1215-
m_AnchoredPosition: {x: -27.19, y: 4.75}
1216-
m_SizeDelta: {x: -54.39, y: 9.49}
1217-
m_Pivot: {x: 0.5, y: 0.5}
1209+
m_AnchorMax: {x: 0, y: 0}
1210+
m_AnchoredPosition: {x: 0, y: 0}
1211+
m_SizeDelta: {x: 323.85, y: 152.1}
1212+
m_Pivot: {x: 0, y: 0}
12181213
--- !u!114 &230565066
12191214
MonoBehaviour:
12201215
m_ObjectHideFlags: 0
@@ -1970,7 +1965,7 @@ RectTransform:
19701965
m_GameObject: {fileID: 347491513}
19711966
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
19721967
m_LocalPosition: {x: 0, y: 0, z: -73}
1973-
m_LocalScale: {x: 1.7, y: 1.7, z: 1.7}
1968+
m_LocalScale: {x: 1.9, y: 1.9, z: 1.9}
19741969
m_Children:
19751970
- {fileID: 518456815}
19761971
- {fileID: 355817107}
@@ -3481,8 +3476,8 @@ RectTransform:
34813476
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.21300001}
34823477
m_AnchorMin: {x: 0.41000003, y: 0.065000005}
34833478
m_AnchorMax: {x: 0.9850001, y: 0.75500005}
3484-
m_AnchoredPosition: {x: -0.69999695, y: 0.2549801}
3485-
m_SizeDelta: {x: -2.33, y: 0.21696}
3479+
m_AnchoredPosition: {x: -14.03, y: 0.77}
3480+
m_SizeDelta: {x: 20.33, y: -12.25}
34863481
m_Pivot: {x: 0.5, y: 0.5}
34873482
--- !u!114 &572630223
34883483
MonoBehaviour:
@@ -3508,7 +3503,7 @@ MonoBehaviour:
35083503
m_FontSize: 14
35093504
m_FontStyle: 0
35103505
m_BestFit: 1
3511-
m_MinSize: 10
3506+
m_MinSize: 12
35123507
m_MaxSize: 40
35133508
m_Alignment: 4
35143509
m_AlignByGeometry: 0
@@ -3889,6 +3884,7 @@ Camera:
38893884
m_OcclusionCulling: 1
38903885
m_StereoConvergence: 10
38913886
m_StereoSeparation: 0.022
3887+
m_StereoMirrorMode: 0
38923888
--- !u!114 &602930570
38933889
MonoBehaviour:
38943890
m_ObjectHideFlags: 0
@@ -4529,7 +4525,6 @@ MeshRenderer:
45294525
m_Enabled: 1
45304526
m_CastShadows: 1
45314527
m_ReceiveShadows: 1
4532-
m_DynamicOccludee: 1
45334528
m_MotionVectors: 1
45344529
m_LightProbeUsage: 1
45354530
m_ReflectionProbeUsage: 1
@@ -4545,7 +4540,6 @@ MeshRenderer:
45454540
m_PreserveUVs: 0
45464541
m_IgnoreNormalsForChartDetection: 0
45474542
m_ImportantGI: 0
4548-
m_StitchLightmapSeams: 0
45494543
m_SelectedEditorRenderState: 3
45504544
m_MinimumChartSize: 4
45514545
m_AutoUVMaxDistance: 0.5
@@ -5515,8 +5509,8 @@ RectTransform:
55155509
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
55165510
m_AnchorMin: {x: 0.10438364, y: 0}
55175511
m_AnchorMax: {x: 0.82600003, y: 1}
5518-
m_AnchoredPosition: {x: 0.65, y: 0}
5519-
m_SizeDelta: {x: 1.3, y: 0}
5512+
m_AnchoredPosition: {x: 2.2, y: 0.9}
5513+
m_SizeDelta: {x: 8.34, y: 0}
55205514
m_Pivot: {x: 0.5, y: 0.5}
55215515
--- !u!114 &861132158
55225516
MonoBehaviour:
@@ -5538,12 +5532,12 @@ MonoBehaviour:
55385532
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
55395533
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
55405534
m_FontData:
5541-
m_Font: {fileID: 12800000, guid: 545925533bcb849c9b7296df8d04f870, type: 3}
5542-
m_FontSize: 14
5535+
m_Font: {fileID: 12800000, guid: 4ce625ebe210f42bb89ea398511fcf54, type: 3}
5536+
m_FontSize: 5
55435537
m_FontStyle: 0
5544-
m_BestFit: 0
5545-
m_MinSize: 10
5546-
m_MaxSize: 40
5538+
m_BestFit: 1
5539+
m_MinSize: 5
5540+
m_MaxSize: 15
55475541
m_Alignment: 4
55485542
m_AlignByGeometry: 0
55495543
m_RichText: 1
@@ -6030,7 +6024,6 @@ SpriteRenderer:
60306024
m_Enabled: 1
60316025
m_CastShadows: 0
60326026
m_ReceiveShadows: 0
6033-
m_DynamicOccludee: 1
60346027
m_MotionVectors: 1
60356028
m_LightProbeUsage: 1
60366029
m_ReflectionProbeUsage: 1
@@ -6046,7 +6039,6 @@ SpriteRenderer:
60466039
m_PreserveUVs: 0
60476040
m_IgnoreNormalsForChartDetection: 0
60486041
m_ImportantGI: 0
6049-
m_StitchLightmapSeams: 0
60506042
m_SelectedEditorRenderState: 0
60516043
m_MinimumChartSize: 4
60526044
m_AutoUVMaxDistance: 0.5
@@ -6172,7 +6164,6 @@ MeshRenderer:
61726164
m_Enabled: 1
61736165
m_CastShadows: 1
61746166
m_ReceiveShadows: 1
6175-
m_DynamicOccludee: 1
61766167
m_MotionVectors: 1
61776168
m_LightProbeUsage: 1
61786169
m_ReflectionProbeUsage: 1
@@ -6188,7 +6179,6 @@ MeshRenderer:
61886179
m_PreserveUVs: 0
61896180
m_IgnoreNormalsForChartDetection: 0
61906181
m_ImportantGI: 0
6191-
m_StitchLightmapSeams: 0
61926182
m_SelectedEditorRenderState: 3
61936183
m_MinimumChartSize: 4
61946184
m_AutoUVMaxDistance: 0.5

SlothWars/Assets/Scripts/GameUIScripts/ButtonOnMouseOver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void OnPointerExit(PointerEventData eventData){
2424
}
2525

2626
IEnumerator waiter(){
27-
yield return new WaitForSeconds (0.7f);
27+
yield return new WaitForSeconds (0.1f);
2828
if (EventSystem.current.IsPointerOverGameObject())
2929
{
3030
show();
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
2-
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
3-
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
4-
XXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHHHXXXXXXXXHHXXXXXXHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
5-
XXXXXXXXXHHXXXXXXXXXXXXXHHHHHHHHHHHHXXXXXHHHXXXXXXXHHHHHHXHHHXHHHXXHHHXHHXHHXXHHXHHHHXXHXHXHHXHHXHXHHHXXX
6-
XXXXXXXHHHHXXXXXXXXXXXHHHHHHHHHHHHHHHXXXXHHHXXXXXXXHHHHHHXHHHXHHHXXHHHXHHXHHXXHHXHHHHXXHXHXHHXHHXHXHHHXXX
7-
XXXXXXHHHHHHXXXXXXHHXXHHHHHHHHHHHHHHHXXXXHHHHHHHHHHHHHHHHXHHHXHHHHHHHHXHHXHHXXHHHHHHHXXHXHXHHXHHXHHHHHXXX
8-
XXXXHHHHHHHHHXXXXHHHHXHHHHHTTTTHHHHHHXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXHHXHHXXHHHHHHHXXHXHXHHXHHXHHHHHXXX
9-
XXXHHHHTHHHHHHHHHHHHHHHHHHHTTTTHHHHHHXXXXHHHXXXXXXXHHHHHHHHHHHHHHHHHHHXHHXHHXXHHHHHHHHHHXHXHHXHHXHHHHHXXX
10-
XXXHHHHTTHHHHHHHHHHHHHHHHHHTTTTHHHHHHXXXXHHHXXXXXXXHHHXHHXHHHHHHHHHHHHXHHXHHXXHHHHHHHHHHHHXHHXHHXHHHHHXXX
11-
XXHHHHHTTHHHHXXXHHHHHHHHHHHTTTTHHHHHHXXXXHHHHXXXXXHHHHHHHHHHHHXXHHHHHHHHHHHHHHXXXXXXXHHXXXXHXXXXXXXXHHHXX
12-
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHHHHXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
13-
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHHHHXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
14-
XXXHHHTTTHHHXXXXXHTTHXXXXXXTTTTXXXXXXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
15-
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXHHHHHHHHHHHHHHXXXXHHHHHXXHHHHHHHHHHHHHHXXXXHHHHHXXHHHHHTTTTHHHTHHX
16-
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTTTXX
17-
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXXXTTXXTTXXXTTXXTXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTTTTX
18-
XTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX
19-
TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
1+
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHXXXXXXXXXXXXXXXXXXXXXXX
2+
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHHXXXXXXXXXXXXXXXXXXXX
3+
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHHHHXXXXXXXXXXXXXXXXXX
4+
XXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHHHXXXXXXXXHHTXTXTXHHXXXXHXXXHXXXXXXXXX
5+
XXXXXXXXXHHXXXXXXXXXXXXXHHHHHHHHHHHHXXXXXHHHXHTTTHXHHHHHHHHHHHHHHXXHXXX
6+
XXXXXXXHHHHXXXXXXXXXXXHHHHHHHHHHHHHHHXXXXHHHXXXTXXXHHHHHHXHHHXHHHHHHHXX
7+
XXXXXXHHHHHHXXXXXXHHXXHHHHHHHHHHHHHHHXXXXHHHHHHHHHHHHHHHHXHHHXHHHHHHHXX
8+
XXXXHHHHHHHHHXXXXHHHHXHHHHHTTTTHHHHHHXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHXX
9+
XXXHHHHTHHHHHHHHHHHHHHHHHHHTXXTHHHHHHXXXXHHHXTXTXTXHHHHHHHHHHHHHHHHHHXX
10+
XXXHHHHTTHHHHHHHHHHHHHHHHHHTXXTHHHHHHXXXXHHHXHTTTHXHHHXHHXHHHHHHHHHHHXX
11+
XXHHHHHTTHHHHXXXHHHHHHHTTHHTXXTHHHHHHXXXXHHHHXXTXXHHHHHHHHHHHHXXHHHHHXX
12+
XXXHHHTTTHHHXXXXXHTTHXHHTTTTTTTTTTTHHHHHHHHHHHHHHHHHHHHHHHHHHHHTHHHTHXX
13+
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHTTHXXXHHHHHHHHHHHHHHHHHHHHHHHTTHTTHHX
14+
XXXHHHTTTHHHXXXXXHTTHXXXXXXTTTTXXXXXXXXXHHHHHHHHHHHHHHHHHHTTTHHTTTTHHHX
15+
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXHHHHHHHHTTTTHHHTTHHTTTHXTXXTHHHH
16+
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXTTTTXXXTTXXTTTXXTXXTXXXX
17+
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXTTTTXXXTTXXTTTXXTTTTXXXX
18+
XTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX
19+
TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT

SlothWars/Library/CurrentMaximizeLayout.dwlt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ MonoBehaviour:
2020
y: 30
2121
width: 1366
2222
height: 636
23-
m_MinSize: {x: 683, y: 492}
23+
m_MinSize: {x: 681, y: 492}
2424
m_MaxSize: {x: 14004, y: 14042}
2525
vertical: 0
26-
controlID: 25349
26+
controlID: 32581
2727
--- !u!114 &2
2828
MonoBehaviour:
2929
m_ObjectHideFlags: 52
@@ -47,7 +47,7 @@ MonoBehaviour:
4747
m_Pos:
4848
serializedVersion: 2
4949
x: 271
50-
y: 19
50+
y: 91
5151
width: 816
5252
height: 344
5353
m_MaximizeOnPlay: 1
@@ -70,7 +70,7 @@ MonoBehaviour:
7070
m_HSlider: 0
7171
m_VSlider: 0
7272
m_IgnoreScrollWheelUntilClicked: 0
73-
m_EnableMouseInput: 0
73+
m_EnableMouseInput: 1
7474
m_EnableSliderZoom: 0
7575
m_UniformScale: 1
7676
m_UpDirection: 1
@@ -120,10 +120,10 @@ MonoBehaviour:
120120
y: 0
121121
width: 1089
122122
height: 636
123-
m_MinSize: {x: 406, y: 492}
123+
m_MinSize: {x: 404, y: 492}
124124
m_MaxSize: {x: 10002, y: 14042}
125125
vertical: 1
126-
controlID: 25329
126+
controlID: 32582
127127
--- !u!114 &4
128128
MonoBehaviour:
129129
m_ObjectHideFlags: 52
@@ -144,10 +144,10 @@ MonoBehaviour:
144144
y: 0
145145
width: 1089
146146
height: 365
147-
m_MinSize: {x: 406, y: 221}
148-
m_MaxSize: {x: 8006, y: 4021}
147+
m_MinSize: {x: 404, y: 221}
148+
m_MaxSize: {x: 8004, y: 4021}
149149
vertical: 0
150-
controlID: 25330
150+
controlID: 32560
151151
--- !u!114 &5
152152
MonoBehaviour:
153153
m_ObjectHideFlags: 52
@@ -203,7 +203,7 @@ MonoBehaviour:
203203
scrollPos: {x: 0, y: 0}
204204
m_SelectedIDs:
205205
m_LastClickedID: 0
206-
m_ExpandedIDs: a667f3ffe068f3fffa69f3ff5a2ef4ffdad7f5ffa0d9f5ffe8ddf5ffeedff5ff92f3f6ff1c30f8ff9abdf8ffe614f9ff4016f9ff7c2cf9ff467afcff000000005ce300007ce3000094e30000be1201008a4c0100a88f0100f68f0100d4b201000cb4010086500200cc5a020078eb030054ec0300
206+
m_ExpandedIDs: 4249ebffd884f0ffa667f3ffe068f3fffa69f3ff5a2ef4ffdad7f5ffa0d9f5ffe8ddf5ffeedff5ff92f3f6ff1c30f8ff9abdf8ffe614f9ff4016f9ff7c2cf9ff467afcff000000005ce300007ce3000094e30000be1201008a4c0100a88f0100f68f0100d4b201000cb4010086500200cc5a020078eb030054ec03003a6704009268040072690400
207207
m_RenameOverlay:
208208
m_UserAcceptedRename: 0
209209
m_Name:
@@ -243,8 +243,8 @@ MonoBehaviour:
243243
y: 0
244244
width: 820
245245
height: 365
246-
m_MinSize: {x: 204, y: 221}
247-
m_MaxSize: {x: 4004, y: 4021}
246+
m_MinSize: {x: 200, y: 200}
247+
m_MaxSize: {x: 4000, y: 4000}
248248
m_ActualView: {fileID: 2}
249249
m_Panes:
250250
- {fileID: 8}
@@ -278,14 +278,14 @@ MonoBehaviour:
278278
width: 816
279279
height: 344
280280
m_SceneLighting: 1
281-
lastFramingTime: 6281.063048058329
281+
lastFramingTime: 6782.805475610656
282282
m_2DMode: 1
283283
m_isRotationLocked: 0
284284
m_AudioPlay: 0
285285
m_Position:
286-
m_Target: {x: 288.88107, y: 275.37134, z: 1}
286+
m_Target: {x: 253.86807, y: 72.78395, z: 0}
287287
speed: 2
288-
m_Value: {x: 288.88107, y: 275.37134, z: 1}
288+
m_Value: {x: 253.86807, y: 72.78395, z: 0}
289289
m_RenderMode: 0
290290
m_ValidateTrueMetals: 0
291291
m_SceneViewState:
@@ -312,9 +312,9 @@ MonoBehaviour:
312312
speed: 2
313313
m_Value: {x: 0, y: 0, z: 0, w: 1}
314314
m_Size:
315-
m_Target: 73.41626
315+
m_Target: 273.32452
316316
speed: 2
317-
m_Value: 73.41626
317+
m_Value: 273.32452
318318
m_Ortho:
319319
m_Target: 1
320320
speed: 2
@@ -343,8 +343,8 @@ MonoBehaviour:
343343
y: 365
344344
width: 1089
345345
height: 271
346-
m_MinSize: {x: 232, y: 271}
347-
m_MaxSize: {x: 10002, y: 10021}
346+
m_MinSize: {x: 230, y: 250}
347+
m_MaxSize: {x: 10000, y: 10000}
348348
m_ActualView: {fileID: 10}
349349
m_Panes:
350350
- {fileID: 10}
@@ -398,7 +398,7 @@ MonoBehaviour:
398398
m_LastProjectPath: H:\Projects\SlothWars\ES2017F1\SlothWars
399399
m_IsLocked: 0
400400
m_FolderTreeState:
401-
scrollPos: {x: 0, y: 119}
401+
scrollPos: {x: 0, y: 101}
402402
m_SelectedIDs: 0c600000
403403
m_LastClickedID: 24588
404404
m_ExpandedIDs: 00000000745f0000b05f00002061000016650000ffffff7f
@@ -483,7 +483,7 @@ MonoBehaviour:
483483
m_NewAssetIndexInList: -1
484484
m_ScrollPosition: {x: 0, y: 0}
485485
m_GridSize: 64
486-
m_DirectoriesAreaWidth: 115
486+
m_DirectoriesAreaWidth: 239
487487
--- !u!114 &11
488488
MonoBehaviour:
489489
m_ObjectHideFlags: 52
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

SlothWars/Library/assetDatabase3

0 Bytes
Binary file not shown.
-648 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)