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

adv/sync_1.file

@@ -1,5 +1,5 @@
-total 211716
--rw-rw---- 1 root sdcard_rw        0 2021-02-20 07:09 sync_1.file
+total 223020
+-rw-rw---- 1 root sdcard_rw        0 2021-02-21 19:27 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2021-07-07 16:02 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2021-07-06 15:30 taobin_adv_01.mp4
 -rw-rw---- 1 root sdcard_rw  3184464 2021-06-22 14:08 taobin_adv_02.mp4
@@ -15,12 +15,12 @@ total 211716
 -rw-rw---- 1 root sdcard_rw  2671705 2022-06-10 17:22 taobin_adv_12.mp4
 -rw-rw---- 1 root sdcard_rw  2756221 2022-06-10 14:32 taobin_adv_13.mp4
 -rw-rw---- 1 root sdcard_rw  3796147 2022-09-16 09:01 taobin_adv_14.mp4
--rw-rw---- 1 root sdcard_rw  3195246 2022-08-23 16:53 taobin_adv_15.mp4
--rw-rw---- 1 root sdcard_rw  6255043 2022-09-02 15:25 taobin_adv_16.mp4
+-rw-rw---- 1 root sdcard_rw  3221450 2022-10-10 11:32 taobin_adv_15.mp4
+-rw-rw---- 1 root sdcard_rw  6086338 2022-10-10 11:29 taobin_adv_16.mp4
 -rw-rw---- 1 root sdcard_rw 18918525 2022-07-25 14:47 taobin_adv_17.mp4
--rw-rw---- 1 root sdcard_rw  2239316 2022-07-19 13:24 taobin_adv_18.mp4
+-rw-rw---- 1 root sdcard_rw  2691879 2022-10-10 11:32 taobin_adv_18.mp4
 -rw-rw---- 1 root sdcard_rw  3360723 2022-08-23 16:53 taobin_adv_19.mp4
--rw-rw---- 1 root sdcard_rw  2734243 2022-09-16 09:14 taobin_adv_20.mp4
+-rw-rw---- 1 root sdcard_rw  6615181 2022-10-10 11:26 taobin_adv_20.mp4
 -rw-rw---- 1 root sdcard_rw  2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4
 -rw-rw---- 1 root sdcard_rw  2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4
 -rw-rw---- 1 root sdcard_rw  2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4
@@ -36,12 +36,12 @@ total 211716
 -rw-rw---- 1 root sdcard_rw  1801226 2022-06-10 17:21 taobin_adv_menu2_12.mp4
 -rw-rw---- 1 root sdcard_rw  2264499 2022-06-10 14:36 taobin_adv_menu2_13.mp4
 -rw-rw---- 1 root sdcard_rw  3043427 2022-09-16 09:01 taobin_adv_menu2_14.mp4
--rw-rw---- 1 root sdcard_rw  2881687 2022-08-23 16:53 taobin_adv_menu2_15.mp4
--rw-rw---- 1 root sdcard_rw  4319598 2022-09-02 15:25 taobin_adv_menu2_16.mp4
+-rw-rw---- 1 root sdcard_rw  2822455 2022-10-10 11:32 taobin_adv_menu2_15.mp4
+-rw-rw---- 1 root sdcard_rw  3897011 2022-10-10 11:29 taobin_adv_menu2_16.mp4
 -rw-rw---- 1 root sdcard_rw 18108788 2022-07-25 14:47 taobin_adv_menu2_17.mp4
--rw-rw---- 1 root sdcard_rw  1914593 2022-07-19 13:24 taobin_adv_menu2_18.mp4
+-rw-rw---- 1 root sdcard_rw  2277074 2022-10-10 11:32 taobin_adv_menu2_18.mp4
 -rw-rw---- 1 root sdcard_rw  2767750 2022-08-23 16:53 taobin_adv_menu2_19.mp4
--rw-rw---- 1 root sdcard_rw  2389277 2022-09-16 09:14 taobin_adv_menu2_20.mp4
+-rw-rw---- 1 root sdcard_rw  5930702 2022-10-10 11:26 taobin_adv_menu2_20.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4
 -rw-rw---- 1 root sdcard_rw  2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4
@@ -57,9 +57,9 @@ total 211716
 -rw-rw---- 1 root sdcard_rw  1911441 2022-06-10 17:21 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw  2145648 2022-06-10 14:36 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  2782199 2022-09-16 09:01 taobin_adv_menu_14.mp4
--rw-rw---- 1 root sdcard_rw  2604682 2022-08-23 16:53 taobin_adv_menu_15.mp4
--rw-rw---- 1 root sdcard_rw  4319598 2022-09-02 15:25 taobin_adv_menu_16.mp4
+-rw-rw---- 1 root sdcard_rw  2632080 2022-10-10 11:32 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw  3964953 2022-10-10 11:29 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2022-07-25 14:47 taobin_adv_menu_17.mp4
--rw-rw---- 1 root sdcard_rw  1867713 2022-07-19 13:24 taobin_adv_menu_18.mp4
+-rw-rw---- 1 root sdcard_rw  2176162 2022-10-10 11:32 taobin_adv_menu_18.mp4
 -rw-rw---- 1 root sdcard_rw  2500307 2022-08-23 16:53 taobin_adv_menu_19.mp4
--rw-rw---- 1 root sdcard_rw  2285887 2022-09-16 09:14 taobin_adv_menu_20.mp4
+-rw-rw---- 1 root sdcard_rw  6263641 2022-10-10 11:26 taobin_adv_menu_20.mp4

xml/page_board.xml

@@ -185,8 +185,14 @@
 
 	If TaobinOnlineX = "true" Then
 		Var CountDownShowButton = 35
-	Var ShowButtonClickFull = "Invisible"
+		Var ShowButtonClickFull = "Invisible"
 		Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
+
+
+		;Var ShowButtonClickFull = "Invisible"
+		;Var CountDownShowButton = 0
+		;Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
+	
 	EndIf
 	If TermTemOnline = "true" Then
 		Var CountDownShowButton = 28
@@ -756,7 +762,7 @@
 </EventTimeout> 
 
 <EventEnd> 
-	;SAVELOG ShowButtonClick
+	SAVELOG "EVENT END"
 	
 	If TaobinOnlineX = "true" Then
 		Var CountDownShowButton = 35

xml/page_thankyou.xml

@@ -127,6 +127,7 @@
 			Random video_id_to_ran
 		EndIf
 		
+		
 		Var ThankyouST = "Enable"
 	EndIf
 

xml/page_thankyouConti.xml

@@ -96,6 +96,8 @@
 			Topping "Select2-ID" Seeker.topping2
 			Topping "Select3-ID" Seeker.topping3
 
+			Topping "Select6-ID" Seeker.topping6
+
 			; Pack
 			Topping "Pack" ExtendDataCurr
 

xml/page_topping_select5.xml

@@ -292,6 +292,8 @@
 	Var StrawState = "Enable"
 	Var LidState = "Enable"
 	Var MAT_ID_9701 = StrawState
+
+	Var SubMenuGroupIDSlot6_1 = 0
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml_main/startup.xml

@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.67"
-	Var XMLPageVersionInt = 667
+	Var XMLPageVersion = "6.69"
+	Var XMLPageVersionInt = 669
 </EventOpen>
 
 <Text>