Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
73f6bb4a35
1 changed files with 27 additions and 11 deletions
|
|
@ -1147,7 +1147,15 @@
|
||||||
|
|
||||||
DEBUGVAR TOPPING3
|
DEBUGVAR TOPPING3
|
||||||
If TOPPING3 = "Collagen(mix)" Then
|
If TOPPING3 = "Collagen(mix)" Then
|
||||||
Var CollagenState = "Enable"
|
If CollagenState = "Enable" Then
|
||||||
|
|
||||||
|
Else
|
||||||
|
If CollagenState = "Press" Then
|
||||||
|
|
||||||
|
Else
|
||||||
|
Var CollagenState = "Enable"
|
||||||
|
EndIf
|
||||||
|
EndIf
|
||||||
Var ExtraTopping = "Enable"
|
Var ExtraTopping = "Enable"
|
||||||
Else
|
Else
|
||||||
Var CollagenState = "Invisible"
|
Var CollagenState = "Invisible"
|
||||||
|
|
@ -1155,15 +1163,17 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If JemilaToppingFlag = 1 Then
|
If JemilaToppingFlag = 1 Then
|
||||||
If CollagenState = "Enable" Then
|
If CollagenState = "Disable" Then
|
||||||
If JemilaToppingFreeFlag = 1 Then
|
|
||||||
Var CollagenToppingBg = "/bg_top_jemila_free.png"
|
Else
|
||||||
Var CollagenToppingPrice = 0
|
If JemilaToppingFreeFlag = 1 Then
|
||||||
Else
|
Var CollagenToppingBg = "/bg_top_jemila_free.png"
|
||||||
Var CollagenToppingBg = "/bg_top_jemila.png"
|
Var CollagenToppingPrice = 0
|
||||||
Var CollagenToppingPrice = 5
|
Else
|
||||||
EndIf
|
Var CollagenToppingBg = "/bg_top_jemila.png"
|
||||||
EndIf
|
Var CollagenToppingPrice = 5
|
||||||
|
EndIf
|
||||||
|
EndIf
|
||||||
Else
|
Else
|
||||||
Var CollagenState = "Invisible"
|
Var CollagenState = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
@ -1433,6 +1443,7 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Var CollagenState = "Disable"
|
Var CollagenState = "Disable"
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
; i f cold menu disable away
|
; i f cold menu disable away
|
||||||
|
|
@ -1444,11 +1455,16 @@
|
||||||
If showOreoAddEnable = "Press" Then
|
If showOreoAddEnable = "Press" Then
|
||||||
Var showOreoAddEnable = "Disable"
|
Var showOreoAddEnable = "Disable"
|
||||||
EndIf
|
EndIf
|
||||||
|
If CollagenState = "Disable" Then
|
||||||
|
Var CollagenState = "Enable"
|
||||||
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
; first time.
|
; first time.
|
||||||
If blend_button_state = "PressForever" Then
|
If blend_button_state = "PressForever" Then
|
||||||
|
If CollagenState = "Disable" Then
|
||||||
|
Var CollagenState = "Enable"
|
||||||
|
EndIf
|
||||||
Else
|
Else
|
||||||
If SubMenuGroupIDSlot6_1 = 300 Then
|
If SubMenuGroupIDSlot6_1 = 300 Then
|
||||||
Var showOreoAddEnable = "Disable"
|
Var showOreoAddEnable = "Disable"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue