Merge remote-tracking branch 'origin/style-update' into style-update

# Conflicts: # Server/wwwroot/css/home.css
pollubnet · Nov 20, 2024 · 016845e · 016845e
2 parents 8019991 + 0dba394
commit 016845e
Show file tree

Hide file tree

Showing 7 changed files with 3,637 additions and 47 deletions.
diff --git a/Server/Components/Pages/GamePage.razor b/Server/Components/Pages/GamePage.razor
@@ -67,10 +67,10 @@
 				<PopupContainer @ref="_popup"></PopupContainer>
 			</div>
 		</div>
-		<div class="cristalBox">
+		<div class="crystalBox">
 			<div class="actionButton"><div class="actionButton-content"><img src="assets/swordbutton.svg" /></div></div>
 			<div class="actionButton"><div class="actionButton-content"><img src="assets/shieldbutton.svg" /></div></div>
-			<div class="cristalCircle">
+			<div class="crystalCircle">
 				<div class="crystal">
 					<img src="assets/crystal.png" alt="">
 				</div>

diff --git a/Server/Components/Pages/Home.razor b/Server/Components/Pages/Home.razor
@@ -20,23 +20,44 @@
 @inject ProtectedSessionStorage ProtectedSessionStore
 
 <div id="container">
+
+    <div class="title">
+        <img class="titleImg" src="assets/background/title.svg"/>
+    </div>
+    <div class="crystalCircle">
+        <div class="crystal">
+            <img src="assets/crystal.png" alt="">
+        </div>
+    </div>
     <div class="login-box">
         <div class="login">
+
             <div class="data-box">
                 <input type="text" @bind="_username" onkeyup="@Enter" required="required"/>
                 <label>Login</label>
             </div>
             <div class="data-box">
                 <input type="password" @bind="_username" onkeyup="@Enter" required="required"/>
                 <label>password</label>
-             </div>
+            </div>
             <div class="data-box">
-                <div @onclick="HandleUserLogin" class="logButton"><div class="logButton-content">Sign in</div></div>
-            </div>    
+                <div @onclick="HandleUserLogin" class="logButton">
+                    <div class="logButton-content">Sign in</div></div>
+            </div>
+
         </div>
     </div>
+
+
 </div>
 
+
+
+<script >
+    
+</script>
+
+
 @code {
     private async Task Enter(KeyboardEventArgs e)
     {
@@ -54,3 +75,4 @@
         NavigationManager.NavigateTo($"/game");
     }
 }
+
diff --git a/Server/Fracture.Server.csproj b/Server/Fracture.Server.csproj
@@ -25,9 +25,6 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="wwwroot\js\" />
-  </ItemGroup>
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
     <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
     <Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory=".." />

