SGP: fix big img size, long menu name & recommend override

2024-07-17 08:34:34 +07:00 · 2024-07-17 08:34:34 +07:00 · 06e2890908
commit 06e2890908
parent 46d88286bd
27 changed files with 762 additions and 705 deletions
--- a/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie-1.png
+++ b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie-1.png
--- a/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png
+++ b/inter/sgp/image/event/season_pass/bn_StrawberrOreo_smoothie.png
--- a/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png
+++ b/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png
--- a/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png
+++ b/inter/sgp/image/event/season_pass/bn_hot_caramel_latte.png
--- a/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png
+++ b/inter/sgp/image/event/season_pass/bn_hot_matcha_milk_tea.png
--- a/inter/sgp/image/event/season_pass/bn_hot_mocha-1.png
+++ b/inter/sgp/image/event/season_pass/bn_hot_mocha-1.png
--- a/inter/sgp/image/event/season_pass/bn_hot_mocha.png
+++ b/inter/sgp/image/event/season_pass/bn_hot_mocha.png
--- a/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie-1.png
+++ b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie-1.png
--- a/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png
+++ b/inter/sgp/image/event/season_pass/bn_iced_Milovalcocoa_smoothie.png
--- a/inter/sgp/image/event/season_pass/bn_protein_Chocolate-1.png
+++ b/inter/sgp/image/event/season_pass/bn_protein_Chocolate-1.png
--- a/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png
+++ b/inter/sgp/image/event/season_pass/bn_protein_Chocolate.png
--- a/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png
+++ b/inter/sgp/image/event/season_pass/bn_smoothie_oreo.png
--- a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark-1.png
+++ b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark-1.png
--- a/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png
+++ b/inter/sgp/image/event/season_pass/bn_thai_milk_tea_SingPark.png
--- a/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png
+++ b/inter/sgp/image/event/season_pass/bp_StrawberrOreo_smoothie.png
--- a/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png
+++ b/inter/sgp/image/event/season_pass/bp_hot_cappuccino.png
--- a/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png
+++ b/inter/sgp/image/event/season_pass/bp_hot_caramel_latte.png
--- a/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png
+++ b/inter/sgp/image/event/season_pass/bp_hot_matcha_milk_tea.png
--- a/inter/sgp/image/event/season_pass/bp_hot_mocha.png
+++ b/inter/sgp/image/event/season_pass/bp_hot_mocha.png
--- a/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png
+++ b/inter/sgp/image/event/season_pass/bp_iced_Milovalcocoa_smoothie.png
--- a/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png
+++ b/inter/sgp/image/event/season_pass/bp_protein_Chocolate.png
--- a/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png
+++ b/inter/sgp/image/event/season_pass/bp_smoothie_oreo.png
--- a/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png
+++ b/inter/sgp/image/event/season_pass/bp_thai_milk_tea_SingPark.png
--- a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
@ -682,17 +682,36 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>OREO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>OREO SMOOTHIE</LanguageSlot1>
 		<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>OREO SMOOTHIE</LanguageSlot3>
 		<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>
 	</LanguageGroup>
+
+	<Text>
+	<X>  16   </X>
+	<Y>  390  </Y>
+	<Size> 33 </Size>
+	<Width> 333 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>VOLCANO</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>VOLCANO</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+
 	</Text>
 	<Text>
 	<X> 16 </X>
-	<Y> 450 </Y>
+	<Y> 465 </Y>
 	<Size> 25 </Size>
 	<Width> 333 </Width>
 	<Font> KanitMediumTTF </Font>
--- a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
@ -682,17 +682,36 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>MILO SMOOTHIE \nVOLCANO</LanguageSlot1>
+		<LanguageSlot1>MILO SMOOTHIE</LanguageSlot1>
 		<LanguageSlot2>โอวัลตินปั่นภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>MILO SMOOTHIE \nVOLCANO</LanguageSlot3>
+		<LanguageSlot3>MILO SMOOTHIE</LanguageSlot3>
 		<LanguageSlot4>โอวัลตินปั่นภูเขาไฟ</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอวัลตินปั่นภูเขาไฟ</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
+
+	<Text>
+	<X>  16   </X>
+	<Y>  390  </Y>
+	<Size> 33 </Size>
+	<Width> 333 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>VOLCANO</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>VOLCANO</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+
 	<Text>
 	<X> 16 </X>
-	<Y> 450 </Y>
+	<Y> 465 </Y>
 	<Size> 25 </Size>
 	<Width> 333 </Width>
 	<Font> KanitMediumTTF </Font>
--- a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
@ -1001,17 +1001,36 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>STRAWBERRY MILK \nOREO VOLCANO</LanguageSlot1>
-		<LanguageSlot2>สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ</LanguageSlot2>
-		<LanguageSlot3>STRAWBERRY MILK \nOREO VOLCANO</LanguageSlot3>
-		<LanguageSlot4>สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ</LanguageSlot4>
+		<LanguageSlot1>STRAWBERRY MILK</LanguageSlot1>
+		<LanguageSlot2>สตอเบอร์รี่ปั่น</LanguageSlot2>
+		<LanguageSlot3>STRAWBERRY MILK</LanguageSlot3>
+		<LanguageSlot4>สตอเบอร์รี่ปั่น</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>สตอเบอร์รี่ปั่น\nโอริโอ้ภูเขาไฟ</LanguageSlot6>
+		<LanguageSlot6>สตอเบอร์รี่ปั่น</LanguageSlot6>
 	</LanguageGroup>
+
+	<Text>
+	<X>  16   </X>
+	<Y>  390  </Y>
+	<Size> 33 </Size>
+	<Width> 333 </Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>OREO VOLCANO</LanguageSlot1>
+		<LanguageSlot2>โอริโอ้ภูเขาไฟ</LanguageSlot2>
+		<LanguageSlot3>OREO VOLCANO</LanguageSlot3>
+		<LanguageSlot4>โอริโอ้ภูเขาไฟ</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>โอริโอ้ภูเขาไฟ</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+
 	</Text>
 	<Text>
 	<X> 16 </X>
-	<Y> 450 </Y>
+	<Y> 465 </Y>
 	<Size> 25 </Size>
 	<Width> 333 </Width>
 	<Font> KanitMediumTTF </Font>
--- a/inter/sgp/xml/page_catalog_group_recommend.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend.lxml
@ -647,8 +647,8 @@
 <Scroll> "Vertical" </Scroll>
 <Column> 4 </Column>
 <Script>
-	 Var block_index_override = 4
-	 Var block_index_move = 1
+	 Var block_index_override = 0
+	 Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
 ; menu_new_list 39