Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

This commit is contained in:
miggaze 2021-09-24 12:17:06 +07:00
commit 5a2e4957cf
117 changed files with 621 additions and 448 deletions

View file

@ -68,14 +68,11 @@
; 1035 is Coke.
STRCONTAIN "1035" MaterialAvailable CokeUI
If CokeUI = "true" Then
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
Else
Var bnSodaAndOther = DirImage + "/bn_soda.png"
Var bpSodaAndOther = DirImage + "/bp_soda.png"
EndIf
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
Var countClick = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -315,8 +312,12 @@
DEBUGVAR countClick
If countClick = 5 Then
Var countClick = 0
Open "ROOT/taobin_project/xml/page_tel_number_mask.xml"
If ToppingNewEnable = "false" Then
Var ToppingNewEnable = "true"
Else
Var ToppingNewEnable = "false"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
Refresh

View file

@ -22,6 +22,7 @@
product_code.append('12-03-02-0005')
#product_code.append('12-03-02-0002')
product_code.append('12-03-02-0007')
product_code.append('12-03-03-0009')
menu_count = len( product_code)
?>

View file

@ -1377,6 +1377,99 @@
<State> showengText </State>
<Value> $12-03-02-0007.descriptionE </Value>
</Text>
</Block>
; button i=13 12-03-03-0009
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> $12-03-03-0009.Button </State>
<Button>
<State> $12-03-03-0009.Button </State>
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-03-0009.image ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-03-0009.image ) " </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-03-0009.image ) " </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var SelectDrink = $12-03-03-0009.Self
Var NameDrink = $12-03-03-0009.NameE
Var NameDrinkTH = $12-03-03-0009.Name
Var DrinkDescriptionTH = $12-03-03-0009.description
Var DrinkDescription = $12-03-03-0009.descriptionE
Var PriceDrink = $12-03-03-0009.Price
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-03-0009.image
Topping "Load" SelectDrink
SAVELOG NameDrink
Var PriceShowValue = charOfBaht + PriceDrink
Var OpenFromXML = CurrentXMLFileName2
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
</EventOnClick>
</Button>
<Text>
<X> 182 </X>
<Y> 12 </Y>
<State> ShowPrice </State>
<Align> "Hurr" </Align>
<Width>150</Width>
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> $12-03-03-0009.Price </Value>
</Text>
<Text>
<X> 164 </X>
<Y> 12 </Y>
<State> ShowPrice </State>
<Width>20</Width>
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "฿"" </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 190 </Y>
<Size> 24 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> $12-03-03-0009.Name </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 246 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> $12-03-03-0009.description </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 190 </Y>
<Size> 22 </Size>
<Width>220</Width>
<Mode> "multi2" </Mode>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> $12-03-03-0009.NameE </Value>
</Text>
<Text>
<X> 16 </X>
<Y> 246 </Y>
<Size> 14 </Size>
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> $12-03-03-0009.descriptionE </Value>
</Text>
</Block>
</FrameScroll>

View file

@ -65,6 +65,8 @@
StopLongPlay
Var show_eng = "false"
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>

View file

@ -15,6 +15,7 @@
;SAVELOG topping1
;SAVELOG topping2
;SAVELOG topping3
DEBUGVAR SelectDrink
DEBUGVAR video_menu_0

View file

@ -6,7 +6,13 @@
<Volume> SoundVolume </Volume>
<EventOpen>
Var y_topping_bg = 912
If ToppingNewEnable = "false" Then
Else
Open "ROOT/taobin_project/xml/page_topping_select2.xml"
EndIf
DEBUGVAR video_menu_0
Var DisableUsingCode = "false"

File diff suppressed because it is too large Load diff

View file

@ -59,17 +59,18 @@
<Button>
<Image>
<X> 870 </X>
<Y> 0 </Y>
<Width> 200 </Width>
<Height> 200 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClickLong>
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
</EventClick>
</EventClickLong>
</Image>
</Page>

View file

@ -387,7 +387,7 @@
<Button>
<X> 431 </X<name />
<X> 431 </X>
<Y> 805 </Y>
<Filename> "ROOT/taobin_project/image//bp_cancel.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/bp_cancel.png" </FilenamePress>

View file

@ -33,17 +33,21 @@
<Button>
<Image>
<X> 870 </X>
<Y> 0 </Y>
<Width> 200 </Width>
<Height> 200 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClickLong>
;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
</EventClickLong>
<EventClick>
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
</EventClick>
</Image>
</Page>