Skip to content

Commit

Permalink
Refresh GameScreen scene
Browse files Browse the repository at this point in the history
  • Loading branch information
silensrunners committed Dec 20, 2017
1 parent 255c573 commit 427413a
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 71 deletions.
50 changes: 20 additions & 30 deletions SlothWars/Assets/Scenes/default_scene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,15 @@ LightmapSettings:
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFiltering: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 112000002, guid: d44b1c78f4b36c0438c4ee52f707dbc0,
type: 2}
m_UseShadowmask: 1
Expand All @@ -111,8 +108,6 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &13375386
Prefab:
Expand Down Expand Up @@ -1211,10 +1206,10 @@ RectTransform:
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.32172608, y: 0.17444418}
m_AnchoredPosition: {x: -27.19, y: 4.75}
m_SizeDelta: {x: -54.39, y: 9.49}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 323.85, y: 152.1}
m_Pivot: {x: 0, y: 0}
--- !u!114 &230565066
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1970,7 +1965,7 @@ RectTransform:
m_GameObject: {fileID: 347491513}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -73}
m_LocalScale: {x: 1.7, y: 1.7, z: 1.7}
m_LocalScale: {x: 1.9, y: 1.9, z: 1.9}
m_Children:
- {fileID: 518456815}
- {fileID: 355817107}
Expand Down Expand Up @@ -3481,8 +3476,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.21300001}
m_AnchorMin: {x: 0.41000003, y: 0.065000005}
m_AnchorMax: {x: 0.9850001, y: 0.75500005}
m_AnchoredPosition: {x: -0.69999695, y: 0.2549801}
m_SizeDelta: {x: -2.33, y: 0.21696}
m_AnchoredPosition: {x: -14.03, y: 0.77}
m_SizeDelta: {x: 20.33, y: -12.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &572630223
MonoBehaviour:
Expand All @@ -3508,7 +3503,7 @@ MonoBehaviour:
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
m_MinSize: 12
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
Expand Down Expand Up @@ -3889,6 +3884,7 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!114 &602930570
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4529,7 +4525,6 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -4545,7 +4540,6 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down Expand Up @@ -5515,8 +5509,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.10438364, y: 0}
m_AnchorMax: {x: 0.82600003, y: 1}
m_AnchoredPosition: {x: 0.65, y: 0}
m_SizeDelta: {x: 1.3, y: 0}
m_AnchoredPosition: {x: 2.2, y: 0.9}
m_SizeDelta: {x: 8.34, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &861132158
MonoBehaviour:
Expand All @@ -5538,12 +5532,12 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 545925533bcb849c9b7296df8d04f870, type: 3}
m_FontSize: 14
m_Font: {fileID: 12800000, guid: 4ce625ebe210f42bb89ea398511fcf54, type: 3}
m_FontSize: 5
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 5
m_MaxSize: 15
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
Expand Down Expand Up @@ -6030,7 +6024,6 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -6046,7 +6039,6 @@ SpriteRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down Expand Up @@ -6172,7 +6164,6 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -6188,7 +6179,6 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void OnPointerExit(PointerEventData eventData){
}

