Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 25 KiB |
|
|
@ -604,7 +604,7 @@
|
|||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "51-03-03-0027"
|
||||
; begin lang
|
||||
Var aliasName[0] = "Strawberry\nOreo Valcano"
|
||||
Var aliasName[0] = "Strawberry\nOreo Volcano"
|
||||
Var aliasDesc[0] = "Milk,Sugar,\nStrawberry Syrup, Oreo"
|
||||
Var aliasName[1] = ""
|
||||
Var aliasDesc[1] = ""
|
||||
|
|
@ -699,9 +699,9 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>Strawberry\nOreo Valcano</LanguageSlot1>
|
||||
<LanguageSlot1>Strawberry\nOreo Volcano</LanguageSlot1>
|
||||
<LanguageSlot2></LanguageSlot2>
|
||||
<LanguageSlot3>Strawberry\nOreo Valcano</LanguageSlot3>
|
||||
<LanguageSlot3>Strawberry\nOreo Volcano</LanguageSlot3>
|
||||
<LanguageSlot4></LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6></LanguageSlot6>
|
||||
|
|
@ -3034,7 +3034,7 @@
|
|||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "51-03-03-0047"
|
||||
; begin lang
|
||||
Var aliasName[0] = "Mint Milk\nBiscoff Volcano"
|
||||
Var aliasName[0] = "Mint\nBiscoff Volcano"
|
||||
Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
|
||||
Var aliasName[1] = ""
|
||||
Var aliasDesc[1] = ""
|
||||
|
|
@ -3129,9 +3129,9 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>Mint Milk\nBiscoff Volcano</LanguageSlot1>
|
||||
<LanguageSlot1>Mint\nBiscoff Volcano</LanguageSlot1>
|
||||
<LanguageSlot2></LanguageSlot2>
|
||||
<LanguageSlot3>Mint Milk\nBiscoff Volcano</LanguageSlot3>
|
||||
<LanguageSlot3>Mint\nBiscoff Volcano</LanguageSlot3>
|
||||
<LanguageSlot4></LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6></LanguageSlot6>
|
||||
|
|
|
|||