From 8445c54f01777513912d4c6d36c28e92a0ff33a0 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 18 九月 2025 14:40:53 +0800
Subject: [PATCH] 首轮测试代码提交
---
src/tg/tg_scene.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/tg/tg_scene.h b/src/tg/tg_scene.h
index de25cbe..61a7047 100644
--- a/src/tg/tg_scene.h
+++ b/src/tg/tg_scene.h
@@ -13,7 +13,11 @@
#include "../protocol.h"
#include "module_def.h"
+<<<<<<< HEAD
#pragma pack (1)
+=======
+
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
typedef struct {
unsigned short magic;
unsigned short nmds;
@@ -24,7 +28,13 @@
tag_input input; //1362
+<<<<<<< HEAD
tag_module in1[MAX_INPUT_NUM]; //4352
+=======
+ tag_input input;//1282
+
+ tag_module in1[MAX_INPUT_NUM];
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
tag_module in2[MAX_INPUT_NUM];
tag_module in3[MAX_INPUT_NUM];
tag_module in4[MAX_INPUT_NUM];
--
Gitblit v1.9.3