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

2024-08-27 21:42:56 +07:00 · 2024-08-27 21:42:56 +07:00 · 169a2b4ae7
commit 169a2b4ae7
parent d7513054ca 48d15957c5
43 changed files with 12356 additions and 388 deletions
--- a/image/event/robinson_beauty/bg_bottom.png
+++ b/image/event/robinson_beauty/bg_bottom.png
--- a/image/event/robinson_beauty/bg_top.png
+++ b/image/event/robinson_beauty/bg_top.png
--- a/image/event/robinson_beauty/point_1-1.png
+++ b/image/event/robinson_beauty/point_1-1.png
--- a/image/event/robinson_beauty/point_1.png
+++ b/image/event/robinson_beauty/point_1.png
--- a/image/event/robinson_beauty/point_1_en.png
+++ b/image/event/robinson_beauty/point_1_en.png
--- a/image/event/robinson_beauty/point_2-1.png
+++ b/image/event/robinson_beauty/point_2-1.png
--- a/image/event/robinson_beauty/point_2.png
+++ b/image/event/robinson_beauty/point_2.png
--- a/image/event/robinson_beauty/point_2_en.png
+++ b/image/event/robinson_beauty/point_2_en.png
--- a/image/event/robinson_beauty/point_3-1.png
+++ b/image/event/robinson_beauty/point_3-1.png
--- a/image/event/robinson_beauty/point_3.png
+++ b/image/event/robinson_beauty/point_3.png
--- a/image/event/robinson_beauty/point_3_en.png
+++ b/image/event/robinson_beauty/point_3_en.png
--- a/image/event/robinson_beauty/point_4.png
+++ b/image/event/robinson_beauty/point_4.png
--- a/image/event/robinson_beauty/point_4_en.png
+++ b/image/event/robinson_beauty/point_4_en.png
--- a/image/event/robinson_beauty/point_5.png
+++ b/image/event/robinson_beauty/point_5.png
--- a/image/event/robinson_beauty/point_5_en.png
+++ b/image/event/robinson_beauty/point_5_en.png
--- a/image/event/robinson_beauty/point_6.png
+++ b/image/event/robinson_beauty/point_6.png
--- a/image/event/robinson_beauty/point_6_en.png
+++ b/image/event/robinson_beauty/point_6_en.png
--- a/image/event/robinson_beauty/point_7.png
+++ b/image/event/robinson_beauty/point_7.png
--- a/image/event/robinson_beauty/point_7_en.png
+++ b/image/event/robinson_beauty/point_7_en.png
--- a/image/event/robinson_beauty/point_8.png
+++ b/image/event/robinson_beauty/point_8.png
--- a/image/event/robinson_beauty/point_8_en.png
+++ b/image/event/robinson_beauty/point_8_en.png
--- a/image/event/robinson_beauty/reward_set_a.png
+++ b/image/event/robinson_beauty/reward_set_a.png
--- a/image/event/robinson_beauty/reward_set_a_name.png
+++ b/image/event/robinson_beauty/reward_set_a_name.png
--- a/image/event/robinson_beauty/reward_set_a_plus.png
+++ b/image/event/robinson_beauty/reward_set_a_plus.png
--- a/image/event/robinson_beauty/reward_set_a_plus_name.png
+++ b/image/event/robinson_beauty/reward_set_a_plus_name.png