Compare commits

..

5 Commits

Author SHA1 Message Date
yuanjunyao
9355fc2016 优化决定了对话框逻辑 2023-12-02 11:37:40 +08:00
yuanjunyao
d6ea57859c Merge remote-tracking branch 'origin/yuanjunyao_dev' into yuanjunyao_dev 2023-12-02 10:39:31 +08:00
yuanjunyao
c6a97771ca 叶子显示顺序跳转 2023-12-02 10:39:18 +08:00
yuanjunyao
a616102694 不开放画家 2023-12-02 10:38:50 +08:00
yuanjunyao
ac32e162b3 更新高清切图 2023-12-02 10:38:34 +08:00
30 changed files with 34 additions and 32 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 593 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 KiB

After

Width:  |  Height:  |  Size: 660 KiB

View File

@ -183,7 +183,7 @@ class HomeView extends GetView<HomeController> {
Widget goalWidget() { Widget goalWidget() {
return Stack( return Stack(
children: [ children: [
controller.explored2.value >= 4 controller.explored2.value >= 1
? Positioned( ? Positioned(
left: 15.w, left: 15.w,
top: 20.h, top: 20.h,
@ -195,7 +195,7 @@ class HomeView extends GetView<HomeController> {
), ),
) )
: Container(), : Container(),
controller.explored2.value >= 3 controller.explored2.value >= 2
? Positioned( ? Positioned(
left: 352.w, left: 352.w,
top: 0.0, top: 0.0,
@ -207,7 +207,7 @@ class HomeView extends GetView<HomeController> {
), ),
) )
: Container(), : Container(),
controller.explored2.value >= 2 controller.explored2.value >= 3
? Positioned( ? Positioned(
left: 363.w, left: 363.w,
top: 180.h, top: 180.h,
@ -476,7 +476,7 @@ class HomeView extends GetView<HomeController> {
), ),
), ),
), ),
controller.explored2.value >= 4 controller.explored2.value >= 1
? Positioned( ? Positioned(
left: 15.w, left: 15.w,
top: 20.h, top: 20.h,
@ -495,7 +495,7 @@ class HomeView extends GetView<HomeController> {
), ),
) )
: Container(), : Container(),
controller.explored2.value >= 3 controller.explored2.value >= 2
? Positioned( ? Positioned(
left: 352.w, left: 352.w,
top: 0.0, top: 0.0,
@ -517,7 +517,7 @@ class HomeView extends GetView<HomeController> {
), ),
) )
: Container(), : Container(),
controller.explored2.value >= 2 controller.explored2.value >= 3
? Positioned( ? Positioned(
left: 363.w, left: 363.w,
top: 180.h, top: 180.h,
@ -536,7 +536,7 @@ class HomeView extends GetView<HomeController> {
), ),
) )
: Container(), : Container(),
controller.explored2.value >= 1 ? firstLeafWidget() : Container(), controller.explored2.value >= 4 ? firstLeafWidget() : Container(),
Positioned( Positioned(
right: 60.w, right: 60.w,
top: 346.h, top: 346.h,
@ -544,9 +544,9 @@ class HomeView extends GetView<HomeController> {
animationWidgetBuilder: animationWidgetBuilder:
AnimatedVisibilityWidget.fadeAnimationWidgetBuilder, AnimatedVisibilityWidget.fadeAnimationWidgetBuilder,
duration: const Duration(milliseconds: 800), duration: const Duration(milliseconds: 800),
isVisible: controller.explored2.value >= 1, isVisible: controller.explored2.value >= 4,
child: Visibility( child: Visibility(
visible: controller.explored2.value >= 1, visible: controller.explored2.value >= 4,
child: const LanternWidget( child: const LanternWidget(
brightCount: 0, brightCount: 0,
), ),

View File

@ -13,7 +13,7 @@ class LanternWidget extends GetView {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ShowUp( return ShowUp(
duration: const Duration(seconds: 2), duration: const Duration(seconds: 1, milliseconds: 500),
child: Container( child: Container(
height: 90.h, height: 90.h,
width: 180.w, width: 180.w,

View File

@ -113,7 +113,7 @@ class SelectController extends GetxController {
vImage: 'btn_male_pic_artist', vImage: 'btn_male_pic_artist',
hImage: 'pic_male_artist', hImage: 'pic_male_artist',
selected: false, selected: false,
enable: true, enable: false,
)); ));
occupations.add(Occupation( occupations.add(Occupation(
id: 6, id: 6,
@ -188,7 +188,7 @@ class SelectController extends GetxController {
vImage: 'btn_female_pic_artist', vImage: 'btn_female_pic_artist',
hImage: 'pic_female_artist', hImage: 'pic_female_artist',
selected: false, selected: false,
enable: true, enable: false,
)); ));
occupations.add(Occupation( occupations.add(Occupation(
id: 6, id: 6,

View File

@ -41,12 +41,12 @@ class SelectView extends GetView<SelectController> {
} }
Widget buildSelect(BuildContext context) { Widget buildSelect(BuildContext context) {
return Stack( return _ShowUp(
children: [ child: Stack(
Positioned( children: [
top: 2.h, Positioned(
left: 412.w, top: 2.h,
child: _ShowUp( left: 412.w,
child: Container( child: Container(
width: 360.w, width: 360.w,
height: 164.h, height: 164.h,
@ -63,9 +63,9 @@ class SelectView extends GetView<SelectController> {
), ),
), ),
), ),
), buildSelectOccupation(context),
buildSelectOccupation(context), ],
], ),
); );
} }
@ -287,22 +287,24 @@ class SelectView extends GetView<SelectController> {
), ),
), ),
), ),
Positioned(
left: 90.w,
top: 62.h,
child: AnimatedVisibilityWidget(
isVisible: !controller.showOccupationName.value,
animationWidgetBuilder: AnimatedVisibilityWidget.fadeAnimationWidgetBuilder,
child: Container(
width: 999.w,
height: 558.h,
color: const Color(0x8C02184B),
),
),
),
controller.recommend.value controller.recommend.value
? buildRecommendConfirmBtn( ? buildRecommendConfirmBtn(
context, controller.selectOccupation.value!.name!) context, controller.selectOccupation.value!.name!)
: buildConfirmBtn( : buildConfirmBtn(
context, controller.selectOccupation.value!.name!), context, controller.selectOccupation.value!.name!),
controller.showOccupationName.value
? Container()
: Positioned(
left: 90.w,
top: 62.h,
child: Container(
width: 999.w,
height: 558.h,
color: const Color(0x8C02184B),
),
),
RSizedBox( RSizedBox(
child: Stack( child: Stack(
children: controller.questionAnswers.map((element) { children: controller.questionAnswers.map((element) {