Browse Source

fix: 1.优化有序游戏的任务流程

issu01
Zhangwen 4 months ago
parent
commit
9995f72a8c
  1. 5
      source/.vscode/settings.json
  2. 19
      source/app/task_game.c
  3. 1401
      source/clib/stdio.h

5
source/.vscode/settings.json

@ -0,0 +1,5 @@
{
"files.associations": {
"stdio.h": "c"
}
}

19
source/app/task_game.c

@ -64,7 +64,7 @@ void L3_task_game_init(void)
_s_task_game.game_info[0].game_supported_oid[1].oid = 0x3136; _s_task_game.game_info[0].game_supported_oid[1].oid = 0x3136;
_s_task_game.game_info[0].game_supported_oid[2].oid = 0x3137; _s_task_game.game_info[0].game_supported_oid[2].oid = 0x3137;
_s_task_game.game_info[0].game_supported_oid[3].oid = 0x3138; _s_task_game.game_info[0].game_supported_oid[3].oid = 0x3138;
_s_task_game.game_info[0].game_supported_oid[4].oid = 0x3178; _s_task_game.game_info[0].game_supported_oid[4].oid = 0x3178; //
_s_task_game.game_info[0].game_supported_oid[4].yes_or_no = 0; _s_task_game.game_info[0].game_supported_oid[4].yes_or_no = 0;
_s_task_game.game_info[0].game_order = 0; _s_task_game.game_info[0].game_order = 0;
@ -98,7 +98,7 @@ void L3_task_game_init(void)
_s_task_game.game_info[1].game_supported_oid[22].oid = 0x3175; _s_task_game.game_info[1].game_supported_oid[22].oid = 0x3175;
_s_task_game.game_info[1].game_supported_oid[23].oid = 0x3176; _s_task_game.game_info[1].game_supported_oid[23].oid = 0x3176;
_s_task_game.game_info[1].game_supported_oid[24].oid = 0x3177; _s_task_game.game_info[1].game_supported_oid[24].oid = 0x3177;
_s_task_game.game_info[1].game_supported_oid[25].oid = 0x3179; _s_task_game.game_info[1].game_supported_oid[25].oid = 0x3179; //
_s_task_game.game_info[1].game_supported_oid[25].yes_or_no = 0; _s_task_game.game_info[1].game_supported_oid[25].yes_or_no = 0;
_s_task_game.game_info[1].game_order = 1; _s_task_game.game_info[1].game_order = 1;
_s_task_game.game_info[1].game_timeout_seconds = 600; _s_task_game.game_info[1].game_timeout_seconds = 600;
@ -108,11 +108,12 @@ void L3_task_game_init(void)
_s_task_game.game_info[2].game_audio = &audio_game_maze; _s_task_game.game_info[2].game_audio = &audio_game_maze;
_s_task_game.game_info[2].game_supported_oid[0].oid = 0x4E85; _s_task_game.game_info[2].game_supported_oid[0].oid = 0x4E85;
_s_task_game.game_info[2].game_supported_oid[1].oid = 0x4E86; _s_task_game.game_info[2].game_supported_oid[1].oid = 0x4E86;
_s_task_game.game_info[2].game_supported_oid[2].oid = 0x4E88; _s_task_game.game_info[2].game_supported_oid[2].oid = 0x4E87;
_s_task_game.game_info[2].game_supported_oid[3].oid = 0x4E89; _s_task_game.game_info[2].game_supported_oid[3].oid = 0x4E88;
_s_task_game.game_info[2].game_supported_oid[4].oid = 0x4E9A; _s_task_game.game_info[2].game_supported_oid[4].oid = 0x4E89;
_s_task_game.game_info[2].game_supported_oid[5].oid = 0x317A; _s_task_game.game_info[2].game_supported_oid[5].oid = 0x4E8A;
_s_task_game.game_info[2].game_supported_oid[5].yes_or_no = 0; _s_task_game.game_info[2].game_supported_oid[6].oid = 0x317A; //
_s_task_game.game_info[2].game_supported_oid[6].yes_or_no = 0;
_s_task_game.game_info[2].game_order = 1; _s_task_game.game_info[2].game_order = 1;
_s_task_game.game_info[2].game_timeout_seconds = 600; _s_task_game.game_info[2].game_timeout_seconds = 600;
_s_task_game.game_info[2].game_score = 0; _s_task_game.game_info[2].game_score = 0;
@ -192,14 +193,14 @@ void L3_task_game_handler(S_TASK_GAME *s)
{ {
break; break;
} }
if (s->read_oid != p->oid) if (s->read_oid != p->oid && has_unhandled_point == 0 && g->game_order == 1)
{ {
if (p->yes_or_no == 1 && p->handled == 0) if (p->yes_or_no == 1 && p->handled == 0)
{ {
has_unhandled_point = 1; has_unhandled_point = 1;
} }
} }
else else if(s->read_oid == p->oid)
{ {
//错误码 或者 是正确码有序,但是存在未处理的点 //错误码 或者 是正确码有序,但是存在未处理的点
if (p->yes_or_no == 0 || (p->yes_or_no == 1 && g->game_order == 1 && has_unhandled_point == 1)) if (p->yes_or_no == 0 || (p->yes_or_no == 1 && g->game_order == 1 && has_unhandled_point == 1))

1401
source/clib/stdio.h

File diff suppressed because it is too large
Loading…
Cancel
Save