diff --git a/assets/images/home/btn_icon_click.png b/assets/images/home/btn_icon_click.png new file mode 100644 index 0000000..1bc30dd Binary files /dev/null and b/assets/images/home/btn_icon_click.png differ diff --git a/assets/images/home/btn_icon_dream_exploration.png b/assets/images/home/btn_icon_dream_exploration.png new file mode 100644 index 0000000..2a8ccad Binary files /dev/null and b/assets/images/home/btn_icon_dream_exploration.png differ diff --git a/assets/images/home/text_dream_tree_page_first_line.png b/assets/images/home/text_dream_tree_page_first_line.png new file mode 100644 index 0000000..78b0963 Binary files /dev/null and b/assets/images/home/text_dream_tree_page_first_line.png differ diff --git a/assets/images/home/text_dream_tree_page_fourth_line.png b/assets/images/home/text_dream_tree_page_fourth_line.png new file mode 100644 index 0000000..4bedf18 Binary files /dev/null and b/assets/images/home/text_dream_tree_page_fourth_line.png differ diff --git a/assets/images/home/text_dream_tree_page_second_line.png b/assets/images/home/text_dream_tree_page_second_line.png new file mode 100644 index 0000000..72800b3 Binary files /dev/null and b/assets/images/home/text_dream_tree_page_second_line.png differ diff --git a/assets/images/home/text_dream_tree_page_third_line.png b/assets/images/home/text_dream_tree_page_third_line.png new file mode 100644 index 0000000..1171df4 Binary files /dev/null and b/assets/images/home/text_dream_tree_page_third_line.png differ diff --git a/assets/images/splash/btn_icon_begin.png b/assets/images/splash/btn_icon_begin.png index e801f80..35e515e 100644 Binary files a/assets/images/splash/btn_icon_begin.png and b/assets/images/splash/btn_icon_begin.png differ diff --git a/assets/images/splash/text_startup_page_first_line.png b/assets/images/splash/text_startup_page_first_line.png new file mode 100644 index 0000000..660e8da Binary files /dev/null and b/assets/images/splash/text_startup_page_first_line.png differ diff --git a/assets/images/splash/text_startup_page_fourth_line.png b/assets/images/splash/text_startup_page_fourth_line.png new file mode 100644 index 0000000..5acc48c Binary files /dev/null and b/assets/images/splash/text_startup_page_fourth_line.png differ diff --git a/assets/images/splash/text_startup_page_second_line.png b/assets/images/splash/text_startup_page_second_line.png new file mode 100644 index 0000000..db19bc7 Binary files /dev/null and b/assets/images/splash/text_startup_page_second_line.png differ diff --git a/assets/images/splash/text_startup_page_third_line.png b/assets/images/splash/text_startup_page_third_line.png new file mode 100644 index 0000000..4fdea13 Binary files /dev/null and b/assets/images/splash/text_startup_page_third_line.png differ diff --git a/assets/images/welcome/btn_label_bg_up.png b/assets/images/welcome/btn_label_bg_up.png index 0a38845..dafde0c 100644 Binary files a/assets/images/welcome/btn_label_bg_up.png and b/assets/images/welcome/btn_label_bg_up.png differ diff --git a/assets/images/welcome/text_welcome_page_first_line.png b/assets/images/welcome/text_welcome_page_first_line.png new file mode 100644 index 0000000..75b2c33 Binary files /dev/null and b/assets/images/welcome/text_welcome_page_first_line.png differ diff --git a/assets/images/welcome/text_welcome_page_fourth_line.png b/assets/images/welcome/text_welcome_page_fourth_line.png new file mode 100644 index 0000000..f91a1d5 Binary files /dev/null and b/assets/images/welcome/text_welcome_page_fourth_line.png differ diff --git a/assets/images/welcome/text_welcome_page_second_line.png b/assets/images/welcome/text_welcome_page_second_line.png new file mode 100644 index 0000000..5092dff Binary files /dev/null and b/assets/images/welcome/text_welcome_page_second_line.png differ diff --git a/assets/images/welcome/text_welcome_page_third_line.png b/assets/images/welcome/text_welcome_page_third_line.png new file mode 100644 index 0000000..c49f326 Binary files /dev/null and b/assets/images/welcome/text_welcome_page_third_line.png differ diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart index 5bb8f1d..c8a6410 100644 --- a/lib/app/modules/home/views/home_view.dart +++ b/lib/app/modules/home/views/home_view.dart @@ -477,21 +477,7 @@ class HomeView extends GetView { ), ), child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - '梦想', - style: TextStyles.boldWhiteShadow22_012, - ), - Text( - '探索', - style: TextStyles.boldWhiteShadow22_012, - ) - ], - ), + child: Images.homeBtnIconDreamExploration, ), ), ), @@ -557,12 +543,18 @@ class HomeView extends GetView { ) : Container(), controller.explored2.value >= 1 ? firstLeafWidget() : Container(), - controller.explored2.value >= 4 - ?LanternWidget( - brightCount: controller.exploreCount.value >= 2 - ? controller.exploreDay.value - : controller.exploreDay.value - 1, - ): Container(), + Positioned( + right: 60.w, + top: 346.h, + child: AnimatedVisibilityWidget( + animationWidgetBuilder: AnimatedVisibilityWidget.fadeAnimationWidgetBuilder, + duration: const Duration(milliseconds: 800), + isVisible: controller.explored2.value >= 1, + child: const LanternWidget( + brightCount: 0, + ), + ), + ), Positioned( left: 168.w, top: 244.h, diff --git a/lib/app/modules/home/widgets/first_time_dialog.dart b/lib/app/modules/home/widgets/first_time_dialog.dart index d044296..b876edc 100644 --- a/lib/app/modules/home/widgets/first_time_dialog.dart +++ b/lib/app/modules/home/widgets/first_time_dialog.dart @@ -2,7 +2,6 @@ import 'package:dreampad/app/shared/shared.dart'; import 'package:dreampad/app/shared/widgets/touch_hint_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; /// 首次dialog的模板 @@ -30,34 +29,10 @@ class FirstTimeDialog extends StatelessWidget { isTextShown.value = true; }, children: [ - Padding( - padding: EdgeInsets.only(bottom: 20.h), - child: Text( - '探梦者，你选择了一个很酷的梦想', - style: TextStyles.mediumWhiteShadow26_034, - ), - ), - Padding( - padding: EdgeInsets.only(bottom: 20.h), - child: Text( - '现在在你面前是专属于你的梦之建木', - style: TextStyles.mediumWhiteShadow26_034, - ), - ), - Padding( - padding: EdgeInsets.only(bottom: 20.h), - child: Text( - '你将会看到你未来几个关键阶段的重要目标', - style: TextStyles.mediumWhiteShadow26_034, - ), - ), - Padding( - padding: EdgeInsets.only(bottom: 20.h), - child: Text( - '准备好了吗？', - style: TextStyles.mediumWhiteShadow26_034, - ), - ), + Images.homeTextDreamTreePageFirstLine, + Images.homeTextDreamTreePageSecondLine, + Images.homeTextDreamTreePageThirdLine, + Images.homeTextDreamTreePageFourthLine, ], ), ), diff --git a/lib/app/modules/home/widgets/lantern_widget.dart b/lib/app/modules/home/widgets/lantern_widget.dart index 48802b4..20b621b 100644 --- a/lib/app/modules/home/widgets/lantern_widget.dart +++ b/lib/app/modules/home/widgets/lantern_widget.dart @@ -12,40 +12,34 @@ class LanternWidget extends GetView { @override Widget build(BuildContext context) { - return Positioned( - right: 60.w, - top: 346.h, - child: ShowUp( - child: Container( - height: 90.h, - width: 180.w, - decoration: const BoxDecoration( - image: DecorationImage( - image: Images.homeLantern, - fit: BoxFit.fill, - ), - ), - child: Stack( - clipBehavior: Clip.none, - children: [ - brightCount! >= 1 - ? Positioned( - left: -9.w, - top: 36.h, - child: Images.homeLanternBright, - ) - : Container(), - brightCount! >= 2 - ? Positioned( - left: 18.w, - top: 27.h, - child: Images.homeLanternBright, - ) - : Container(), - ], - ), + return Container( + height: 90.h, + width: 180.w, + decoration: const BoxDecoration( + image: DecorationImage( + image: Images.homeLantern, + fit: BoxFit.fill, ), ), + child: Stack( + clipBehavior: Clip.none, + children: [ + brightCount! >= 1 + ? Positioned( + left: -9.w, + top: 36.h, + child: Images.homeLanternBright, + ) + : Container(), + brightCount! >= 2 + ? Positioned( + left: 18.w, + top: 27.h, + child: Images.homeLanternBright, + ) + : Container(), + ], + ), ); } } diff --git a/lib/app/modules/welcome/views/hello_widget.dart b/lib/app/modules/welcome/views/hello_widget.dart index dba91a2..01ef43b 100644 --- a/lib/app/modules/welcome/views/hello_widget.dart +++ b/lib/app/modules/welcome/views/hello_widget.dart @@ -23,33 +23,18 @@ class HelloWidget extends StatelessWidget { child: AnimatedColumnWidget( children: [ Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - '探梦者你好', - style: TextStyles.mediumWhiteShadow26_034, - ), + padding: EdgeInsets.only(bottom: 8.h), + child: Images.welcomeFirstLine, ), Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - '这里是建木遗迹', - style: TextStyles.mediumWhiteShadow26_034, - ), + padding: EdgeInsets.only(bottom: 8.h), + child: Images.welcomeSecondLine, ), Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - '在探索之前', - style: TextStyles.mediumWhiteShadow26_034, - ), - ), - Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - '请告诉我', - style: TextStyles.mediumWhiteShadow26_034, - ), + padding: EdgeInsets.only(bottom: 8.h), + child: Images.welcomeThirdLine, ), + Images.welcomeFourthLine, ], onDone: () { isTextShown.value = true; diff --git a/lib/app/modules/welcome/views/splash_view.dart b/lib/app/modules/welcome/views/splash_view.dart index 3730a23..995490a 100644 --- a/lib/app/modules/welcome/views/splash_view.dart +++ b/lib/app/modules/welcome/views/splash_view.dart @@ -18,7 +18,7 @@ class SplashView extends StatelessWidget { return Stack( children: [ Positioned( - top: 228.h, + top: 200.h, left: 0, right: 0, child: Center( @@ -26,15 +26,10 @@ class SplashView extends StatelessWidget { style: TextStyles.mediumWhiteShadowHeight26_034, child: AnimatedColumnWidget( children: [ - const Text('上古时期，天帝颛顼命重黎绝地天通'), - const Text('斩断了连接天界与人间之桥——建木为重生建木'), - const Text( - '探梦者们踏上了旅途……', - ), - Text( - '故事源于《山海经·大荒西经》', - style: TextStyles.mediumWhiteShadow16_034, - ), + Images.splashFirstLine, + Images.splashSecondLine, + Images.splashThirdLine, + Images.splashFourthLine, ], onDone: () { isStoryShown.value = true; diff --git a/lib/app/shared/constants/images.dart b/lib/app/shared/constants/images.dart index 79ffd72..e83bd2d 100644 --- a/lib/app/shared/constants/images.dart +++ b/lib/app/shared/constants/images.dart @@ -157,6 +157,84 @@ class Images { width: 66.w, ); + static Widget splashFirstLine = LoadAssetImage( + 'splash/text_startup_page_first_line', + height: 42.w * 1.5, + width: 326.w * 1.5, + ); + + static Widget splashSecondLine = LoadAssetImage( + 'splash/text_startup_page_second_line', + height: 42.w * 1.5, + width: 326.w * 1.5, + ); + + static Widget splashThirdLine = LoadAssetImage( + 'splash/text_startup_page_third_line', + height: 42.w * 1.5, + width: 326.w * 1.5, + ); + + static Widget splashFourthLine = LoadAssetImage( + 'splash/text_startup_page_fourth_line', + height: 42.w * 1.5, + width: 326.w * 1.5, + ); + + static Widget welcomeFirstLine = LoadAssetImage( + 'welcome/text_welcome_page_first_line', + height: 30.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget welcomeSecondLine = LoadAssetImage( + 'welcome/text_welcome_page_second_line', + height: 30.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget welcomeThirdLine = LoadAssetImage( + 'welcome/text_welcome_page_third_line', + height: 30.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget welcomeFourthLine = LoadAssetImage( + 'welcome/text_welcome_page_fourth_line', + height: 30.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget homeTextDreamTreePageFirstLine = LoadAssetImage( + 'home/text_dream_tree_page_first_line', + height: 42.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget homeTextDreamTreePageSecondLine = LoadAssetImage( + 'home/text_dream_tree_page_second_line', + height: 42.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget homeTextDreamTreePageThirdLine = LoadAssetImage( + 'home/text_dream_tree_page_third_line', + height: 42.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget homeTextDreamTreePageFourthLine = LoadAssetImage( + 'home/text_dream_tree_page_fourth_line', + height: 42.w * 1.5, + width: 346.w * 1.5, + ); + + static Widget homeBtnIconDreamExploration = LoadAssetImage( + 'home/btn_icon_dream_exploration', + height: 34.w * 1.8, + width: 32.w * 1.8, + ); + static Widget homeExploreCountdown = LoadAssetImage( 'home/btn_icon_explore_countdown', height: 66.w,