do hurr

2023-05-01 21:39:17 +07:00 · 2023-05-01 21:39:17 +07:00 · 944dfd78e0
commit 944dfd78e0
parent 585bef4d26
11 changed files with 142 additions and 28 deletions
--- a/xml/event/big_logo_back_to_school.inc
+++ b/xml/event/big_logo_back_to_school.inc
@ -2,7 +2,7 @@
 <Button>
    <X> 42 </X>
    <Y> 520 </Y>
-    <State> BigButtonEnable </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Filename> 
     eval( 
        If show_eng = "true" Then 
@ -24,6 +24,17 @@
            Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
        EndIf
        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
+        EndIf
+        )
     </FilenameDisable>
    <EventOnClick> 
        Var NameDrink = "OREO SMOOTHIE  VOLCANO"
--- a/xml/event/big_logo_oreo_buy2_save_movel.inc
+++ b/xml/event/big_logo_oreo_buy2_save_movel.inc
@ -2,7 +2,7 @@
 <Button>
    <X> 42 </X>
    <Y> 520 </Y>
-    <State> BigButtonEnable </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Filename> 
     eval( 
        If show_eng = "true" Then 
@ -24,6 +24,17 @@
            Var return = "ROOT/taobin_project/image/event/bp_oreo_buy2_save_move.png"
        EndIf
        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/event/bn_oreo_buy2_save_move_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/event/bn_oreo_buy2_save_move.png"
+        EndIf
+        )
     </FilenameDisable>
 <EventOnClick> 
        Var NameDrink = "OREO SMOOTHIE  VOLCANO"
--- a/xml/event/page_recommend_backToSchool.xml
+++ b/xml/event/page_recommend_backToSchool.xml
@ -1068,7 +1068,7 @@
    <MarginTop> 22 </MarginTop>
    <Width> 225 </Width>
    <Height> 296 </Height>
-    <State> Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032) </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Button>
    <State> $Sum1203030032 </State> 
    <Filename> "ROOT/taobin_project/image/page_drink_n//bn_super_oreo_volcano.png" </Filename>
@ -8916,7 +8916,7 @@ LIMENADE SODA" </Value>
 <Button>
    <X> 42 </X>
    <Y> 520 </Y>
-    <State> BigButtonEnable </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Filename> 
     eval( 
        If show_eng = "true" Then 
@ -8938,6 +8938,17 @@ LIMENADE SODA" </Value>
            Var return = "ROOT/taobin_project/image/event/bp_back_to_school.png"
        EndIf
        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/event/bn_back_to_school_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/event/bn_back_to_school.png"
+        EndIf
+        )
     </FilenameDisable>
    <EventOnClick> 
        Var NameDrink = "OREO SMOOTHIE  VOLCANO"
--- a/xml/event/page_recommend_oreo_buy2_save_more.xml
+++ b/xml/event/page_recommend_oreo_buy2_save_more.xml
@ -1068,7 +1068,7 @@
    <MarginTop> 22 </MarginTop>
    <Width> 225 </Width>
    <Height> 296 </Height>
-    <State> Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032) </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Button>
    <State> $Sum1203030032 </State> 
    <Filename> "ROOT/taobin_project/image/page_drink_n//bn_super_oreo_volcano.png" </Filename>
@ -8916,7 +8916,7 @@ LIMENADE SODA" </Value>
 <Button>
    <X> 42 </X>
    <Y> 520 </Y>
-    <State> BigButtonEnable </State> 
+    <State> Flag( 12-03-03-0032.Button, ,$Sum1203030032) </State> 
    <Filename> 
     eval( 
        If show_eng = "true" Then 
@ -8938,6 +8938,17 @@ LIMENADE SODA" </Value>
            Var return = "ROOT/taobin_project/image/event/bp_oreo_buy2_save_move.png"
        EndIf
        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+        
+            Var return = "ROOT/taobin_project/image/event/bn_oreo_buy2_save_move_en.png"
+        
+        Else
+            Var return = "ROOT/taobin_project/image/event/bn_oreo_buy2_save_move.png"
+        EndIf
+        )
     </FilenameDisable>
 <EventOnClick> 
        Var NameDrink = "OREO SMOOTHIE  VOLCANO"
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@ -1,8 +1,40 @@

 ; zone promote
-If SongkranEnable = 1 Then
-    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
-Else
-    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-EndIf
+If OpenFromPageBoard = 1 Then

+	If SongkranEnable = 1 Then
+	    OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+	    Var OpenFromPageBoard = 0
+	Else
+		If OreoForFreeEnable = 1 Then
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_backToSchool.xml"
+			Var OpenFromPageBoard = 0
+		EndIf
+
+		If OreoDueEnable = 1 Then
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_oreo_buy2_save_more.xml"
+			Var OpenFromPageBoard = 0
+		EndIf
+
+		If OpenFromPageBoard = 1 Then
+	    	OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+	    EndIf
+	EndIf
+Else
+
+	If SongkranEnable = 1 Then
+	    Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" 
+	Else
+		If OreoForFreeEnable = 1 Then
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_backToSchool.xml"
+		EndIf
+
+		If OreoDueEnable = 1 Then
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_oreo_buy2_save_more.xml"
+		EndIf
+
+
+	    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+	EndIf
+EndIf
+Var OpenFromPageBoard = 0
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -8,6 +8,7 @@ Var BackToSchoolForFreeEnable = 0

 Var OreoForFreeEnable = 0
 Var OreoDueEnable = 0
+
 If SystemDateMonthInt = 5 Then
 	If SystemDateDayInt = 6 Then
 		Var OreoDueEnable = 1
@ -49,7 +50,6 @@ If SystemDateMonthInt = 5 Then
 	EndIf
 EndIf

-DEBUGVAR OreoDueEnable
 If OreoDueEnable = 0 Then
 	Var $12-03-03-0009-alter.Button = "Invisible"
 Else
@ -58,10 +58,26 @@ Else
 EndIf


-Var $12-03-03-0009-alter.Price = 70
+If BoxID = 172644 Then
+	Var OreoDueEnable = 1
+EndIf

-Var $12-03-03-0009-alter.NameE = $12-03-03-0009.NameE
-Var $12-03-03-0009-alter.descriptionE = $12-03-03-0009.descriptionE
-Var $12-03-03-0009-alter.Name = $12-03-03-0009.Name
-Var $12-03-03-0009-alter.description = $12-03-03-0009.description
+If BoxID = 172527 Then
+	Var OreoDueEnable = 1
+EndIf
+If BoxID = 173149 Then
+	Var OreoForFreeEnable = 1
+EndIf
+
+Var SoundBackToSchoolEnable = 1
+
+
+DEBUGVAR OreoDueEnable
+DEBUGVAR OreoForFreeEnable
+
+;Var $12-03-03-0009-alter.Price = 70
+;Var $12-03-03-0009-alter.NameE = $12-03-03-0009.NameE
+;Var $12-03-03-0009-alter.descriptionE = $12-03-03-0009.descriptionE
+;Var $12-03-03-0009-alter.Name = $12-03-03-0009.Name
+;Var $12-03-03-0009-alter.description = $12-03-03-0009.description