Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

image/event/image_template1

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
-normal_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
-press_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
-press_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
-disable_eng=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
-disable_thai=ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.png
+normal_eng=ROOT/taobin_project/image/event/pro_peach.png
+normal_thai=ROOT/taobin_project/image/event/pro_peach.png
+press_eng=ROOT/taobin_project/image/event/pro_peach.png
+press_thai=ROOT/taobin_project/image/event/pro_peach.png
+disable_eng=ROOT/taobin_project/image/event/pro_peach.png
+disable_thai=ROOT/taobin_project/image/event/pro_peach.png

xml/event/out_put_file1.txt

@@ -1 +1 @@
-/event/promotion_mymint.xml
+/event/promotion_peach.xml

xml/event/promotion_onclick1.inc

@@ -1 +1 @@
-Var BigButtonEnable = "Invisible"
+Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml"

xml/event/promotion_template1.inc

@@ -2,9 +2,8 @@
 <Button>
     <X> 42 </X>
     <Y> 520 </Y>
-
-<State> BigButtonEnable </State>
-    <Filename>
+    <State> BigButtonEnable </State>
+    <Filename> 
      eval( 
         If show_eng = "true" Then 
             Var return = ###normal_eng
@@ -16,64 +15,26 @@
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = ###normal_eng
+            Var return = ###press_eng    
         Else
-            Var return = ###normal_thai
+            Var return = ###press_thai
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = ###normal_eng
+            Var return = ###disable_eng
         Else
-            Var return = ###normal_thai
+            Var return = ###disable_thai
         EndIf
         )
      </FilenameDisable>
 <EventOnClick> 
 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_mymint.xml"
+        ###EventOnClick
         
 </EventOnClick>
-
-
-<Video>
-    <X> 42 </X>
-    <Y> 520 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_th.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 520 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/my_mint_my_moment/pro_mymint_en.mp4" </Filename>
-</Video>
-
 </Button>
 
 <EventUnitTest1>

xml/event/script_common_for_open_promotion_xml.ev

@@ -16,15 +16,15 @@ Else
 	; zone promote
 	If OpenFromPageBoard = 1 Then
 
-		If RerunProEnable = 1 Then
+		If ProPeachEnable = 1 Then
 			Var BigButtonEnable = "Enable"
-			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_rerun.xml"
+			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_peach.xml"
 			Var OpenFromPageBoard = 0
 		
 		Else
-			If pro15THBEnable = 1 Then
+			If RerunProEnable = 1 Then
 				Var BigButtonEnable = "Enable"
-				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
+				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_rerun.xml"
 				Var OpenFromPageBoard = 0
 			
 			Else
@@ -40,9 +40,9 @@ Else
 			Open "ROOT/taobin_project/xml/event/promotion_rerun.xml"
 
 		Else
-			If pro15THBEnable = 1 Then
+			If ProPeachEnable = 1 Then
 				Var BigButtonEnable = "Enable"
-				Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
+				Open "ROOT/taobin_project/xml/event/promotion_peach.xml"
 		
 			Else
 				Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 

xml/event/tricker.ev

@@ -57,6 +57,9 @@ Var FromMyMintPro = 0
 Var RerunProEnable = 0
 Var FromRerunPro = 0
 
+; Enable pro Peach, Feb 1 - 13
+Var ProPeachEnable = 0
+
 Var NewCollectPoint = 1
 
 If SystemDateMonthInt = 10 Then
@@ -104,14 +107,25 @@ If SystemDateMonthInt = 1 Then
 EndIf
 
 
+If SystemDateMonthInt = 2 Then
+	If SystemDateDayInt >= 1 Then
+		If SystemDateDayInt <= 13 Then
+			Var ProPeachEnable = 1
+		EndIf
+	EndIf
+
+EndIf
+
 
 
 If BoxID = 173149 Then
-	Var RerunProEnable = 1
+	Var RerunProEnable = 0
+	Var ProPeachEnable = 1
 EndIf
 
 If BoxID = 105005 Then
-	Var RerunProEnable = 1
+	Var RerunProEnable = 0
+	Var ProPeachEnable = 1
 EndIf
 
 If BoxID = 175668 Then
@@ -169,6 +183,7 @@ If InternationalEnable = 1 Then
 	Var MysteryProEnable = 0
 	Var PepweenEnable = 0
 	Var RerunProEnable = 0
+	Var ProPeachEnable = 0
 EndIf
 
 

xml/page_catalog_group_coffee.xml

@@ -544,7 +544,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 60
+; menu_new_list 61
 	; ==================> Len = 17
 	; 12-01-01-0001 - - 
 <Block>

xml/page_catalog_group_pro_bad_valentine.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_catalog_group_pro_peach.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>