diff --git a/Server/Modules/MapGenerator/Services/MapGeneratorService.cs b/Server/Modules/MapGenerator/Services/MapGeneratorService.cs
@@ -35,8 +35,8 @@ public Task<MapData> GetMap(NoiseParameters noiseParameters)
 
     private MapData GenerateMap(NoiseParameters noiseParameters)
     {
-        int width = 32;
-        int height = 32;
+        int width = 64;
+        int height = 64;
         bool useFalloff = true;
         _seed = noiseParameters.UseRandomSeed ? _rnd.Next(int.MaxValue) : noiseParameters.Seed;
 

diff --git a/Server/wwwroot/assets/background/title.svg b/Server/wwwroot/assets/background/title.svg
diff --git a/Server/wwwroot/css/game.css b/Server/wwwroot/css/game.css
@@ -81,7 +81,7 @@ body {
     border: solid 2.5px rgb(0, 0, 0);
 }
 
-.cristalBox {
+.crystalBox {
     padding-top: 10px;
     display: flex;
     flex-direction: row;
@@ -145,7 +145,7 @@ body {
 
 
 
-.cristalCircle {
+.crystalCircle {
     padding: 5px;
     z-index: 1;
     border-radius: 100%;
@@ -225,6 +225,9 @@ body {
     width: calc(100% - (var(--popup-padding) * 2));
     height: calc(100% - (var(--popup-padding) * 2));
     backdrop-filter: blur(1px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .statManager {
@@ -282,20 +285,20 @@ body {
     box-shadow: 0px 0px 10px #000;
 }
 
-    .miniMapTable tr td, .mapTable tr td {
-        border: #000 1px solid;
-        background-color: blue;
-    }
+.miniMapTable tr td, .mapTable tr td {
+    border: #000 1px solid;
+    background-color: blue;
+}
 
-    .miniMapTable tr td {
-        width: 5px;
-        height: 5px;
-    }
+.miniMapTable tr td {
+    width: 2px;
+    height: 2px;
+}
 
-    .mapTable tr td {
-        width: 20px;
-        height: 20px;
-    }
+.mapTable tr td {
+    width: 8px;
+    height: 8px;
+}
 
 .settings {
     height: 10%;
@@ -304,7 +307,17 @@ body {
     flex-direction: row;
     align-items: center;
 }
-
+.map{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+
+}
+.mapTable{
+    margin-top: 5px
+
+}
 
 
 .stats {
@@ -347,19 +360,19 @@ body {
     box-shadow: 0px 0px 10px #000;
 }
 
-    .equipmentTable tr td {
-        border: #000 3px solid;
-        margin-left: 5px;
-        margin-right: 5px;
-        width: 100px;
-        height: 100px;
+.equipmentTable tr td {
+    border: #000 3px solid;
+    margin-left: 5px;
+    margin-right: 5px;
+    width: 100px;
+    height: 100px;
+    background-color: rgba(0,0,25,0.7);
+
+}
+
+    .equipmentTable tr td:hover {
         background-color: rgba(0,0,25,0.7);
-
     }
-
-        .equipmentTable tr td:hover {
-            background-color: rgba(0,0,25,0.7);
-        }
 .row{
     display: flex;
     flex-direction: column;
@@ -375,8 +388,9 @@ body {
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    margin: 0;
     backdrop-filter: blur(1px);
+    height: 200px;
+    width: 200px;
 }
 .buttonEquip {
     background-color: rgba(138, 136, 136, 0.9);
@@ -391,15 +405,14 @@ body {
     backdrop-filter: blur(1px);
 }
 .eqColumn {
-    width: 50%;
-    height: 100%;
     overflow-y: scroll;
     text-align: justify;
     scrollbar-color: rgb(0, 0, 0) rgba(0,0,0,0);
     scrollbar-width: auto;
     scrollbar-arrow-color: black;
     scroll-snap-type: y mandatory;
     scroll-behavior: smooth;
+
 }
 .eqColumn span {
     font-size: 1.1em;

diff --git a/Server/wwwroot/css/home.css b/Server/wwwroot/css/home.css
@@ -4,7 +4,7 @@ html {
     height: 100%;
 }
 *{
-    overflow: hidden;
+
     font-family: "Courier", sans-serif;
 }
 body {
@@ -25,12 +25,15 @@ body {
 
 
 }
+html, body{
+    position: fixed;
+}
 
 #container {
     width: 100%;
     height: 100vh;
     display: flex;
-    flex-direction: row;
+    flex-direction: column;
 }
 
 .logButton{
@@ -52,16 +55,15 @@ body {
 
 
 
-.cristalCircle {
+.crystalCircle {
     padding: 5px;
     z-index: 1;
-    border-radius: 100%;
-    height: 70px;
-    width: 70px;
+    height: 0px;
+    width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
-    box-shadow: 0 0 5px #cc7afc,0 0 25px #b27afc;
+
 }
 
 
@@ -75,13 +77,14 @@ body {
     display: flex;
     align-items: center;
     justify-content: center;
+
 }
 
 .crystal img {
     height: 100px;
     transition: 1s ease-in-out;
     user-select: none;
-
+    
 }
 
 
@@ -110,6 +113,7 @@ body {
     width: 400px;
     background-color: rgba(76, 76, 76, 0.27);
     margin: auto;
+    margin-top: 0px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -118,6 +122,7 @@ body {
     /*border: solid 0.5px;*/
     /*border-color: black;*/
     filter: dropShadow(10px);
+
 }
 .data-box{
 
@@ -199,6 +204,25 @@ body {
     font-size:1.2rem ;
 }
 
+.title{
+    width: 100vw;
+    height: 400px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+.titleImg{
+    width: 1000px;
+    height: 400px;
+    filter: drop-shadow(5px 8px 3px rgb(0 0 0 / 0.4));
+
+}
+canvas{
+    filter: blur(1px);
+    z-index: 10;
+}
+
 :root {
     --rarity-common: #808080;
     --rarity-uncommon: #8ef059;