Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2024-07-16 13:31:29 +07:00 · 2024-07-16 13:31:29 +07:00 · fdc9178397
commit fdc9178397
parent dc9f424124 705ab50146
384 changed files with 17810 additions and 3933 deletions
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_0_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_0_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_0_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_0_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_10_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_10_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_10_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_10_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_12_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_12_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_12_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_12_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_13_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_13_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_13_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_13_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_14_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_14_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_14_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_14_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_15_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_15_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_15_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_15_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_16_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_16_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_16_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_16_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_17_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_17_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_17_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_17_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_18_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_18_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_18_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_18_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_1_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_1_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_1_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_1_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_20_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_20_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_20_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_20_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_2_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_2_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_2_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_2_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_3_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_3_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_3_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_3_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_5_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_5_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_5_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_5_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_6_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_6_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_6_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_6_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_7_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_7_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_7_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_7_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_8_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_8_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_8_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_8_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_9_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_9_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_9_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_9_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_11_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_11_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_11_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_11_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_19_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_19_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_19_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_19_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_4_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_4_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_4_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_A_4_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_0_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_0_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_10_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_10_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_10_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_10_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_11_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_11_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_11_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_11_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_12_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_12_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_12_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_12_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_13_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_13_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_13_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_13_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_14_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_14_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_14_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_14_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_15_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_15_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_15_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_15_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_16_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_16_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_16_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_16_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_18_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_18_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_18_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_18_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_1_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_1_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_20_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_20_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_20_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_20_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_2_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_2_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_2_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_2_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_3_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_3_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_3_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_3_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_4_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_4_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_4_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_4_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_5_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_5_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_5_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_5_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_6_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_6_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_6_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_6_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_7_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_7_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_7_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_7_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_8_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_8_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_8_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_8_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_9_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_9_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_9_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_9_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_17_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeA/button_overlay_catalog_A_19_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_0_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_0_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_0_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_0_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_10_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_10_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_10_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_10_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_12_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_12_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_12_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_12_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_13_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_13_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_13_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_13_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_14_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_14_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_14_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_14_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_15_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_15_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_15_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_15_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_16_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_16_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_16_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_16_posi2.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_17_posi1.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_17_posi1.png
--- a/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_17_posi2.png
+++ b/inter/sgp/image/event/menu_overlay_set/gradeB/button_overlay_17_posi2.png
--- a/Show more
+++ b/Show more