Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
f85e2eeacf
46 changed files with 14044 additions and 5697 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -27,6 +27,8 @@
|
|||
EndIf
|
||||
|
||||
Var Seeker.IsLineMember = 0
|
||||
Var LipMaskOutofStock = 0
|
||||
Var TintMeOutofStock = 0
|
||||
|
||||
If PayOfflineMode = 1 Then
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
|
|
@ -90,6 +92,18 @@
|
|||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var TNumberTaobinMemberXXX = TelephoneNumber
|
||||
Var Seeker.IsAlreadyGetReward = Ext1c
|
||||
Var LipMaskOutofStock = Ext1d
|
||||
Var TintMeOutofStock = Ext1e
|
||||
|
||||
|
||||
;DEBUG
|
||||
;Var LipMaskOutofStock = 1
|
||||
;Var TintMeOutofStock = 1
|
||||
|
||||
|
||||
DEBUGVAR LipMaskOutofStock
|
||||
DEBUGVAR TintMeOutofStock
|
||||
|
||||
If TaobinName = "" Then
|
||||
Var Seeker.IsLineMember = 0
|
||||
Else
|
||||
|
|
@ -131,6 +145,27 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If LipMaskOutofStock = 1 Then
|
||||
If TintMeOutofStock = 1 Then
|
||||
SAVELOG "All reward out of stock skip to normal collect point."
|
||||
|
||||
WRITE_FILE "/mnt/sdcard/lipit_reward_out_of_stock" "1"
|
||||
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
If Seeker.CollectPointMain = 1 Then
|
||||
GETACCEXT Param1 23
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
GETACCEXT Param1 23
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumberX
|
||||
|
|
|
|||
|
|
@ -163,6 +163,15 @@
|
|||
Var var3 = "X"
|
||||
|
||||
Var randResultStr = rewardList[randResultInt]
|
||||
|
||||
If LipMaskOutofStock = 1 Then
|
||||
Var randResultStr = "tint_me_healthy_balm"
|
||||
EndIf
|
||||
|
||||
If TintMeOutofStock = 1 Then
|
||||
Var randResultStr = "lip_mask_stick"
|
||||
EndIf
|
||||
|
||||
If randResultStr = "lip_mask_stick" Then
|
||||
Var rewardImage = DirImage + "/reward_lip_mask_stick.png"
|
||||
Var CodeType = "126"
|
||||
|
|
|
|||
43
xml/event/multi_promotion_config_13_4-17_05_2024.json
Normal file
43
xml/event/multi_promotion_config_13_4-17_05_2024.json
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
[
|
||||
{
|
||||
"name": "tea_time",
|
||||
"template": "/event/promotion_video_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
|
||||
"video_eng": "ROOT/taobin_project/image/event/lipit/tea_time_en.mp4",
|
||||
"video_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.mp4",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "monday_banana",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "free_energy_drink",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_bridge.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -3,7 +3,71 @@
|
|||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<State>
|
||||
eval(
|
||||
If BigButtonEnable = "Enable" Then
|
||||
If LipitRewardOutOfStock = 1 Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<EventOnClick>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_lipit.xml"
|
||||
|
||||
</EventOnClick>
|
||||
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
|
||||
<State>
|
||||
eval(
|
||||
If BigButtonEnable = "Enable" Then
|
||||
If LipitRewardOutOfStock = 1 Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -49,7 +113,11 @@
|
|||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
If LipitRewardOutOfStock = 1 Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
|
|
@ -64,7 +132,11 @@
|
|||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
If LipitRewardOutOfStock = 1 Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -6,9 +6,13 @@ DEBUGVAR OpenFromPageBoard
|
|||
|
||||
DEBUGVAR LipitPro
|
||||
DEBUGVAR MondayBananaPro
|
||||
DEBUGVAR PepsiSecondCup30Enable
|
||||
DEBUGVAR FreeEnergyDrink
|
||||
DEBUGVAR EnergyDrinkEnable
|
||||
DEBUGVAR TeaTimePro
|
||||
DEBUGVAR FreeFirePro
|
||||
DEBUGVAR FreeFireMenuState1
|
||||
DEBUGVAR FreeFireMenuState2
|
||||
DEBUGVAR FreeFireMenuState3
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
Var PromotionState2 = "Invisible"
|
||||
|
|
@ -29,6 +33,7 @@ Else
|
|||
DEBUGVAR FreeEnergyDrink
|
||||
;Var FreeEnergyDrink = 1
|
||||
;Var EnableFreeEnergyDrink = "true"
|
||||
;Var MondayBananaPro = 1
|
||||
DEBUGVAR EnableFreeEnergyDrink
|
||||
|
||||
Var CountEnablePromotion = 0
|
||||
|
|
|
|||
|
|
@ -69,9 +69,10 @@ Var PepsiSecondCup30Enable = 0
|
|||
Var PepsiSecondCup30DiscountEnable = 0
|
||||
Var FromPepsiSecondCup30 = 0
|
||||
|
||||
; Enable Lipit Promotion, 18 Mar - 12 Apr
|
||||
; Enable Lipit Promotion, 18 Mar - 5 Apr
|
||||
Var LipitPro = 0
|
||||
Var FromLipitPro = 0
|
||||
Var LipitRewardOutOfStock = 0
|
||||
|
||||
; Enable Monday Banana Promotion, every Monday start 11 Mar - 19 Apr
|
||||
Var MondayBananaPro = 0
|
||||
|
|
@ -82,6 +83,12 @@ Var FreeEnergyDrink = 0
|
|||
Var FromPowerUpPro = 0
|
||||
Var FreePowerup = "Invisible"
|
||||
|
||||
; Enable Tea Time, 13 - 30 Apr
|
||||
Var TeaTimePro = 0
|
||||
|
||||
; Enable Free Fire, 1 - 30 Apr
|
||||
Var FreeFirePro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
|
||||
Var NewFlowPaymentCode = 0
|
||||
|
|
@ -189,6 +196,7 @@ EndIf
|
|||
If SystemDateMonthInt = 4 Then
|
||||
|
||||
Var FreeEnergyDrink = 1
|
||||
Var FreeFirePro = 1
|
||||
|
||||
If SystemDateDayInt = 1 Then
|
||||
Var MondayBananaPro = 1
|
||||
|
|
@ -214,6 +222,10 @@ If SystemDateMonthInt = 4 Then
|
|||
Var LipitPro = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 13 Then
|
||||
Var TeaTimePro = 1
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -365,8 +377,23 @@ Else
|
|||
Var FreeEnergyDrink = 0
|
||||
EndIf
|
||||
|
||||
If FreeFirePro = 1 Then
|
||||
Var FreeFireMenuState1 = $12-99-03-0026.Button
|
||||
Var FreeFireMenuState2 = $12-99-03-0067.Button
|
||||
Var FreeFireMenuState3 = $12-99-03-0066.Button
|
||||
Else
|
||||
Var FreeFireMenuState1 = "Invisible"
|
||||
Var FreeFireMenuState2 = "Invisible"
|
||||
Var FreeFireMenuState3 = "Invisible"
|
||||
EndIf
|
||||
|
||||
If LipitPro = 1 Then
|
||||
|
||||
READ_FILE "/mnt/sdcard/lipit_reward_out_of_stock" lipitOutOfStock
|
||||
STRCONTAIN "1" lipitOutOfStock LipitOutOfStockContain
|
||||
If LipitOutOfStockContain = "true" Then
|
||||
Var LipitRewardOutOfStock = 1
|
||||
EndIf
|
||||
|
||||
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
|
||||
Var CountDownShowButton = 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue