prepare for WX14 test

This commit is contained in:
WEBXOSS 2016-12-01 23:55:20 +08:00
parent a1b421e2b2
commit 5fe341e675
3 changed files with 16 additions and 16 deletions

View file

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- <html> --> <html>
<html manifest="../webxoss.appcache"> <!-- <html manifest="../webxoss.appcache"> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>DeckEditor</title> <title>DeckEditor</title>
<script> <script>
global = window; global = window;
</script> </script>
<script src="../CardInfo.js"></script> <script src="../../CardInfo.js"></script>
<script src="../CardInfo_ru.js"></script> <script src="../CardInfo_ru.js"></script>
<script src="../CardInfo_ko.js"></script> <script src="../CardInfo_ko.js"></script>
<link rel="stylesheet" type="text/css" href="editor.css"> <link rel="stylesheet" type="text/css" href="editor.css">
@ -73,12 +73,12 @@
</div> </div>
</section> </section>
<script src="../Localize.min.js"></script> <!-- <script src="../Localize.min.js"></script>
<script src="../ImageAndDetail.min.js"></script> <script src="../ImageAndDetail.min.js"></script>
<script src="./Deck.min.js"></script> <script src="./Deck.min.js"></script>
<script src="./DeckEditor.js"></script> <script src="./DeckEditor.js"></script> -->
<!-- <script src="../lib/util.js"></script> <script src="../lib/util.js"></script>
<script src="../Localize.js"></script> <script src="../Localize.js"></script>
<script src="../ImageFileCache.js"></script> <script src="../ImageFileCache.js"></script>
<script src="../ImageManager.js"></script> <script src="../ImageManager.js"></script>
@ -86,6 +86,6 @@
<script src="../DeckManager.js"></script> <script src="../DeckManager.js"></script>
<script src="./Rules.js"></script> <script src="./Rules.js"></script>
<script src="./Searcher.js"></script> <script src="./Searcher.js"></script>
<script src="./editor.js"></script> --> <script src="./editor.js"></script>
</body> </body>
</html> </html>

View file

@ -7,7 +7,7 @@ var map_zh_CN = {
'OK': '确定', 'OK': '确定',
'CANCEL': '取消', 'CANCEL': '取消',
'NO_CARDS': '没有卡牌', 'NO_CARDS': '没有卡牌',
'or': '或' 'OR': '或'
}, },
_misc: { _misc: {
'DIALOG_TITLE_EFFECTS': '多个效果发动,选择一个优先处理', 'DIALOG_TITLE_EFFECTS': '多个效果发动,选择一个优先处理',
@ -2433,7 +2433,7 @@ Localize.guard = function (info) {
Localize.cost = function (info) { Localize.cost = function (info) {
if (info.costOr) { if (info.costOr) {
return info.costOr.map(function (color) { return info.costOr.map(function (color) {
return Localize('costColor',color); return Localize('color',color);
},this).join(' ' + Localize('common', 'OR') + ' '); },this).join(' ' + Localize('common', 'OR') + ' ');
} }
var props = ['costWhite','costBlack','costRed','costBlue','costGreen','costColorless']; var props = ['costWhite','costBlack','costRed','costBlue','costGreen','costColorless'];

View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html manifest="webxoss.appcache"> <!-- <html manifest="webxoss.appcache"> -->
<!-- <html> --> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@ -243,16 +243,16 @@
<script src="./lib/easeljs-0.8.2.min.js" defer="defer"></script> <script src="./lib/easeljs-0.8.2.min.js" defer="defer"></script>
<script src="./socket.io.min.js" defer="defer"></script> <script src="./socket.io.min.js" defer="defer"></script>
<script src="./CardInfo.js" defer="defer"></script> <script src="../CardInfo.js" defer="defer"></script>
<script src="./CardInfo_ru.js" defer="defer"></script> <script src="./CardInfo_ru.js" defer="defer"></script>
<script src="./CardInfo_ko.js" defer="defer"></script> <script src="./CardInfo_ko.js" defer="defer"></script>
<script src="./Localize.min.js" defer="defer"></script> <!-- <script src="./Localize.min.js" defer="defer"></script>
<script src="./ImageAndDetail.min.js" defer="defer"></script> <script src="./ImageAndDetail.min.js" defer="defer"></script>
<script src="./DeckEditor/Deck.min.js" defer="defer"></script> <script src="./DeckEditor/Deck.min.js" defer="defer"></script>
<script src="./webxoss.js" defer="defer"></script> <script src="./webxoss.js" defer="defer"></script> -->
<!-- <script src="./Localize.js" defer="defer"></script> <script src="./Localize.js" defer="defer"></script>
<script src="./ImageFileCache.js" defer="defer"></script> <script src="./ImageFileCache.js" defer="defer"></script>
<script src="./ImageManager.js" defer="defer"></script> <script src="./ImageManager.js" defer="defer"></script>
<script src="./Detail.js" defer="defer"></script> <script src="./Detail.js" defer="defer"></script>
@ -277,6 +277,6 @@
<script src="./DeckManager.js" defer="defer"></script> <script src="./DeckManager.js" defer="defer"></script>
<script src="./DeckEditor/Rules.js" defer="defer"></script> <script src="./DeckEditor/Rules.js" defer="defer"></script>
<script src="./DeckEditor/Searcher.js" defer="defer"></script> <script src="./DeckEditor/Searcher.js" defer="defer"></script>
<script src="./RoomManager.js" defer="defer"></script> --> <script src="./RoomManager.js" defer="defer"></script>
</body> </body>
</html> </html>