Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
fd2225caaf
179 changed files with 105204 additions and 26985 deletions
16956
xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
Normal file
16956
xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
Normal file
File diff suppressed because it is too large
Load diff
16956
xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
Normal file
16956
xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,28 @@
|
|||
[
|
||||
{
|
||||
"name": "apple_farm_festival",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "school_ovaltine",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
[
|
||||
{
|
||||
"name": "taiwanese_tea",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "school_ovaltine",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +1 @@
|
|||
/event/promotion_oreo_volcano.xml
|
||||
/event/promotion_taiwanese_tea.xml
|
||||
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Var BigButtonEnable = "Invisible"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
19174
xml/event/promotion_taiwanese_tea.xml
Normal file
19174
xml/event/promotion_taiwanese_tea.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -5,18 +5,9 @@
|
|||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename> ###normal_thai </Filename>
|
||||
<FilenamePress> ###normal_thai </FilenamePress>
|
||||
<FilenameDisable> ###normal_thai </FilenameDisable>
|
||||
<FilenamePress> ###press_thai </FilenamePress>
|
||||
<FilenameDisable> ###disable_thai </FilenameDisable>
|
||||
<EventOnClick>
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
###EventOnClick
|
||||
</EventOnClick>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4" </Filename>
|
||||
</Video>
|
||||
</Button>
|
||||
|
|
@ -5,9 +5,9 @@ DEBUGVAR CocktailShow
|
|||
DEBUGVAR OpenFromPageBoard
|
||||
|
||||
DEBUGVAR SchoolOvaltinePro
|
||||
DEBUGVAR OreoVolcanoPro
|
||||
DEBUGVAR AppleFarmFestivalPro
|
||||
DEBUGVAR HappyTriosPro
|
||||
DEBUGVAR TaiwaneseTeaPro
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
Var PromotionState2 = "Invisible"
|
||||
|
|
@ -31,26 +31,6 @@ Else
|
|||
|
||||
Else
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If OreoVolcanoPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_school_ovaltine_and_oreo_volcano.xml"
|
||||
EndIf
|
||||
Else
|
||||
If OreoVolcanoPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_volcano.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If AppleFarmFestivalPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
|
@ -59,11 +39,30 @@ Else
|
|||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_happy_trios.xml"
|
||||
EndIf
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml"
|
||||
EndIf
|
||||
Else
|
||||
If HappyTriosPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_happy_trios.xml"
|
||||
EndIf
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If TaiwaneseTeaPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_taiwanese_tea.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -80,9 +80,6 @@ Var BoostEnergyPro = 0
|
|||
; Matcha every day, 1 - 18 May
|
||||
Var MatchaEveryDayPro = 0
|
||||
|
||||
; School Ovaltine, 19 - 31 May
|
||||
Var SchoolOvaltinePro = 0
|
||||
|
||||
; Oreo volcano, 1 - 31 May
|
||||
Var OreoVolcanoPro = 0
|
||||
|
||||
|
|
@ -92,6 +89,12 @@ Var AppleFarmFestivalPro = 0
|
|||
; Happy Trios, 1 - 30 June
|
||||
Var HappyTriosPro = 0
|
||||
|
||||
; School Ovaltine, 15 - 30 June
|
||||
Var SchoolOvaltinePro = 0
|
||||
|
||||
; Taiwanese Tea, 16 - 30 June
|
||||
Var TaiwaneseTeaPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PaymentCodeShouldCollectPromotionPoint = 0
|
||||
|
||||
|
|
@ -156,8 +159,18 @@ If SystemDateMonthInt = 5 Then
|
|||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 6 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
Var HappyTriosPro = 1
|
||||
|
||||
If SystemDateDayInt <= 14 Then
|
||||
Var HappyTriosPro = 1
|
||||
Else
|
||||
Var SchoolOvaltinePro = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt <= 15 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
Else
|
||||
Var TaiwaneseTeaPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -202,7 +215,6 @@ EndIf
|
|||
|
||||
If BoxID = 123456 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR ConfigNumer
|
||||
|
|
@ -307,6 +319,12 @@ Else
|
|||
Var AppleFarmFestivalPro = 0
|
||||
EndIf
|
||||
|
||||
If TaiwanesePowderEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var TaiwaneseTeaPro = 0
|
||||
EndIf
|
||||
|
||||
Var CurrentMainVideoTemp = 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@
|
|||
|
||||
STRCONTAIN "1021" MaterialAvailable CaramelSyrupEnable
|
||||
STRCONTAIN "1218" MaterialAvailable AppleSyrupEnable
|
||||
STRCONTAIN "1044" MaterialAvailable TaiwanesePowderEnable
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
If AppFastEnable = "true" Then
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -561,8 +561,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Ms. Savage"
|
||||
Var NameDrinkTH = "ครูไหวใจร้าย"
|
||||
Var NameDrink = "Ovaltine Latte"
|
||||
Var NameDrinkTH = "โอวัลตินกาแฟ"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
|
||||
Var DrinkDescription = "Ovaltine Milk Coffee"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
|
||||
|
|
@ -635,7 +635,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "ครูไหวใจร้าย" </Value>
|
||||
<Value> "โอวัลตินกาแฟ" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -656,7 +656,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Ms. Savage" </Value>
|
||||
<Value> "Ovaltine Latte" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -810,8 +810,8 @@ Super Volcano" </Value>
|
|||
<Volume> SoundVolume </Volume>
|
||||
<OverlayImage> xmlpro( 12-21-03-0092, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Ms. Savage"
|
||||
Var NameDrinkTH = "ครูไหวใจร้าย"
|
||||
Var NameDrink = "Ovaltine Latte"
|
||||
Var NameDrinkTH = "โอวัลตินกาแฟ"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
|
||||
Var DrinkDescription = "Ovaltine Milk Coffee"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
|
||||
|
|
@ -884,7 +884,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "ครูไหวใจร้าย" </Value>
|
||||
<Value> "โอวัลตินกาแฟ" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -905,7 +905,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Ms. Savage" </Value>
|
||||
<Value> "Ovaltine Latte" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1060,8 +1060,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Hot Senior"
|
||||
Var NameDrinkTH = "รุ่นพี่โซฮ็อต"
|
||||
Var NameDrink = "Ovaltine Thai Milk Tea"
|
||||
Var NameDrinkTH = "โอวัลตินชาไทยนม"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม ชาไทย"
|
||||
Var DrinkDescription = "Ovaltine Milk Thai Tea"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_ThaiTea.png"
|
||||
|
|
@ -1134,7 +1134,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "รุ่นพี่โซฮ็อต" </Value>
|
||||
<Value> "โอวัลตินชาไทยนม" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1155,7 +1155,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Hot Senior" </Value>
|
||||
<Value> "Ovaltine Thai Milk Tea" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1311,8 +1311,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Gifted Geek"
|
||||
Var NameDrinkTH = "กิ๊ฟเต็ดสายเนิร์ด"
|
||||
Var NameDrink = "Ovaltine Matcha Latte"
|
||||
Var NameDrinkTH = "โอวัลตินมัทฉะลาเต้"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม มัทฉะ"
|
||||
Var DrinkDescription = "Ovaltine Milk Matcha"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Matcha.png"
|
||||
|
|
@ -1385,7 +1385,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "กิ๊ฟเต็ดสายเนิร์ด" </Value>
|
||||
<Value> "โอวัลตินมัทฉะลาเต้" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1406,7 +1406,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Gifted Geek" </Value>
|
||||
<Value> "Ovaltine Matcha Latte" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1562,8 +1562,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Back Row Gang"
|
||||
Var NameDrinkTH = "แก๊งเด็กหลังห้อง"
|
||||
Var NameDrink = "Ovaltine Taiwanese Milk Tea"
|
||||
Var NameDrinkTH = "โอวัลตินชานม"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม ชาไต้หวัน"
|
||||
Var DrinkDescription = "Ovaltine Milk Taiwanese Tea"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Taiwanese_Tea.png"
|
||||
|
|
@ -1636,7 +1636,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "แก๊งเด็กหลังห้อง" </Value>
|
||||
<Value> "โอวัลตินชานม" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1657,7 +1657,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Back Row Gang" </Value>
|
||||
<Value> "Ovaltine Taiwanese Milk Tea" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1813,8 +1813,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Hallway Gossiper"
|
||||
Var NameDrinkTH = "เจ่เจ้ขาเมาส์"
|
||||
Var NameDrink = "Ovaltine Jasmine Tea"
|
||||
Var NameDrinkTH = "โอวัลตินมะลิ"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม ชามะลิ"
|
||||
Var DrinkDescription = "Ovaltine Milk Jasmine Tea"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Jasmine.png"
|
||||
|
|
@ -1887,7 +1887,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "เจ่เจ้ขาเมาส์" </Value>
|
||||
<Value> "โอวัลตินมะลิ" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1908,7 +1908,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Hallway Gossiper" </Value>
|
||||
<Value> "Ovaltine Jasmine Tea" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2064,8 +2064,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Cool Class Prez"
|
||||
Var NameDrinkTH = "ประธานสุดคูล"
|
||||
Var NameDrink = "Ovaltine Salak"
|
||||
Var NameDrinkTH = "โอวัลตินน้ำแดง"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม สละ"
|
||||
Var DrinkDescription = "Ovaltine Milk Salak"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Salak.png"
|
||||
|
|
@ -2138,7 +2138,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "ประธานสุดคูล" </Value>
|
||||
<Value> "โอวัลตินน้ำแดง" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2159,7 +2159,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Cool Class Prez" </Value>
|
||||
<Value> "Ovaltine Salak" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2315,8 +2315,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Head Majorette"
|
||||
Var NameDrinkTH = "ดรัมเมเยอร์ไม้หนึ่ง"
|
||||
Var NameDrink = "Ovaltine Caramel"
|
||||
Var NameDrinkTH = "โอวัลตินคาราเมล"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม คาราเมล"
|
||||
Var DrinkDescription = "Ovaltine Milk Caramel"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Caramel.png"
|
||||
|
|
@ -2389,7 +2389,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "ดรัมเมเยอร์ไม้หนึ่ง" </Value>
|
||||
<Value> "โอวัลตินคาราเมล" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2410,7 +2410,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Head Majorette" </Value>
|
||||
<Value> "Ovaltine Caramel" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2566,8 +2566,8 @@ Super Volcano" </Value>
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "Sweet Freshie"
|
||||
Var NameDrinkTH = "รุ่นน้องหน้าหวาน"
|
||||
Var NameDrink = "Ovaltine Coconut"
|
||||
Var NameDrinkTH = "โอวัลตินมะพร้าว"
|
||||
Var DrinkDescriptionTH = "โอวัลติน นม มะพร้าว"
|
||||
Var DrinkDescription = "Ovaltine Milk Coconut"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Coconut.png"
|
||||
|
|
@ -2640,7 +2640,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "รุ่นน้องหน้าหวาน" </Value>
|
||||
<Value> "โอวัลตินมะพร้าว" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -2661,7 +2661,7 @@ Super Volcano" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Sweet Freshie" </Value>
|
||||
<Value> "Ovaltine Coconut" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
|
|||
36
xml/page_catalog_group_pro_taiwanese_tea.skt
Normal file
36
xml/page_catalog_group_pro_taiwanese_tea.skt
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<?hurr
|
||||
#include=menu_head.py
|
||||
?>
|
||||
|
||||
<Popup>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1920 </Height>
|
||||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
; On open
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
|
||||
</EventOpen>
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
|
||||
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen_v2.py
|
||||
?>
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen.py
|
||||
?>
|
||||
|
||||
|
||||
|
||||
</Popup>
|
||||
3626
xml/page_catalog_group_pro_taiwanese_tea.xml
Normal file
3626
xml/page_catalog_group_pro_taiwanese_tea.xml
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -16,7 +16,7 @@
|
|||
;EndIf
|
||||
|
||||
Var ErrorCause = ""
|
||||
Var MAX_EMA_CODE = 5
|
||||
Var MAX_UKB_CODE = 5
|
||||
|
||||
Var PreScaleCanculate = 100
|
||||
|
||||
|
|
@ -409,7 +409,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If EMAMemberID = "" Then
|
||||
If UKBMemberID = "" Then
|
||||
|
||||
Else
|
||||
Var CameraState = "Invisible"
|
||||
|
|
@ -445,7 +445,7 @@
|
|||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "UKB:2:"
|
||||
Var ECommerceQR = ECommerceQR + EMAMemberID
|
||||
Var ECommerceQR = ECommerceQR + UKBMemberID
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
|
|
@ -1455,7 +1455,7 @@
|
|||
|
||||
If textLen = MAX_EMA_CODE Then
|
||||
|
||||
Var EMAMemberID = scanmsg
|
||||
Var UKBMemberID = scanmsg
|
||||
|
||||
If Timeout < 120 Then
|
||||
If CoinInFlag = 0 Then
|
||||
|
|
@ -1486,7 +1486,7 @@
|
|||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "UKB:2:"
|
||||
Var ECommerceQR = ECommerceQR + EMAMemberID
|
||||
Var ECommerceQR = ECommerceQR + UKBMemberID
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
|
|
@ -1829,9 +1829,9 @@ EndIf
|
|||
<X> 328 </X>
|
||||
<Y> 1399 </Y>
|
||||
<State> PayWithUKBState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
@ -1851,7 +1851,7 @@ EndIf
|
|||
|
||||
Var scanresult = ""
|
||||
Var scanmsg = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
|
||||
If IsCardlessEnable = 1 Then
|
||||
CashlessReq OFF ""
|
||||
|
|
@ -1989,11 +1989,11 @@ EndIf
|
|||
<X> 398 </X>
|
||||
<Y> 1275 </Y>
|
||||
<State> EMAEnterNumberButtonState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable>
|
||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_staff_pass_number.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_staff_pass_number.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_staff_pass_number.png" </FilenameDisable>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
|
||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ukb.lxml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -2055,7 +2055,7 @@ EndIf
|
|||
|
||||
Var scanresult = ""
|
||||
Var scanmsg = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
INITSCANQR
|
||||
|
||||
Var CameraState = "Enable"
|
||||
|
|
@ -2091,7 +2091,7 @@ EndIf
|
|||
Var EMAEnterNumberButtonState = "Invisible"
|
||||
Var EMAPopupErrorState = "Invisible"
|
||||
Var QRCODE99 = ""
|
||||
Var EMAMemberID = ""
|
||||
Var UKBMemberID = ""
|
||||
|
||||
Var popup_cancel_button_y = 1345
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -21,6 +21,13 @@
|
|||
Var EnableTestCoinBank = "Invisible"
|
||||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var EnableCheckin = "Enable"
|
||||
Var EnableTestCoinBank = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
SAVELOG "VendingPreMain"
|
||||
|
||||
</EventOpen>
|
||||
|
|
@ -48,7 +55,7 @@
|
|||
DEBUGVAR tmpPassPhrase
|
||||
|
||||
__CMD "still-stay-on-pre-main" "-" "-" "-"
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
@ -128,7 +135,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 80 </Height>
|
||||
<State> EnableTestSystem </State>
|
||||
<State> EnableTestSystem </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename>
|
||||
|
|
@ -144,7 +151,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableServiceOp </State>
|
||||
<State> EnableServiceOp </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename>
|
||||
|
|
@ -160,7 +167,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableMaintenance </State>
|
||||
<State> EnableMaintenance </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename>
|
||||
|
|
@ -176,7 +183,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 560 </Width>
|
||||
<Height> 142 </Height>
|
||||
<State> EnableConfigureMachine </State>
|
||||
<State> EnableConfigureMachine </State>
|
||||
|
||||
<Button>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue