Merge branch 'master' of kong:/1TBHDD/ikong/taobin_project

This commit is contained in:
kenta-work 2023-09-28 11:08:53 +07:00
commit 3101ea5c89
17 changed files with 104 additions and 19 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 703 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 710 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 715 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,011 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View file

@ -34,6 +34,16 @@
DEBUGVAR CoffinBtnDir
</EventOpen>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
; background
<Image>
<X> 0 </X>
@ -68,22 +78,79 @@
</EventClick>
</Button>
<Image>
<X> 373 </X>
; Thai menu
<Image>
<X> 373 </X>
<Y> 444 </Y>
<Width> 334 </Width>
<Height> 75 </Height>
<Filename> "ROOT/taobin_project/image/event/pepween/let_ghost_show_u.png" </Filename>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
</Image>
<Image>
<X> 79 </X>
<Y> 526 </Y>
<Width> 923 </Width>
<Height> 67 </Height>
<Filename> "ROOT/taobin_project/image/event/pepween/choose_your_ghost.png" </Filename>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
</Image>
; Eng menu
<Image>
<X> 334 </X>
<Y> 444 </Y>
<Width> 334 </Width>
<Width> 412 </Width>
<Height> 75 </Height>
<Filename> "ROOT/taobin_project/image/event/pepween/let_ghost_show_u.png" </Filename>
<Filename> "ROOT/taobin_project/image/event/pepween/let_ghost_show_u_en.png" </Filename>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
</Image>
<Image>
<X> 79 </X>
<Y> 526 </Y>
<Width> 923 </Width>
<Height> 67 </Height>
<Filename> "ROOT/taobin_project/image/event/pepween/choose_your_ghost.png" </Filename>
<X> 37 </X>
<Y> 532 </Y>
<Width> 1007 </Width>
<Height> 54 </Height>
<Filename> "ROOT/taobin_project/image/event/pepween/choose_your_ghost_en.png" </Filename>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
</Image>
; Button top left - Caroline
<Button>
<X> 25 </X>

View file

@ -9223,9 +9223,10 @@ LIMENADE SODA" </Value>
Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
; test random page
Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
</EventOnClick>

View file

@ -1,3 +1,6 @@
DEBUGVAR NetworkStatus
DEBUGVAR SELLONLINE
DEBUGVAR PayOfflineMode
; zone promote
If OpenFromPageBoard = 1 Then
@ -13,11 +16,27 @@ If OpenFromPageBoard = 1 Then
EndIf
Else
If ProPepweenEnable = 1 Then
If PepweenEnable = 1 Then
; Temporary debug
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
;If NetworkStatus = "DEACTIVE" Then
; Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
;Else
; If NetworkStatus = "DOWN" Then
; Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
;
; Else
; Var BigButtonEnable = "Enable"
; Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
; EndIf
;EndIf
Else

View file

@ -33,7 +33,7 @@ Var MomDayEnable = 0
Var GameEnableFromTrickerEv = 0
; Enable pro Pepween
Var PepweenEnable = 0
Var PepweenEnable = 1
; Enable pro Tamatian. 16-30 Sep
Var TamatianEnable = 0
@ -41,8 +41,6 @@ Var TamatianEnable = 0
; September 9 - 16
Var MayDayRunEnable = 0
; Pro Pepween 16 - 31 Oct
Var ProPepweenEnable = 0
If SystemDateMonthInt = 9 Then
If SystemDateDayInt > 5 Then
@ -79,15 +77,15 @@ If SystemDateMonthInt = 10 Then
If SystemDateDayInt > 15 Then
Var ProPepweenEnable = 1
Var PepweenEnable = 1
EndIf
EndIf
DEBUGVAR ProPepweenEnable
DEBUGVAR PepweenEnable
If SystemDateMonthInt = 11 Then
Var ProPepweenEnable = 0
Var PepweenEnable = 0
EndIf
@ -201,7 +199,7 @@ If InternationalEnable = 1 Then
Var PepsiPromoteVideo = 0
Var PepsiProCodeEnable = 0
Var MysteryProEnable = 0
Var ProPepweenEnable = 0
Var PepweenEnable = 0
EndIf