Merge branch 'amarillonmc:beginning' into waaagh

gamedata/cache/mixitem_1.php

@@ -202,11 +202,11 @@ $mixinfo = array
 	array('class' => 'wf', 'stuff' => array('红宝石方块','打火机','空白符卡'),'result' => array('火符「Agni Shine」','WF',40,'∞','uU'),),
 	array('class' => 'wf', 'stuff' => array('绿宝石方块','空白符卡','树叶'),'result' => array('木符『Sylphy Horn』','WF',50,'∞','wWc'),),
 	array('class' => 'wf', 'stuff' => array('蓝宝石方块','天然水','水符「Princess Undine」'),'result' => array('水符『Jerry Fish Princess』','WF',70,'∞','riI'),),
-	array('class' => 'wf', 'stuff' => array('土符「Lazy Trilithon」','水符「Princess Undine」','空白符卡'),'result' => array('土&水符『Noachian Deluge』','WF',220,'50','ic'),),
+	array('class' => 'wf', 'stuff' => array('土符「Lazy Trilithon」','水符「Princess Undine」','空白符卡'),'result' => array('土＆水符『Noachian Deluge』','WF',220,'50','ic'),),
 	array('class' => 'wf', 'stuff' => array('黄色方块','岩石','空白符卡'),'result' => array('土符「Lazy Trilithon」','WF',100,'∞','c'),),
-	array('class' => 'wf', 'stuff' => array('土符「Lazy Trilithon」','火符「Agni Shine」','岩石'),'result' => array('火&土符『Lava Cromlech』','WF',240,180,'d'),),
+	array('class' => 'wf', 'stuff' => array('土符「Lazy Trilithon」','火符「Agni Shine」','岩石'),'result' => array('火＆土符『Lava Cromlech』','WF',240,180,'d'),),
 	array('class' => 'wf', 'stuff' => array('金色方块','电池','空白符卡'),'result' => array('金符「Metal Fatigue」','WF',130,'∞','eE'),),
-	array('class' => 'wf', 'stuff' => array('水符「Princess Undine」','金符「Metal Fatigue」'),'result' => array('金&水符『Mercury Poison』','WF',94,'∞','paZ'),),
+	array('class' => 'wf', 'stuff' => array('水符「Princess Undine」','金符「Metal Fatigue」'),'result' => array('金＆水符『Mercury Poison』','WF',94,'∞','paZ'),),
 	array('class' => 'wf', 'stuff' => array('鲜红的生血','长矛','造雾设备'),'result' => array('神枪『Spear The Gungnir』 ','WF',5500,'1','c'),),
 	array('class' => 'wf', 'stuff' => array('《东方幻想乡》','触手的力量','【触手的萃取液】'),'result' => array('梦幻『幻月』 ','WF',900,'∞','rdcm'),),
 	array('class' => 'wf', 'stuff' => array('空白符卡','《魔女的魔导书》'),'result' => array('《魔导师速成攻略》','VF',233,'1',''),),
@@ -214,12 +214,12 @@ $mixinfo = array
 	array('class' => 'wf', 'stuff' => array('月光碎片','☆残页的魔导书☆','空白符卡'),'result' => array('月符「Silent Serena」-劣','WF',40,'∞','rc'),),
 	array('class' => 'wf', 'stuff' => array('日符「Royal Flare」-劣','《魔女的魔导书》'),'result' => array('日符「Royal Flare」','WF',260,'∞','udc'),),
 	array('class' => 'wf', 'stuff' => array('月符「Silent Serena」-劣','《魔女的魔导书》'),'result' => array('月符「Silent Serena」','WF',120,'∞','irc'),),
-	array('class' => 'wf', 'stuff' => array('月符「Silent Serena」','日符「Royal Flare」'),'result' => array('日&月符『Royal Diamond Ring』','WF',432,'∞','riud'),),
-	array('class' => 'wf', 'stuff' => array('金符「Metal Fatigue」','火符「Agni Shine」','《魔女的魔导书》'),'result' => array('火&金符『St. Elmo Pillar』','WF',330,'∞','ndfc'),),
-	array('class' => 'wf', 'stuff' => array('水符『Jerry Fish Princess』','月符「Silent Serena」','消音器','天然水'),'result' => array('水&月符『Silent Deluge』','WF',233,'∞','kZz'),),
+	array('class' => 'wf', 'stuff' => array('月符「Silent Serena」','日符「Royal Flare」'),'result' => array('日＆月符『Royal Diamond Ring』','WF',432,'∞','riud'),),
+	array('class' => 'wf', 'stuff' => array('金符「Metal Fatigue」','火符「Agni Shine」','《魔女的魔导书》'),'result' => array('火＆金符『St. Elmo Pillar』','WF',330,'∞','ndfc'),),
+	array('class' => 'wf', 'stuff' => array('水符『Jerry Fish Princess』','月符「Silent Serena」','消音器','天然水'),'result' => array('水＆月符『Silent Deluge』','WF',233,'∞','kZz'),),
 	array('class' => 'wf', 'stuff' => array('火符「Agni Shine」','水符「Princess Undine」','木符『Sylphy Horn』','金符「Metal Fatigue」','土符「Lazy Trilithon」'),'result' => array('火水木金土符『贤者之石』','WF',5000,'∞','uipwe'),),
 	array('class' => 'wf', 'stuff' => array('月符「Silent Serena」','月符「Silent Serena」','火水木金土符『贤者之石』','金符「Metal Fatigue」'),'result' => array('月月火水木金金符『年中无休』（笑）','WF',65500,'∞','rd'),),
-	array('class' => 'wf', 'stuff' => array('日&月符『Royal Diamond Ring』','梦幻『幻月』','神枪『Spear The Gungnir』','紫奥义『弹幕结界』'),'result' => array('模式『EX』','WF',72000,'∞','crdZ'),),
+	array('class' => 'wf', 'stuff' => array('日＆月符『Royal Diamond Ring』','梦幻『幻月』','神枪『Spear The Gungnir』','紫奥义『弹幕结界』'),'result' => array('模式『EX』','WF',72000,'∞','crdZ'),),
 
 	array('class' => 'fseed', 'stuff' => array('◆篝火','◆篝火','◆篝火'),'result' => array('◆◆篝火','DB',10,1,'a'),),
 	array('class' => 'fseed', 'stuff' => array('◆埋火','◆埋火','◆埋火'),'result' => array('◆◆埋火','DH',10,1,'B'),),