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

inter/whatthecup/color_settings.ev

@@ -7,6 +7,9 @@ Var WTCSemiMediumBlueColor = "0x3D59FF"
 Var WTCBlueColor = "0x0025FF"
 
 ; case-1-bg-white
+
+Var BackgroundColor = WTCLightBlueColor
+
 Var HeadlineColor1 = WTCBlueColor
 Var SubHeadlineColor1 = WTCBlueColor
 Var BodyTextColor1 = WTCMediumBlueColor
@@ -16,7 +19,15 @@ Var ButtonColor1 = WTCWhiteColor
 Var ButtonTextColor1 = WTCBlueColor
 Var ButtonDisabledColor1 = WTCLightBlueColor
 
+Var HeadlineColor = WTCBlueColor
+Var SubHeadlineColor = SubHeadlineColor1
+Var PopupBodyTextColor = BodyTextColor1
+
+
 ; case-2-bg-light-blue
+
+Var BackgroundColor2 = WTCLightBlueColor
+
 Var HeadlineColor2 = WTCBlueColor
 Var SubHeadlineColor2 = WTCBlueColor
 Var BodyTextColor2 = WTCMediumBlueColor
@@ -27,6 +38,9 @@ Var ButtonTextColor2 = WTCBlueColor
 Var ButtonDisabledColor2 = WTCSemiLightBlueColor
 
 ; case-3-bg-medium-white
+
+Var BackgroundColor3 = WTCMediumBlueColor
+
 Var HeadlineColor3 = WTCWhiteColor
 Var SubHeadlineColor3 = WTCWhiteColor
 Var BodyTextColor3 = WTCSemiLightBlueColor
@@ -37,6 +51,9 @@ Var ButtonTextColor3 = WTCBlueColor
 Var ButtonDisabledColor3 = WTCSemiLightBlueColor
 
 ; case-4-bg-blue
+
+Var BackgroundColor4 = WTCLightBlueColor
+
 Var HeadlineColor4 = WTCWhiteColor
 Var SubHeadlineColor4 = WTCWhiteColor
 Var BodyTextColor4 = WTCSemiLightBlueColor
@@ -46,3 +63,23 @@ Var ButtonColor4 = WTCWhiteColor
 Var ButtonTextColor4 = WTCBlueColor
 Var ButtonDisabledColor4 = WTCSemiLightBlueColor
 
+If TargetThemeNum = 2 Then
+    Var BackgroundColor = BackgroundColor2
+    Var HeadlineColor = HeadlineColor2
+    Var SubHeadlineColor = BodyTextColor2
+    Var PopupBodyTextColor = WTCSemiMediumBlueColor
+EndIf
+
+If TargetThemeNum = 3 Then
+    Var BackgroundColor = BackgroundColor3
+    Var HeadlineColor = HeadlineColor3
+    Var SubHeadlineColor = BodyTextColor3
+    Var PopupBodyTextColor = BodyTextColor3
+EndIf
+
+If TargetThemeNum = 4 Then
+    Var BackgroundColor = BackgroundColor4
+    Var HeadlineColor = HeadlineColor4
+    Var SubHeadlineColor = BodyTextColor4
+    Var PopupBodyTextColor = BodyTextColor4
+EndIf

inter/whatthecup/default_color_settings.ev

@@ -0,0 +1,7 @@
+Var WelcomeColor = "0xEE8C62"
+
+
+Var BackgroundColor = "0xeae6e1"
+Var HeadlineColor = "0x513C2F"
+Var SubHeadlineColor = "0x6F5F51"
+Var PopupBodyTextColor = "0xB78F24"

inter/whatthecup/sgp/xml/page_catalog.lxml

@@ -282,7 +282,7 @@
 <Y> 380 </Y>
 <Width> 1080 </Width>
 <Height> 1540 </Height>
-<Color> WTCLightBlueColor </Color>
+<Color> BackgroundColor </Color>
 </Image>
 
 <EventLanguageOnChange>