pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pakin 2024-10-17 10:03:07 +07:00
commit 457f891071
24 changed files with 34 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.inter/whatthecup/sgp/image/user_take_cup_en/bn_door_open.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.3 KiB

BIN
.inter/whatthecup/sgp/image/user_take_cup_en/bp_door_open.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

6
adv/sync_1.file
View file

@ -1,5 +1,5 @@
total 248764
-rw-rw---- 1 root sdcard_rw 0 2024-10-08 10:51 sync_1.file
total 252288
-rw-rw---- 1 root sdcard_rw 0 2021-03-18 16:21 sync_1.file
-rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4
-rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4
@ -37,7 +37,7 @@ total 248764
-rw-rw---- 1 root sdcard_rw 258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
-rw-rw---- 1 root sdcard_rw 3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
-rw-rw---- 1 root sdcard_rw 2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4
-rw-rw---- 1 root sdcard_rw 5096243 2024-08-19 16:57 taobin_adv_menu_16.mp4
-rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4
-rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
-rw-rw---- 1 root sdcard_rw 2165663 2023-09-18 18:44 taobin_adv_menu_18.mp4
-rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4

BIN
app/game/game01.tgz.aa
View file

Binary file not shown.

BIN
app/game/game01.tgz.ab
View file

Binary file not shown.

BIN
app/game/game01.tgz.ac
View file

Binary file not shown.

BIN
app/game/game01.tgz.ad
View file

Binary file not shown.

BIN
app/game/game01.tgz.ae
View file

Binary file not shown.

BIN
app/game/game01.tgz.af Normal file
View file

Binary file not shown.

BIN
app/game/game01.tgz.ag Normal file
View file

Binary file not shown.

BIN
app/game/game01.tgz.ah Normal file
View file

Binary file not shown.

BIN
app/game/game01.tgz.ai Normal file
View file

Binary file not shown.

20
app/game/sync_1.file
View file

@ -1,16 +1,16 @@
total 94764
-rw-rw---- 1 root sdcard_rw 4081021 2024-02-11 21:51 TAMATIAN-01.gif
-rw-rw---- 1 root sdcard_rw 4778152 2024-08-23 13:54 TAMATIAN-01_en.gif
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.aa
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ab
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ac
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ad
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ae
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.af
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ag
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ah
-rw-rw---- 1 root sdcard_rw 4200190 2021-03-19 16:32 game01.tgz.ai
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.aa
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ab
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ac
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ad
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ae
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.af
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ag
-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ah
-rw-rw---- 1 root sdcard_rw 4200190 2024-10-16 14:12 game01.tgz.ai
-rw-rw---- 1 root sdcard_rw 82 2024-02-11 21:51 last-cmd
-rw-rw---- 1 root sdcard_rw 10 2024-02-11 21:51 need_upgrade
-rw-rw---- 1 root sdcard_rw 402 2024-02-11 21:51 readme
-rw-rw---- 1 root sdcard_rw 0 2021-03-19 16:32 sync_1.file
-rw-rw---- 1 root sdcard_rw 0 2024-10-16 14:12 sync_1.file

BIN
image/page_doing/brewing_txt_adv11.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Before After
Before After

BIN
image/page_doing/brewing_txt_adv11_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Before After
Before After

21
inter/tha/.special/RoadShow.ev
View file

@ -13,28 +13,13 @@ If SystemDateYearInt = 2024 Then
DEBUGVAR SystemTimeHourInt
If BoxID = 201193 Then
If SystemDateDayInt = 18 Then
Var RoadShow = "true"
EndIf
Var HalloweenPro = 1
EndIf
If BoxID = 201316 Then
If SystemDateDayInt = 18 Then
Var RoadShow = "true"
EndIf
If BoxID = 173249 Then
Var HalloweenPro = 1
EndIf
If BoxID = 201193 Then
If SystemDateDayInt = 19 Then
Var RoadShow = "true"
EndIf
EndIf
If BoxID = 201316 Then
If SystemDateDayInt = 19 Then
Var RoadShow = "true"
EndIf
EndIf
EndIf

