Merge remote-tracking branch 'origin/freeEnergyDrink' into masterpiece

2024-03-08 10:09:38 +07:00 · 2024-03-08 10:09:38 +07:00 · 45264a090c
commit 45264a090c
parent 6596d83310 42a38a5727
31 changed files with 12872 additions and 589 deletions
--- a/image/consent_en/bn_back.png
+++ b/image/consent_en/bn_back.png
--- a/image/consent_en/bp_back.png
+++ b/image/consent_en/bp_back.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -0,0 +1,6 @@
+normal_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+normal_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
+press_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+press_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
+disable_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+disable_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
--- a/image/event/powerup_free_1/insert_id_card.png
+++ b/image/event/powerup_free_1/insert_id_card.png
--- a/image/event/powerup_free_1/insert_id_card_en.png
+++ b/image/event/powerup_free_1/insert_id_card_en.png
--- a/image/event/powerup_free_1/powerup.png
+++ b/image/event/powerup_free_1/powerup.png
--- a/image/event/powerup_free_1/powerup_en.png
+++ b/image/event/powerup_free_1/powerup_en.png
--- a/image/event/powerup_free_1/powerup_error.png
+++ b/image/event/powerup_free_1/powerup_error.png
--- a/image/event/powerup_free_1/powerup_error_en.png
+++ b/image/event/powerup_free_1/powerup_error_en.png
--- a/image/event/powerup_free_1/powerup_policy.png
+++ b/image/event/powerup_free_1/powerup_policy.png
--- a/image/event/powerup_free_1/powerup_policy_en.png
+++ b/image/event/powerup_free_1/powerup_policy_en.png
--- a/image/event/powerup_free_1/powerup_quota_full.png
+++ b/image/event/powerup_free_1/powerup_quota_full.png
--- a/image/event/powerup_free_1/powerup_quota_full_en.png
+++ b/image/event/powerup_free_1/powerup_quota_full_en.png
--- a/image/topping2/bn_powerupFree.png
+++ b/image/topping2/bn_powerupFree.png
--- a/image/topping2/bp_powerupFree.png
+++ b/image/topping2/bp_powerupFree.png
--- a/image/topping2_en/bn_powerupFree.png
+++ b/image/topping2_en/bn_powerupFree.png
--- a/image/topping2_en/bp_powerupFree.png
+++ b/image/topping2_en/bp_powerupFree.png