diff --git a/.gitignore b/.gitignore index 32f79366..f67a93f4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,20 +4,9 @@ # 上传两个文件夹 !lua_probject/ !wb_unity_pro/ -wb_unity_pro/* -!wb_unity_pro/Assets/ -wb_unity_pro/Assets/* -!wb_unity_pro/Assets/ART/ +!wb_new_ui/ !lua_probject/** -<<<<<<< HEAD -!wb_unity_pro/Assets/ART/** -!.gitignore -======= -<<<<<<< HEAD -!wb_unity_pro/Assets/ART/** -!.gitignore -======= -!wb_unity_pro/Assets/ART/** ->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a ->>>>>>> 0686db8061b2c5c116395dd935e8cfdbaeda16b4 +!wb_unity_pro/** +!wb_new_ui/** +!.gitignore \ No newline at end of file diff --git a/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml b/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml new file mode 100644 index 00000000..894a09df --- /dev/null +++ b/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml @@ -0,0 +1,13 @@ + + + + + + + + + + + +