IEnumerator waiter(){
yield return new WaitForSeconds (0.7f);
yield return new WaitForSeconds (0.1f);
if (EventSystem.current.IsPointerOverGameObject())
{
show();
Expand Down
38 changes: 19 additions & 19 deletions SlothWars/Assets/Scripts/terrain1.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHHHXXXXXXXXHHXXXXXXHHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXHHXXXXXXXXXXXXXHHHHHHHHHHHHXXXXXHHHXXXXXXXHHHHHHXHHHXHHHXXHHHXHHXHHXXHHXHHHHXXHXHXHHXHHXHXHHHXXX
XXXXXXXHHHHXXXXXXXXXXXHHHHHHHHHHHHHHHXXXXHHHXXXXXXXHHHHHHXHHHXHHHXXHHHXHHXHHXXHHXHHHHXXHXHXHHXHHXHXHHHXXX
XXXXXXHHHHHHXXXXXXHHXXHHHHHHHHHHHHHHHXXXXHHHHHHHHHHHHHHHHXHHHXHHHHHHHHXHHXHHXXHHHHHHHXXHXHXHHXHHXHHHHHXXX
XXXXHHHHHHHHHXXXXHHHHXHHHHHTTTTHHHHHHXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXHHXHHXXHHHHHHHXXHXHXHHXHHXHHHHHXXX
XXXHHHHTHHHHHHHHHHHHHHHHHHHTTTTHHHHHHXXXXHHHXXXXXXXHHHHHHHHHHHHHHHHHHHXHHXHHXXHHHHHHHHHHXHXHHXHHXHHHHHXXX
XXXHHHHTTHHHHHHHHHHHHHHHHHHTTTTHHHHHHXXXXHHHXXXXXXXHHHXHHXHHHHHHHHHHHHXHHXHHXXHHHHHHHHHHHHXHHXHHXHHHHHXXX
XXHHHHHTTHHHHXXXHHHHHHHHHHHTTTTHHHHHHXXXXHHHHXXXXXHHHHHHHHHHHHXXHHHHHHHHHHHHHHXXXXXXXHHXXXXHXXXXXXXXHHHXX
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHHHHXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHHHHXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
XXXHHHTTTHHHXXXXXHTTHXXXXXXTTTTXXXXXXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHXXXXXHHHHXXXHHHXXXXXXHHHHHX
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXHHHHHHHHHHHHHHXXXXHHHHHXXHHHHHHHHHHHHHHXXXXHHHHHXXHHHHHTTTTHHHTHHX
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTTTXX
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXXXTTXXTTXXXTTXXTXXTTXXXXXXXTTXXXXXXXTTXXXXXTTXXXXXXXTTTTTX
XTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX
TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHHXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHXXXXXXXXXHHHHHHHHHHHXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXHHHHHHHHHHXXXXXXXXHHTXTXTXHHXXXXHXXXHXXXXXXXXX
XXXXXXXXXHHXXXXXXXXXXXXXHHHHHHHHHHHHXXXXXHHHXHTTTHXHHHHHHHHHHHHHHXXHXXX
XXXXXXXHHHHXXXXXXXXXXXHHHHHHHHHHHHHHHXXXXHHHXXXTXXXHHHHHHXHHHXHHHHHHHXX
XXXXXXHHHHHHXXXXXXHHXXHHHHHHHHHHHHHHHXXXXHHHHHHHHHHHHHHHHXHHHXHHHHHHHXX
XXXXHHHHHHHHHXXXXHHHHXHHHHHTTTTHHHHHHXXXXHHHHHHHHHHHHHHHHHHHHHHHHHHHHXX
XXXHHHHTHHHHHHHHHHHHHHHHHHHTXXTHHHHHHXXXXHHHXTXTXTXHHHHHHHHHHHHHHHHHHXX
XXXHHHHTTHHHHHHHHHHHHHHHHHHTXXTHHHHHHXXXXHHHXHTTTHXHHHXHHXHHHHHHHHHHHXX
XXHHHHHTTHHHHXXXHHHHHHHTTHHTXXTHHHHHHXXXXHHHHXXTXXHHHHHHHHHHHHXXHHHHHXX
XXXHHHTTTHHHXXXXXHTTHXHHTTTTTTTTTTTHHHHHHHHHHHHHHHHHHHHHHHHHHHHTHHHTHXX
XXXHHHTTTHHHXXXXXHTTHXHHHHHTTTTHHHTTHXXXHHHHHHHHHHHHHHHHHHHHHHHTTHTTHHX
XXXHHHTTTHHHXXXXXHTTHXXXXXXTTTTXXXXXXXXXHHHHHHHHHHHHHHHHHHTTTHHTTTTHHHX
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXHHHHHHHHTTTTHHHTTHHTTTHXTXXTHHHH
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXTTTTXXXTTXXTTTXXTXXTXXXX
XXXXXXTTTXXXXXXXXXTTXXXXXXXTTTTXXXXXXXXXTTXXXXXTTTTXXXTTXXTTTXXTTTTXXXX
XTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX
TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
42 changes: 21 additions & 21 deletions SlothWars/Library/CurrentMaximizeLayout.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ MonoBehaviour:
y: 30
width: 1366
height: 636
m_MinSize: {x: 683, y: 492}
m_MinSize: {x: 681, y: 492}
m_MaxSize: {x: 14004, y: 14042}
vertical: 0
controlID: 25349
controlID: 32581
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -47,7 +47,7 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 271
y: 19
y: 91
width: 816
height: 344
m_MaximizeOnPlay: 1
Expand All @@ -70,7 +70,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoom: 0
m_UniformScale: 1
m_UpDirection: 1
Expand Down Expand Up @@ -120,10 +120,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 636
m_MinSize: {x: 406, y: 492}
m_MinSize: {x: 404, y: 492}
m_MaxSize: {x: 10002, y: 14042}
vertical: 1
controlID: 25329
controlID: 32582
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -144,10 +144,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 365
m_MinSize: {x: 406, y: 221}
m_MaxSize: {x: 8006, y: 4021}
m_MinSize: {x: 404, y: 221}
m_MaxSize: {x: 8004, y: 4021}
vertical: 0
controlID: 25330
controlID: 32560
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -203,7 +203,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: a667f3ffe068f3fffa69f3ff5a2ef4ffdad7f5ffa0d9f5ffe8ddf5ffeedff5ff92f3f6ff1c30f8ff9abdf8ffe614f9ff4016f9ff7c2cf9ff467afcff000000005ce300007ce3000094e30000be1201008a4c0100a88f0100f68f0100d4b201000cb4010086500200cc5a020078eb030054ec0300
m_ExpandedIDs: 4249ebffd884f0ffa667f3ffe068f3fffa69f3ff5a2ef4ffdad7f5ffa0d9f5ffe8ddf5ffeedff5ff92f3f6ff1c30f8ff9abdf8ffe614f9ff4016f9ff7c2cf9ff467afcff000000005ce300007ce3000094e30000be1201008a4c0100a88f0100f68f0100d4b201000cb4010086500200cc5a020078eb030054ec03003a6704009268040072690400
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -243,8 +243,8 @@ MonoBehaviour:
y: 0
width: 820
height: 365
m_MinSize: {x: 204, y: 221}
m_MaxSize: {x: 4004, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 8}
Expand Down Expand Up @@ -278,14 +278,14 @@ MonoBehaviour:
width: 816
height: 344
m_SceneLighting: 1
lastFramingTime: 6281.063048058329
lastFramingTime: 6782.805475610656
m_2DMode: 1
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 288.88107, y: 275.37134, z: 1}
m_Target: {x: 253.86807, y: 72.78395, z: 0}
speed: 2
m_Value: {x: 288.88107, y: 275.37134, z: 1}
m_Value: {x: 253.86807, y: 72.78395, z: 0}
m_RenderMode: 0
m_ValidateTrueMetals: 0
m_SceneViewState:
Expand All @@ -312,9 +312,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 73.41626
m_Target: 273.32452
speed: 2
m_Value: 73.41626
m_Value: 273.32452
m_Ortho:
m_Target: 1
speed: 2
Expand Down Expand Up @@ -343,8 +343,8 @@ MonoBehaviour:
y: 365
width: 1089
height: 271
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
Expand Down Expand Up @@ -398,7 +398,7 @@ MonoBehaviour:
m_LastProjectPath: H:\Projects\SlothWars\ES2017F1\SlothWars
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 119}
scrollPos: {x: 0, y: 101}
m_SelectedIDs: 0c600000
m_LastClickedID: 24588
m_ExpandedIDs: 00000000745f0000b05f00002061000016650000ffffff7f
Expand Down Expand Up @@ -483,7 +483,7 @@ MonoBehaviour:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_DirectoriesAreaWidth: 115
m_DirectoriesAreaWidth: 239
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down
Binary file modified SlothWars/Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown.
Binary file modified SlothWars/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown.
Binary file modified SlothWars/Library/assetDatabase3
Binary file not shown.
Binary file modified SlothWars/Library/metadata/50/503749ec470194b3a91f82f47758bb70
Binary file not shown.
Binary file modified SlothWars/Library/metadata/a4/a48c0fab51ea2fc4fb83446acd81f820
Binary file not shown.

0 comments on commit 427413a

Please sign in to comment.