Merge pull request #793 from LittleFish-233/master

周年庆任务游玩记录判断修改为2024年有效，修改周年庆任务移动端样式
CnGal · Jul 23, 2024 · 247c874 · 247c874
2 parents 53fc635 + 209d4b6
commit 247c874
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 17 deletions.
diff --git a/CnGalWebSite/CnGalWebSite.APIServer/Controllers/SpaceAPIController.cs b/CnGalWebSite/CnGalWebSite.APIServer/Controllers/SpaceAPIController.cs
@@ -480,7 +480,7 @@ public async Task<ActionResult<Result>> EditUserDataAsync(EditUserDataViewModel
                     await _userService.TryAddGCoins(user.Id, UserIntegralSourceType.BindSteamId, 10, null);
 
                     // 如果还有评语 继续添加G币
-                    if (await _playedGameRepository.AnyAsync(s => s.ApplicationUserId == user.Id && string.IsNullOrWhiteSpace(s.PlayImpressions) == false))
+                    if (await _playedGameRepository.AnyAsync(s => s.ApplicationUserId == user.Id && string.IsNullOrWhiteSpace(s.PlayImpressions) == false && s.LastEditTime.Year == 2024))
                     {
                         await _userService.TryAddGCoins(user.Id, UserIntegralSourceType.AnniversariesShare, 1, null);
                     }
@@ -656,7 +656,7 @@ public async Task<ActionResult<UserTaskModel>> GetUserTasks()
             if (model.IsAnniversariesShare == false && model.IsBindSteamId)
             {
                 // 如果还有评语 继续添加G币
-                if (await _playedGameRepository.AnyAsync(s => s.ApplicationUserId == user.Id && string.IsNullOrWhiteSpace(s.PlayImpressions) == false))
+                if (await _playedGameRepository.AnyAsync(s => s.ApplicationUserId == user.Id && string.IsNullOrWhiteSpace(s.PlayImpressions) == false && s.LastEditTime.Year == 2024))
                 {
                     await _userService.TryAddGCoins(user.Id, UserIntegralSourceType.AnniversariesShare, 1, null);
                     model.IsAnniversariesShare = true;

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Users/Tasks/TaskCard.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Users/Tasks/TaskCard.razor
@@ -1,5 +1,5 @@
 
-<MDCard Class="user-task-card">
+<MDCard Class="user-task-card  h-100">
     <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaIcon Type="Icon" XLarge Small=false />
      <div class="content-card">
          <div class="name title-large">@Name</div>
@@ -9,11 +9,11 @@
      <div class="action-card">
          @if (Finished)
         {
-            <CnGalWebSite.Components.Buttons.MasaButton TextStyle Icon="@IconType.Check.ToIconString()" Text="已完成"/>
+            <CnGalWebSite.Components.Buttons.MasaButton Small TextStyle Icon="@IconType.Check.ToIconString()" Text="已完成" />
         }
         else
         {
-            <CnGalWebSite.Components.Buttons.MasaButton Rounded Icon="@ButtonIcon.ToIconString()" IsAsync Text="@ButtonText" OnClick="OnClick" />
+            <CnGalWebSite.Components.Buttons.MasaButton Small Rounded Icon="@ButtonIcon.ToIconString()" IsAsync Text="@ButtonText" OnClick="OnClick" />
         }
     </div>
 </MDCard>

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Users/Tasks/TaskGroupCard.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Users/Tasks/TaskGroupCard.razor
@@ -6,8 +6,8 @@
     @if (OnlyShowAnniversaries == false)
     {
         <CnGalWebSite.Components.Containers.MasaTitleContainer Title="日常任务" Icon="@IconType.DailyTask.ToIconString()" Collapable Outline>
-            <MRow>
-                <MCol Cols="12" Md="6" Lg="4" Xl="3" Class="mb-4">
+            <MRow Class="compact-row">
+                <MCol Cols="4" Xl="3" Class="mb-4">
                     <SignInCard Model="Model" />
                 </MCol>
             </MRow>
@@ -17,17 +17,16 @@
     <AuthorizeView Roles="Admin">
         <Authorized>
             <CnGalWebSite.Components.Containers.MasaTitleContainer Title="周年庆任务" Icon="@IconType.Birthday.ToIconString()" Collapable Outline>
-                <MRow>
-                    <MCol Cols="12" Md="6" Lg="4" Xl="3" Class="mb-4 h-100">
+                <MRow Class="compact-row">
+                    <MCol Cols="4"  Xl="3" Class="mb-4">
                         <BookLiveCard Model="Model" />
                     </MCol>
-                    <MCol Cols="12" Md="6" Lg="4" Xl="3" Class="mb-4 h-100">
+                    <MCol Cols="4" Xl="3" Class="mb-4">
                         <LotteryCard Model="Model" />
                     </MCol>
-                    <MCol Cols="12" Md="6" Lg="4" Xl="3" Class="mb-4 h-100">
+                    <MCol Cols="4" Xl="3" Class="mb-4">
                         <ShareAndCommentGameCard Model="Model" />
                     </MCol>
-
                 </MRow>
             </CnGalWebSite.Components.Containers.MasaTitleContainer>
         </Authorized>
@@ -38,8 +37,8 @@
     {
 
         <CnGalWebSite.Components.Containers.MasaTitleContainer Title="新手任务" Icon="@IconType.NewbieTask.ToIconString()" Collapable Outline>
-            <MRow>
-                <MCol Cols="12" Md="6" Lg="4" Xl="3" Class="mb-4">
+            <MRow Class="compact-row">
+                <MCol Cols="4" Xl="3" Class="mb-4">
                     <BindSteamIdCard Model="Model" />
                 </MCol>
             </MRow>

diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/anniversary.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/anniversary.css
@@ -34,3 +34,17 @@
 .anniversaries-group-card .name {
     font-size: inherit;
 }
+/*周年庆任务*/
+.user-task-card {
+    gap: .5rem;
+    padding: .5rem;
+}
+    .user-task-card .name {
+        font-size: medium!important;
+    }
+    .user-task-card .biref{
+        font-size:small;
+    }
+    .user-task-card .reward {
+        font-size: smaller;
+    }
diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/bundle-app.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/bundle-app.css
@@ -1,4 +1,4 @@
-
+
 /*分享库存*/
 .anniversary-page .user-steam-card {
     gap: .5rem;
@@ -34,6 +34,20 @@
 .anniversaries-group-card .name {
     font-size: inherit;
 }
+/*周年庆任务*/
+.user-task-card {
+    gap: .5rem;
+    padding: .5rem;
+}
+    .user-task-card .name {
+        font-size: medium!important;
+    }
+    .user-task-card .biref{
+        font-size:small;
+    }
+    .user-task-card .biref {
+        font-size: smaller;
+    }
 
 
 /*全局*/
@@ -354,6 +368,82 @@
 .d-app {
     display: flex;
 }
+/*通用行列组件*/
+.compact-row {
+    margin: -4px!important;
+}
+.compact-row .col,
+.compact-row .col-1, 
+.compact-row .col-10, 
+.compact-row .col-11, 
+.compact-row .col-12, 
+.compact-row .col-2, 
+.compact-row .col-3, 
+.compact-row .col-4, 
+.compact-row .col-5, 
+.compact-row .col-6, 
+.compact-row .col-7, 
+.compact-row .col-8, 
+.compact-row .col-9, 
+.compact-row .col-auto, 
+.compact-row .col-lg, 
+.compact-row .col-lg-1, 
+.compact-row .col-lg-10, 
+.compact-row .col-lg-11, 
+.compact-row .col-lg-12, 
+.compact-row .col-lg-2, 
+.compact-row .col-lg-3, 
+.compact-row .col-lg-4, 
+.compact-row .col-lg-5, 
+.compact-row .col-lg-6, 
+.compact-row .col-lg-7, 
+.compact-row .col-lg-8, 
+.compact-row .col-lg-9, 
+.compact-row .col-lg-auto, 
+.compact-row .col-md, 
+.compact-row .col-md-1, 
+.compact-row .col-md-10, 
+.compact-row .col-md-11, 
+.compact-row .col-md-12, 
+.compact-row .col-md-2, 
+.compact-row .col-md-3, 
+.compact-row .col-md-4, 
+.compact-row .col-md-5, 
+.compact-row .col-md-6, 
+.compact-row .col-md-7, 
+.compact-row .col-md-8, 
+.compact-row .col-md-9, 
+.compact-row .col-md-auto, 
+.compact-row .col-sm, 
+.compact-row .col-sm-1, 
+.compact-row .col-sm-10, 
+.compact-row .col-sm-11, 
+.compact-row .col-sm-12, 
+.compact-row .col-sm-2, 
+.compact-row .col-sm-3, 
+.compact-row .col-sm-4, 
+.compact-row .col-sm-5, 
+.compact-row .col-sm-6, 
+.compact-row .col-sm-7, 
+.compact-row .col-sm-8, 
+.compact-row .col-sm-9, 
+.compact-row .col-sm-auto, 
+.compact-row .col-xl, 
+.compact-row .col-xl-1, 
+.compact-row .col-xl-10, 
+.compact-row .col-xl-11, 
+.compact-row .col-xl-12, 
+.compact-row .col-xl-2, 
+.compact-row .col-xl-3, 
+.compact-row .col-xl-4, 
+.compact-row .col-xl-5, 
+.compact-row .col-xl-6, 
+.compact-row .col-xl-7, 
+.compact-row .col-xl-8, 
+.compact-row .col-xl-9, 
+.compact-row .col-xl-auto {
+        padding: 4px!important;
+    }
 
 
 .entry-card-default.relevance-card .main-card img {

diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/bundle-app.min.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/bundle-app.min.css
diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/common-app.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/app/common-app.css
@@ -24,3 +24,79 @@
 .d-app {
     display: flex;
 }
+/*通用行列组件*/
+.compact-row {
+    margin: -4px!important;
+}
+.compact-row .col,
+.compact-row .col-1, 
+.compact-row .col-10, 
+.compact-row .col-11, 
+.compact-row .col-12, 
+.compact-row .col-2, 
+.compact-row .col-3, 
+.compact-row .col-4, 
+.compact-row .col-5, 
+.compact-row .col-6, 
+.compact-row .col-7, 
+.compact-row .col-8, 
+.compact-row .col-9, 
+.compact-row .col-auto, 
+.compact-row .col-lg, 
+.compact-row .col-lg-1, 
+.compact-row .col-lg-10, 
+.compact-row .col-lg-11, 
+.compact-row .col-lg-12, 
+.compact-row .col-lg-2, 
+.compact-row .col-lg-3, 
+.compact-row .col-lg-4, 
+.compact-row .col-lg-5, 
+.compact-row .col-lg-6, 
+.compact-row .col-lg-7, 
+.compact-row .col-lg-8, 
+.compact-row .col-lg-9, 
+.compact-row .col-lg-auto, 
+.compact-row .col-md, 
+.compact-row .col-md-1, 
+.compact-row .col-md-10, 
+.compact-row .col-md-11, 
+.compact-row .col-md-12, 
+.compact-row .col-md-2, 
+.compact-row .col-md-3, 
+.compact-row .col-md-4, 
+.compact-row .col-md-5, 
+.compact-row .col-md-6, 
+.compact-row .col-md-7, 
+.compact-row .col-md-8, 
+.compact-row .col-md-9, 
+.compact-row .col-md-auto, 
+.compact-row .col-sm, 
+.compact-row .col-sm-1, 
+.compact-row .col-sm-10, 
+.compact-row .col-sm-11, 
+.compact-row .col-sm-12, 
+.compact-row .col-sm-2, 
+.compact-row .col-sm-3, 
+.compact-row .col-sm-4, 
+.compact-row .col-sm-5, 
+.compact-row .col-sm-6, 
+.compact-row .col-sm-7, 
+.compact-row .col-sm-8, 
+.compact-row .col-sm-9, 
+.compact-row .col-sm-auto, 
+.compact-row .col-xl, 
+.compact-row .col-xl-1, 
+.compact-row .col-xl-10, 
+.compact-row .col-xl-11, 
+.compact-row .col-xl-12, 
+.compact-row .col-xl-2, 
+.compact-row .col-xl-3, 
+.compact-row .col-xl-4, 
+.compact-row .col-xl-5, 
+.compact-row .col-xl-6, 
+.compact-row .col-xl-7, 
+.compact-row .col-xl-8, 
+.compact-row .col-xl-9, 
+.compact-row .col-xl-auto {
+        padding: 4px!important;
+    }
diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.css
@@ -1684,6 +1684,10 @@ html {
 .anniversaries-group-card .biref {
     font-size: small;
 }
+/*周年庆介绍*/
+.anniversaries-introdution-card p{
+    margin:0!important;
+}
 
 .article-introduce {
     gap: 2rem;

diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.min.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/bundle.min.css
diff --git a/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/share/anniversary.css b/CnGalWebSite/CnGalWebSite.Shared/wwwroot/css/share/anniversary.css
@@ -51,3 +51,7 @@
 .anniversaries-group-card .biref {
     font-size: small;
 }
+/*周年庆介绍*/
+.anniversaries-introdution-card p{
+    margin:0!important;
+}