Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source

...

This commit is contained in:

kong 2023-07-21 12:11:01 +07:00

parent 7ce74c038a 67a0100b52

commit 13a5a37b36

156 changed files with 951 additions and 96 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

image/collect_point1/img4.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/collect_point1/text_7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 14 KiB

BIN

image/collect_point1/text_edit2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

image/collect_point1_en/img4.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

image/collect_point1_en/text_7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 12 KiB

BIN

image/collect_point1_en/text_edit2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

image/display_point/bn_accept.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

image/display_point/bn_skip.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

image/display_point/img_popup5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 87 KiB

BIN

image/display_point/img_popup6.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 67 KiB

BIN

image/display_point/img_popup7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

image/display_point/img_popup8.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 50 KiB

BIN

image/display_point_en/bn_accept.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

image/display_point_en/bn_skip.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

image/display_point_en/img_popup5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 88 KiB

BIN

image/display_point_en/img_popup6.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 69 KiB

BIN

image/display_point_en/img_popup7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 39 KiB

BIN

image/display_point_en/img_popup8.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 54 KiB

BIN

spiral/image/page_spiral/03-02-01-0015.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

spiral/image/page_spiral/03-02-01-0016.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

spiral/image/page_spiral/03-02-01-0017.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

spiral/image/page_spiral/03-02-01-0018.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

spiral/image/page_spiral/03-02-01-0019.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 23 KiB

BIN

spiral/image/page_spiral/03-02-01-0020.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 35 KiB

BIN

spiral/image/page_spiral/03-02-01-0021.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

spiral/image/page_spiral/03-02-01-0022.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 40 KiB

BIN

spiral/image/page_spiral/03-02-01-0023.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 42 KiB

BIN

spiral/image/page_spiral/03-02-01-0024.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

spiral/image/page_spiral/03-02-01-0025.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 43 KiB

BIN

spiral/image/page_spiral/03-02-01-0026.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 20 KiB

BIN

spiral/image/page_spiral/03-02-01-0027.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 20 KiB

BIN

spiral/image/page_spiral/03-02-01-0028.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

spiral/image/page_spiral/03-02-01-0029.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

spiral/image/page_spiral/03-02-01-0030.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

spiral/image/page_spiral/03-02-01-0031.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 20 KiB

BIN

spiral/image/page_spiral/03-02-01-0032.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

spiral/image/page_spiral/03-02-01-0033.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 22 KiB

BIN

spiral/image/page_spiral/03-02-01-0034.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

BIN

spiral/image/page_spiral/03-02-01-0035.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

spiral/image/page_spiral/03-02-01-0036.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 39 KiB

BIN

spiral/image/page_spiral/03-02-01-0037.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

spiral/image/page_spiral/03-02-01-0038.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

spiral/image/page_spiral/03-02-01-0039.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 46 KiB

BIN

spiral/image/page_spiral/03-02-01-0040.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 35 KiB

BIN

spiral/image/page_spiral/03-02-01-0041.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

spiral/image/page_spiral/03-02-01-0042.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 29 KiB

BIN

spiral/image/page_spiral/03-02-01-0043.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

BIN

spiral/image/page_spiral/03-02-01-0044.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

spiral/image/page_spiral/03-02-01-0045.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

spiral/image/page_spiral/03-02-01-0046.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

spiral/image/page_spiral/03-02-01-0047.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 29 KiB

BIN

spiral/image/page_spiral/03-02-01-0048.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 45 KiB

BIN

spiral/image/page_spiral/03-02-01-0049.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 42 KiB

BIN

spiral/image/page_spiral/03-02-01-0050.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

spiral/image/page_spiral/03-02-01-0051.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB

BIN

spiral/image/page_spiral/03-02-01-0052.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

BIN

spiral/image/page_spiral/03-02-01-0053.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 28 KiB

BIN

spiral/image/page_spiral/03-02-01-0054.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 18 KiB

BIN

spiral/image/page_spiral/03-02-01-0055.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 15 KiB

BIN

spiral/image/page_spiral/03-02-01-0056.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0015.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 187 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0016.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 103 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0017.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 159 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0018.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 126 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0019.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 114 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0020.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 178 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0021.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 127 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0022.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 200 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0023.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 199 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0024.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 179 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0025.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 231 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0026.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 93 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0027.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 105 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0028.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 107 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0029.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 106 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0030.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 106 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0031.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 90 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0032.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 192 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0033.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 84 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0034.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 93 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0035.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 107 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0036.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 203 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0037.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 185 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0038.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 131 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0039.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 171 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0040.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 161 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0041.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 168 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0042.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 92 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0043.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 94 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0044.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 167 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0045.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 170 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0046.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 170 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0047.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 146 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0048.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 141 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0049.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 216 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0050.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 169 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0051.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 159 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0052.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 127 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0053.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 129 KiB

BIN

spiral/image/page_spiral/spiral_product_03-02-01-0054.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 74 KiB

Some files were not shown because too many files have changed in this diff Show more