Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
8a1a2fb9ea
16 changed files with 49276 additions and 6134 deletions
BIN
inter/whatthecup/sgp/image/collect_point1_en/img3.png
Normal file
BIN
inter/whatthecup/sgp/image/collect_point1_en/img3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
inter/whatthecup/sgp/image/collect_point1_en/text_2.png
Normal file
BIN
inter/whatthecup/sgp/image/collect_point1_en/text_2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
|
@ -374,6 +374,13 @@
|
|||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000003 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -401,6 +408,13 @@
|
|||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000005 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
; menu row 2
|
||||
|
|
@ -426,6 +440,13 @@
|
|||
Open OpenFileXML
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000006 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 193 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -450,6 +471,13 @@
|
|||
Open OpenFileXML
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000007 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 193 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
|
||||
|
|
@ -476,6 +504,13 @@
|
|||
Open OpenFileXML
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000011 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 211 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -502,6 +537,13 @@
|
|||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000012 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 211 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
|
||||
|
|
@ -527,6 +569,13 @@
|
|||
Open OpenFileXML
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000009 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 211 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
;###############################################################
|
||||
|
|
@ -557,6 +606,13 @@
|
|||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000008 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
|
||||
|
|
@ -585,6 +641,13 @@
|
|||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000010 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 82 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue