Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

# Conflicts:
#	pages/game/components/goose.vue

common/styles/global/pages.scss

@@ -245,18 +245,24 @@
 		position: absolute;left: 20rpx;top:var(--status-bar-height);z-index: 2;
 	}
 	// animal
-		.animal-img{width:48rpx;height: 68rpx;@include ezy-no-repeat-cover;position: absolute;animation: shakeAndGrow 3s infinite;}
-		@keyframes shakeAndGrow {
-			0% {transform: translateX(0) scale(1);}
-			25% {transform: rotate(-20deg);}
-			50% {transform: rotate(20deg);}
-			75% {transform: rotate(0deg) scale(1.2);}
-			100% {transform: rotate(0deg) scale(1);}
-		}
-	.dan-img{background-image: url("@/static/images/study/animal-img1.png");}
-	.xiao-e-img{background-image: url("@/static/images/study/animal-img2.png");}
-	.zhong-e-img{background-image: url("@/static/images/study/animal-img3.png");}
-	.da-e-img{background-image: url("@/static/images/study/animal-img4.png");}
+	.animal-img{width:48rpx;height: 68rpx;@include ezy-no-repeat-cover;position: absolute;}
+	@keyframes shakeDan {
+		0% {transform: translateX(0) scale(1);}
+		25% {transform: rotate(-20deg);}
+		50% {transform: rotate(20deg);}
+		75% {transform: rotate(0deg) scale(1.2);}
+		100% {transform: rotate(0deg) scale(1);}
+	}
+	@keyframes shakeE {
+		0% {transform: translateX(0);}
+		25% {transform: rotate(-8deg);}
+		75% {transform: rotate(8deg);}
+		100% {transform: rotate(0deg);}
+	}
+	.dan-img{background-image: url("@/static/images/study/animal-img1.png");animation: shakeDan 3s infinite;}
+	.xiao-e-img{background-image: url("@/static/images/study/animal-img2.png");animation: shakeE 3s infinite;}
+	.zhong-e-img{background-image: url("@/static/images/study/animal-img3.png");animation: shakeE 3s infinite;}
+	.da-e-img{background-image: url("@/static/images/study/animal-img4.png");animation: shakeE 3s infinite;}
 }
 // 数学
 .ezy-shuxue-study-page{
@@ -1046,13 +1052,17 @@
 	.game-jf-box{position: absolute;right: 24rpx;top: var(--status-bar-height);}
 	// goose
 	.game-goose-box{
-		position: absolute;bottom: 300rpx;right: 80rpx;
+		position: absolute;bottom: 300rpx;right: 80rpx;color: #0d5f84;
+		.game-progress-text{
+			position: absolute;left: 50%;transform: translateX(-50%);font-size: 18rpx;bottom: 303rpx;
+		}
 		.game-progress-box{
 			width: 138rpx;height: 25rpx;position: absolute;left: 48rpx;
 			.u-line-progress__background{
 				width: 138rpx;height: 25rpx!important;
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/game/jf-bj.png");
 			}
+			.u-line-progress__line{height: 25rpx!important;}
 		}
 		.goose-img-box{width: 231rpx;height: 442rpx;@include ezy-no-repeat-cover;}
 	}
@@ -1063,9 +1073,9 @@
 	
 	// food
 	.food-img-box{width: 80rpx;height: 75rpx;position: absolute;}
-	.food-img25{bottom: 368rpx;left: 274rpx;}
-	.food-img50{bottom: 360rpx;left: 270rpx;}
-	.food-img100{bottom: 360rpx;left: 272rpx;}
+	.food-img100{bottom: 368rpx;left: 274rpx;}
+	.food-img300{bottom: 360rpx;left: 270rpx;}
+	.food-img600{bottom: 360rpx;left: 272rpx;}
 	
 	//btn
 	.food-btn-box{
@@ -1105,7 +1115,7 @@
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/game/food-jf-bj.png");margin-top: 20rpx;
 				.jf-icon{width: 35rpx;height: 35rpx;margin:0 4rpx 0 10rpx;flex-shrink: 0;
 				@include ezy-no-repeat-cover;background-image: url("@/static/images/my/jf-qb.png");}
-				.jf-text{min-width: 60rpx;text-align: center;color: #fff;}
+				.jf-text{min-width: 60rpx;text-align: center;color: #fff;margin-top: 2rpx;}
 			}
 		}
 	}

pages/game/components/goose.vue

@@ -1,8 +1,7 @@
 <template>
 	<view>
-    <up-line-progress v-if="growthType!==3" :percentage="progress" activeColor="#54e1fe" class="game-progress-box">
-      <!-- <text class="u-percentage-slot">{{progress}}</text> -->
-    </up-line-progress>
+		<up-line-progress v-if="growthType!==3" :percentage="30" :showText="false" activeColor="#54e1fe" class="game-progress-box"> </up-line-progress>
+		<text class="game-progress-text">成长值：{{progress}}%</text>
 		<image :src="imgUrl" class="goose-img-box"></image>
 	</view>
 </template>