THAI INTER: MultiProcess, Change langs, script_thank, Fix machine unknow stage, topping with new textSpan, Add Image
This commit is contained in:
parent
3c994e2ed1
commit
a92068fb72
9 changed files with 162 additions and 242 deletions
|
|
@ -583,17 +583,10 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
;Var StringToppingOatMilkWithPrice = ""
|
||||
Var StringToppingOreoWithPrice = ""
|
||||
Var StringCoffeeLevelWithPrice0 = ""
|
||||
Var StringCoffeeLevelWithPrice1 = ""
|
||||
Var StringCoffeeLevelWithPrice2 = ""
|
||||
Var StringCoffeeLevelWithPrice3 = ""
|
||||
;Var StringToppingShotWithPrice = ""
|
||||
|
||||
DEBUGVAR SugarNormalCheck
|
||||
DEBUGVAR SugarZeroCalCheck
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
;test
|
||||
;Var SugarZeroCalOption = "Enable"
|
||||
|
||||
|
||||
</EventOpen>
|
||||
|
|
@ -1104,7 +1097,6 @@
|
|||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var show_eng = "true"
|
||||
DEBUGVAR show_eng
|
||||
Var topping_shot_price_x = 630
|
||||
Var text_x_add_oreo_price = 430
|
||||
Var text_show_normal_x = 568
|
||||
|
|
@ -1114,7 +1106,6 @@
|
|||
Var Text_SugarNormalPrice_Y = 80
|
||||
Var text_cancel_xc = 5
|
||||
Var text_cancel_yc = 30
|
||||
Var show_eng = "true"
|
||||
Var OatMilkPrice_X = 210
|
||||
If show_name_len > 24 Then
|
||||
Var showname = showname + "###size=54"
|
||||
|
|
@ -1128,30 +1119,6 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
|
||||
;DEBUGVAR StringToppingOatMilkWithPrice
|
||||
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
;DEBUGVAR StringToppingOatMilkWithPrice
|
||||
|
||||
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
|
||||
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
|
||||
|
||||
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
|
||||
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
|
||||
|
||||
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
|
||||
|
||||
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
|
||||
|
||||
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
|
||||
|
||||
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
|
||||
|
||||
|
||||
;Var showname = aliasName[LanguageShowByIndex]
|
||||
;Var showdesc = aliasName[LanguageShowByIndex]
|
||||
|
||||
|
|
@ -4277,24 +4244,15 @@
|
|||
<Text>
|
||||
<X> 95 </X>
|
||||
<Y> Text_SugarNormalPrice_Y </Y>
|
||||
<Width> 100 </Width>
|
||||
<Width> 200 </Width>
|
||||
<Height> 72 </Height>
|
||||
<Language>
|
||||
<ID> 000068 </ID>
|
||||
<SubValue> "(Free)" </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 171 </X>
|
||||
<Y> 75 </Y>
|
||||
<Width> 100 </Width>
|
||||
<Height> 34 </Height>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> "(Free)" </Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> Text_SugarZeroCalPrice_X </X>
|
||||
<Y> 77 </Y>
|
||||
|
|
@ -4302,19 +4260,12 @@
|
|||
<Height> 120 </Height>
|
||||
<Language>
|
||||
<ID> 000069 </ID>
|
||||
<SubValue> SugarZeroCalPriceStr </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> SugarZeroCalPrice_X </X>
|
||||
<Y> 75 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> SugarZeroCalPriceStr </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
; sugar1
|
||||
<Button>
|
||||
|
|
@ -5015,58 +4966,31 @@
|
|||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> 92 </X>
|
||||
<Y> 55 </Y>
|
||||
<Width> 150 </Width>
|
||||
<Height> 34 </Height>
|
||||
<X> 95 </X>
|
||||
<Y> Text_SugarNormalPrice_Y </Y>
|
||||
<Width> 200 </Width>
|
||||
<Height> 72 </Height>
|
||||
<Language>
|
||||
<ID> 000105 </ID>
|
||||
<ID> 000068 </ID>
|
||||
<SubValue> "(Free)" </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 171 </X>
|
||||
<Y> 55 </Y>
|
||||
<Width> 100 </Width>
|
||||
<Height> 34 </Height>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> "(Free)" </Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 357 </X>
|
||||
<Y> 69 </Y>
|
||||
<Width> 250 </Width>
|
||||
<Height> 34 </Height>
|
||||
<Language>
|
||||
<ID> 000106 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 357 </X>
|
||||
<Y> 96 </Y>
|
||||
<X> Text_SugarZeroCalPrice_X </X>
|
||||
<Y> 77 </Y>
|
||||
<Width> 600 </Width>
|
||||
<Height> 21 </Height>
|
||||
<Height> 120 </Height>
|
||||
<Language>
|
||||
<ID> 000107 </ID>
|
||||
<ID> 000069 </ID>
|
||||
<SubValue> SugarZeroCalPriceStr </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
|
||||
<Text>
|
||||
<X> SugarZeroCalPrice_X </X>
|
||||
<Y> 67 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> SugarZeroCalPriceStr </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
; sugar1
|
||||
<Button>
|
||||
<X> 149 </X>
|
||||
|
|
@ -5440,58 +5364,31 @@
|
|||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> 92 </X>
|
||||
<Y> 55 </Y>
|
||||
<Width> 150 </Width>
|
||||
<Height> 34 </Height>
|
||||
<X> 95 </X>
|
||||
<Y> Text_SugarNormalPrice_Y </Y>
|
||||
<Width> 200 </Width>
|
||||
<Height> 72 </Height>
|
||||
<Language>
|
||||
<ID> 000105 </ID>
|
||||
<ID> 000068 </ID>
|
||||
<SubValue> "(Free)" </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 171 </X>
|
||||
<Y> 55 </Y>
|
||||
<Width> 100 </Width>
|
||||
<Height> 34 </Height>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> "(Free)" </Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 357 </X>
|
||||
<Y> 69 </Y>
|
||||
<Width> 250 </Width>
|
||||
<Height> 34 </Height>
|
||||
<Language>
|
||||
<ID> 000106 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 357 </X>
|
||||
<Y> 96 </Y>
|
||||
<X> Text_SugarZeroCalPrice_X </X>
|
||||
<Y> 77 </Y>
|
||||
<Width> 600 </Width>
|
||||
<Height> 21 </Height>
|
||||
<Height> 120 </Height>
|
||||
<Language>
|
||||
<ID> 000107 </ID>
|
||||
<ID> 000069 </ID>
|
||||
<SubValue> SugarZeroCalPriceStr </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
|
||||
<Text>
|
||||
<X> SugarZeroCalPrice_X </X>
|
||||
<Y> 67 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> SugarZeroCalPriceStr </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
; sugar1
|
||||
<Button>
|
||||
<X> 149 </X>
|
||||
|
|
@ -6062,19 +5959,21 @@
|
|||
<Height> 65 </Height>
|
||||
<Language>
|
||||
<ID> 000113 </ID>
|
||||
;<SubValue> OatMilkPrice </SubValue>
|
||||
<SubValue> OatMilkPrice </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> OatMilkPrice_X </X>
|
||||
<Y> 77 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 28 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> OatMilkPrice </Value>
|
||||
</Text>
|
||||
;<Text>
|
||||
;<X> OatMilkPrice_X </X>
|
||||
;<Y> 77 </Y>
|
||||
;<Font> KanitRegularTTF </Font>
|
||||
;<State> "Enable" </State>
|
||||
;<Size> 28 </Size>
|
||||
;<Color> 0x84776F </Color>
|
||||
;<Value> OatMilkPrice </Value>
|
||||
;</Text>
|
||||
|
||||
</Block>
|
||||
;
|
||||
|
|
@ -6159,6 +6058,8 @@
|
|||
<Y> 4 </Y>
|
||||
<Language>
|
||||
<ID> 000102 </ID>
|
||||
<SubValue> Var(" " + text_price_topping) </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
<Width> 800 </Width>
|
||||
<Height> 65 </Height>
|
||||
|
|
@ -6217,15 +6118,15 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> topping_shot_price_x </X>
|
||||
<Y> 2 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "ShotCoffeePremium"</State>
|
||||
<Size> 36 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> text_price_topping </Value>
|
||||
</Text>
|
||||
;<Text>
|
||||
;<X> topping_shot_price_x </X>
|
||||
;<Y> 2 </Y>
|
||||
;<Font> KanitRegularTTF </Font>
|
||||
;<State> "ShotCoffeePremium"</State>
|
||||
;<Size> 36 </Size>
|
||||
;<Color> 0x84776F </Color>
|
||||
;<Value> text_price_topping </Value>
|
||||
;</Text>
|
||||
|
||||
</Row1>
|
||||
|
||||
|
|
@ -6249,6 +6150,8 @@
|
|||
<Y> 4 </Y>
|
||||
<Language>
|
||||
<ID> 000100 </ID>
|
||||
<SubValue> Var(" " + text_shot_normal_add) </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
<Width> 800 </Width>
|
||||
<Height> 65 </Height>
|
||||
|
|
@ -6347,15 +6250,15 @@
|
|||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> text_show_normal_x </X>
|
||||
<Y> 4 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 36 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> text_shot_normal_add </Value>
|
||||
</Text>
|
||||
;<Text>
|
||||
;<X> text_show_normal_x </X>
|
||||
;<Y> 4 </Y>
|
||||
;<Font> KanitRegularTTF </Font>
|
||||
;<State> "Enable" </State>
|
||||
;<Size> 36 </Size>
|
||||
;<Color> 0x84776F </Color>
|
||||
;<Value> text_shot_normal_add </Value>
|
||||
;</Text>
|
||||
|
||||
|
||||
|
||||
|
|
@ -6383,7 +6286,7 @@
|
|||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bn_add_oreo.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_oreo.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_oreo.png" ) </FilenameDisable>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_oreo.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -6463,11 +6366,12 @@
|
|||
<Text>
|
||||
<X> 120 </X>
|
||||
<Y> 12 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 36 </Size>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Value> StringToppingOreoWithPrice </Value>
|
||||
<Language>
|
||||
<ID> 000101 </ID>
|
||||
<SubValue> text_price_6 </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 36 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
|
||||
|
|
@ -7043,10 +6947,11 @@
|
|||
<X> custom_coffee_level_medium_text_x </X>
|
||||
<Y> CustomCoffeeTextY </Y>
|
||||
<State> showCoffeeLevel </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Value> StringCoffeeLevelWithPrice0 </Value>
|
||||
<Language>
|
||||
<ID> 000108 </ID>
|
||||
<SubValue> CustomCoffeeLevelAdditionalPrice[0] </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
;<Text>
|
||||
|
|
@ -7062,10 +6967,11 @@
|
|||
<X> 676 </X>
|
||||
<Y> CustomCoffeeTextY </Y>
|
||||
<State> showCoffeeLevel </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Value> StringCoffeeLevelWithPrice1 </Value>
|
||||
<Language>
|
||||
<ID> 000109 </ID>
|
||||
<SubValue> CustomCoffeeLevelAdditionalPrice[1] </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
;<Text>
|
||||
|
|
@ -7081,10 +6987,12 @@
|
|||
<X> custom_coffee_level_dark_text_x </X>
|
||||
<Y> CustomCoffeeTextY </Y>
|
||||
<State> showCoffeeLevel </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Value> StringCoffeeLevelWithPrice2 </Value>
|
||||
<Language>
|
||||
<ID> 000110 </ID>
|
||||
<SubValue> CustomCoffeeLevelAdditionalPrice[2] </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
;<Text>
|
||||
|
|
@ -7100,10 +7008,12 @@
|
|||
<X> custom_coffee_level_darker_text_x </X>
|
||||
<Y> CustomCoffeeTextY </Y>
|
||||
<State> showCoffeeLevel </State>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Value> StringCoffeeLevelWithPrice3 </Value>
|
||||
<Language>
|
||||
<ID> 000111 </ID>
|
||||
<SubValue> CustomCoffeeLevelAdditionalPrice[3] </SubValue>
|
||||
<SubColor> 0x84776F </SubColor>
|
||||
;<SubSize> 28 </SubSize>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
|
||||
|
|
@ -8795,40 +8705,6 @@
|
|||
Var SugarZeroCalCheck = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If OatMilkEnable = "Enable" Then
|
||||
DEBUGVAR LanguageShowByIndex
|
||||
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
DEBUGVAR StringToppingOatMilkWithPrice
|
||||
EndIf
|
||||
|
||||
If showOreoAddEnable = "Enable" Then
|
||||
DEBUGVAR LanguageShowByIndex
|
||||
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
|
||||
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
|
||||
DEBUGVAR StringToppingOreoWithPrice
|
||||
EndIf
|
||||
|
||||
If ShotCoffeePremium = "Enable" Then
|
||||
Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
|
||||
Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
|
||||
EndIf
|
||||
|
||||
If showCoffeeLevel = "Enable" Then
|
||||
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
|
||||
|
||||
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
|
||||
|
||||
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
|
||||
|
||||
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
|
||||
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
|
||||
EndIf
|
||||
|
||||
|
||||
BackslashNToEnter showname
|
||||
BackslashNToEnter showdesc
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue