Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
0e19679048
4 changed files with 503 additions and 4 deletions
|
|
@ -767,7 +767,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,Disable=Invisible,$Sum510301000251030200025103030002) </State>
|
||||
<State> Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) </State>
|
||||
<Button>
|
||||
<State> $Sum510301000251030200025103030002 </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" </Filename>
|
||||
|
|
|
|||
|
|
@ -825,7 +825,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,Disable=Invisible,$Sum510301000251030200025103030002) </State>
|
||||
<State> Flag( 51-03-01-0002.Button,51-03-02-0002.Button,51-03-03-0002.Button,$Sum510301000251030200025103030002) </State>
|
||||
<Button>
|
||||
<State> $Sum510301000251030200025103030002 </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_cocoa.png" </Filename>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue