diff --git a/source/app/main.c b/source/app/main.c index f925e89..4c06024 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -90,7 +90,7 @@ void main(void) //版本信息 L0_uart0_sendstr("Version info : "); - L0_uart0_sendArray("PEN_V4",6); + L0_uart0_sendArray("PEN_V4_8k",9); L0_uart0_0d0a(); while(1) diff --git a/source/app/task_game.c b/source/app/task_game.c index b422c80..c8a1052 100644 --- a/source/app/task_game.c +++ b/source/app/task_game.c @@ -20,14 +20,16 @@ #include "../app/task_w600.h" -// 系统不识别的码为无效码：0x3FFF 和 0x0000 -// game_supported_oid 支持码：本游戏支持的 -// 游戏标识码 和 游戏内容码（正确码和错误码：单个游戏内的） +// 1.系统不识别的码为无效码：0x3FFF 和 0x0000 +// 2.game_supported_oid 支持码：本游戏支持的 +// 3.游戏标识码 +// 4.游戏内容码:正确码和错误码0x**FF：单个游戏内的 -S_TASK_GAME _s_task_game; -POINT_BUF pointbuf; // 非点读类游戏 +/*************************************游戏标识码***************************************** */ +/***************************************PAGE1******************************************* */ +/****************************************15个******************************************* */ #define GAME_OID_ZLXS_4 0x2800 #define GAME_OID_HYJJ_3 0x2900 #define GAME_OID_HYJJ_4 0x2A00 @@ -44,6 +46,39 @@ POINT_BUF pointbuf; #define GAME_OID_JSSJ_4 0x4300 #define GAME_OID_JSSJ_5 0x4400 +/*************************************游戏标识码***************************************** */ +/***************************************PAGE2******************************************* */ +/****************************************24个******************************************* */ +#define GAME_OID_YXPL_1 0x1000 +#define GAME_OID_YXPL_2 0x1100 +#define GAME_OID_YDSD_1 0x1200 +#define GAME_OID_YDSD_SZDD_1 0x1300 +#define GAME_OID_YDSD_2 0x1400 +#define GAME_OID_YDSD_SZDD_2 0x1500 +#define GAME_OID_BBDX_1 0x1600 +#define GAME_OID_BBDX_2 0x1700 +#define GAME_OID_BBDX_3 0x1800 +#define GAME_OID_BBDX_4 0x1900 +#define GAME_OID_CSCD_2 0x1A00 +#define GAME_OID_CSCD_3 0x1B00 +#define GAME_OID_DQPM_2 0x1C00 +#define GAME_OID_DQPM_3 0x1D00 +#define GAME_OID_SZSB_2 0x1E00 +#define GAME_OID_SZSB_3 0x1F00 +#define GAME_OID_SZDB_2 0x2000 +#define GAME_OID_SZDB_3 0x2100 +#define GAME_OID_SETFG_3 0x2200 +#define GAME_OID_SETFG_SZXZ_3 0x2300 +#define GAME_OID_SETFG_4 0x2400 +#define GAME_OID_SETFG_5 0x2500 +#define GAME_OID_SETFG_SZDD_5 0x2600 +#define GAME_OID_ZLXS_3 0x2700 + + + + +/*************************************************************************************** */ + // 点读类游戏 #define GAME_OID_ZBT_1 0xB000 #define GAME_OID_SHERT_1 0x2200 @@ -55,6 +90,9 @@ POINT_BUF pointbuf; #define GAME_MAX_SECONDS 600 +S_TASK_GAME _s_task_game; +POINT_BUF pointbuf; + void L3_task_game_init(void) { U8 i = 0; @@ -68,6 +106,11 @@ void L3_task_game_init(void) _s_task_game.invalid_oid = INVALID_OID; _s_task_game.game_maxseconds = GAME_MAX_SECONDS; + _s_task_game.game_info_index = -1; + _s_task_game.game_point_index = -1; + _s_task_game.start_seconds = 0; + _s_task_game.eeror_times = 0; + // L0_uart0_0d0a(); // L0_uart0_ushex(sizeof(pointbuf)); 406 @@ -86,7 +129,6 @@ void L3_task_game_init(void) _s_task_game.game_info[0].game_supported_oid[0].oid = 0xB001; _s_task_game.game_info[0].game_supported_oid[1].oid = 0xB002; _s_task_game.game_info[0].game_supported_oid[2].oid = 0xB003; - // _s_task_game.game_info[0].game_supported_oid[3].oid = 0xB004; _s_task_game.game_info[0].game_supported_oid[3].oid = 0xB0FF; //错误码 _s_task_game.game_info[0].game_supported_oid[3].yes_or_no = 1; _s_task_game.game_info[0].game_order = 0; @@ -112,9 +154,9 @@ void L3_task_game_init(void) // 舒尔特方格3星 _s_task_game.game_info[1].game_oid = GAME_OID_SHERT_1; - _s_task_game.game_info[1].game_audio = &audio_game_shulte_1; - _s_task_game.game_info[1].game_supported_oid = pointbuf.shert_1; - _s_task_game.game_info[1].game_oid_num = shert_1_num; + _s_task_game.game_info[1].game_audio = &audio_game_shulte_3; + _s_task_game.game_info[1].game_supported_oid = pointbuf.shert_3; + _s_task_game.game_info[1].game_oid_num = shert_3_num; _s_task_game.game_info[1].game_supported_oid[0].oid = 0x2201; _s_task_game.game_info[1].game_supported_oid[1].oid = 0x2202; _s_task_game.game_info[1].game_supported_oid[2].oid = 0x2203; @@ -146,11 +188,11 @@ void L3_task_game_init(void) _s_task_game.game_info[1].game_timeout_seconds = 120; _s_task_game.game_info[1].game_score = 0; -/***************************************************************************************** */ -/****************************************PAGE1*15个*************************************** */ -/***************************************************************************************** */ +/*************************************************************************************** */ +/***************************************PAGE1******************************************* */ +/****************************************15个******************************************* */ - // 众里寻三3星 + // 众里寻三，4星 _s_task_game.game_info[3].game_oid = GAME_OID_ZLXS_4; _s_task_game.game_info[3].game_audio = &audio_game_zlxs_4; _s_task_game.game_info[3].game_supported_oid = pointbuf.zlxs_4; @@ -159,7 +201,7 @@ void L3_task_game_init(void) _s_task_game.game_info[3].game_order = 0; _s_task_game.game_info[3].game_timeout_seconds = 60; _s_task_game.game_info[3].game_score = 0; - // 火眼金晶3星 + // 火眼金晶，3星 _s_task_game.game_info[4].game_oid = GAME_OID_HYJJ_3; _s_task_game.game_info[4].game_audio = &audio_game_hyjj_3; _s_task_game.game_info[4].game_supported_oid = pointbuf.hyjj_3; @@ -168,7 +210,7 @@ void L3_task_game_init(void) _s_task_game.game_info[4].game_order = 0; _s_task_game.game_info[4].game_timeout_seconds = 60; _s_task_game.game_info[4].game_score = 0; - // 火眼金晶4星 + // 火眼金晶，4星 _s_task_game.game_info[5].game_oid = GAME_OID_HYJJ_4; _s_task_game.game_info[5].game_audio = &audio_game_hyjj_4; _s_task_game.game_info[5].game_supported_oid = pointbuf.hyjj_4; @@ -177,7 +219,7 @@ void L3_task_game_init(void) _s_task_game.game_info[5].game_order = 0; _s_task_game.game_info[5].game_timeout_seconds = 60; _s_task_game.game_info[5].game_score = 0; - // 火眼金晶5星 + // 火眼金晶，5星 _s_task_game.game_info[6].game_oid = GAME_OID_HYJJ_5; _s_task_game.game_info[6].game_audio = &audio_game_hyjj_5; _s_task_game.game_info[6].game_supported_oid = pointbuf.hyjj_5; @@ -186,7 +228,7 @@ void L3_task_game_init(void) _s_task_game.game_info[6].game_order = 0; _s_task_game.game_info[6].game_timeout_seconds = 60; _s_task_game.game_info[6].game_score = 0; - // 从小到大4星 + // 从小到大，4星 _s_task_game.game_info[7].game_oid = GAME_OID_CXDD_4; _s_task_game.game_info[7].game_audio = &audio_game_cxdd_4; _s_task_game.game_info[7].game_supported_oid = pointbuf.cxdd_4; @@ -195,7 +237,7 @@ void L3_task_game_init(void) _s_task_game.game_info[7].game_order = 0; _s_task_game.game_info[7].game_timeout_seconds = 60; _s_task_game.game_info[7].game_score = 0; - // 明察秋毫4星 + // 明察秋毫，4星 _s_task_game.game_info[8].game_oid = GAME_OID_MCQH_4; _s_task_game.game_info[8].game_audio = &audio_game_mcqh_4; _s_task_game.game_info[8].game_supported_oid = pointbuf.mcqh_4; @@ -204,7 +246,7 @@ void L3_task_game_init(void) _s_task_game.game_info[8].game_order = 0; _s_task_game.game_info[8].game_timeout_seconds = 60; _s_task_game.game_info[8].game_score = 0; - // 明察秋毫5星 + // 明察秋毫，5星 _s_task_game.game_info[9].game_oid = GAME_OID_MCQH_5; _s_task_game.game_info[9].game_audio = &audio_game_mcqh_5; _s_task_game.game_info[9].game_supported_oid = pointbuf.mcqh_5; @@ -213,7 +255,7 @@ void L3_task_game_init(void) _s_task_game.game_info[9].game_order = 0; _s_task_game.game_info[9].game_timeout_seconds = 60; _s_task_game.game_info[9].game_score = 0; - // 积木再现3星 + // 积木再现，3星 _s_task_game.game_info[10].game_oid = GAME_OID_JMZX_3; _s_task_game.game_info[10].game_audio = &audio_game_jmzx_3; _s_task_game.game_info[10].game_supported_oid = pointbuf.jmzx_3; @@ -222,7 +264,7 @@ void L3_task_game_init(void) _s_task_game.game_info[10].game_order = 0; _s_task_game.game_info[10].game_timeout_seconds = 60; _s_task_game.game_info[10].game_score = 0; - // 积木再现4星 + // 积木再现，4星 _s_task_game.game_info[11].game_oid = GAME_OID_JMZX_4; _s_task_game.game_info[11].game_audio = &audio_game_jmzx_4; _s_task_game.game_info[11].game_supported_oid = pointbuf.jmzx_4; @@ -231,7 +273,7 @@ void L3_task_game_init(void) _s_task_game.game_info[11].game_order = 0; _s_task_game.game_info[11].game_timeout_seconds = 60; _s_task_game.game_info[11].game_score = 0; - // 积木再现5星 + // 积木再现，5星 _s_task_game.game_info[12].game_oid = GAME_OID_JMZX_5; _s_task_game.game_info[12].game_audio = &audio_game_jmzx_5; _s_task_game.game_info[12].game_supported_oid = pointbuf.jmzx_5; @@ -240,7 +282,7 @@ void L3_task_game_init(void) _s_task_game.game_info[12].game_order = 0; _s_task_game.game_info[12].game_timeout_seconds = 60; _s_task_game.game_info[12].game_score = 0; - // 还原钟表1星 + // 还原钟表，1星 _s_task_game.game_info[13].game_oid = GAME_OID_HYZB_1; _s_task_game.game_info[13].game_audio = &audio_game_hyzb_1; _s_task_game.game_info[13].game_supported_oid = pointbuf.hyzb_1; @@ -249,7 +291,7 @@ void L3_task_game_init(void) _s_task_game.game_info[13].game_order = 0; _s_task_game.game_info[13].game_timeout_seconds = 60; _s_task_game.game_info[13].game_score = 0; - // 还原钟表2星 + // 还原钟表，2星 _s_task_game.game_info[14].game_oid = GAME_OID_HYZB_2; _s_task_game.game_info[14].game_audio = &audio_game_hyzb_2; _s_task_game.game_info[14].game_supported_oid = pointbuf.hyzb_2; @@ -258,7 +300,7 @@ void L3_task_game_init(void) _s_task_game.game_info[14].game_order = 0; _s_task_game.game_info[14].game_timeout_seconds = 60; _s_task_game.game_info[14].game_score = 0; - // 时间规划3星 + // 时间规划，3星 _s_task_game.game_info[15].game_oid = GAME_OID_SJGH_3; _s_task_game.game_info[15].game_audio = &audio_game_sjgh_3; _s_task_game.game_info[15].game_supported_oid = pointbuf.sjgh_3; @@ -267,7 +309,7 @@ void L3_task_game_init(void) _s_task_game.game_info[15].game_order = 0; _s_task_game.game_info[15].game_timeout_seconds = 60; _s_task_game.game_info[15].game_score = 0; - // 计算时间4星 + // 计算时间，4星 _s_task_game.game_info[16].game_oid = GAME_OID_JSSJ_4; _s_task_game.game_info[16].game_audio = &audio_game_jssj_4; _s_task_game.game_info[16].game_supported_oid = pointbuf.jssj_4; @@ -276,7 +318,7 @@ void L3_task_game_init(void) _s_task_game.game_info[16].game_order = 0; _s_task_game.game_info[16].game_timeout_seconds = 60; _s_task_game.game_info[16].game_score = 0; - // 计算时间5星 + // 计算时间，5星 _s_task_game.game_info[17].game_oid = GAME_OID_JSSJ_5; _s_task_game.game_info[17].game_audio = &audio_game_jssj_5; _s_task_game.game_info[17].game_supported_oid = pointbuf.jssj_5; @@ -285,235 +327,237 @@ void L3_task_game_init(void) _s_task_game.game_info[17].game_order = 0; _s_task_game.game_info[17].game_timeout_seconds = 60; _s_task_game.game_info[17].game_score = 0; -/***************************************************************************************** */ -/****************************************PAGE2*24个*************************************** */ -/***************************************************************************************** */ - // 有序排列1星 - _s_task_game.game_info[18].game_oid = GAME_OID_YXPL_5; - _s_task_game.game_info[18].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[18].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[18].game_oid_num = jssj_5_num; - _s_task_game.game_info[18].game_supported_oid[0].oid = 0x40FE; + +/***************************************PAGE2******************************************* */ +/****************************************24个******************************************* */ + // 有序排列，1星 + _s_task_game.game_info[18].game_oid = GAME_OID_YXPL_1; + _s_task_game.game_info[18].game_audio = &audio_game_yxpl_1; + _s_task_game.game_info[18].game_supported_oid = pointbuf.yxpl_1; + _s_task_game.game_info[18].game_oid_num = yxpl_1_num; + _s_task_game.game_info[18].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[18].game_order = 0; _s_task_game.game_info[18].game_timeout_seconds = 60; _s_task_game.game_info[18].game_score = 0; - // 有序排列2星 - _s_task_game.game_info[19].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[19].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[19].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[19].game_oid_num = jssj_5_num; - _s_task_game.game_info[19].game_supported_oid[0].oid = 0x40FE; + // 有序排列，2星 + _s_task_game.game_info[19].game_oid = GAME_OID_YXPL_2; + _s_task_game.game_info[19].game_audio = &audio_game_yxpl_2; + _s_task_game.game_info[19].game_supported_oid = pointbuf.yxpl_2; + _s_task_game.game_info[19].game_oid_num = yxpl_2_num; + _s_task_game.game_info[19].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[19].game_order = 0; _s_task_game.game_info[19].game_timeout_seconds = 60; _s_task_game.game_info[19].game_score = 0; - // 眼到手到1星 - _s_task_game.game_info[20].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[20].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[20].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[20].game_oid_num = jssj_5_num; - _s_task_game.game_info[20].game_supported_oid[0].oid = 0x40FE; + // 眼到手到，1星 + _s_task_game.game_info[20].game_oid = GAME_OID_YDSD_1; + _s_task_game.game_info[20].game_audio = &audio_game_ydsd_1; + _s_task_game.game_info[20].game_supported_oid = pointbuf.ydsd_1; + _s_task_game.game_info[20].game_oid_num = ydsd_1_num; + _s_task_game.game_info[20].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[20].game_order = 0; _s_task_game.game_info[20].game_timeout_seconds = 60; _s_task_game.game_info[20].game_score = 0; - // 眼到手到2星 - _s_task_game.game_info[21].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[21].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[21].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[21].game_oid_num = jssj_5_num; - _s_task_game.game_info[21].game_supported_oid[0].oid = 0x40FE; + // 眼到手到，2星 + _s_task_game.game_info[21].game_oid = GAME_OID_YDSD_2; + _s_task_game.game_info[21].game_audio = &audio_game_ydsd_2; + _s_task_game.game_info[21].game_supported_oid = pointbuf.ydsd_2; + _s_task_game.game_info[21].game_oid_num = ydsd_2_num; + _s_task_game.game_info[21].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[21].game_order = 0; _s_task_game.game_info[21].game_timeout_seconds = 60; _s_task_game.game_info[21].game_score = 0; - // 眼到手到（数字颠倒）1星 - _s_task_game.game_info[22].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[22].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[22].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[22].game_oid_num = jssj_5_num; - _s_task_game.game_info[22].game_supported_oid[0].oid = 0x40FE; + // 眼到手到（数字颠倒），1星 + _s_task_game.game_info[22].game_oid = GAME_OID_YDSD_SZDD_1; + _s_task_game.game_info[22].game_audio = &audio_game_ydsd_szdd_1; + _s_task_game.game_info[22].game_supported_oid = pointbuf.ydsd_szdd_1; + _s_task_game.game_info[22].game_oid_num = ydsd_szdd_1_num; + _s_task_game.game_info[22].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[22].game_order = 0; _s_task_game.game_info[22].game_timeout_seconds = 60; _s_task_game.game_info[22].game_score = 0; - // 眼到手到（数字颠倒）2星 - _s_task_game.game_info[23].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[23].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[23].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[23].game_oid_num = jssj_5_num; - _s_task_game.game_info[23].game_supported_oid[0].oid = 0x40FE; + // 眼到手到（数字颠倒），2星 + _s_task_game.game_info[23].game_oid = GAME_OID_YDSD_SZDD_2; + _s_task_game.game_info[23].game_audio = &audio_game_ydsd_szdd_2; + _s_task_game.game_info[23].game_supported_oid = pointbuf.ydsd_szdd_2; + _s_task_game.game_info[23].game_oid_num = ydsd_szdd_2_num; + _s_task_game.game_info[23].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[23].game_order = 0; _s_task_game.game_info[23].game_timeout_seconds = 60; _s_task_game.game_info[23].game_score = 0; - // 比比大小1星 - _s_task_game.game_info[24].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[24].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[24].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[24].game_oid_num = jssj_5_num; - _s_task_game.game_info[24].game_supported_oid[0].oid = 0x40FE; + // 比比大小，1星 + _s_task_game.game_info[24].game_oid = GAME_OID_BBDX_1; + _s_task_game.game_info[24].game_audio = &audio_game_bbdx_1; + _s_task_game.game_info[24].game_supported_oid = pointbuf.bbdx_1; + _s_task_game.game_info[24].game_oid_num = bbdx_1_num; + _s_task_game.game_info[24].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[24].game_order = 0; _s_task_game.game_info[24].game_timeout_seconds = 60; _s_task_game.game_info[24].game_score = 0; - // 比比大小2星 - _s_task_game.game_info[25].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[25].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[25].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[25].game_oid_num = jssj_5_num; - _s_task_game.game_info[25].game_supported_oid[0].oid = 0x40FE; + // 比比大小，2星 + _s_task_game.game_info[25].game_oid = GAME_OID_BBDX_2; + _s_task_game.game_info[25].game_audio = &audio_game_bbdx_2; + _s_task_game.game_info[25].game_supported_oid = pointbuf.bbdx_2; + _s_task_game.game_info[25].game_oid_num = bbdx_2_num; + _s_task_game.game_info[25].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[25].game_order = 0; _s_task_game.game_info[25].game_timeout_seconds = 60; _s_task_game.game_info[25].game_score = 0; - // 比比大小3星 - _s_task_game.game_info[26].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[26].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[26].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[26].game_oid_num = jssj_5_num; - _s_task_game.game_info[26].game_supported_oid[0].oid = 0x40FE; + // 比比大小，3星 + _s_task_game.game_info[26].game_oid = GAME_OID_BBDX_3; + _s_task_game.game_info[26].game_audio = &audio_game_bbdx_3; + _s_task_game.game_info[26].game_supported_oid = pointbuf.bbdx_3; + _s_task_game.game_info[26].game_oid_num = bbdx_3_num; + _s_task_game.game_info[26].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[26].game_order = 0; _s_task_game.game_info[26].game_timeout_seconds = 60; _s_task_game.game_info[26].game_score = 0; - // 比比大小4星 - _s_task_game.game_info[27].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[27].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[27].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[27].game_oid_num = jssj_5_num; - _s_task_game.game_info[27].game_supported_oid[0].oid = 0x40FE; + // 比比大小，4星 + _s_task_game.game_info[27].game_oid = GAME_OID_BBDX_4; + _s_task_game.game_info[27].game_audio = &audio_game_bbdx_4; + _s_task_game.game_info[27].game_supported_oid = pointbuf.bbdx_4; + _s_task_game.game_info[27].game_oid_num = bbdx_4_num; + _s_task_game.game_info[27].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[27].game_order = 0; _s_task_game.game_info[27].game_timeout_seconds = 60; _s_task_game.game_info[27].game_score = 0; - // 成双成对2星 - _s_task_game.game_info[28].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[28].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[28].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[28].game_oid_num = jssj_5_num; - _s_task_game.game_info[28].game_supported_oid[0].oid = 0x40FE; + // 成双成对，2星 + _s_task_game.game_info[28].game_oid = GAME_OID_CSCD_2; + _s_task_game.game_info[28].game_audio = &audio_game_cscd_2; + _s_task_game.game_info[28].game_supported_oid = pointbuf.cscd_2; + _s_task_game.game_info[28].game_oid_num = cscd_2_num; + _s_task_game.game_info[28].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[28].game_order = 0; _s_task_game.game_info[28].game_timeout_seconds = 60; _s_task_game.game_info[28].game_score = 0; - // 成双成对3星 - _s_task_game.game_info[29].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[29].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[29].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[29].game_oid_num = jssj_5_num; - _s_task_game.game_info[29].game_supported_oid[0].oid = 0x40FE; + // 成双成对，3星 + _s_task_game.game_info[29].game_oid = GAME_OID_CSCD_3; + _s_task_game.game_info[29].game_audio = &audio_game_cscd_3; + _s_task_game.game_info[29].game_supported_oid = pointbuf.cscd_3; + _s_task_game.game_info[29].game_oid_num = cscd_3_num; + _s_task_game.game_info[29].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[29].game_order = 0; _s_task_game.game_info[29].game_timeout_seconds = 60; _s_task_game.game_info[29].game_score = 0; - // 单枪匹马2星 - _s_task_game.game_info[30].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[30].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[30].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[30].game_oid_num = jssj_5_num; - _s_task_game.game_info[30].game_supported_oid[0].oid = 0x40FE; + // 单枪匹马，2星 + _s_task_game.game_info[30].game_oid = GAME_OID_DQPM_2; + _s_task_game.game_info[30].game_audio = &audio_game_dqpm_2; + _s_task_game.game_info[30].game_supported_oid = pointbuf.dqpm_2; + _s_task_game.game_info[30].game_oid_num = dqpm_2_num; + _s_task_game.game_info[30].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[30].game_order = 0; _s_task_game.game_info[30].game_timeout_seconds = 60; _s_task_game.game_info[30].game_score = 0; - // 单枪匹马3星 - _s_task_game.game_info[31].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[31].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[31].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[31].game_oid_num = jssj_5_num; - _s_task_game.game_info[31].game_supported_oid[0].oid = 0x40FE; + // 单枪匹马，3星 + _s_task_game.game_info[31].game_oid = GAME_OID_DQPM_3; + _s_task_game.game_info[31].game_audio = &audio_game_dqpm_3; + _s_task_game.game_info[31].game_supported_oid = pointbuf.dqpm_3; + _s_task_game.game_info[31].game_oid_num = dqpm_3_num; + _s_task_game.game_info[31].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[31].game_order = 0; _s_task_game.game_info[31].game_timeout_seconds = 60; _s_task_game.game_info[31].game_score = 0; - // 数字顺背2星 - _s_task_game.game_info[32].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[32].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[32].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[32].game_oid_num = jssj_5_num; - _s_task_game.game_info[32].game_supported_oid[0].oid = 0x40FE; + // 数字顺背，2星 + _s_task_game.game_info[32].game_oid = GAME_OID_SZSB_2; + _s_task_game.game_info[32].game_audio = &audio_game_szsb_2; + _s_task_game.game_info[32].game_supported_oid = pointbuf.szsb_2; + _s_task_game.game_info[32].game_oid_num = szsb_2_num; + _s_task_game.game_info[32].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[32].game_order = 0; _s_task_game.game_info[32].game_timeout_seconds = 60; _s_task_game.game_info[32].game_score = 0; - // 数字顺背3星 - _s_task_game.game_info[33].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[33].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[33].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[33].game_oid_num = jssj_5_num; - _s_task_game.game_info[33].game_supported_oid[0].oid = 0x40FE; + // 数字顺背，3星 + _s_task_game.game_info[33].game_oid = GAME_OID_SZSB_3; + _s_task_game.game_info[33].game_audio = &audio_game_szsb_3; + _s_task_game.game_info[33].game_supported_oid = pointbuf.szsb_3; + _s_task_game.game_info[33].game_oid_num = szsb_3_num; + _s_task_game.game_info[33].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[33].game_order = 0; _s_task_game.game_info[33].game_timeout_seconds = 60; _s_task_game.game_info[33].game_score = 0; - // 数字倒背2星 - _s_task_game.game_info[34].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[34].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[34].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[34].game_oid_num = jssj_5_num; - _s_task_game.game_info[34].game_supported_oid[0].oid = 0x40FE; + // 数字倒背，2星 + _s_task_game.game_info[34].game_oid = GAME_OID_SZDB_2; + _s_task_game.game_info[34].game_audio = &audio_game_szdb_2; + _s_task_game.game_info[34].game_supported_oid = pointbuf.szdb_2; + _s_task_game.game_info[34].game_oid_num = szdb_2_num; + _s_task_game.game_info[34].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[34].game_order = 0; _s_task_game.game_info[34].game_timeout_seconds = 60; _s_task_game.game_info[34].game_score = 0; - // 数字倒背3星 - _s_task_game.game_info[35].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[35].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[35].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[35].game_oid_num = jssj_5_num; - _s_task_game.game_info[35].game_supported_oid[0].oid = 0x40FE; + // 数字倒背，3星 + _s_task_game.game_info[35].game_oid = GAME_OID_SZDB_3; + _s_task_game.game_info[35].game_audio = &audio_game_szdb_3; + _s_task_game.game_info[35].game_supported_oid = pointbuf.szdb_3; + _s_task_game.game_info[35].game_oid_num = szdb_3_num; + _s_task_game.game_info[35].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[35].game_order = 0; _s_task_game.game_info[35].game_timeout_seconds = 60; _s_task_game.game_info[35].game_score = 0; - // 舒尔特方格3星 - _s_task_game.game_info[36].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[36].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[36].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[36].game_oid_num = jssj_5_num; - _s_task_game.game_info[36].game_supported_oid[0].oid = 0x40FE; - _s_task_game.game_info[36].game_order = 0; - _s_task_game.game_info[36].game_timeout_seconds = 60; - _s_task_game.game_info[36].game_score = 0; - // 舒尔特方格（数字旋转）3星 - _s_task_game.game_info[37].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[37].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[37].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[37].game_oid_num = jssj_5_num; - _s_task_game.game_info[37].game_supported_oid[0].oid = 0x40FE; + // 舒尔特方格，3星 + // _s_task_game.game_info[36].game_oid = GAME_OID_SETFG_3; + // _s_task_game.game_info[36].game_audio = &audio_game_setfg_3; + // _s_task_game.game_info[36].game_supported_oid = pointbuf.setfg_3; + // _s_task_game.game_info[36].game_oid_num = setfg_3_num; + // _s_task_game.game_info[36].game_supported_oid[0].oid = 0x10FE; + // _s_task_game.game_info[36].game_order = 0; + // _s_task_game.game_info[36].game_timeout_seconds = 60; + // _s_task_game.game_info[36].game_score = 0; + // 舒尔特方格（数字旋转），3星 + _s_task_game.game_info[37].game_oid = GAME_OID_SETFG_SZXZ_3; + _s_task_game.game_info[37].game_audio = &audio_game_setfg_szxz_3; + _s_task_game.game_info[37].game_supported_oid = pointbuf.setfg_szxz_3; + _s_task_game.game_info[37].game_oid_num = setfg_szxz_3_num; + _s_task_game.game_info[37].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[37].game_order = 0; _s_task_game.game_info[37].game_timeout_seconds = 60; _s_task_game.game_info[37].game_score = 0; - // 舒尔特方格4星 - _s_task_game.game_info[38].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[38].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[38].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[38].game_oid_num = jssj_5_num; - _s_task_game.game_info[38].game_supported_oid[0].oid = 0x40FE; + // 舒尔特方格，4星 + _s_task_game.game_info[38].game_oid = GAME_OID_SETFG_4; + _s_task_game.game_info[38].game_audio = &audio_game_setfg_4; + _s_task_game.game_info[38].game_supported_oid = pointbuf.setfg_4; + _s_task_game.game_info[38].game_oid_num = setfg_4_num; + _s_task_game.game_info[38].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[38].game_order = 0; _s_task_game.game_info[38].game_timeout_seconds = 60; _s_task_game.game_info[38].game_score = 0; - // 舒尔特方格5星 - _s_task_game.game_info[39].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[39].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[39].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[39].game_oid_num = jssj_5_num; - _s_task_game.game_info[39].game_supported_oid[0].oid = 0x40FE; + // 舒尔特方格，5星 + _s_task_game.game_info[39].game_oid = GAME_OID_SETFG_5; + _s_task_game.game_info[39].game_audio = &audio_game_setfg_5; + _s_task_game.game_info[39].game_supported_oid = pointbuf.setfg_5; + _s_task_game.game_info[39].game_oid_num = setfg_5_num; + _s_task_game.game_info[39].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[39].game_order = 0; _s_task_game.game_info[39].game_timeout_seconds = 60; _s_task_game.game_info[39].game_score = 0; - // 舒尔特方格（数字旋转）5星 - _s_task_game.game_info[40].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[40].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[40].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[40].game_oid_num = jssj_5_num; - _s_task_game.game_info[40].game_supported_oid[0].oid = 0x40FE; + // 舒尔特方格（数字颠倒），5星 + _s_task_game.game_info[40].game_oid = GAME_OID_SETFG_SZDD_5; + _s_task_game.game_info[40].game_audio = &audio_game_setfg_szdd_5; + _s_task_game.game_info[40].game_supported_oid = pointbuf.setfg_szdd_5; + _s_task_game.game_info[40].game_oid_num = setfg_szdd_5_num; + _s_task_game.game_info[40].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[40].game_order = 0; _s_task_game.game_info[40].game_timeout_seconds = 60; _s_task_game.game_info[40].game_score = 0; - // 众里寻三3星 - _s_task_game.game_info[41].game_oid = GAME_OID_JSSJ_5; - _s_task_game.game_info[41].game_audio = &audio_game_jssj_5; - _s_task_game.game_info[41].game_supported_oid = pointbuf.jssj_5; - _s_task_game.game_info[41].game_oid_num = jssj_5_num; - _s_task_game.game_info[41].game_supported_oid[0].oid = 0x40FE; + // 众里寻三，3星 + _s_task_game.game_info[41].game_oid = GAME_OID_ZLXS_3; + _s_task_game.game_info[41].game_audio = &audio_game_zlxs_3; + _s_task_game.game_info[41].game_supported_oid = pointbuf.zlxs_3; + _s_task_game.game_info[41].game_oid_num = zlxs_3_num; + _s_task_game.game_info[41].game_supported_oid[0].oid = 0x10FE; _s_task_game.game_info[41].game_order = 0; _s_task_game.game_info[41].game_timeout_seconds = 60; _s_task_game.game_info[41].game_score = 0; +/***************************************PAGE3******************************************* */ +/****************************************24个******************************************* */ -/***************************************************************************************** */ -/***************************************************************************************** */ -/***************************************************************************************** */ +/***************************************PAGE4******************************************* */ +/****************************************24个******************************************* */ +/***************************************PAGE5******************************************* */ +/****************************************24个******************************************* */ + +/***************************************PAGE6******************************************* */ +/****************************************24个******************************************* */ - _s_task_game.game_info_index = -1; - _s_task_game.game_point_index = -1; - _s_task_game.start_seconds = 0; - _s_task_game.eeror_times = 0; } #define D_task_READ_OID 0x50 diff --git a/source/app/task_game.h b/source/app/task_game.h index c80525c..5206a06 100644 --- a/source/app/task_game.h +++ b/source/app/task_game.h @@ -22,9 +22,12 @@ // #define game_supported_oid_max 32 #define game_num_max 20 -#define zbt_1_num 5 + +#define zbt_1_num 4 #define zmg_1_num 6 -#define shert_1_num 32 +#define shert_3_num 26 + +/********PAGE1*******/ #define zlxs_4_num 1 #define hyjj_3_num 1 #define hyjj_4_num 1 @@ -40,6 +43,37 @@ #define sjgh_3_num 1 #define jssj_4_num 1 #define jssj_5_num 1 +/********PAGE2*******/ +#define yxpl_1_num 1 +#define yxpl_2_num 1 +#define ydsd_1_num 1 +#define ydsd_2_num 1 +#define ydsd_szdd_1_num 1 +#define ydsd_szdd_2_num 1 +#define bbdx_1_num 1 +#define bbdx_2_num 1 +#define bbdx_3_num 1 +#define bbdx_4_num 1 +#define cscd_2_num 1 +#define cscd_3_num 1 +#define dqpm_2_num 1 +#define dqpm_3_num 1 +#define szsb_2_num 1 +#define szsb_3_num 1 +#define szdb_2_num 1 +#define szdb_3_num 1 +#define setfg_3_num 26 +#define setfg_szxz_3_num 1 +#define setfg_4_num 1 +#define setfg_5_num 1 +#define setfg_szdd_5_num 1 +#define zlxs_3_num 1 + + +/********PAGE3*******/ +/********PAGE4*******/ +/********PAGE5*******/ +/********PAGE6*******/ typedef struct _point_info @@ -54,7 +88,9 @@ typedef struct _point_buf { POINT_INFO zbt_1[zbt_1_num]; POINT_INFO zmg_1[zmg_1_num]; - POINT_INFO shert_1[shert_1_num]; + POINT_INFO shert_3[shert_3_num]; + + /************PAGE1***********/ POINT_INFO zlxs_4[zlxs_4_num]; POINT_INFO hyjj_3[hyjj_3_num]; POINT_INFO hyjj_4[hyjj_4_num]; @@ -70,6 +106,38 @@ typedef struct _point_buf POINT_INFO sjgh_3[sjgh_3_num]; POINT_INFO jssj_4[jssj_4_num]; POINT_INFO jssj_5[jssj_5_num]; + + /************PAGE2***********/ + POINT_INFO yxpl_1[yxpl_1_num]; + POINT_INFO yxpl_2[yxpl_2_num]; + POINT_INFO ydsd_1[ydsd_1_num]; + POINT_INFO ydsd_2[ydsd_2_num]; + POINT_INFO ydsd_szdd_1[ydsd_szdd_1_num]; + POINT_INFO ydsd_szdd_2[ydsd_szdd_2_num]; + POINT_INFO bbdx_1[bbdx_1_num]; + POINT_INFO bbdx_2[bbdx_2_num]; + POINT_INFO bbdx_3[bbdx_3_num]; + POINT_INFO bbdx_4[bbdx_4_num]; + POINT_INFO cscd_2[cscd_2_num]; + POINT_INFO cscd_3[cscd_3_num]; + POINT_INFO dqpm_2[dqpm_2_num]; + POINT_INFO dqpm_3[dqpm_3_num]; + POINT_INFO szsb_2[szsb_2_num]; + POINT_INFO szsb_3[szsb_3_num]; + POINT_INFO szdb_2[szdb_2_num]; + POINT_INFO szdb_3[szdb_3_num]; + POINT_INFO setfg_3[setfg_3_num]; + POINT_INFO setfg_szxz_3[setfg_szxz_3_num]; + POINT_INFO setfg_4[setfg_4_num]; + POINT_INFO setfg_5[setfg_5_num]; + POINT_INFO setfg_szdd_5[setfg_szdd_5_num]; + POINT_INFO zlxs_3[zlxs_3_num]; + + /************PAGE3***********/ + /************PAGE4***********/ + /************PAGE5***********/ + /************PAGE6***********/ + }POINT_BUF; typedef struct game_info @@ -85,7 +153,7 @@ typedef struct game_info typedef struct _s_task_game { - TS_task task; + TS_task task; //TS_task U16 read_oid; //读取到的oid值 U16 invalid_oid; //代表无效oid值，0x3FFF U16 game_maxseconds; //所有游戏超时的最大时间，单位为秒 diff --git a/source/bsp/bsp_WT2605B.c b/source/bsp/bsp_WT2605B.c index a08d7de..a0869b6 100644 --- a/source/bsp/bsp_WT2605B.c +++ b/source/bsp/bsp_WT2605B.c @@ -15,11 +15,28 @@ TS_SPEECH_AUDIO audio_config_phone = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x37,0x9 TS_SPEECH_AUDIO audio_volume_up = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x38,0x96,0xEF}; //T008 音量增大 TS_SPEECH_AUDIO audio_volume_down = {0x7E,0x07,0xA3,0x54,0x30,0x30,0x39,0x97,0xEF}; //T009 音量减小 TS_SPEECH_AUDIO audio_low_power = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x32,0x92,0xEF}; //T022 电池电量低，请及时充电 -/****************************************训练提示音****************************************/ -TS_SPEECH_AUDIO audio_game_maze_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x30,0x8F,0xEF}; //T010 走迷宫，一星。请按照要求画出一条从入口到出口的线，不能跨越实线 +TS_SPEECH_AUDIO audio_game_error = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x33,0x92,0xEF}; //T013 错误 +TS_SPEECH_AUDIO audio_game_correct = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x34,0x93,0xEF}; //T014 “正确提示音” +TS_SPEECH_AUDIO audio_game_overtime = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x35,0x94,0xEF}; //T015 超时结束，再接再励 +TS_SPEECH_AUDIO audio_game_complete = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x36,0x95,0xEF}; //T016 恭喜你，任务完成 + +/****************************************服务器下发任务************************************/ +TS_SPEECH_AUDIO audio_tcp_maze = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x37,0x96,0xEF}; //T017 请进行走迷宫游戏训练 +TS_SPEECH_AUDIO audio_tcp_different = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x38,0x97,0xEF}; //T018 请进行找不同游戏训练 +TS_SPEECH_AUDIO audio_tcp_shulte = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x39,0x98,0xEF}; //T019 请进行舒尔特方格游戏训练 +TS_SPEECH_AUDIO audio_tcp_complete = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x30,0x90,0xEF}; //T020 恭喜你，今天所有训练任务已完成 +TS_SPEECH_AUDIO audio_tcp_noplan = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x31,0x91,0xEF}; //T021 今天暂无训练任务，可以进行自由训练哦 + + + +/****************************************************点击游戏标识码，播放游戏名称和游戏规则**********************************************************/ + +TS_SPEECH_AUDIO audio_game_maze_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x30,0x8F,0xEF}; //T010 走迷宫，一星。请按照要求画出一条从入口到出口的线，不能跨越实线 TS_SPEECH_AUDIO audio_game_different_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x31,0x90,0xEF}; //T011 找不同，一星。请找出两张图片中不同的地方 -TS_SPEECH_AUDIO audio_game_shulte_1 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x32,0x91,0xEF}; //T012 舒尔特方格，一星。请按照从小到大的顺序依次指出1-25 +TS_SPEECH_AUDIO audio_game_shulte_3 = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x32,0x91,0xEF}; //T012 舒尔特方格，三星。请按照从小到大的顺序依次指出1-25 +/*****************************************************************PAGE1************************************************************************* */ +/******************************************************************15个************************************************************************* */ TS_SPEECH_AUDIO audio_game_zlxs_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x33,0x93,0xEF}; //T023 众里寻3，四星。请按顺序逐行依次指出3和3的倍数，以及含3的数字方块 TS_SPEECH_AUDIO audio_game_hyjj_3 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x34,0x94,0xEF}; //T024 火眼金晶，三星。请快速找出顺时针旋转90度的数字方块 TS_SPEECH_AUDIO audio_game_hyjj_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x35,0x95,0xEF}; //T025 火眼金晶，四星。请快速找出顺时针旋转180度的数字方块 @@ -27,7 +44,6 @@ TS_SPEECH_AUDIO audio_game_hyjj_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x36,0x9 TS_SPEECH_AUDIO audio_game_cxdd_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x37,0x97,0xEF}; //T027 从小到大，四星。请按照从小到大的顺序依次指出刚才出现的数字 TS_SPEECH_AUDIO audio_game_mcqh_4 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x38,0x98,0xEF}; //T028 明察秋毫，四星。请按顺序指出数字积木的位置 TS_SPEECH_AUDIO audio_game_mcqh_5 = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x39,0x99,0xEF}; //T029 明察秋毫，五星。请按顺序指出数字积木的位置 - TS_SPEECH_AUDIO audio_game_jmzx_3 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x30,0x91,0xEF}; //T030 积木再现，三星。请回忆数字积木的位置并指出 TS_SPEECH_AUDIO audio_game_jmzx_4 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x31,0x92,0xEF}; //T031 积木再现，四星。请回忆数字积木的位置并指出 TS_SPEECH_AUDIO audio_game_jmzx_5 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x32,0x93,0xEF}; //T032 积木再现，五星。请回忆数字积木的位置并指出 @@ -37,17 +53,32 @@ TS_SPEECH_AUDIO audio_game_sjgh_3 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x35,0x9 TS_SPEECH_AUDIO audio_game_jssj_4 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x36,0x97,0xEF}; //T036 计算时间，四星。计算并将钟表拨动至相应的位置 TS_SPEECH_AUDIO audio_game_jssj_5 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x37,0x98,0xEF}; //T037 计算时间，五星。计算并将钟表拨动至相应的位置 - -TS_SPEECH_AUDIO audio_game_error = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x33,0x92,0xEF}; //T013 错误 -TS_SPEECH_AUDIO audio_game_correct = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x34,0x93,0xEF}; //T014 “正确提示音” -TS_SPEECH_AUDIO audio_game_overtime = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x35,0x94,0xEF}; //T015 超时结束，再接再励 -TS_SPEECH_AUDIO audio_game_complete = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x36,0x95,0xEF}; //T016 恭喜你，任务完成 -/****************************************服务器下发任务************************************/ -TS_SPEECH_AUDIO audio_tcp_maze = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x37,0x96,0xEF}; //T017 请进行走迷宫游戏训练 -TS_SPEECH_AUDIO audio_tcp_different = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x38,0x97,0xEF}; //T018 请进行找不同游戏训练 -TS_SPEECH_AUDIO audio_tcp_shulte = {0x7E,0x07,0xA3,0x54,0x30,0x31,0x39,0x98,0xEF}; //T019 请进行舒尔特方格游戏训练 -TS_SPEECH_AUDIO audio_tcp_complete = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x30,0x90,0xEF}; //T020 恭喜你，今天所有训练任务已完成 -TS_SPEECH_AUDIO audio_tcp_noplan = {0x7E,0x07,0xA3,0x54,0x30,0x32,0x31,0x91,0xEF}; //T021 今天暂无训练任务，可以进行自由训练哦 +/*****************************************************************PAGE2************************************************************************* */ +/******************************************************************24个************************************************************************* */ +TS_SPEECH_AUDIO audio_game_yxpl_1 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x38,0x99,0xEF}; //T038 有序排列，1星。请将数字方块按照从小到大、从左到右的顺序依次摆放 +TS_SPEECH_AUDIO audio_game_yxpl_2 = {0x7E,0x07,0xA3,0x54,0x30,0x33,0x39,0x9A,0xEF}; //T039 有序排列，2星。请将数字方块按照从小到大、从左到右的顺序依次摆放 +TS_SPEECH_AUDIO audio_game_ydsd_1 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x30,0x92,0xEF}; //T040 眼到手到，1星。请按数字顺序快速依次指出1到10 +TS_SPEECH_AUDIO audio_game_ydsd_2 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x31,0x93,0xEF}; //T041 眼到手到，2星。请按数字顺序快速依次指出1到15 +TS_SPEECH_AUDIO audio_game_ydsd_szdd_1 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x32,0x94,0xEF}; //T042 眼到手到（数字颠倒），1星。请按数字顺序快速依次指出1到10 +TS_SPEECH_AUDIO audio_game_ydsd_szdd_2 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x33,0x95,0xEF}; //T043 眼到手到（数字颠倒），2星。请按数字顺序快速依次指出1到15 +TS_SPEECH_AUDIO audio_game_bbdx_1 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x34,0x96,0xEF}; //T044 比比大小，1星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_bbdx_2 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x35,0x97,0xEF}; //T045 比比大小，2星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_bbdx_3 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x36,0x98,0xEF}; //T046 比比大小，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_bbdx_4 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x37,0x99,0xEF}; //T047 比比大小，4星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_cscd_2 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x38,0x9A,0xEF}; //T048 成双成对，2星。请将双数按照从小到大的顺序排列至左方 +TS_SPEECH_AUDIO audio_game_cscd_3 = {0x7E,0x07,0xA3,0x54,0x30,0x34,0x39,0x9B,0xEF}; //T049 成双成对，3星。请将双数按照从大到小的顺序排列至左方 +TS_SPEECH_AUDIO audio_game_dqpm_2 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x30,0x93,0xEF}; //T050 单枪匹马，2星。请将单数按照从小到大的顺序排列至左方 +TS_SPEECH_AUDIO audio_game_dqpm_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x31,0x94,0xEF}; //T051 单枪匹马，3星。请将单数按照从大到小的顺序排列至左方 +TS_SPEECH_AUDIO audio_game_szsb_2 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x32,0x95,0xEF}; //T052 数字顺背，2星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szsb_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x33,0x96,0xEF}; //T053 数字顺背，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szdb_2 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x34,0x97,0xEF}; //T054 数字倒背，2星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_szdb_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x35,0x98,0xEF}; //T055 数字倒背，3星。请按照任务要求，进行训练 +TS_SPEECH_AUDIO audio_game_setfg_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x36,0x99,0xEF}; //T056 舒尔特方格，3星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_szxz_3 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x37,0x9A,0xEF}; //T057 舒尔特方格，4星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_4 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x38,0x9B,0xEF}; //T058 舒尔特方格，5星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_5 = {0x7E,0x07,0xA3,0x54,0x30,0x35,0x39,0x9C,0xEF}; //T059 舒尔特方格（数字旋转），3星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_setfg_szdd_5 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x30,0x94,0xEF}; //T060 舒尔特方格（数字颠倒），5星。请按照从小到大的顺序依次指出1到25 +TS_SPEECH_AUDIO audio_game_zlxs_3 = {0x7E,0x07,0xA3,0x54,0x30,0x36,0x31,0x95,0xEF}; //T061 众里寻三，3星。请按顺序逐行依次指出3和3的倍数 TS_SPEECH_VOLUME volume_control = {0x7E,0x04,0xAE,0x1E,0xD0,0xEF}; //音量控制 diff --git a/source/bsp/bsp_WT2605B.h b/source/bsp/bsp_WT2605B.h index b36c62a..8658e0f 100644 --- a/source/bsp/bsp_WT2605B.h +++ b/source/bsp/bsp_WT2605B.h @@ -37,8 +37,9 @@ extern TS_SPEECH_AUDIO audio_volume_down; extern TS_SPEECH_AUDIO audio_game_maze_1; //迷宫，一星 extern TS_SPEECH_AUDIO audio_game_different_1; //找不同，一星 -extern TS_SPEECH_AUDIO audio_game_shulte_1; //舒尔特方格，三星 +extern TS_SPEECH_AUDIO audio_game_shulte_3; //舒尔特方格，三星 +/****************************PAGE1****************************/ extern TS_SPEECH_AUDIO audio_game_zlxs_4; //众里寻3，四星 extern TS_SPEECH_AUDIO audio_game_hyjj_3; //火眼金晶，三星 extern TS_SPEECH_AUDIO audio_game_hyjj_4; //火眼金晶，四星 @@ -54,6 +55,37 @@ extern TS_SPEECH_AUDIO audio_game_hyzb_2; //还原钟表，二星 extern TS_SPEECH_AUDIO audio_game_sjgh_3; //时间规划，三星 extern TS_SPEECH_AUDIO audio_game_jssj_4; //计算时间，四星 extern TS_SPEECH_AUDIO audio_game_jssj_5; //计算时间，五星 +/****************************PAGE2****************************/ +extern TS_SPEECH_AUDIO audio_game_yxpl_1; //T038 有序排列，1星 +extern TS_SPEECH_AUDIO audio_game_yxpl_2; //T039 有序排列，2星 +extern TS_SPEECH_AUDIO audio_game_ydsd_1; //T040 眼到手到，1星 +extern TS_SPEECH_AUDIO audio_game_ydsd_2; //T041 眼到手到，2星 +extern TS_SPEECH_AUDIO audio_game_ydsd_szdd_1; //T042 眼到手到（数字颠倒），1星 +extern TS_SPEECH_AUDIO audio_game_ydsd_szdd_2; //T043 眼到手到（数字颠倒），2星 +extern TS_SPEECH_AUDIO audio_game_bbdx_1; //T044 比比大小，1星 +extern TS_SPEECH_AUDIO audio_game_bbdx_2; //T045 比比大小，2星 +extern TS_SPEECH_AUDIO audio_game_bbdx_3; //T046 比比大小，3星 +extern TS_SPEECH_AUDIO audio_game_bbdx_4; //T047 比比大小，4星 +extern TS_SPEECH_AUDIO audio_game_cscd_2; //T048 成双成对，2星 +extern TS_SPEECH_AUDIO audio_game_cscd_3; //T049 成双成对，3星 +extern TS_SPEECH_AUDIO audio_game_dqpm_2; //T050 单枪匹马，2星 +extern TS_SPEECH_AUDIO audio_game_dqpm_3; //T051 单枪匹马，3星 +extern TS_SPEECH_AUDIO audio_game_szsb_2; //T052 数字顺背，2星 +extern TS_SPEECH_AUDIO audio_game_szsb_3; //T053 数字顺背，3星 +extern TS_SPEECH_AUDIO audio_game_szdb_2; //T054 数字倒背，2星 +extern TS_SPEECH_AUDIO audio_game_szdb_3; //T055 数字倒背，3星 +extern TS_SPEECH_AUDIO audio_game_setfg_; //T056 舒尔特方格，3星 +extern TS_SPEECH_AUDIO audio_game_setfg_szxz_3; //T057 舒尔特方格，4星 +extern TS_SPEECH_AUDIO audio_game_setfg_4; //T058 舒尔特方格，5星 +extern TS_SPEECH_AUDIO audio_game_setfg_5; //T059 舒尔特方格（数字旋转），3星 +extern TS_SPEECH_AUDIO audio_game_setfg_szdd_5; //T060 舒尔特方格（数字颠倒），5星 +extern TS_SPEECH_AUDIO audio_game_zlxs_3; //T061 众里寻三，3星 + +/****************************PAGE3****************************/ +/****************************PAGE4****************************/ +/****************************PAGE5****************************/ +/****************************PAGE6****************************/ + extern TS_SPEECH_AUDIO audio_game_error; //错误 extern TS_SPEECH_AUDIO audio_game_correct; //正确