Просмотр исходного кода

Add animations: box, cry, read, hack (#990)

* Add animations: box, cry, read, hack
* Desktop: unload animation if application is already started

Co-authored-by: あく <alleteam@gmail.com>
Albert Kharisov 3 лет назад
Родитель
Сommit
2c616983cf
69 измененных файлов с 318 добавлено и 7 удалено
  1. 6 0
      applications/desktop/scenes/desktop_scene_main.c
  2. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_0.png
  3. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_1.png
  4. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_2.png
  5. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_3.png
  6. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_4.png
  7. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_5.png
  8. BIN
      assets/dolphin/external/L1_Boxing_128x64/frame_6.png
  9. 32 0
      assets/dolphin/external/L1_Boxing_128x64/meta.txt
  10. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_0.png
  11. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_1.png
  12. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_2.png
  13. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_3.png
  14. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_4.png
  15. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_5.png
  16. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_6.png
  17. BIN
      assets/dolphin/external/L1_Cry_128x64/frame_7.png
  18. 41 0
      assets/dolphin/external/L1_Cry_128x64/meta.txt
  19. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_0.png
  20. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_1.png
  21. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_2.png
  22. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_3.png
  23. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_4.png
  24. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_5.png
  25. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_6.png
  26. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_7.png
  27. BIN
      assets/dolphin/external/L1_Read_books_128x64/frame_8.png
  28. 23 0
      assets/dolphin/external/L1_Read_books_128x64/meta.txt
  29. BIN
      assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png
  30. BIN
      assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png
  31. BIN
      assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png
  32. BIN
      assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png
  33. BIN
      assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png
  34. 32 0
      assets/dolphin/external/L2_Hacking_pc_128x64/meta.txt
  35. 28 7
      assets/dolphin/external/manifest.txt
  36. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm
  37. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm
  38. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm
  39. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm
  40. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm
  41. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm
  42. BIN
      assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm
  43. 32 0
      assets/resources/dolphin/L1_Boxing_128x64/meta.txt
  44. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_0.bm
  45. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_1.bm
  46. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_2.bm
  47. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_3.bm
  48. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_4.bm
  49. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_5.bm
  50. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_6.bm
  51. BIN
      assets/resources/dolphin/L1_Cry_128x64/frame_7.bm
  52. 41 0
      assets/resources/dolphin/L1_Cry_128x64/meta.txt
  53. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm
  54. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm
  55. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm
  56. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm
  57. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm
  58. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm
  59. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm
  60. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm
  61. BIN
      assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm
  62. 23 0
      assets/resources/dolphin/L1_Read_books_128x64/meta.txt
  63. BIN
      assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm
  64. BIN
      assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm
  65. BIN
      assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm
  66. BIN
      assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm
  67. BIN
      assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm
  68. 32 0
      assets/resources/dolphin/L2_Hacking_pc_128x64/meta.txt
  69. 28 0
      assets/resources/dolphin/manifest.txt

+ 6 - 0
applications/desktop/scenes/desktop_scene_main.c

@@ -87,6 +87,12 @@ void desktop_scene_main_on_enter(void* context) {
     Loader* loader = furi_record_open("loader");
     desktop->app_start_stop_subscription = furi_pubsub_subscribe(
         loader_get_pubsub(loader), desktop_scene_main_app_started_callback, desktop);
+
+    // Special case: application is already running (autostart application)
+    if(loader_is_locked(loader)) {
+        animation_manager_unload_and_stall_animation(desktop->animation_manager);
+    }
+
     furi_record_close("loader");
 
     desktop_main_set_callback(main_view, desktop_scene_main_callback, desktop);

BIN
assets/dolphin/external/L1_Boxing_128x64/frame_0.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_1.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_2.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_3.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_4.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_5.png


BIN
assets/dolphin/external/L1_Boxing_128x64/frame_6.png


+ 32 - 0
assets/dolphin/external/L1_Boxing_128x64/meta.txt

@@ -0,0 +1,32 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 9
+Active frames: 7
+Frames order: 0 1 2 1 3 1 2 3 1 4 5 6 5 6 5 4
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 2
+
+Slot: 0
+X: 78
+Y: 16
+Text: F*&K!!!
+AlignH: Left
+AlignV: Bottom
+StartFrame: 2
+EndFrame: 4
+
+Slot: 1
+X: 78
+Y: 16
+Text: What ya\nlookin at?!
+AlignH: Left
+AlignV: Center
+StartFrame: 10
+EndFrame: 15

BIN
assets/dolphin/external/L1_Cry_128x64/frame_0.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_1.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_2.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_3.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_4.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_5.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_6.png


BIN
assets/dolphin/external/L1_Cry_128x64/frame_7.png


+ 41 - 0
assets/dolphin/external/L1_Cry_128x64/meta.txt

@@ -0,0 +1,41 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 8
+Active frames: 4
+Frames order: 0 1 2 3 4 2 3 4 5 6 7 6
+Active cycles: 2
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 2
+
+Slot: 0
+X: 22
+Y: 40
+Text: I miss you
+AlignH: Right
+AlignV: Bottom
+StartFrame: 9
+EndFrame: 11
+
+Slot: 0
+X: 17
+Y: 40
+Text: my friend...
+AlignH: Right
+AlignV: Bottom
+StartFrame: 12
+EndFrame: 15
+
+Slot: 1
+X: 2
+Y: 29
+Text: Why are you\nalways away?
+AlignH: Right
+AlignV: Bottom
+StartFrame: 9
+EndFrame: 15

BIN
assets/dolphin/external/L1_Read_books_128x64/frame_0.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_1.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_2.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_3.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_4.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_5.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_6.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_7.png


BIN
assets/dolphin/external/L1_Read_books_128x64/frame_8.png


+ 23 - 0
assets/dolphin/external/L1_Read_books_128x64/meta.txt

@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 13
+Active frames: 2
+Frames order: 0 1 0 2 3 3 4 0 1 5 6 1 1 7 8
+Active cycles: 2
+Frame rate: 2
+Duration: 3600
+Active cooldown: 5
+
+Bubble slots: 1
+
+Slot: 0
+X: 5
+Y: 28
+Text: Predictable twist
+AlignH: Right
+AlignV: Bottom
+StartFrame: 14
+EndFrame: 16

BIN
assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png


BIN
assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png


BIN
assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png


BIN
assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png


BIN
assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png


+ 32 - 0
assets/dolphin/external/L2_Hacking_pc_128x64/meta.txt

@@ -0,0 +1,32 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 3
+Active frames: 2
+Frames order: 0 1 2 3 4
+Active cycles: 4
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 22
+Y: 25
+Text: Mess with\nthe best,
+AlignH: Right
+AlignV: Center
+StartFrame: 4
+EndFrame: 7
+
+Slot: 0
+X: 31
+Y: 25
+Text: die like\nthe rest.
+AlignH: Right
+AlignV: Center
+StartFrame: 8
+EndFrame: 10

+ 28 - 7
assets/dolphin/external/manifest.txt

@@ -1,7 +1,6 @@
 Filetype: Flipper Animation Manifest
 Version: 1
 
-# Animation 1
 Name: L1_Waves_128x50
 Min butthurt: 0
 Max butthurt: 5
@@ -9,7 +8,6 @@ Min level: 1
 Max level: 3
 Weight: 3
 
-# Animation 2
 Name: L1_Laptop_128x51
 Min butthurt: 0
 Max butthurt: 9
@@ -17,7 +15,6 @@ Min level: 1
 Max level: 3
 Weight: 3
 
-# Animation 3
 Name: L1_Sleep_128x64
 Min butthurt: 0
 Max butthurt: 10
@@ -25,7 +22,6 @@ Min level: 1
 Max level: 3
 Weight: 3
 
-# Animation 4
 Name: L1_Recording_128x51
 Min butthurt: 0
 Max butthurt: 8
@@ -33,7 +29,6 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-# Animation 5
 Name: L1_Furippa1_128x64
 Min butthurt: 0
 Max butthurt: 6
@@ -41,7 +36,6 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-# Animation 6
 Name: L2_Furippa2_128x64
 Min butthurt: 0
 Max butthurt: 6
@@ -49,10 +43,37 @@ Min level: 2
 Max level: 2
 Weight: 3
 
-# Animation 7
 Name: L3_Furippa3_128x64
 Min butthurt: 0
 Max butthurt: 6
 Min level: 3
 Max level: 3
 Weight: 3
+
+Name: L1_Read_books_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L2_Hacking_pc_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 2
+Max level: 2
+Weight: 3
+
+Name: L1_Cry_128x64
+Min butthurt: 8
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Boxing_128x64
+Min butthurt: 10
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3

BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm


BIN
assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm


+ 32 - 0
assets/resources/dolphin/L1_Boxing_128x64/meta.txt

@@ -0,0 +1,32 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 9
+Active frames: 7
+Frames order: 0 1 2 1 3 1 2 3 1 4 5 6 5 6 5 4
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 2
+
+Slot: 0
+X: 78
+Y: 16
+Text: F*&K!!!
+AlignH: Left
+AlignV: Bottom
+StartFrame: 2
+EndFrame: 4
+
+Slot: 1
+X: 78
+Y: 16
+Text: What ya\nlookin at?!
+AlignH: Left
+AlignV: Center
+StartFrame: 10
+EndFrame: 15

BIN
assets/resources/dolphin/L1_Cry_128x64/frame_0.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_1.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_2.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_3.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_4.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_5.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_6.bm


BIN
assets/resources/dolphin/L1_Cry_128x64/frame_7.bm


+ 41 - 0
assets/resources/dolphin/L1_Cry_128x64/meta.txt

@@ -0,0 +1,41 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 8
+Active frames: 4
+Frames order: 0 1 2 3 4 2 3 4 5 6 7 6
+Active cycles: 2
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 2
+
+Slot: 0
+X: 22
+Y: 40
+Text: I miss you
+AlignH: Right
+AlignV: Bottom
+StartFrame: 9
+EndFrame: 11
+
+Slot: 0
+X: 17
+Y: 40
+Text: my friend...
+AlignH: Right
+AlignV: Bottom
+StartFrame: 12
+EndFrame: 15
+
+Slot: 1
+X: 2
+Y: 29
+Text: Why are you\nalways away?
+AlignH: Right
+AlignV: Bottom
+StartFrame: 9
+EndFrame: 15

BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm


BIN
assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm


+ 23 - 0
assets/resources/dolphin/L1_Read_books_128x64/meta.txt

@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 13
+Active frames: 2
+Frames order: 0 1 0 2 3 3 4 0 1 5 6 1 1 7 8
+Active cycles: 2
+Frame rate: 2
+Duration: 3600
+Active cooldown: 5
+
+Bubble slots: 1
+
+Slot: 0
+X: 5
+Y: 28
+Text: Predictable twist
+AlignH: Right
+AlignV: Bottom
+StartFrame: 14
+EndFrame: 16

BIN
assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm


BIN
assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm


BIN
assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm


BIN
assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm


BIN
assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm


+ 32 - 0
assets/resources/dolphin/L2_Hacking_pc_128x64/meta.txt

@@ -0,0 +1,32 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 3
+Active frames: 2
+Frames order: 0 1 2 3 4
+Active cycles: 4
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 22
+Y: 25
+Text: Mess with\nthe best,
+AlignH: Right
+AlignV: Center
+StartFrame: 4
+EndFrame: 7
+
+Slot: 0
+X: 31
+Y: 25
+Text: die like\nthe rest.
+AlignH: Right
+AlignV: Center
+StartFrame: 8
+EndFrame: 10

+ 28 - 0
assets/resources/dolphin/manifest.txt

@@ -49,3 +49,31 @@ Max butthurt: 6
 Min level: 3
 Max level: 3
 Weight: 3
+
+Name: L1_Read_books_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 1
+Weight: 3
+
+Name: L2_Hacking_pc_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 2
+Max level: 2
+Weight: 3
+
+Name: L1_Cry_128x64
+Min butthurt: 8
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3
+
+Name: L1_Boxing_128x64
+Min butthurt: 10
+Max butthurt: 13
+Min level: 1
+Max level: 3
+Weight: 3