BIN
video/brewing_adv11.mp4
View file

Binary file not shown.

BIN
video/brewing_adv12.mp4 Normal file → Executable file
View file

Binary file not shown.

BIN
video/brewing_txt_adv11.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Before After
Before After

BIN
video/brewing_txt_adv11_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Before After
Before After

13
video/script3_first_brewing.ev
View file

@ -72,14 +72,15 @@ Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
; RobinsonBeautyPro for test
;If brewing_adv11_size = "" Then
; GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size
;EndIf
If brewing_adv11_size = "" Then
GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size
EndIf
Var HalloweenPro = 1
DEBUGVAR brewing_adv11_size
If brewing_adv11_size = 9358730 Then
If RobinsonBeautyPro = 1 Then
If brewing_adv11_size = 9800005 Then
If HalloweenPro = 1 Then
Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11.mp4";
If show_eng = "true" Then

16
video/sync_1.file
View file

@ -1,14 +1,14 @@
total 184304
-rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4
total 190372
-rw-rw---- 1 root sdcard_rw 9800005 2024-10-10 14:37 brewing_adv11.mp4
-rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4
-rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4
-rw-rw---- 1 root sdcard_rw 9673549 2024-07-25 10:29 brewing_adv14.mp4
-rw-rw---- 1 root sdcard_rw 8455461 2024-10-04 09:52 brewing_adv15.mp4
-rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4
-rw-rw---- 1 root sdcard_rw 9368231 2024-07-19 15:00 brewing_adv4.mp4
-rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png
-rw-rw---- 1 root sdcard_rw 51866 2024-08-29 11:30 brewing_txt_adv11.png
-rw-rw---- 1 root sdcard_rw 50184 2024-08-29 11:31 brewing_txt_adv11_en.png
-rw-rw---- 1 root sdcard_rw 60184 2024-10-16 16:35 brewing_txt_adv11.png
-rw-rw---- 1 root sdcard_rw 53138 2024-10-16 16:35 brewing_txt_adv11_en.png
-rw-rw---- 1 root sdcard_rw 43166 2024-08-29 11:31 brewing_txt_adv12.png
-rw-rw---- 1 root sdcard_rw 42692 2024-08-29 11:31 brewing_txt_adv12_en.png
-rw-rw---- 1 root sdcard_rw 53750 2024-08-29 11:30 brewing_txt_adv13.png
@ -24,11 +24,11 @@ total 184304
-rw-rw---- 1 root sdcard_rw 42967 2024-07-19 18:16 brewing_txt_adv4_en.png
-rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4
-rw-rw---- 1 root sdcard_rw 9673549 2024-07-25 10:29 main_page_event.mp4
-rw-rw---- 1 root sdcard_rw 1217 2024-10-07 17:50 script1.ev
-rw-rw---- 1 root sdcard_rw 1217 2024-10-09 16:15 script1.ev
-rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev
-rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev
-rw-rw---- 1 root sdcard_rw 7200 2024-10-04 13:58 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-10-08 10:51 sync_1.file
-rw-rw---- 1 root sdcard_rw 7185 2024-10-16 16:55 script3_first_brewing.ev
-rw-rw---- 1 root sdcard_rw 0 2024-10-16 16:54 sync_1.file
-rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4
-rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4
-rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4

8
xml/page_NewBrewing3.xml
View file

@ -17,17 +17,11 @@
SAVELOG "page_Newbrewing3.xml version 2"
DEBUGVAR MachineStage
<<<<<<< HEAD
DEBUGVAR Seeker.ORDER_ID
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
=======
DEBUGVAR Seeker.ORDER_ID
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
>>>>>>> a27f8c94eb6df022194c4c644404ecfa103696c4
Var PictureFileTextDesctionState = "Enable"

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "9.04"
Var XMLPageVersionInt = 904
Var XMLPageVersion = "9.06"
Var XMLPageVersionInt = 906
;Oreo
Var OreoGuarantee = 0