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

This commit is contained in:
Pakin 2024-08-23 15:47:22 +07:00
commit 8f5b2b1937
143 changed files with 26391 additions and 4254 deletions

View file

@ -1907,7 +1907,7 @@
<Width> 241 </Width>
<Height> 204 </Height>
<State> ButtonGamePressToPlayState </State>
<Filename> "ROOT/taobin_project/app/game/TAMATIAN-01.gif" </Filename>
<Filename> "ROOT/taobin_project/app/game/TAMATIAN-01_en.gif" </Filename>
</GIF>
<Image>

View file

@ -65,8 +65,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen

View file

@ -66,8 +66,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen