Merge branch 'masterpiece' into sgp_blue
This commit is contained in:
commit
dcf94d4fc3
12 changed files with 73 additions and 56 deletions
|
|
@ -449,6 +449,7 @@
|
|||
DEBUGVAR Seeker
|
||||
If game_mode_enable = "true" Then
|
||||
|
||||
CheckApp "com.NDF.taobin" GameInstalled
|
||||
|
||||
DEBUGVAR GameInstalled
|
||||
|
||||
|
|
@ -721,14 +722,15 @@
|
|||
Var Timeout = Timeout + 1
|
||||
|
||||
If Timeout < 2 Then
|
||||
If Game01Enable = 0 Then
|
||||
If game_mode_enable = "true" Then
|
||||
If BREW_CNT > 75 Then
|
||||
SAVELOG "Button game enable from EventTimeout"
|
||||
Var Game01Enable = 1
|
||||
Var ButtonGameCountDownState = "Invisible"
|
||||
Var ButtonGamePressToPlayState = "Enable"
|
||||
|
||||
If GameInstalled = "true" Then
|
||||
If Game01Enable = 0 Then
|
||||
If game_mode_enable = "true" Then
|
||||
If BREW_CNT > 75 Then
|
||||
SAVELOG "Button game enable from EventTimeout"
|
||||
Var Game01Enable = 1
|
||||
Var ButtonGameCountDownState = "Invisible"
|
||||
Var ButtonGamePressToPlayState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -113,22 +113,14 @@
|
|||
Var text_x_add_oreo_price = 510
|
||||
Var text_show_normal_x = 408
|
||||
Var SugarZeroCalPrice_X = 540
|
||||
Else
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/topping2"
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||
Var showname = NameDrinkTH
|
||||
Var showdesc = DrinkDescriptionTH
|
||||
EndIf
|
||||
|
||||
Var text_show_thai = "Enable"
|
||||
Var text_show_eng = "Invisible"
|
||||
|
||||
Var topping_shot_price_x = 600
|
||||
Var text_x_add_oreo_price = 490
|
||||
Var text_show_normal_x = 386
|
||||
Var SugarZeroCalPrice_X = 482
|
||||
|
||||
If LanguageShow = "UAE_DUBAI" Then
|
||||
Var topping_shot_price_x = 630
|
||||
Var text_x_add_oreo_price = 620
|
||||
Var text_show_normal_x = 535
|
||||
Var text_milk_choice_price_x = 325
|
||||
Var SugarZeroCalPrice_X = 540
|
||||
EndIf
|
||||
|
||||
Var bg_strawlid = DirImage + "/bg_strawlid.png"
|
||||
|
|
@ -491,13 +483,14 @@
|
|||
If SugarSoundFlag = 1 Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If LanguageShow = "UAE_DUBAI" Then
|
||||
Var topping_shot_price_x = 630
|
||||
Var text_x_add_oreo_price = 600
|
||||
Var text_show_normal_x = 528
|
||||
Var text_milk_choice_price_x = 295
|
||||
Var text_x_add_oreo_price = 620
|
||||
Var text_show_normal_x = 535
|
||||
Var text_milk_choice_price_x = 325
|
||||
Var SugarZeroCalPrice_X = 540
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue