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
|
||||
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"
|
||||
Else
|
||||
Var CollagenState = "Invisible"
|
||||
|
|
@ -1155,15 +1163,17 @@
|
|||
EndIf
|
||||
|
||||
If JemilaToppingFlag = 1 Then
|
||||
If CollagenState = "Enable" Then
|
||||
If JemilaToppingFreeFlag = 1 Then
|
||||
Var CollagenToppingBg = "/bg_top_jemila_free.png"
|
||||
Var CollagenToppingPrice = 0
|
||||
Else
|
||||
Var CollagenToppingBg = "/bg_top_jemila.png"
|
||||
Var CollagenToppingPrice = 5
|
||||
EndIf
|
||||
EndIf
|
||||
If CollagenState = "Disable" Then
|
||||
|
||||
Else
|
||||
If JemilaToppingFreeFlag = 1 Then
|
||||
Var CollagenToppingBg = "/bg_top_jemila_free.png"
|
||||
Var CollagenToppingPrice = 0
|
||||
Else
|
||||
Var CollagenToppingBg = "/bg_top_jemila.png"
|
||||
Var CollagenToppingPrice = 5
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var CollagenState = "Invisible"
|
||||
EndIf
|
||||
|
|
@ -1433,6 +1443,7 @@
|
|||
EndIf
|
||||
|
||||
Var CollagenState = "Disable"
|
||||
|
||||
EndIf
|
||||
|
||||
; i f cold menu disable away
|
||||
|
|
@ -1444,11 +1455,16 @@
|
|||
If showOreoAddEnable = "Press" Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
If CollagenState = "Disable" Then
|
||||
Var CollagenState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; first time.
|
||||
If blend_button_state = "PressForever" Then
|
||||
|
||||
If CollagenState = "Disable" Then
|
||||
Var CollagenState = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
If SubMenuGroupIDSlot6_1 = 300 Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue