Skip to content
Snippets Groups Projects
Commit 1410df27 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

updated window & fixed canvas resolution

parent f36e9502
Branches
No related tags found
No related merge requests found
Showing
with 1948 additions and 10 deletions
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.4514196, g: 0.5008462, b: 0.5719757, a: 1}
m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -264,11 +264,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
......@@ -333,7 +333,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &818494564
Transform:
m_ObjectHideFlags: 0
......
......@@ -11,12 +11,14 @@
background-repeat: no-repeat;
background-size: cover;
background-position: center;
font-family: "COCOGOOSE";
font-family: "Cocogoose Regular";
border-radius: 5px;
}
.window .content{
flex-grow: 1;
display: flex;
flex-direction: column;
margin-top: 1.5%;
background-image: url('../images/darkBg.jpg');
background-repeat: no-repeat;
......@@ -29,18 +31,60 @@
.window .content .title{
color: #dbbea9;
margin: -.5em 0 0 0;
}
.window .content .textBox{
border-radius: 5px;
background-color: #262626;
box-shadow: 0px 0px 10px 4px rgba(84,160,227,0.65);
box-shadow: 0px 0px 2px 2px #3f566d;
}
.window .content .listContainer{
flex-grow: 1;
display: flex;
flex-direction: column;
border-radius: 5px;
/*
border: 3px solid #3f566d;
border-image: linear-gradient(#3f566d, #262626) 30;
*/
box-shadow: 0px 0px 2px 2px #3f566d, inset 0px 0px 2px 2px #000;
padding: 1em;
}
.window .content .listContainer .item{
max-height: 3em;
display: flex;
flex-direction: row;
padding: .5em;
border-radius: 5px;
border: 1px solid #8fdcf9;
box-shadow: 0px 0px 2px 2px #3f566d, inset 0px 0px 2px 2px #3f566d;
}
.window .content .listContainer .item .description{
flex-grow: 1;
padding-left: .5em;
}
.window .content .listContainer .item .description span{
font-family: "Cocogoose Regular Light";
font-weight: 6 00;
font-size: .75em;
}
.icon{
height: 100%;
}
.icon img{
height: inherit;
}
.window .actionsBar{
display: flex;
flex-direction: row;
justify-content: flex-end;
padding: .5em 1em;
}
.window h1, .window h2, .window h3, .window h4, .window h5, .window h6{
margin: 0;
......
File added
Source diff could not be displayed: it is too large. Options to address this: view the blob.
File added
File added
File added
......@@ -110,11 +110,19 @@
url("ddbcad2d205ba94bb5608f2cba618523.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url("ddbcad2d205ba94bb5608f2cba618523.svg#HelveticaNeueLTPro-It") format("svg"); /* iOS 4.1- */
}
@font-face {font-family: "COCOGOOSE";
@font-face {font-family: "Cocogoose Regular";
src: url("d14035f6b1afeabafbee4abb2ebf0fc6.eot"); /* IE9*/
src: url("d14035f6b1afeabafbee4abb2ebf0fc6.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
url("d14035f6b1afeabafbee4abb2ebf0fc6.woff2") format("woff2"), /* chrome、firefox */
url("d14035f6b1afeabafbee4abb2ebf0fc6.woff") format("woff"), /* chrome、firefox */
url("d14035f6b1afeabafbee4abb2ebf0fc6.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url("d14035f6b1afeabafbee4abb2ebf0fc6.svg#COCOGOOSE") format("svg"); /* iOS 4.1- */
url("d14035f6b1afeabafbee4abb2ebf0fc6.svg#Cocogoose Regular") format("svg"); /* iOS 4.1- */
}
@font-face {font-family: "Cocogoose Regular Light";
src: url("b4e46f03d0e03a9192dc3c2ad1a4e104.eot"); /* IE9*/
src: url("b4e46f03d0e03a9192dc3c2ad1a4e104.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
url("b4e46f03d0e03a9192dc3c2ad1a4e104.woff2") format("woff2"), /* chrome、firefox */
url("b4e46f03d0e03a9192dc3c2ad1a4e104.woff") format("woff"), /* chrome、firefox */
url("b4e46f03d0e03a9192dc3c2ad1a4e104.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url("b4e46f03d0e03a9192dc3c2ad1a4e104.svg#Cocogoose Regular Light") format("svg"); /* iOS 4.1- */
}
\ No newline at end of file
BrowserAssets/UI/images/icons/create-icon.png

6.34 KiB

......@@ -32,13 +32,27 @@
<div class="title">
<h2>Parties en ligne</h2>
</div>
<!--
<div class="textBox">
Blablabla Mr Freeman.
</div>
-->
<span>Choisi ou créé une partie pour pouvoir jouer au jeu.</span>
<div class="listContainer">
<div class="item">
<div class="icon">
<img src="images/icons/create-icon.png" alt="create-icon">
</div>
<div class="description">
<h4>Créer une partie</h4>
<span>Les joueurs présents sur ton réseau local pourront te rejoindre. :D</span>
</div>
</div>
</div>
</div>
<div class="actionsBar">
<div class="item">
<span>Créer une partie</span>
<span>Rejoindre</span>
</div>
</div>
</div>
......
......@@ -5,6 +5,9 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/UI/MainMenu.unity
guid: 50c5b4897a71dc64399811a98a1eae49
- enabled: 1
path: Assets/Scenes/Hub.unity
guid: 548ff420e1a556f44ab8d1326b7d9200
......
......@@ -108,6 +108,11 @@
"key": "mesh.meshColliderIsConvex",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.stripProBuilderScriptsOnBuild",
"value": "{\"m_Value\":true}"
},
{
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.dragSelectRectMode",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment