Merge branch 'jackfrued:master' into master

2023-06-14 12:04:23 +08:00 · 2023-06-14 12:04:23 +08:00 · 13080951af
parent 9821dd5030 09857a579b
commit 13080951af
815 changed files with 237 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Day01-15/01.初识Python.md
+++ b/Day01-15/01.初识Python.md
--- a/Day01-15/02.语言元素.md
+++ b/Day01-15/02.语言元素.md
--- a/Day01-15/03.分支结构.md
+++ b/Day01-15/03.分支结构.md
--- a/Day01-15/04.循环结构.md
+++ b/Day01-15/04.循环结构.md
--- a/Day01-15/05.构造程序逻辑.md
+++ b/Day01-15/05.构造程序逻辑.md
--- a/Day01-15/06.函数和模块的使用.md
+++ b/Day01-15/06.函数和模块的使用.md
--- a/Day01-15/07.字符串和常用数据结构.md
+++ b/Day01-15/07.字符串和常用数据结构.md
--- a/Day01-15/08.面向对象编程基础.md
+++ b/Day01-15/08.面向对象编程基础.md
--- a/Day01-15/09.面向对象进阶.md
+++ b/Day01-15/09.面向对象进阶.md
--- a/Day01-15/10.图形用户界面和游戏开发.md
+++ b/Day01-15/10.图形用户界面和游戏开发.md
--- a/Day01-15/11.文件和异常.md
+++ b/Day01-15/11.文件和异常.md
--- a/Day01-15/12.字符串和正则表达式.md
+++ b/Day01-15/12.字符串和正则表达式.md
--- a/Day01-15/13.进程和线程.md
+++ b/Day01-15/13.进程和线程.md
--- a/Day01-15/14.网络编程入门和网络应用开发.md
+++ b/Day01-15/14.网络编程入门和网络应用开发.md
--- a/Day01-15/15.图像和办公文档处理.md
+++ b/Day01-15/15.图像和办公文档处理.md
--- a/Day01-15/code/Day01/flag.py
+++ b/Day01-15/code/Day01/flag.py
--- a/Day01-15/code/Day01/hello.py
+++ b/Day01-15/code/Day01/hello.py
--- a/Day01-15/code/Day01/peppa_pig.py
+++ b/Day01-15/code/Day01/peppa_pig.py
--- a/Day01-15/code/Day02/centigrade.py
+++ b/Day01-15/code/Day02/centigrade.py
--- a/Day01-15/code/Day02/circle.py
+++ b/Day01-15/code/Day02/circle.py
--- a/Day01-15/code/Day02/leap.py
+++ b/Day01-15/code/Day02/leap.py
--- a/Day01-15/code/Day02/operator.py
+++ b/Day01-15/code/Day02/operator.py
--- a/Day01-15/code/Day02/strings.py
+++ b/Day01-15/code/Day02/strings.py
--- a/Day01-15/code/Day02/variable1.py
+++ b/Day01-15/code/Day02/variable1.py
--- a/Day01-15/code/Day02/variable2.py
+++ b/Day01-15/code/Day02/variable2.py
--- a/Day01-15/code/Day02/variable3.py
+++ b/Day01-15/code/Day02/variable3.py
--- a/Day01-15/code/Day02/variable4.py
+++ b/Day01-15/code/Day02/variable4.py
--- a/Day01-15/code/Day02/variable5.py
+++ b/Day01-15/code/Day02/variable5.py
--- a/Day01-15/code/Day03/conversion.py
+++ b/Day01-15/code/Day03/conversion.py
--- a/Day01-15/code/Day03/grade.py
+++ b/Day01-15/code/Day03/grade.py
--- a/Day01-15/code/Day03/piecewise.py
+++ b/Day01-15/code/Day03/piecewise.py
--- a/Day01-15/code/Day03/rolldice.py
+++ b/Day01-15/code/Day03/rolldice.py
--- a/Day01-15/code/Day03/tax.py
+++ b/Day01-15/code/Day03/tax.py
--- a/Day01-15/code/Day03/triangle.py
+++ b/Day01-15/code/Day03/triangle.py
--- a/Day01-15/code/Day03/verify.py
+++ b/Day01-15/code/Day03/verify.py
--- a/Day01-15/code/Day04/for1.py
+++ b/Day01-15/code/Day04/for1.py
--- a/Day01-15/code/Day04/for2.py
+++ b/Day01-15/code/Day04/for2.py
--- a/Day01-15/code/Day04/for3.py
+++ b/Day01-15/code/Day04/for3.py
--- a/Day01-15/code/Day04/for4.py
+++ b/Day01-15/code/Day04/for4.py
--- a/Day01-15/code/Day04/for5.py
+++ b/Day01-15/code/Day04/for5.py
--- a/Day01-15/code/Day04/for6.py
+++ b/Day01-15/code/Day04/for6.py
--- a/Day01-15/code/Day04/while1.py
+++ b/Day01-15/code/Day04/while1.py
--- a/Day01-15/code/Day04/while2.py
+++ b/Day01-15/code/Day04/while2.py
--- a/Day01-15/code/Day05/chicken.py
+++ b/Day01-15/code/Day05/chicken.py
--- a/Day01-15/code/Day05/craps.py
+++ b/Day01-15/code/Day05/craps.py
--- a/Day01-15/code/Day05/fibonacci.py
+++ b/Day01-15/code/Day05/fibonacci.py
--- a/Day01-15/code/Day05/guess.py
+++ b/Day01-15/code/Day05/guess.py
--- a/Day01-15/code/Day05/lily.py
+++ b/Day01-15/code/Day05/lily.py
--- a/Day01-15/code/Day05/palindrome.py
+++ b/Day01-15/code/Day05/palindrome.py
--- a/Day01-15/code/Day05/perfect.py
+++ b/Day01-15/code/Day05/perfect.py
--- a/Day01-15/code/Day05/prime.py
+++ b/Day01-15/code/Day05/prime.py
--- a/Day01-15/code/Day05/table.py
+++ b/Day01-15/code/Day05/table.py
--- a/Day01-15/code/Day06/function1.py
+++ b/Day01-15/code/Day06/function1.py
--- a/Day01-15/code/Day06/function2.py
+++ b/Day01-15/code/Day06/function2.py
--- a/Day01-15/code/Day06/function3.py
+++ b/Day01-15/code/Day06/function3.py
--- a/Day01-15/code/Day06/function4.py
+++ b/Day01-15/code/Day06/function4.py
--- a/Day01-15/code/Day06/function5.py
+++ b/Day01-15/code/Day06/function5.py
--- a/Day01-15/code/Day06/function6.py
+++ b/Day01-15/code/Day06/function6.py
--- a/Day01-15/code/Day07/avgscore.py
+++ b/Day01-15/code/Day07/avgscore.py
--- a/Day01-15/code/Day07/dict1.py
+++ b/Day01-15/code/Day07/dict1.py
--- a/Day01-15/code/Day07/dict2.py
+++ b/Day01-15/code/Day07/dict2.py
--- a/Day01-15/code/Day07/fibonacci.py
+++ b/Day01-15/code/Day07/fibonacci.py
--- a/Day01-15/code/Day07/findmax.py
+++ b/Day01-15/code/Day07/findmax.py
--- a/Day01-15/code/Day07/list1.py
+++ b/Day01-15/code/Day07/list1.py
--- a/Day01-15/code/Day07/list2.py
+++ b/Day01-15/code/Day07/list2.py
--- a/Day01-15/code/Day07/list3.py
+++ b/Day01-15/code/Day07/list3.py
--- a/Day01-15/code/Day07/lottery.py
+++ b/Day01-15/code/Day07/lottery.py
--- a/Day01-15/code/Day07/marquee.py
+++ b/Day01-15/code/Day07/marquee.py
--- a/Day01-15/code/Day07/scoretable.py
+++ b/Day01-15/code/Day07/scoretable.py
--- a/Day01-15/code/Day07/set1.py
+++ b/Day01-15/code/Day07/set1.py
--- a/Day01-15/code/Day07/set2.py
+++ b/Day01-15/code/Day07/set2.py
--- a/Day01-15/code/Day07/tic-tac-toe.py
+++ b/Day01-15/code/Day07/tic-tac-toe.py
--- a/Day01-15/code/Day07/tuple.py
+++ b/Day01-15/code/Day07/tuple.py
--- a/Day01-15/code/Day07/yanghui.py
+++ b/Day01-15/code/Day07/yanghui.py
--- a/Day01-15/code/Day08/access.py
+++ b/Day01-15/code/Day08/access.py
--- a/Day01-15/code/Day08/circle.py
+++ b/Day01-15/code/Day08/circle.py
--- a/Day01-15/code/Day08/clock.py
+++ b/Day01-15/code/Day08/clock.py
--- a/Day01-15/code/Day08/guess.py
+++ b/Day01-15/code/Day08/guess.py
--- a/Day01-15/code/Day08/hack.py
+++ b/Day01-15/code/Day08/hack.py
--- a/Day01-15/code/Day08/rect.py
+++ b/Day01-15/code/Day08/rect.py
--- a/Day01-15/code/Day08/student.py
+++ b/Day01-15/code/Day08/student.py
--- a/Day01-15/code/Day09/association.py
+++ b/Day01-15/code/Day09/association.py
--- a/Day01-15/code/Day09/car1.py
+++ b/Day01-15/code/Day09/car1.py
--- a/Day01-15/code/Day09/car2.py
+++ b/Day01-15/code/Day09/car2.py
--- a/Day01-15/code/Day09/clock.py
+++ b/Day01-15/code/Day09/clock.py
--- a/Day01-15/code/Day09/dependency.py
+++ b/Day01-15/code/Day09/dependency.py
--- a/Day01-15/code/Day09/diamond.py
+++ b/Day01-15/code/Day09/diamond.py
--- a/Day01-15/code/Day09/employee.py
+++ b/Day01-15/code/Day09/employee.py
--- a/Day01-15/code/Day09/multi.py
+++ b/Day01-15/code/Day09/multi.py
--- a/Day01-15/code/Day09/pet.py
+++ b/Day01-15/code/Day09/pet.py
--- a/Day01-15/code/Day09/rational.py
+++ b/Day01-15/code/Day09/rational.py
--- a/Day01-15/code/Day09/shape.py
+++ b/Day01-15/code/Day09/shape.py
--- a/Day01-15/code/Day09/triangle.py
+++ b/Day01-15/code/Day09/triangle.py
--- a/Day01-15/code/Day10/ball.py
+++ b/Day01-15/code/Day10/ball.py
--- a/Day01-15/code/Day10/gui1.py
+++ b/Day01-15/code/Day10/gui1.py
--- a/Day01-15/code/Day10/gui2.py
+++ b/Day01-15/code/Day10/gui2.py
--- a/Day01-15/code/Day10/gui3.py
+++ b/Day01-15/code/Day10/gui3.py
--- a/Day01-15/code/Day10/renju.py
+++ b/Day01-15/code/Day10/renju.py
--- a/Day01-15/code/Day10/snake.py
+++ b/Day01-15/code/Day10/snake.py
--- a/Show More
+++ b/Show More