Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
3b7213eefc
211 changed files with 54939 additions and 9621 deletions
|
|
@ -436,6 +436,12 @@
|
|||
If PromotionIDCurrentOrder = 2 Then
|
||||
SAVELOG "Promotion: Oreo Get 1 Free 1"
|
||||
EndIf
|
||||
|
||||
If FromCoffeeDrink1BathPro = 1 Then
|
||||
SAVELOG "From Coffee Drink 1 Bath pro"
|
||||
Var PromotionIDCurrentOrder = 3
|
||||
EndIf
|
||||
|
||||
DEBUGVAR PromotionIDCurrentOrder
|
||||
|
||||
Var CoundDownStillOnPage = 240
|
||||
|
|
@ -646,13 +652,6 @@
|
|||
<Value> showdesc </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<State> StageShowAlias</State>
|
||||
<X> 144 </X>
|
||||
<Y> 413 </Y>
|
||||
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
<GIF>
|
||||
<X> 493 </X>
|
||||
<Y> 968 </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue