diff --git a/image/bn_back_to_school.png b/image/bn_back_to_school.png deleted file mode 100644 index 738cf83c..00000000 Binary files a/image/bn_back_to_school.png and /dev/null differ diff --git a/image/bn_back_to_school_en.png b/image/bn_back_to_school_en.png deleted file mode 100644 index 29072d50..00000000 Binary files a/image/bn_back_to_school_en.png and /dev/null differ diff --git a/image/bn_oreo_buy2_save_move.png b/image/bn_oreo_buy2_save_move.png deleted file mode 100644 index 8625b7c7..00000000 Binary files a/image/bn_oreo_buy2_save_move.png and /dev/null differ diff --git a/image/bn_oreo_buy2_save_move_en.png b/image/bn_oreo_buy2_save_move_en.png deleted file mode 100644 index 72e6ae74..00000000 Binary files a/image/bn_oreo_buy2_save_move_en.png and /dev/null differ diff --git a/image/event/bn_back_to_school.png b/image/event/bn_back_to_school.png index 49ae9cf6..738cf83c 100644 Binary files a/image/event/bn_back_to_school.png and b/image/event/bn_back_to_school.png differ diff --git a/image/event/bn_back_to_school_en.png b/image/event/bn_back_to_school_en.png index 774c0052..29072d50 100644 Binary files a/image/event/bn_back_to_school_en.png and b/image/event/bn_back_to_school_en.png differ diff --git a/image/event/bn_back_to_school_limit.png b/image/event/bn_back_to_school_limit.png new file mode 100644 index 00000000..34f1063d Binary files /dev/null and b/image/event/bn_back_to_school_limit.png differ diff --git a/image/event/bn_back_to_school_limit_en.png b/image/event/bn_back_to_school_limit_en.png new file mode 100644 index 00000000..9d16274d Binary files /dev/null and b/image/event/bn_back_to_school_limit_en.png differ diff --git a/image/event/bn_oreo_buy2_save_move.png b/image/event/bn_oreo_buy2_save_move.png index eb5bd249..dc35d29f 100644 Binary files a/image/event/bn_oreo_buy2_save_move.png and b/image/event/bn_oreo_buy2_save_move.png differ diff --git a/image/event/bn_oreo_buy2_save_move_en.png b/image/event/bn_oreo_buy2_save_move_en.png index 471d1fd5..2b1df028 100644 Binary files a/image/event/bn_oreo_buy2_save_move_en.png and b/image/event/bn_oreo_buy2_save_move_en.png differ diff --git a/xml/event/big_logo_back_to_school.inc b/xml/event/big_logo_back_to_school.inc index 684fbce6..cb220627 100644 --- a/xml/event/big_logo_back_to_school.inc +++ b/xml/event/big_logo_back_to_school.inc @@ -6,33 +6,54 @@ eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + EndIf EndIf ) eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png" + EndIf EndIf ) eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + EndIf EndIf ) @@ -90,7 +111,11 @@ Var SelectDrinkType = 0 Var BackToSchoolForFreeEnable = 1 - Open "ROOT/taobin_project/xml/page_topping_select6.xml" + If OreoForFreeLimit = "true" Then + + Else + Open "ROOT/taobin_project/xml/page_topping_select6.xml" + EndIf diff --git a/xml/event/page_recommend_backToSchool.xml b/xml/event/page_recommend_backToSchool.xml index c669ae20..0e22e2fa 100644 --- a/xml/event/page_recommend_backToSchool.xml +++ b/xml/event/page_recommend_backToSchool.xml @@ -8920,33 +8920,54 @@ LIMENADE SODA" eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + EndIf EndIf ) eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bp_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png" + EndIf EndIf ) eval( If show_eng = "true" Then - - Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit_en.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png" + EndIf Else - Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + If OreoForFreeLimit = "true" Then + Var return = "ROOT/taobin_project/image/event/bn_back_to_school_limit.png" + Else + Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png" + EndIf EndIf ) @@ -9004,7 +9025,11 @@ LIMENADE SODA" Var SelectDrinkType = 0 Var BackToSchoolForFreeEnable = 1 - Open "ROOT/taobin_project/xml/page_topping_select6.xml" + If OreoForFreeLimit = "true" Then + + Else + Open "ROOT/taobin_project/xml/page_topping_select6.xml" + EndIf diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 89492b22..e7f24ec5 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -50,34 +50,28 @@ If SystemDateMonthInt = 5 Then EndIf EndIf -If OreoDueEnable = 0 Then - Var $12-03-03-0009-alter.Button = "Invisible" -Else - Var $12-03-03-0009-alter.Button = "Enable" - -EndIf If BoxID = 172644 Then - Var OreoDueEnable = 1 + Var OreoDueEnable = 0 + Var OreoForFreeEnable = 1 EndIf If BoxID = 172527 Then Var OreoDueEnable = 1 EndIf + If BoxID = 173149 Then Var OreoForFreeEnable = 1 EndIf +Var OreoForFreeLimit = "" +READ_FILE "/mnt/sdcard/oreo_for_free_limit" OreoForFreeLimit + +Var OreoForFreeLimit = "true" Var SoundBackToSchoolEnable = 1 - +DEBUGVAR OreoForFreeLimit DEBUGVAR OreoDueEnable DEBUGVAR OreoForFreeEnable -;Var $12-03-03-0009-alter.Price = 70 -;Var $12-03-03-0009-alter.NameE = $12-03-03-0009.NameE -;Var $12-03-03-0009-alter.descriptionE = $12-03-03-0009.descriptionE -;Var $12-03-03-0009-alter.Name = $12-03-03-0009.Name -;Var $12-03-03-0009-alter.description = $12-03-03-0009.description - diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 85c44554..7bbc0d1e 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -475,7 +475,7 @@ EndIf Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav" EndIf - + Play PlaySoundLag EndIf EndIf @@ -1151,16 +1151,18 @@ Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - If SoundThaiIndex = 1 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/select_level.wav" + ; Play Sound #zone + If SoundBackToSchoolEnable = 1 Then + + If SoundBackToSchoolType = 1 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" + EndIf + If SoundBackToSchoolType = 2 Then + Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" + EndIf + Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav" EndIf - If SoundThaiIndex = 2 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/select_level.wav" - EndIf - If SoundThaiIndex = 3 Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/select_level.wav" - EndIf - + Play PlaySoundLag EndIf EndIf diff --git a/xml/vending_info.xml b/xml/vending_info.xml index b7a6f4b5..18b8f300 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -681,7 +681,7 @@ SAVELOG IDFullNameEng - +; /mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/