pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

[UNIVERSE] Remove bug Git conflict vscode

Browse source
This commit is contained in:
Kenta420 2024-09-24 16:28:55 +07:00
parent ab57f05898
commit 58d7b37a2c
1 changed files with 10 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

48
inc/video.inc
View file

@ -7,8 +7,8 @@
<EventOpen>
If showMultiAds = "true" Then
If PreviousFileName = "" Then
Var PreviousFileName = PreviseXMLFileName2
EndIf
@ -39,12 +39,8 @@
DEBUGVAR CountDownPauseVideo2
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -57,10 +53,6 @@
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -68,7 +60,7 @@
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
@ -91,7 +83,7 @@
EndIf
EndIf
Else
DEBUGVAR a_video_menu[ads_idx]
If CountryName = "Singapore" Then
@ -118,10 +110,6 @@
If CurrentXMLFileName2 = "" Then
DEBUGVAR CountDownPauseVideo2
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -135,7 +123,7 @@
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
If CountryName = "Malaysia" Then
@ -165,13 +153,13 @@
<EventVideoEnd>
DEBUGVAR CurrentXMLFileName2
Var video_end = "Video end"
DEBUGVAR video_end
DEBUGVAR video_end
If CountDownPauseVideo2 = -1 Then
Var CountDownPauseVideo2 = 0
EndIf
If showMultiAds = "true" Then
Var ads_idx = ads_idx + 1
@ -187,10 +175,6 @@
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -203,10 +187,6 @@
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -216,7 +196,7 @@
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CountryName = "Malaysia" Then
@ -236,16 +216,12 @@
EndIf
EndIf
Else
DEBUGVAR a_video_menu[ads_idx]
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 1 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
@ -258,10 +234,6 @@
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else