Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
Pakin
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -57,8 +57,8 @@
|
|||
|
||||
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
|
||||
|
||||
Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
|
||||
Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
|
||||
Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png"
|
||||
Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png"
|
||||
|
||||
Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_en.png"
|
||||
Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_en.png"
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_en.png"
|
||||
|
||||
|
||||
Var bn_get_lid_image = DirImageDoing + "/bn_get_lid_en.png"
|
||||
Var bp_get_lid_image = DirImageDoing + "/bp_get_lid_en.png"
|
||||
Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png"
|
||||
Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png"
|
||||
|
||||
Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
|
||||
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
|
||||
|
|
@ -1903,7 +1903,7 @@
|
|||
|
||||
|
||||
<Button>
|
||||
<X> 526 </X>
|
||||
<X> 440 </X>
|
||||
<Y> 1787 </Y>
|
||||
<State> ButtonGameCountDownState </State>
|
||||
<Filename> Var( DirImageDoing + "/bn_game_cnt_down.png") </Filename>
|
||||
|
|
@ -1925,7 +1925,7 @@
|
|||
</Button>
|
||||
|
||||
<GIF>
|
||||
<X> 526 </X>
|
||||
<X> 440 </X>
|
||||
<Y> 1680 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 204 </Height>
|
||||
|
|
@ -1934,7 +1934,7 @@
|
|||
</GIF>
|
||||
|
||||
<Image>
|
||||
<X> 526 </X>
|
||||
<X> 440 </X>
|
||||
<Y> 1680 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 204 </Height>
|
||||
|
|
@ -1996,7 +1996,7 @@
|
|||
|
||||
;====================================================================
|
||||
<Button>
|
||||
<X> XStraw </X>
|
||||
<X> 160 </X>
|
||||
<Y> 1787 </Y>
|
||||
<State> EnableGetMoreStrawFileName2 </State>
|
||||
<Filename> Var( DirImageDoing + "/bn_get_more_straw.png" ) </Filename>
|
||||
|
|
@ -2014,14 +2014,7 @@
|
|||
Else
|
||||
Var EnableGetMoreStrawFileName2 = "Invisible"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<X> 50 </X>
|
||||
<Y> 20 </Y>
|
||||
<Width> 331 </Width>
|
||||
<Height> 96 </Height>
|
||||
<ID> 000402 </ID>
|
||||
</Language>
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -2077,7 +2070,7 @@
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 14 </X>
|
||||
<X> 40 </X>
|
||||
<Y> 1787 </Y>
|
||||
<State>GetLidButtonState2</State>
|
||||
<Mode> "No" </Mode>
|
||||
|
|
@ -2094,13 +2087,6 @@
|
|||
|
||||
Refresh
|
||||
</EventClick>
|
||||
<Language>
|
||||
<X> 40 </X>
|
||||
<Y> 20 </Y>
|
||||
<Width> 232 </Width>
|
||||
<Height> 96 </Height>
|
||||
<ID> 000403 </ID>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<EventUnitTest4>
|
||||
|
|
|
|||