Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
wanlop run
commit
61f8db6445
1 changed files with 120 additions and 116 deletions
|
|
@ -1089,32 +1089,33 @@
|
|||
|
||||
Var offset_total = 0
|
||||
|
||||
If CustomOreoState = "Enable" Then
|
||||
Var offset_total = 72
|
||||
EndIf
|
||||
|
||||
Var ovaltine_offset = offset_total
|
||||
Var ovaltine_y = 1060
|
||||
Var ovaltine_button_y = 1070
|
||||
Var ovaltine_text_y = 1085
|
||||
|
||||
If CustomOvaltineState = "Enable" Then
|
||||
Var offset_total = offset_total + 72
|
||||
EndIf
|
||||
|
||||
Var oreo_offset = offset_total
|
||||
Var oreo_y = 1060 + oreo_offset
|
||||
Var oreo_button_y = 1070 + oreo_offset
|
||||
Var oreo_text_y = 1085 + oreo_offset
|
||||
|
||||
If CustomOreoState = "Enable" Then
|
||||
Var offset_total = offset_total + 72
|
||||
EndIf
|
||||
|
||||
Var cocoa_offset = offset_total
|
||||
Var cocoa_y = 1060 + cocoa_offset
|
||||
Var cocoa_button_y = 1070 + cocoa_offset
|
||||
Var cocoa_text_y = 1085 + cocoa_offset
|
||||
|
||||
If CustomCocoaState = "Enable" Then
|
||||
Var offset_total = offset_total + 72
|
||||
EndIf
|
||||
|
||||
Var bottom_offset = offset_total
|
||||
|
||||
Var ovaltine_y = 1060 + ovaltine_offset
|
||||
Var ovaltine_button_y = 1070 + ovaltine_offset
|
||||
Var ovaltine_text_y = 1085 + ovaltine_offset
|
||||
|
||||
Var cocoa_y = 1060 + cocoa_offset
|
||||
Var cocoa_button_y = 1070 + cocoa_offset
|
||||
Var cocoa_text_y = 1085 + cocoa_offset
|
||||
|
||||
Var bottom_y = 1060 + bottom_offset
|
||||
Var accept_y = 1075 + bottom_offset
|
||||
|
||||
|
|
@ -10641,6 +10642,110 @@
|
|||
</Image>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 240 </X>
|
||||
<Y> ovaltine_y </Y>
|
||||
<Width> 641 </Width>
|
||||
<Height> 72 </Height>
|
||||
<State> CustomOvaltineState </State>
|
||||
<Filename> Var( DirImage + "/topping_revamp/bg_top_ovaltine.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 800 </X>
|
||||
<Y> ovaltine_button_y </Y>
|
||||
<State> CustomOvaltineCheckState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG "Click ovaltine cb"
|
||||
If CustomOvaltineCheckState = "Press" Then
|
||||
Var CustomOvaltineCheckState = "Enable"
|
||||
If toppingID6index4 = 323 Then
|
||||
Var showOvaltineEnable = "Enable"
|
||||
EndIf
|
||||
Var SelectedToppingCount = SelectedToppingCount - 1
|
||||
Else
|
||||
If SelectedToppingCount < 2 Then
|
||||
Var CustomOvaltineCheckState = "Press"
|
||||
Var showOvaltineEnable = "Press"
|
||||
Var SelectedToppingCount = SelectedToppingCount + 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedToppingCount >= 2 Then
|
||||
If CustomOreoCheckState = "Press" Then
|
||||
Else
|
||||
If toppingID6index2Status = "" Then
|
||||
Var CustomOreoCheckState = "Invisible"
|
||||
Var showOreoAddEnable = "Invisible"
|
||||
EndIf
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var CustomOreoCheckState = "Disable"
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
If CustomCocoaCheckState = "Press" Then
|
||||
Else
|
||||
If toppingID6index3Status = "" Then
|
||||
Var CustomCocoaCheckState = "Invisible"
|
||||
Var showCocoaEnable = "Invisible"
|
||||
EndIf
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var CustomCocoaCheckState = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If CustomOreoCheckState = "Disable" Then
|
||||
If toppingID6index2 = 321 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var CustomOreoCheckState = "Enable"
|
||||
Var showOreoAddEnable = "Enable"
|
||||
Else
|
||||
Var CustomOreoCheckState = "Disable"
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
If CustomCocoaCheckState = "Disable" Then
|
||||
If toppingID6index3 = 322 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var CustomCocoaCheckState = "Enable"
|
||||
Var showCocoaEnable = "Enable"
|
||||
Else
|
||||
Var CustomCocoaCheckState = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Animation>
|
||||
<Style> "shake-text" </Style>
|
||||
<OnEvent> "OnValueChange" </OnEvent>
|
||||
</Animation>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> 750 </X>
|
||||
<Y> 1083 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> CustomOvaltineState </State>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> OvaltinePriceText </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 240 </X>
|
||||
<Y> oreo_y </Y>
|
||||
|
|
@ -10737,7 +10842,7 @@
|
|||
|
||||
<Text>
|
||||
<X> 750 </X>
|
||||
<Y> 1083 </Y>
|
||||
<Y> 1155 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> CustomOreoState </State>
|
||||
<Size> 16 </Size>
|
||||
|
|
@ -10746,109 +10851,8 @@
|
|||
</Text>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 240 </X>
|
||||
<Y> ovaltine_y </Y>
|
||||
<Width> 641 </Width>
|
||||
<Height> 72 </Height>
|
||||
<State> CustomOvaltineState </State>
|
||||
<Filename> Var( DirImage + "/topping_revamp/bg_top_ovaltine.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 800 </X>
|
||||
<Y> ovaltine_button_y </Y>
|
||||
<State> CustomOvaltineCheckState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG "Click ovaltine cb"
|
||||
If CustomOvaltineCheckState = "Press" Then
|
||||
Var CustomOvaltineCheckState = "Enable"
|
||||
If toppingID6index4 = 323 Then
|
||||
Var showOvaltineEnable = "Enable"
|
||||
EndIf
|
||||
Var SelectedToppingCount = SelectedToppingCount - 1
|
||||
Else
|
||||
If SelectedToppingCount < 2 Then
|
||||
Var CustomOvaltineCheckState = "Press"
|
||||
Var showOvaltineEnable = "Press"
|
||||
Var SelectedToppingCount = SelectedToppingCount + 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedToppingCount >= 2 Then
|
||||
If CustomOreoCheckState = "Press" Then
|
||||
Else
|
||||
If toppingID6index2Status = "" Then
|
||||
Var CustomOreoCheckState = "Invisible"
|
||||
Var showOreoAddEnable = "Invisible"
|
||||
EndIf
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var CustomOreoCheckState = "Disable"
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
If CustomCocoaCheckState = "Press" Then
|
||||
Else
|
||||
If toppingID6index3Status = "" Then
|
||||
Var CustomCocoaCheckState = "Invisible"
|
||||
Var showCocoaEnable = "Invisible"
|
||||
EndIf
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var CustomCocoaCheckState = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If CustomOreoCheckState = "Disable" Then
|
||||
If toppingID6index2 = 321 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var CustomOreoCheckState = "Enable"
|
||||
Var showOreoAddEnable = "Enable"
|
||||
Else
|
||||
Var CustomOreoCheckState = "Disable"
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
If CustomCocoaCheckState = "Disable" Then
|
||||
If toppingID6index3 = 322 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var CustomCocoaCheckState = "Enable"
|
||||
Var showCocoaEnable = "Enable"
|
||||
Else
|
||||
Var CustomCocoaCheckState = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Animation>
|
||||
<Style> "shake-text" </Style>
|
||||
<OnEvent> "OnValueChange" </OnEvent>
|
||||
</Animation>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> 750 </X>
|
||||
<Y> 1155 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> CustomOvaltineState </State>
|
||||
<Size> 16 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> OvaltinePriceText </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
<Image>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue