diff --git a/Assets/Script/Excel/Read/ReadExcel.cs b/Assets/Script/Excel/Read/ReadExcel.cs index ded400a..f148ebb 100644 --- a/Assets/Script/Excel/Read/ReadExcel.cs +++ b/Assets/Script/Excel/Read/ReadExcel.cs @@ -259,6 +259,7 @@ namespace ZXL.Excel answer ); array.Add(info); + Debug.Log(id); // for (var j = 1; j < xLeng; j++) // ÐÐ // { // if (objs[i, j] == null) continue; @@ -328,35 +329,35 @@ namespace ZXL.Excel { var sheet = pck.Workbook.Worksheets[sheetName]; - var excelRange = sheet.Cells["b:g"]; - int row = excelRange.Count(x => x.Address.Length == 2 && x.Address[1] == '2'); - var enumerable = excelRange.Select((x, i) => - { - if (x.Address.Length == 2 && x.Address[1] == '1') - { - return null; - } - - return x.Value.ToString(); - }); - var strings = enumerable.Where(x => x is not null).ToArray(); - List list = new List(); - var stringsLength = strings.Length; - for (var i = 0; (i + row - 1) < stringsLength; i += row) - { - var strings1 = new string[row]; - for (var i1 = 0; i1 < row; i1++) - { - strings1[i1] = strings[i + i1]; - } - - list.Add(strings1); - } - - foreach (var strings1 in list) - { - Debug.Log(string.Join(',', strings1)); - } + // var excelRange = sheet.Cells["b:g"]; + // int row = excelRange.Count(x => x.Address.Length == 2 && x.Address[1] == '2'); + // var enumerable = excelRange.Select((x, i) => + // { + // if (x.Address.Length == 2 && x.Address[1] == '1') + // { + // return null; + // } + // + // return x.Value.ToString(); + // }); + // var strings = enumerable.Where(x => x is not null).ToArray(); + // List list = new List(); + // var stringsLength = strings.Length; + // for (var i = 0; (i + row - 1) < stringsLength; i += row) + // { + // var strings1 = new string[row]; + // for (var i1 = 0; i1 < row; i1++) + // { + // strings1[i1] = strings[i + i1]; + // } + // + // list.Add(strings1); + // } + // + // foreach (var strings1 in list) + // { + // Debug.Log(string.Join(',', strings1)); + // } objs = sheet.Cells.Value as object[,]; return objs; diff --git a/Assets/StreamingAssets/Excel/QuestionBank_A.xlsx b/Assets/StreamingAssets/Excel/QuestionBank_A.xlsx index b2b5ed1..ad1e418 100644 Binary files a/Assets/StreamingAssets/Excel/QuestionBank_A.xlsx and b/Assets/StreamingAssets/Excel/QuestionBank_A.xlsx differ diff --git a/Assets/StreamingAssets/Excel/QuestionBank_B.xlsx b/Assets/StreamingAssets/Excel/QuestionBank_B.xlsx index 449c1b2..51f282d 100644 Binary files a/Assets/StreamingAssets/Excel/QuestionBank_B.xlsx and b/Assets/StreamingAssets/Excel/QuestionBank_B.xlsx differ diff --git a/Assets/StreamingAssets/Excel/QuestionBank_C.xlsx b/Assets/StreamingAssets/Excel/QuestionBank_C.xlsx index d20fc67..0acab02 100644 Binary files a/Assets/StreamingAssets/Excel/QuestionBank_C.xlsx and b/Assets/StreamingAssets/Excel/QuestionBank_C.xlsx differ diff --git a/Assets/StreamingAssets/Excel/QuestionBank_D.xlsx b/Assets/StreamingAssets/Excel/QuestionBank_D.xlsx index 25b5677..e720d82 100644 Binary files a/Assets/StreamingAssets/Excel/QuestionBank_D.xlsx and b/Assets/StreamingAssets/Excel/QuestionBank_D.xlsx differ diff --git a/Assets/StreamingAssets/TXT/data-107368510.txt b/Assets/StreamingAssets/TXT/data-107368510.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-107368510.txt.meta b/Assets/StreamingAssets/TXT/data-107368510.txt.meta new file mode 100644 index 0000000..9f650f4 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-107368510.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d37e7344f8fded34bbbd835a31492e18 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-1078322262.txt b/Assets/StreamingAssets/TXT/data-1078322262.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-1078322262.txt.meta b/Assets/StreamingAssets/TXT/data-1078322262.txt.meta new file mode 100644 index 0000000..48cfa50 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-1078322262.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c8ea764553a073341a9c50bec75ae29f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-1706297044.txt b/Assets/StreamingAssets/TXT/data-1706297044.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-1706297044.txt.meta b/Assets/StreamingAssets/TXT/data-1706297044.txt.meta new file mode 100644 index 0000000..3dcf655 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-1706297044.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 84c6359e638b703418dd28ac8dd449c4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-1971805971.txt b/Assets/StreamingAssets/TXT/data-1971805971.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-1971805971.txt.meta b/Assets/StreamingAssets/TXT/data-1971805971.txt.meta new file mode 100644 index 0000000..d129a7d --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-1971805971.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76d97a2bbdf391e48a1ee71a199382f2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-2060373782.txt b/Assets/StreamingAssets/TXT/data-2060373782.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-2060373782.txt.meta b/Assets/StreamingAssets/TXT/data-2060373782.txt.meta new file mode 100644 index 0000000..e3d9631 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-2060373782.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f39395f0a201ab4981e1f9ce6dca30a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-509079678.txt b/Assets/StreamingAssets/TXT/data-509079678.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-509079678.txt.meta b/Assets/StreamingAssets/TXT/data-509079678.txt.meta new file mode 100644 index 0000000..439e773 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-509079678.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 037804e1cec86c1428424902ba16ddaf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-751660148.txt b/Assets/StreamingAssets/TXT/data-751660148.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-751660148.txt.meta b/Assets/StreamingAssets/TXT/data-751660148.txt.meta new file mode 100644 index 0000000..9a7f11d --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-751660148.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 39c9b104c9e16174c9103c0705614c39 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data-80239305.txt b/Assets/StreamingAssets/TXT/data-80239305.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data-80239305.txt.meta b/Assets/StreamingAssets/TXT/data-80239305.txt.meta new file mode 100644 index 0000000..7e6ce2c --- /dev/null +++ b/Assets/StreamingAssets/TXT/data-80239305.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2a82db953c2cb904cb5d13c25b642c13 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data1186077948.txt b/Assets/StreamingAssets/TXT/data1186077948.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data1186077948.txt.meta b/Assets/StreamingAssets/TXT/data1186077948.txt.meta new file mode 100644 index 0000000..48d5aa8 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data1186077948.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71b26610abb5c1f46adde01601badd77 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data1251323710.txt b/Assets/StreamingAssets/TXT/data1251323710.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data1251323710.txt.meta b/Assets/StreamingAssets/TXT/data1251323710.txt.meta new file mode 100644 index 0000000..6d6d847 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data1251323710.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 185f25cb9b4976549973bc0704489fb3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data13393982.txt b/Assets/StreamingAssets/TXT/data13393982.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data13393982.txt.meta b/Assets/StreamingAssets/TXT/data13393982.txt.meta new file mode 100644 index 0000000..5a5c500 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data13393982.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d57142bee0a08b4c80f332ffc68d9ad +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data1420761446.txt b/Assets/StreamingAssets/TXT/data1420761446.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data1420761446.txt.meta b/Assets/StreamingAssets/TXT/data1420761446.txt.meta new file mode 100644 index 0000000..3f93949 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data1420761446.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b902234160c59144c9b2dc6f9a2c0c6b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data1442532672.txt b/Assets/StreamingAssets/TXT/data1442532672.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data1442532672.txt.meta b/Assets/StreamingAssets/TXT/data1442532672.txt.meta new file mode 100644 index 0000000..46b3d73 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data1442532672.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 104071319376386489154702710e0c34 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data1553227158.txt b/Assets/StreamingAssets/TXT/data1553227158.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data1553227158.txt.meta b/Assets/StreamingAssets/TXT/data1553227158.txt.meta new file mode 100644 index 0000000..a32e781 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data1553227158.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 452d478cbe81bdd469554fef0f89da65 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data257076697.txt b/Assets/StreamingAssets/TXT/data257076697.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data257076697.txt.meta b/Assets/StreamingAssets/TXT/data257076697.txt.meta new file mode 100644 index 0000000..a27a2cc --- /dev/null +++ b/Assets/StreamingAssets/TXT/data257076697.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dafff20d49f71ea49b77b9f1706e4339 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data348096176.txt b/Assets/StreamingAssets/TXT/data348096176.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data348096176.txt.meta b/Assets/StreamingAssets/TXT/data348096176.txt.meta new file mode 100644 index 0000000..1cc3f36 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data348096176.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 209dbdfe2d9a3de42a5151a0380ac3c8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data366820265.txt b/Assets/StreamingAssets/TXT/data366820265.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data366820265.txt.meta b/Assets/StreamingAssets/TXT/data366820265.txt.meta new file mode 100644 index 0000000..4589fae --- /dev/null +++ b/Assets/StreamingAssets/TXT/data366820265.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 106f46d026567c046a7ca04ddd3ec7e9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data557431738.txt b/Assets/StreamingAssets/TXT/data557431738.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data557431738.txt.meta b/Assets/StreamingAssets/TXT/data557431738.txt.meta new file mode 100644 index 0000000..39d11eb --- /dev/null +++ b/Assets/StreamingAssets/TXT/data557431738.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 175c24c325f92034f80ca828f21cd9ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TXT/data914596531.txt b/Assets/StreamingAssets/TXT/data914596531.txt new file mode 100644 index 0000000..e69de29 diff --git a/Assets/StreamingAssets/TXT/data914596531.txt.meta b/Assets/StreamingAssets/TXT/data914596531.txt.meta new file mode 100644 index 0000000..c0d40f3 --- /dev/null +++ b/Assets/StreamingAssets/TXT/data914596531.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ad07e12d83f7ab44a2f94ff89aa3a4f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: