瀏覽代碼

Squashed '2048/' changes from 663bbe7bd..0f75a0e5d

0f75a0e5d fixing some big bugs
028620333 combine 1
794d7ae27 move base pack here
REVERT: 663bbe7bd Merge pull request #2 from eugene-kirzhanov/update
REVERT: c70dadaf6 Update code to match one in unleashed-firmware repo
REVERT: 6e347a963 First implementation

git-subtree-dir: 2048
git-subtree-split: 0f75a0e5d98f0f3c6ac128a0e500ff5c969c967d
Willy-JL 2 年之前
父節點
當前提交
aac0e3781e
共有 5 個文件被更改,包括 13 次插入4 次删除
  1. 7 0
      README-catalog.md
  2. 4 2
      application.fam
  3. 2 2
      game_2048.c
  4. 二進制
      img/1.png
  5. 二進制
      img/2.png

+ 7 - 0
README-catalog.md

@@ -0,0 +1,7 @@
+In this classic game, your objective is to collect the highest number of points by connecting identical numbers on the playing field.
+
+You can control the game using the Up, Down, Right, and Left buttons, which allow you to move all cells on the playing field simultaneously.
+
+Whenever you merge two identical numbers, their value doubles. For instance, combining 2 and 2 results in 4.
+
+The game ends when no further moves are possible. Exiting the game will save the current state of the game board.

+ 4 - 2
application.fam

@@ -3,12 +3,14 @@ App(
     name="2048",
     name="2048",
     apptype=FlipperAppType.EXTERNAL,
     apptype=FlipperAppType.EXTERNAL,
     entry_point="game_2048_app",
     entry_point="game_2048_app",
-    cdefines=["APP_GAME_2048"],
     requires=[
     requires=[
         "gui",
         "gui",
     ],
     ],
     stack_size=1 * 1024,
     stack_size=1 * 1024,
     order=90,
     order=90,
 	fap_icon="game_2048.png",
 	fap_icon="game_2048.png",
-    fap_category="Games"
+    fap_category="Games",
+    fap_author="@eugene-kirzhanov",
+    fap_version="1.2",
+    fap_description="Play the port of the 2048 game on Flipper Zero.",
 )
 )

+ 2 - 2
game_2048.c

@@ -401,7 +401,7 @@ int32_t game_2048_app() {
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
 
     // Call dolphin deed on game start
     // Call dolphin deed on game start
-    DOLPHIN_DEED(DolphinDeedPluginGameStart);
+    dolphin_deed(DolphinDeedPluginGameStart);
 
 
     bool is_finished = false;
     bool is_finished = false;
     while(!is_finished) {
     while(!is_finished) {
@@ -494,8 +494,8 @@ int32_t game_2048_app() {
                 }
                 }
             }
             }
 
 
-            view_port_update(view_port);
             furi_mutex_release(game_state->mutex);
             furi_mutex_release(game_state->mutex);
+            view_port_update(view_port);
         }
         }
     }
     }
 
 

二進制
img/1.png


二進制
img/2.png