Merge pull request #151 from hikawiier/waaagh

Update urmng & mix & ex_cursed

Merge pull request #151 from hikawiier/waaagh
Update urmng & mix & ex_cursed
1c273e6e · Nemo Ma · GitHub · f7e5f1a9 · 14ad96f3 · 1c273e6e
Commit 1c273e6e authored May 22, 2023 by Nemo Ma Committed by GitHub May 22, 2023
15 changed files
--- a/gamedata/cache/clubskills_1.php
+++ b/gamedata/cache/clubskills_1.php
@@ -2060,6 +2060,12 @@ $cskills = Array
 			'lasttimes' => 0, //真正作用的持续时间
 		),
 	),
+	'inf_cursed' => Array
+	(
+		'name' => '霉运',
+		'tags' => Array('inf'),
+		'desc' => '<span class="red b">你感觉自己要倒大霉了……</span>',
+	),
 );



--- a/gamedata/cache/mixitem_1.php
+++ b/gamedata/cache/mixitem_1.php
@@ -11,8 +11,8 @@ $mixinfo = array
 	array('class' => 'h', 'stuff' => array('精神制剂','解毒剂',),'result' => array('体力回复药','HS',200,5,),),
 	array('class' => 'h', 'stuff' => array('面包','矿泉水','锅？'),'result' => array('☆法式长棍面包☆','HB',100,3,),),
 	array('class' => 'h', 'stuff' => array('治疗针','体力回复药','蒸馏水'),'result' => array('特级恢复药','HB',120,2,),),	
-	array('class' => 'h', 'stuff' => array('甜生姜','地雷酥糖'),'result' => array('曾经的荣光-橙黄','HB',50,1,),),
-	array('class' => 'h', 'stuff' => array('曾经的荣光-橙黄','面包'),'result' => array('更改菜谱后的不甜酱包','HB',300,4,'Z'),),
+	array('class' => 'h', 'stuff' => array('甜生姜','地雷酥糖'),'result' => array('曾经的荣光-橙黄','HB',50,2,),),
+	array('class' => 'h', 'stuff' => array('曾经的荣光-橙黄','面包'),'result' => array('更改菜谱后的不甜酱包','PB',300,8,'Z'),),

 	
 	array('class' => 'wc', 'stuff' => array('汽油','空瓶'),'result' => array('☆火焰瓶☆','WC',80,50,'ud'),),	
@@ -22,7 +22,7 @@ $mixinfo = array
 	array('class' => 'wk', 'stuff' => array('针筒','毒药'),'result' => array('毒针','WK',32,20,'p'),),	
 	array('class' => 'wk', 'stuff' => array('毒针','毒针'),'result' => array('D.毒针','WK',48,20,'p'),),
 	array('class' => 'wk', 'stuff' => array('D.毒针','D.毒针','D.毒针'),'result' => array('D.D.D','WK',80,20,'pN'),),
-	array('class' => 'wk', 'stuff' => array('西瓜','水果刀','磨刀石'),'result' => array('西瓜刀','WK',99,'∞','c'),),
+	array('class' => 'wk', 'stuff' => array('西瓜','水果刀','磨刀石'),'result' => array('西瓜刀','WK',99,'∞','Nnc'),),
 	array('class' => 'wk', 'stuff' => array('白色的羽毛','白色的羽毛','白色的羽毛','白色的羽毛','白色的羽毛'),'result' => array('纯白片翼','WK',150,200,'ia'),),
 	array('class' => 'wk', 'stuff' => array('白色的羽毛','闪耀的羽毛','彩虹光芒的羽毛','翼人的羽毛'),'result' => array('悲叹片翼','WK',3200,200,'ai'),),
 	array('class' => 'wk', 'stuff' => array('白色的羽毛','凤凰之羽','露琪亚之羽','绿宝石方块'),'result' => array('精灵片翼','WK',300,200,'uid'),),
@@ -36,15 +36,24 @@ $mixinfo = array
 	array('class' => 'wk', 'stuff' => array('冰封的『Oblivion』','解冻药水'),'result' => array('『Oblivion』','WK',300,10,'i'),),
 	array('class' => 'wk', 'stuff' => array('『Oathkeeper』','『Oblivion』'),'result' => array('『Two Become One』','WK',450,20,'ui'),),
 	array('class' => 'wk', 'stuff' => array('悲叹之种','《寻星流奥义书》','D.D.D','『Two Become One』'),'result' => array('『Last Remote』','WK',10000,1000,'ZNrfk'),),
+	array('class' => 'wk', 'stuff' => array('长矛','美工刀'),'result' => array('护手剑','WK',50,45,'NK'),),
+	array('class' => 'wk', 'stuff' => array('护手剑','毒药'),'result' => array('浸毒刺剑','WK',50,45,'NKp'),),
+	array('class' => 'wk', 'stuff' => array('浸毒刺剑','妖精的羽翼','『祝福宝石』'),'result' => array('☆公主细剑☆','WK',225,80,'Nnp'),),
+	array('class' => 'wk', 'stuff' => array('☆公主细剑☆','★荆棘王冠★','真 - 幻想戏服'),'result' => array('★女王细剑★','WK',655,255,'HNnpc'),),
+	array('class' => 'wk', 'stuff' => array('★女王细剑★','神之操控','安雅人体冰雕'),'result' => array('「女王蔷薇」','WK',1926,'∞','HNnrpc'),),
+	array('class' => 'wk', 'stuff' => array('「女王蔷薇」','■DeathNote■','悲叹之种'),'result' => array('「皇家蔷薇」','WK',17740,'∞','Nnrpc'),),
+	array('class' => 'wk', 'stuff' => array('「皇家蔷薇」','龙虎旗帜'),'result' => array('「猩红蔷薇」','WK',179310,'∞','BNnrfc'),),
 	
 	array('class' => 'wp', 'stuff' => array('电击鞭','原型武器P','实验装甲A'),'result' => array('『T-LINK念动冲拳』','WP',180,'∞','eN'),),
 	array('class' => 'wp', 'stuff' => array('☆电击器☆','原型武器P','实验装甲A'),'result' => array('『T-LINK念动冲拳』','WP',240,'∞','eN'),),
-	array('class' => 'wp', 'stuff' => array('『T-LINK念动冲拳』','某种机械设备','增幅设备','☆爆裂模式☆'),'result' => array('『T-LINK天上天下念动连击拳』','WP',450,'∞','ZernN'),),
-	array('class' => 'wp', 'stuff' => array('【北斗百裂拳】','《北斗神拳》'),'result' => array('【北斗有情破颜拳】','WP',390,100,'drn'),),
+	array('class' => 'wp', 'stuff' => array('『T-LINK念动冲拳』','增幅设备','☆爆裂模式☆'),'result' => array('『T-LINK天上天下念动连击拳』','WP',450,'∞','ZernN'),),
+	array('class' => 'wp', 'stuff' => array('【北斗百裂拳】','《北斗神拳》'),'result' => array('【北斗有情破颜拳】','WP',390,'∞','drny'),),
 	array('class' => 'wp', 'stuff' => array('☆金属拳套☆','压缩气罐'),'result' => array('☆简易火箭飞拳☆','WP',160,'∞','cd'),),
 	array('class' => 'wp', 'stuff' => array('☆简易火箭飞拳☆','电磁发射装置'),'result' => array('★火箭飞拳★','WP',400,'∞','cdN'),),
 	array('class' => 'wp', 'stuff' => array('《哲♂学》','小棍棒','增幅设备'),'result' => array('森之妖精的棍棒','WP',200,60,'re'),),
 	array('class' => 'wp', 'stuff' => array('冰沙','小棍棒','御神签'),'result' => array('冰棍棒','WP',19,39,'ir'),),
+	array('class' => 'wp', 'stuff' => array('御币','【风神的神德】','☆守矢神签☆'),'result' => array('☆守矢风祝的御币☆','WP',128,28,'yrew'),),
+	array('class' => 'wp', 'stuff' => array('小棍棒','白色方块','黑色方块','悲叹之种','悲叹之种'),'result' => array('★悔悟之棍棒★','WP',777,'∞','Zydkz'),),
 	array('class' => 'wp', 'stuff' => array('☆法式长棍面包☆','水'),'result' => array('法式面包棍棒','WP',120,25,'NRz'),),
 	array('class' => 'wp', 'stuff' => array('棍棒','岩石','钉','毒药'),'result' => array('绽花毒藤','WKP',180,150,'Np'),),
 	array('class' => 'wp', 'stuff' => array('向日葵','月光碎片','铁链','超级重锤'),'result' => array('太极','WP',180,150,'Nwc'),),
@@ -54,11 +63,11 @@ $mixinfo = array
 	array('class' => 'wp', 'stuff' => array('风滚草','晨星链刃','太极','海胆链球'),'result' => array('龙魂破','WKP',6600,2200,'ZrdfN'),),
 	
 	array('class' => 'wg', 'stuff' => array('火把','红宝石方块'),'result' => array('『红石电路』','X',1,1,''),),
-	array('class' => 'wg', 'stuff' => array('★炸药★','『红石电路』'),'result' => array('『红石光束炮』','WG',280,280,'yfdo'),),
+	array('class' => 'wg', 'stuff' => array('★阔剑地雷★','地雷','『红石电路』'),'result' => array('『红石光束炮』','WG',280,280,'yfdo'),),
 	array('class' => 'wg', 'stuff' => array('老式火枪','原型武器G','定时炸弹','某种电子零件'),'result' => array('★发条式突击步枪★','WG',150,100,'r'),),
 	array('class' => 'wg', 'stuff' => array('原型武器G','鲨鱼鳍'),'result' => array('『迷你鲨』','WG',72,120,'rc'),),
-	array('class' => 'wg', 'stuff' => array('『迷你鲨』','非法枪械部件','攻击之源','触手的力量'),'result' => array('『巨兽鲨』','WG',344,240,'rc'),),
-	array('class' => 'wg', 'stuff' => array('『巨兽鲨』','某种机械设备','悲叹之种','礼品盒'),'result' => array('『链式机枪』','WG',431,175,'ZNnrc'),),
+	array('class' => 'wg', 'stuff' => array('『迷你鲨』','攻击之源','某种电子零件','触手的力量'),'result' => array('『巨兽鲨』','WG',344,240,'rc'),),
+	array('class' => 'wg', 'stuff' => array('『巨兽鲨』','悲叹之种','礼品盒'),'result' => array('『链式机枪』','WG',431,175,'ZNnrc'),),
 	array('class' => 'wg', 'stuff' => array('喷雾器罐','打火机'),'result' => array('★简易火焰放射器★','WG',150,80,'u'),),
 	array('class' => 'wg', 'stuff' => array('★阔剑地雷★','电磁发射装置','某种电子零件'),'result' => array('【定向阔剑发射器】','WG',810,3,'dNoy'),),
 	array('class' => 'wg', 'stuff' => array('★阔剑地雷★','【定向阔剑发射器】'),'result' => array('【定向阔剑发射器】','WG',810,3,'dNoy'),),
@@ -89,7 +98,7 @@ $mixinfo = array
 	array('class' => 'wd', 'stuff' => array('【烈焰红唇】','密封的酒瓶'),'result' => array('★血腥玛丽★Bloody Mary','WD',310,150,'dw'),),
 	array('class' => 'wd', 'stuff' => array('伏特加','牛肉汤','バカ⑨制冰块'),'result' => array('【燃烧的鸡尾酒】','HB',233,2),),
 	array('class' => 'wd', 'stuff' => array('【燃烧的鸡尾酒】','密封的酒瓶'),'result' => array('★公牛子弹★Bull Shot','WD',210,300,'dr'),),
-	array('class' => 'wd', 'stuff' => array('★血腥玛丽★Bloody Mary','★公牛子弹★Bull Shot','密封的酒瓶'),'result' => array('★血腥公牛★Bloody Bull','WD',520,450,'dwr'),),
+	array('class' => 'wd', 'stuff' => array('★血腥玛丽★Bloody Mary','★公牛子弹★Bull Shot','密封的酒瓶'),'result' => array('★血腥公牛★Bloody Bull','WD',520,450,'dwry'),),
 	array('class' => 'wd', 'stuff' => array('☆自爆电池☆','★时停怀表★'),'result' => array('寒冰炸弹','WD',260,45,'i'),),
 	array('class' => 'wd', 'stuff' => array('『祝福宝石』','★瓶装幽灵★','某种电子零件'),'result' => array('★幽灵冲击★','WD',320,200,'Nn'),),
 	array('class' => 'wd', 'stuff' => array('★幽灵冲击★','《魔女的魔导书》','笔记本电脑'),'result' => array('奥术飞弹','WD',400,300,'Nnr'),),
@@ -101,6 +110,7 @@ $mixinfo = array
 	array('class' => 'w', 'stuff' => array('数据……碎片','电子马克笔','天然属性也是很可怕的！'),'result' => array('黑色夺魂曲','DB',57,77,'ZBb'),),
 	array('class' => 'w', 'stuff' => array('『午夜钟声』','『午夜钟声』','『午夜钟声』'),'result' => array('电子马克笔','DA',53,75,'Z'),),
 	
+	array('class' => 'item', 'stuff' => array('打火机','地雷'),'result' => array('驱云弹（？）','EW',1,1,0),),
 	array('class' => 'item', 'stuff' => array('生命探测器','增幅设备'),'result' => array('广域生命探测器','ER',1,1,2),),
 	array('class' => 'item', 'stuff' => array('早苗面包','仙贝面包','咖喱面包','红豆面包'),'result' => array('天然呆四面的奖赏','Z',1,1,'z'),),
 	array('class' => 'item', 'stuff' => array('安雅人体冰雕','火把'),'result' => array('武器师安雅的奖赏','Y',1,1,),),
@@ -129,7 +139,7 @@ $mixinfo = array
 	array('class' => 'key', 'stuff' => array('神北 小毬的半身像','一之濑 琴美的半身像','SSS团长的半身像'),'result' => array('天然属性也是很可怕的！','WD',160,46,'zd'),),
 	array('class' => 'key', 'stuff' => array('天然属性也是很可怕的！','篝酱的奇迹☆胶带～刃'),'result' => array('【KEY系巴嘎弹】','WD',1800,5,'Rz'),),
 	array('class' => 'key', 'stuff' => array('【KEY系巴嘎弹】','红色的丝带'),'result' => array('【KEY系超级巴嘎弹】','WD',1800,5,'zd'),),
-	array('class' => 'key', 'stuff' => array('四季流转的咏叹调','旁观轮回的覆唱诗'),'result' => array('【KEY系催泪弹】','WD',3600,5,'zd'),),
+	array('class' => 'key', 'stuff' => array('四季流转的咏叹调','旁观轮回的覆唱诗'),'result' => array('【KEY系催泪弹】','WD',7200,5,'zd'),),
 	array('class' => 'key', 'stuff' => array('手机','二重战斗匕首','《ACFUN大逃杀攻略》','『寻星勇者』'),'result' => array('【KEY系未来弹】','WP',860,5,'zd'),),
 	array('class' => 'key', 'stuff' => array('提示纸条K','提示纸条E','提示纸条Y','提示纸条D'),'result' => array('【KEY系生命弹】','WG',860,5,'zdr'),),
 	array('class' => 'key', 'stuff' => array('【KEY系未来弹】','【恋歌】','破灭未来的残光','来自未来的奇迹'),'result' => array('【春雨夏海，秋叶冬雪】','DB',600,600,'ZBb'),),
@@ -163,26 +173,29 @@ $mixinfo = array
 	array('class' => 'cube', 'stuff' => array('金色方块','绿色方块'),'result' => array('蓝宝石方块','X',1,1,),),
 	array('class' => 'cube', 'stuff' => array('蓝色方块','黄色方块'),'result' => array('绿宝石方块','X',1,1,),),
 	array('class' => 'cube', 'stuff' => array('红宝石方块','蓝宝石方块'),'result' => array('绿宝石方块','X',1,2,),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','黄色方块'),'result' => array('黄色的宝石枪','WG',240,180,'e'),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','红色方块'),'result' => array('红色的宝石刀','WK',240,180,'u'),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','蓝色方块'),'result' => array('蓝色的宝石锤','WP',240,180,'i'),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','绿色方块'),'result' => array('绿色的宝石镖','WC',240,180,'p'),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','金色方块'),'result' => array('金色的宝石炸弹','WD',240,180,'d'),),
-	array('class' => 'cube', 'stuff' => array('绿宝石方块','银色方块'),'result' => array('银色的宝石符卡','WF',240,180,'w'),),
-	array('class' => 'cube', 'stuff' => array('红色的宝石刀','悲叹之种'),'result' => array('★恐惧的黑色安息日★','WK',240,320,'rud'),),
-	array('class' => 'cube', 'stuff' => array('银色的宝石符卡','悲叹之种'),'result' => array('★失落的银色镇魂歌★','WF',240,320,'rwd'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','黄色方块'),'result' => array('黄色的宝石枪','WG',240,180,'ez'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','红色方块'),'result' => array('红色的宝石刀','WK',240,180,'uz'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','蓝色方块'),'result' => array('蓝色的宝石锤','WP',240,180,'iz'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','绿色方块'),'result' => array('绿色的宝石镖','WC',240,180,'pz'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','金色方块'),'result' => array('金色的宝石炸弹','WD',240,180,'dz'),),
+	array('class' => 'cube', 'stuff' => array('绿宝石方块','银色方块'),'result' => array('银色的宝石符卡','WF',240,180,'wz'),),
+	array('class' => 'cube', 'stuff' => array('红色的宝石刀','悲叹之种'),'result' => array('★恐惧的黑色安息日★','WK',240,320,'rudz'),),
+	array('class' => 'cube', 'stuff' => array('银色的宝石符卡','悲叹之种'),'result' => array('★失落的银色镇魂歌★','WF',240,320,'rwdz'),),
 	array('class' => 'cube', 'stuff' => array('绿宝石方块','水晶方块'),'result' => array('水晶宝石盾','DA',240,180,'PC'),),
 	array('class' => 'cube', 'stuff' => array('绿宝石方块','红宝石方块'),'result' => array('珍珠头盔','DH',360,180,'KDa'),),
 	array('class' => 'cube', 'stuff' => array('绿宝石方块','蓝宝石方块'),'result' => array('钻石靴子','DF',360,180,'GFa'),),
 	array('class' => 'cube', 'stuff' => array('红宝石方块','红色方块'),'result' => array('深红色的项链','A',240,180,'aM'),),
 	array('class' => 'cube', 'stuff' => array('蓝宝石方块','蓝色方块'),'result' => array('蔚蓝色的项链','A',240,180,'Hc'),),
-	array('class' => 'cube', 'stuff' => array('黄色方块','黄色方块','黄色方块'),'result' => array('★高压电击★','WD',122,251,'red'),),
-	array('class' => 'cube', 'stuff' => array('红色方块','红色方块','红色方块'),'result' => array('★烈焰冲撞★','WP',122,122,'ru'),),
-	array('class' => 'cube', 'stuff' => array('绿色方块','绿色方块','绿色方块'),'result' => array('★飞叶快刀★','WK',122,122,'Zrp'),),
-	array('class' => 'cube', 'stuff' => array('蓝色方块','蓝色方块','蓝色方块'),'result' => array('★急冻光线★','WG',122,251,'ric'),),
-	array('class' => 'cube', 'stuff' => array('金色方块','金色方块','金色方块'),'result' => array('★齿轮飞碟★','WC',122,386,'rd'),),
-	array('class' => 'cube', 'stuff' => array('银色方块','银色方块','银色方块'),'result' => array('★精神破坏★','WF',122,122,'rw'),),
-	array('class' => 'cube', 'stuff' => array('水晶方块','水晶方块','水晶方块'),'result' => array('★灭亡之歌★','TN',960,2,),),
+	array('class' => 'cube', 'stuff' => array('红宝石方块','黑色方块'),'result' => array('终极红宝石之秘药','HB',386,76,'z'),),
+	array('class' => 'cube', 'stuff' => array('蓝宝石方块','白色方块'),'result' => array('始源蓝宝石之秘药','MV',76,2,'z'),),
+	array('class' => 'cube', 'stuff' => array('黄色方块','黄色方块','黄色方块'),'result' => array('★高压电击★','WD',122,251,'redz'),),
+	array('class' => 'cube', 'stuff' => array('红色方块','红色方块','红色方块'),'result' => array('★烈焰冲撞★','WP',122,122,'ruz'),),
+	array('class' => 'cube', 'stuff' => array('绿色方块','绿色方块','绿色方块'),'result' => array('★飞叶快刀★','WK',122,122,'Zrpz'),),
+	array('class' => 'cube', 'stuff' => array('蓝色方块','蓝色方块','蓝色方块'),'result' => array('★急冻光线★','WG',122,251,'ricz'),),
+	array('class' => 'cube', 'stuff' => array('金色方块','金色方块','金色方块'),'result' => array('★齿轮飞碟★','WC',122,386,'rdz'),),
+	array('class' => 'cube', 'stuff' => array('银色方块','银色方块','银色方块'),'result' => array('★精神破坏★','WF',122,122,'rwz'),),
+	array('class' => 'cube', 'stuff' => array('水晶方块','水晶方块','水晶方块'),'result' => array('★灭亡之歌★','TN',960,2,'z'),),
+	array('class' => 'cube', 'stuff' => array('水晶方块','白色方块','黑色方块'),'result' => array('★便当盒★','WC',99,'∞','ipr'),),
 	
 	
 	array('class' => 'wf', 'stuff' => array('空白符卡','☆博丽护符☆'),'result' => array('梦符『梦想妙珠』','WF',40,'∞','r'),),
@@ -214,6 +227,7 @@ $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',99,999,'zzz'),),
 	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'),),
@@ -296,7 +310,7 @@ $mixinfo = array


 	array('class' => 'ocg', 'stuff' => array('「被封印的艾克佐迪亚」','「被封印者的左腕」','「被封印者的右腕」','「被封印者的左足」','「被封印者的右足」'),'result' => array('「被封印的黑暗大法师」','WC',8192,1,),),
-	array('class' => 'ocg', 'stuff' => array('「被封印的黑暗大法师」','★神卡认证★'),'result' => array('『黑暗大法师』','WC12',8192,'∞','AaZ'),),
+	array('class' => 'ocg', 'stuff' => array('「被封印的黑暗大法师」','★神卡认证★'),'result' => array('『黑暗大法师』','WC12',8192,'∞','Rx'),),
 	array('class' => 'ocg', 'stuff' => array('「隼骑士」-仮','☆四星认证☆'),'result' => array('「隼骑士」','WC03',100,'∞','rj'),),
 	array('class' => 'ocg', 'stuff' => array('「V-喷气虎」-仮','☆四星认证☆'),'result' => array('「V-喷气虎」','WC04',160,'180','p'),),
 	array('class' => 'ocg', 'stuff' => array('「W-弹射飞翼」-仮','☆四星认证☆'),'result' => array('「W-弹射飞翼」','WC04',130,'150','u'),),

--- a/gamedata/cache/resources_1.php
+++ b/gamedata/cache/resources_1.php
@@ -1067,6 +1067,7 @@ $itemspkinfo = Array(
 	's' => '调整',
 	'U' => '防火',
 	'u' => '火焰',
+	'V' => '诅咒',
 	'v' => '灵魂绑定',
 	'W' => '隔音',
 	'w' => '音波',

--- a/gamedata/cache/shopitem_1.php
+++ b/gamedata/cache/shopitem_1.php
 <? if(!defined('IN_GAME')) exit('Access Denied'); ?>
 0,2,,,补给,,,,,
-1,300,13,0,矿泉水,HS,120,1,,
-1,150,17,0,体力回复药,HS,240,1,,
-1,100,26,1,圆形罐头,HS,600,1,,
-1,300,12,0,面包,HH,120,1,,
-1,150,22,0,治疗针,HH,220,1,,
-1,100,55,1,超级治疗针,HH,640,1,,
-1,100,43,0,美味水,HB,75,2,,
-1,100,98,1,非常食,HB,788,2,,
-1,100,113,2,龙料理,HB,1500,2,,
+1,100,13,0,矿泉水,HS,120,1,,
+1,70,17,0,体力回复药,HS,240,1,,
+1,60,26,1,圆形罐头,HS,600,1,,
+1,100,12,0,面包,HH,120,1,,
+1,70,22,0,治疗针,HH,220,1,,
+1,60,55,1,超级治疗针,HH,640,1,,
+1,45,43,0,美味水,HB,75,2,,
+1,45,98,1,非常食,HB,788,2,,
+1,45,113,2,龙料理,HB,1500,2,,
 0,2,,,药剂,,,,,
 2,1000,1,0,装有H173的注射器,Y,1,1,,
 2,50,20,0,溶剂SCP-294_PT_Poini_Kune,Y,1,1,,
@@ -16,12 +16,12 @@
 2,50,20,0,溶剂SCP-294_PT_Strarf,Y,1,1,,
 2,50,20,1,溶剂SCP-294_PT_ErulTron,Y,1,1,,
 2,750,5,0,毒药,Y,1,1,,
-2,25,10,0,解毒剂,Cp,1,1,,
-2,25,20,0,烧伤药剂,Cu,1,1,,
-2,25,20,0,解冻药水,Ci,1,1,,
-2,25,20,0,麻痹药剂,Ce,1,1,,
-2,25,20,0,清醒药剂,Cw,1,1,,
-2,10,60,1,全恢复药剂,Ca,1,1,,
+2,5,10,0,解毒剂,Cp,1,1,,
+2,5,20,0,烧伤药剂,Cu,1,1,,
+2,5,20,0,解冻药水,Ci,1,1,,
+2,5,20,0,麻痹药剂,Ce,1,1,,
+2,5,20,0,清醒药剂,Cw,1,1,,
+2,5,60,1,全恢复药剂,Ca,1,1,,
 0,3,,,钝器,,,,,
 3,500,10,0,桌球拍,WP,20,15,,
 3,100,300,0,超级重锤,WP,80,15,,
@@ -39,7 +39,7 @@
 5,1,12000,0,『巴雷特M82A1』,WJ,600,1,Nnj,
 5,500,16,0,玩具手枪,WG,24,24,,
 5,1,900,0,消音器,Y,1,1
-5,150,5800,0,冷冻光束枪,WG,233,20,i,
+5,150,3200,0,冷冻光束枪,WG,233,20,i,
 5,10,420,0,『精神震荡弹』,WG,64,48,e,
 5,10,420,0,『连射激光』,WG,64,80,ro,
 5,100,800,0,『特尔斯的龙旋风型』,WG,160,40,,
@@ -83,27 +83,27 @@
 8,100,300,0,☆残页的魔导书☆,X,1,1,,
 8,5,5500,0,《魔女的魔导书》,X,1,1,, 
 0,9,,,防具,,,,,
-9,300,14,0,死库水,DB,1,75,,
+9,300,14,0,死库水,DB,1,75,z,
 9,1,5,0,『Poini Kune的死库水』,DB,5,75,,
 9,1,5,0,『Erul Tron的泳装』,DB,10,75,,
 9,1,32768,0,数据……碎片,DB,3756,7,Z,
-9,100,600,0,防弹背心,DB,25,30,G,
-9,50,1500,1,☆能量装甲☆,DB,50,30,GC,
-9,25,3200,2,☆光学迷彩改进型☆,DB,90,20,GC,
-9,200,20,0,防毒面具,DH,15,12,q,
-9,50,420,1,☆军用头盔☆,DH,50,35,,
-9,50,420,1,☆军用盾牌☆,DA,50,35,,
-9,50,420,1,☆军靴☆,DF,50,35,,
-9,25,800,0,『小毬的草帽挂件』,DH,80,80,,
-9,20,1500,2,★诅咒铠甲★,DB,120,40,,
-9,20,1500,2,★荆棘王冠★,DH,120,40,,
-9,20,1500,2,★至尊魔戒★,DA,120,40,,
-9,20,1500,2,★Strike Unit★,DF,120,40,,
-9,50,400,1,火焰防御场,A,1,1,U,
-9,50,400,1,冻气防御场,A,1,1,I,
-9,50,400,1,电磁护盾,A,1,1,E,
-9,50,400,1,空气护盾,A,1,1,W,
-9,1,600,0,妖精的羽翼,A,1,1,q,
+9,50,1500,1,☆能量装甲☆,DB,350,300,GC,
+9,25,3200,2,☆光学迷彩改进型☆,DB,2900,200,a,
+9,5,220,0,防毒面具,DH,15,12,q,
+9,5,220,0,☆防弹背心☆,DB,75,15,G,
+9,5,220,0,☆军用头盔☆,DH,75,15,C,
+9,5,220,0,☆军用盾牌☆,DA,75,15,KP,
+9,5,220,0,☆军靴☆,DF,75,15,D,
+9,25,800,0,『小毬的草帽挂件』,DH,80,80,z,
+9,2,1500,0,★诅咒铠甲★,DB,120,40,Rc,
+9,2,1500,0,★荆棘王冠★,DH,120,40,Rc,
+9,2,1500,0,★至尊魔戒★,DA,120,40,Rc,
+9,2,1500,0,★Strike Unit★,DF,120,40,Rc,
+9,3,400,0,火焰防御场,A,1,1,U,
+9,3,400,0,冻气防御场,A,1,1,I,
+9,3,400,0,电磁护盾,A,1,1,E,
+9,3,400,0,空气护盾,A,1,1,W,
+9,3,600,0,妖精的羽翼,A,1,1,q,
 0,10,,,书籍,,,,,
 10,3,300,0,《殴系指南》,VP,30,1,,
 10,3,300,0,《斩系指南》,VK,30,1,,
@@ -126,7 +126,7 @@
 0,12,,,杂物,,,,,
 12,250,150,0,水果刀,Z,1,1,,
 12,200,60,0,钉,Y,3,4,,
-12,100,120,1,钢钉,Y,20,1,,
+12,100,120,1,钢钉,Y,60,1,,
 12,75,250,0,磨刀石,Y,5,5,,
 12,30,600,1,贤者之磨刀石,Y,60,1,,
 12,500,6,0,手枪子弹,GB,1,12,,
@@ -172,15 +172,15 @@
 15,30,20,0,绘图志,WP,15,200,,
 15,30,20,0,团子,WC,15,200,,
 15,1,9999999,0,小毬血,X,1,1,,
-15,30,2777,1,真-红色的发圈,DH,500,150,KG,
-15,30,2777,1,小空,DA,500,150,CD,
-15,30,2777,1,真 - 幻想戏服,DB,500,150,PF,
-15,30,3777,1,亲手制作的鲷鱼烧,HB,500,150,,
-15,30,3777,1,培根蛋+？,HB,500,150,,
-15,30,3777,1,秋生大叔的面包,HB,500,150,,
-15,30,4777,2,天使之剑,WK,600,150,cd,
-15,30,4777,2,恐龙扑克牌,WC,600,150,rdc,
-15,30,4777,2,秋生大叔的球棒,WP,600,150,cd,
+15,7,2777,0,真-红色的发圈,DH,500,150,KG,
+15,7,2777,0,小空,DA,500,150,CD,
+15,7,2777,0,真 - 幻想戏服,DB,500,150,PF,
+15,7,3777,1,亲手制作的鲷鱼烧,HB,500,150,,
+15,7,3777,1,培根蛋+？,HB,500,150,,
+15,7,3777,1,秋生大叔的面包,HB,500,150,,
+15,7,3777,1,天使之剑,WK,600,150,cd,
+15,7,3777,1,恐龙扑克牌,WC,600,150,rdc,
+15,7,3777,1,秋生大叔的球棒,WP,600,150,cd,
 0,16,,,解锁钥匙,,,,,
 16,3,200,0,✦种火钥匙,Y,1,1,,
 16,2,1000,0,✦钥匙碎片,Y,1,1,,

--- a/gamedata/cache/titles_1.php
+++ b/gamedata/cache/titles_1.php
@@ -222,6 +222,7 @@ if(!defined('IN_GAME')) exit('Access Denied');
    14 => Array(
      'money' => '[:+=:]3210',
      'wep' => '增殖之腿', 'wepk' => 'WCP', 'wepe' => 10,  'weps' => '∞', 'wepsk' => 'd',
+      'arf' => '腿？', 'arfk' => 'DF', 'arfe' => 9, 'arfs' => 99, 'arfsk' => 'VxK',
    ),
    # 19. 美食家
    19 => Array(

--- a/gamedata/cache/tooltip_1.php
+++ b/gamedata/cache/tooltip_1.php
@@ -195,6 +195,7 @@ $tps_isk = Array
 	's' => Array('title' => "这个物品是游戏王同调合成的必备素材。",),
 	'U' => Array('title' => "高概率将火焰属性对你的属性伤害减半。并避免烧伤状态。",),
 	'u' => Array('title' => "攻击对手时，将产生额外的火焰属性伤害。也有可能让对手陷入烧伤状态。",),
+	'V' => Array('title' => "装备或拾取带有诅咒属性的物品时，无法将其丢弃、赠予或存入容器。\n持有诅咒道具时，可能会在探索中遭遇不测……",),
 	'v' => Array('title' => "丢弃本物品，或你死亡时，本物品会消失。",),
 	'W' => Array('title' => "高概率将音波属性对你的属性伤害减半。并避免混乱状态。",),
 	'w' => Array('title' => "攻击对手时，将产生额外的音波属性伤害。也有可能让对手陷入混乱异常状态。",),

--- a/include/admin/urlist.php
+++ b/include/admin/urlist.php
@@ -27,6 +27,7 @@ if($urcmd){
 	} else {
 		while($ur = $db->fetch_array($result)) {
 			if(!$ur['gender']){$ur['gender']='0';}
+			$ur = format_userdata($ur);
 			$urdata[] = $ur;
 		}
 		$startno = $start + 1;
@@ -34,7 +35,7 @@ if($urcmd){
 		$resultinfo = '第'.$startno.'条-第'.$endno.'条记录';
 	}
 }
-if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkach') {
+if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del') {
 	$operlist = $gfaillist = $ffaillist = array();
 	for($i=0;$i<$showlimit;$i++){
 		if(isset(${'user_'.$i})) {
@@ -46,46 +47,6 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 					$urdata[$i]['groupid'] = 1;
 				}elseif($urcmd == 'del'){
 					unset($urdata[$i]);
-				}elseif($urcmd == 'checkach'){
-					$adata = $urdata[$i]; $n = $urdata[$i]['username'];
-					$adata['achrev'] = json_decode($adata['achrev'],true);
-					$new_ach = Array(); $cpl = Array(); $prc = Array();
-					//手动变化成就储存结构
-					if(!empty($adata['achievement']) && empty($adata['achrev']))
-					{
-						include_once GAME_ROOT.'./include/game/achievement.func.php';
-						$alist = get_achlist();
-						foreach($alist as $a => $aarr)
-						{
-							if($a <= 57)
-							{
-								$cpl[$a]=check_achievement($a,$n);
-								$prc[$a]=fetch_achievement($a,$n);
-								//新成就储存结构内，只会保存有进度的成就
-								if(!empty($cpl[$a]) || !empty($prc[$a]))
-								{
-									// 到达999阶段的成就 替换为配置中预设的达成等级
-									if($cpl[$a] == 999)
-									{
-										if($a == 16 || $a == 17 || $a == 18 || $a == 19) 
-										{
-											//特判：四个结局成就阶段会变更为1...就这样了！
-											$cpl[$a] = 1;
-										}
-										else
-										{
-											$cpl[$a] = $aarr['lvl'] ?: count($aarr['name']);
-										}
-									}
-									$new_ach[$a]['l'] = $cpl[$a] ?: 0;
-									$new_ach[$a]['v'] = $prc[$a] ?: 0;
-								}
-							}
-						}
-						$new_ach = json_encode($new_ach);
-						$db->query("UPDATE {$gtablepre}users SET achrev='$new_ach' WHERE username='".$n."'" );
-					}
-					//$new_ach = '';
 				}
 //				adminlog('banur',$urdata[$i]['username']);
 			}elseif(isset($urdata[$i]) && $urdata[$i]['uid'] == ${'user_'.$i}){
@@ -106,10 +67,8 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 		}elseif($urcmd == 'del'){
 			$operword = '删除';
 			$qryword = "DELETE FROM {$gtablepre}users ";
-		}elseif($urcmd == 'checkach'){
-			$cmd_info .= " 帐户 $opernames 调整了成就储存结构";
 		}
-		if($operlist && $urcmd != 'checkach'){
+		if($operlist){
 			$qrywhere = '('.implode(',',array_keys($operlist)).')';
 			$opernames = implode(',',($operlist));
 			$db->query("$qryword WHERE uid IN $qrywhere");
@@ -159,14 +118,43 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 		}else{
 			$urdata[$no]['gender'] = $urgender = ${'gender_'.$no};
 		}
+		if(!empty(${'addtitles_'.$no}) && isset($titles_list[${'addtitles_'.$no}]))
+		{
+			$nkey = ${'addtitles_'.$no};
+			$flag = titles_get_new($urdata[$no],$nkey);
+			if($flag)
+			{
+				$cmd_info .= "".$urdata[$no]['username']." 获得了头衔 {$titles_list[$nkey]} <br>";
+				$db->query("UPDATE {$gtablepre}users SET nicksrev='{$urdata[$no]['nicksrev']}' WHERE uid='$uid'");
+			}
+			else 
+			{
+				$cmd_info .= "".$urdata[$no]['username']." 已拥有头衔 {$titles_list[$nkey]} ，不能重复获取<br>";
+			}
+		}
+		if(!empty(${'deltitles_'.$no}) && isset($titles_list[${'deltitles_'.$no}]))
+		{
+			$nkey = ${'deltitles_'.$no};
+			$flag = titles_delete($urdata[$no],$nkey);
+			if($flag)
+			{
+				$cmd_info .= "从".$urdata[$no]['username']." 的头衔列表中删去了 {$titles_list[$nkey]} <br>";
+				$db->query("UPDATE {$gtablepre}users SET nicksrev='{$urdata[$no]['nicksrev']}' WHERE uid='$uid'");
+			}
+			else 
+			{
+				$cmd_info .= "".$urdata[$no]['username']." 未持有头衔 {$titles_list[$nkey]}<br>";
+			}
+		}
 		if(!empty(${'pass_'.$no})){
 			$urpass = md5(${'pass_'.$no});
 			$db->query("UPDATE {$gtablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',password='$urpass',credits='$urcredits',credits2='$urcredits2' WHERE uid='$uid'");
-			$cmd_info = "帐户 ".$urdata[$no]['username']." 的密码及其他信息已修改！";
+			$cmd_info .= "帐户 ".$urdata[$no]['username']." 的密码及其他信息已修改！";
 		}else{
 			$db->query("UPDATE {$gtablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',credits='$urcredits',credits2='$urcredits2' WHERE uid='$uid'");
-			$cmd_info = "帐户 ".$urdata[$no]['username']." 的信息已修改！";
+			$cmd_info .= "帐户 ".$urdata[$no]['username']." 的信息已修改！";
 		}
+		$urdata[$no] = fetch_userdata_by_username($urdata[$no]['username']);
 	}
 	$urcmd = 'list';
 }

--- a/include/game/battle.func.php
+++ b/include/game/battle.func.php
@@ -252,6 +252,15 @@ function senditem(){
 		$itms = & ${'itms'.$itmn};
 		$itmsk = & ${'itmsk'.$itmn};

+		# 诅咒道具不能赠予，不准祸水东引！
+		if(in_array('V',get_itmsk_array($itmsk)))
+		{
+			$log .= "你伸出手，挠了挠自己的头。<br>你本来打算干什么来着？<br>";
+			$action = ''; $bid = 0;
+			$mode = 'command';
+			return;
+		}
+
 		//global $w_pid,$w_name,$w_pass,$w_type,$w_endtime,$w_gd,$w_sNo,$w_icon,$w_club,$w_hp,$w_mhp,$w_sp,$w_msp,$w_att,$w_def,$w_pls,$w_lvl,$w_exp,$w_money,$w_bid,$w_inf,$w_rage,$w_pose,$w_tactic,$w_killnum,$w_state,$w_wp,$w_wk,$w_wg,$w_wc,$w_wd,$w_wf,$w_teamID,$w_teamPass,$w_wep,$w_wepk,$w_wepe,$w_weps,$w_arb,$w_arbk,$w_arbe,$w_arbs,$w_arh,$w_arhk,$w_arhe,$w_arhs,$w_ara,$w_arak,$w_arae,$w_aras,$w_arf,$w_arfk,$w_arfe,$w_arfs,$w_art,$w_artk,$w_arte,$w_arts,$w_itm0,$w_itmk0,$w_itme0,$w_itms0,$w_itm1,$w_itmk1,$w_itme1,$w_itms1,$w_itm2,$w_itmk2,$w_itme2,$w_itms2,$w_itm3,$w_itmk3,$w_itme3,$w_itms3,$w_itm4,$w_itmk4,$w_itme4,$w_itms4,$w_itm5,$w_itmk5,$w_itme5,$w_itms5,$w_itm6,$w_itmk6,$w_itme6,$w_itms6,$w_wepsk,$w_arbsk,$w_arhsk,$w_arask,$w_arfsk,$w_artsk,$w_itmsk0,$w_itmsk1,$w_itmsk2,$w_itmsk3,$w_itmsk4,$w_itmsk5,$w_itmsk6,$w_rp,$w_skillpoint,$nick;
 		extract($edata,EXTR_PREFIX_ALL,'w');


--- a/include/game/depot.func.php
+++ b/include/game/depot.func.php
@@ -81,6 +81,11 @@
 			$log.="<span class='red'>你身上的钱不足以支付储存道具的手续费！</span><br>";
 			return;
 		}
+		if(strpos(${'itmsk'.$i},'V')!==false)
+		{
+			$log.="<span class='red'>你尝试着把诅咒道具扔进安全箱，但安全箱又立刻将它吐了出来！</span><br>";
+			return;
+		}
 		if(strpos(${'itmsk'.$i},'v')!==false)
 		{
 			$log.="<span class='red'>你尝试着把灵魂绑定的道具扔进安全箱，但安全箱又立刻将它吐了出来！</span><br>";

--- a/include/game/item.func.php
+++ b/include/game/item.func.php
@@ -83,6 +83,20 @@ function itemuse($itmn,&$data=NULL) {
 			$mode = 'command';
 			return;
 		}
+		# 诅咒装备不能主动卸下
+		if(in_array('V',get_itmsk_array(${$eqp.'sk'})))
+		{
+			$log .= "你尝试着将{$$eqp}替换下来……但它就像长在了你身上一样，纹丝不动！<br>";
+			$mode = 'command';
+			return;
+		}
+		# 主动装备诅咒装备时，会变得不幸！
+		if(in_array('V',get_itmsk_array($isk)))
+		{
+			$log .= "<span class=\"grey\">你感觉自己要倒大霉了……</span><br>";
+			getclubskill('inf_cursed',$clbpara);
+		}
+
 		//PORT
 		if(strpos($itmsk,'^')!==false){
 			//global $itmnumlimit;

--- a/include/game/itemmain.func.php
+++ b/include/game/itemmain.func.php
@@ -415,6 +415,14 @@ function itemget(&$data=NULL)
 	}
 	extract($data,EXTR_REFS);
 	$log .= "获得了物品<span class=\"yellow\">$itm0</span>。<br>";
+
+	# 拾取诅咒物品时，触发霉运
+	if(!empty($itmsk0) && in_array('V',get_itmsk_array($itmsk0)))
+	{
+		$log .= "<span class=\"grey\">你感觉自己要倒大霉了……</span><br>";
+		getclubskill('inf_cursed',$clbpara);
+	}
+
 	//PORT
 	if(strpos($itmsk0,'^')!==false){
 		$keep_flag = false;
@@ -469,7 +477,6 @@ function itemget(&$data=NULL)
 			}
 			return;
 		}
-		
 	}

 	itemadd($data);
@@ -544,6 +551,13 @@ function itemdrop($item,&$data=NULL) {
 		$mode = 'command';
 		return;
 	}
+	# 诅咒装备不能被丢弃
+	if(in_array('V',get_itmsk_array($itmsk)))
+	{
+		$log .= "你丢弃了……<br>你忽然忘记自己原本想干什么了。<br>";
+		$mode = 'command';
+		return;
+	}
 	if(!$itms||!$itmk||$itmk=='WN'||$itmk=='DN'){
 		$log .= '该物品不存在！<br>';
 		$mode = 'command';
@@ -604,6 +618,13 @@ function itemoff($item){
 		$mode = 'command';
 		return;
 	}
+	# 诅咒装备不能主动卸下
+	if(in_array('V',get_itmsk_array($itmsk)))
+	{
+		$log .= "你尝试着卸下{$itm}……但它就像长在了你身上一样，纹丝不动！<br>";
+		$mode = 'command';
+		return;
+	}

 	//卸下装备时，进行单次套装检测
 	reload_single_set_item($pdata,$item,$itm);
@@ -1549,6 +1570,20 @@ function reload_set_items(&$pa)
 			$sid = $set_items[$eqp][$pa[$eqp]];
 			$pa['clbpara']['setitems'][$sid] += 1;
 		}
+		# 身上存在诅咒装备时，触发霉运效果
+		if(!empty($pa[$eqp.'sk']) && in_array('V',get_itmsk_array($pa[$eqp.'sk'])))
+		{
+			$cursed_flag = 1;
+		}
+	}
+	# 身上存在诅咒效果
+	if(isset($cursed_flag))
+	{
+		if(check_skill_unlock('inf_cursed',$pa)) getclubskill('inf_cursed',$pa['clbpara']);
+	}
+	else 
+	{
+		if(!check_skill_unlock('inf_cursed',$pa)) lostclubskill('inf_cursed',$pa['clbpara']);
 	}
 	# 身上存在套装效果
 	if(!empty($pa['clbpara']['setitems']))

--- a/include/game/titles.func.php
+++ b/include/game/titles.func.php
@@ -39,9 +39,9 @@ function get_title($t,$n)

 function titles_get_new(&$udata,$tkey,$mode=0)
 {
-	global $db,$gtablepre,$gamecfg;
-	include config("titles",$gamecfg);
+	global $titles_list;

+	$flag = 0;
 	$tkey = (int)$tkey;

 	if(empty($udata['nicksrev'])) $udata['nicksrev'] = Array('nicks' => Array(0));
@@ -49,11 +49,37 @@ function titles_get_new(&$udata,$tkey,$mode=0)
 	$nicksrev = is_array($nicksrev) ? $nicksrev : json_decode($nicksrev,true);

 	# 要获得的头衔编号必须存在于头衔列表内
-	if(isset($titles_list[$tkey]) && !in_array($tkey,$nicksrev['nicks'])) $nicksrev['nicks'][] = $tkey;
+	if(isset($titles_list[$tkey]) && !in_array($tkey,$nicksrev['nicks']))
+	{
+		$nicksrev['nicks'][] = $tkey;
+		$flag = 1;
+	}

 	$nicksrev = json_encode($nicksrev);

-	return;
+	return $flag;
+}
+
+function titles_delete(&$udata,$tkey,$mode=0)
+{
+	global $titles_list;
+
+	$flag = 0;
+	$tkey = (int)$tkey;
+
+	$nicksrev = &$udata['nicksrev'];
+	$nicksrev = is_array($nicksrev) ? $nicksrev : json_decode($nicksrev,true);
+
+	# 要获得的头衔编号必须存在于头衔列表内
+	if(isset($titles_list[$tkey]) && in_array($tkey,$nicksrev['nicks']))
+	{
+		unset($nicksrev['nicks'][array_search($tkey,$nicksrev['nicks'])]);
+		$flag = 1;
+	}
+
+	$nicksrev = json_encode($nicksrev);
+
+	return $flag;
 }

 function titles_get_desc($tkey,$mode=0)

--- a/templates/default/admin_urlist.htm
+++ b/templates/default/admin_urlist.htm
@@ -29,13 +29,11 @@
 			<th>分数2</th>
 			<th>性别</th>
 			<th>头像</th>
-			<!--<th>社团</th>
-			<th>成就</th>
-			<th>成就（新）</th>
-			<th>称号表</th>-->
 			<th>口头禅</th>
 			<th>杀人留言</th>
 			<th>遗言</th>
+			<th>添加头衔</th>
+			<th>删除头衔</th>
 			<th>操作</th>
 		</tr>
 		<!--{if $urdata}-->
@@ -58,10 +56,6 @@
 				</select>
 			</td>
 			<td><input type="text" name="icon_$n" size="2" maxlength="2" value="$ur['icon']" disabled="true"></td>
-			<!--<td>{$clubinfo[$ur['club']]}</td>
-			<td><input type="text" name="achievement_$n" size="20" maxlength="400" value="$ur['achievement']" disabled="true"></td>
-			<td><input type="text" name="achrev_$n" size="20" maxlength="400" value="$ur['achrev']" disabled="true"></td>
-			<td><input type="text" name="nicks_$n" size="20" maxlength="300" value="$ur['nicks']" disabled="true"></td>-->
 			<td><input type="text" name="motto_$n" size="20" maxlength="60" value="$ur['motto']" disabled="true"></td>
 			<td><input type="text" name="killmsg_$n" size="20" maxlength="20" value="$ur['killmsg']" disabled="true"></td>
 			<td><input type="text" name="lastword_$n" size="20" maxlength="20" value="$ur['lastword']" disabled="true"></td>
@@ -85,13 +79,23 @@
 				</select>
 			</td>
 			<td><input type="text" name="icon_$n" size="2" maxlength="2" value="$ur['icon']"></td>
-			<!--<td>{$clubinfo[$ur['club']]}</td>
-			<td><input type="text" name="achievement_$n" size="20" maxlength="400" value="$ur['achievement']"></td>
-			<td><textarea name="achrev_$n" style="overflow:auto">$ur['achrev']</textarea></td>
-			<td><input type="text" name="nicks_$n" size="20" maxlength="300" value="$ur['nicks']"></td>-->
 			<td><input type="text" name="motto_$n" size="20" maxlength="60" value="$ur['motto']"></td>
 			<td><input type="text" name="killmsg_$n" size="20" maxlength="60" value="$ur['killmsg']"></td>
 			<td><input type="text" name="lastword_$n" size="20" maxlength="60" value="$ur['lastword']"></td>
+			<td>
+				<select name="addtitles_$n">
+					<!--{loop $titles_list $nkey $ninfo}-->
+						<option value="$nkey">$ninfo</option>
+					<!--{/loop}-->
+				</select>
+			</td>
+			<td>
+				<select name="deltitles_$n">
+					<!--{loop $ur['nicksrev']['nicks'] $nkey}-->
+						<option value="$nkey">$titles_list[$nkey]</option>
+					<!--{/loop}-->
+				</select>
+			</td>
 			<td>
 				<input type="submit" value="修改" onclick="$('urcmd').value='edit_{$n}_{$ur['uid']}'">
 			</td>

--- a/templates/default/dialogue.htm
+++ b/templates/default/dialogue.htm
@@ -53,8 +53,8 @@

 </center></p>
 <!--{if (isset($dialogue_branch[$dialogue_id]) || isset($dialogue_end[$dialogue_id]))}-->
-    <img class="dialog-background" src="img/profile.gif" id="x" onclick="">
+    <img class="dialog-background" src="img/profile.gif" onclick="">
 <!--{else}-->
-    <img class="dialog-background" src="img/profile.gif" id="x" onclick="closeDialog($('dialogue'));$('command').value='end_dialogue';postCmd('gamecmd','command.php');this.disabled=true;">
+    <img class="dialog-background" src="img/profile.gif" onclick="closeDialog($('dialogue'));$('command').value='end_dialogue';postCmd('gamecmd','command.php');this.disabled=true;">
 <!--{/if}-->
 </dialog>
\ No newline at end of file
--- a/templates/default/opening.htm
+++ b/templates/default/opening.htm
@@ -10,7 +10,7 @@
        <div class="glow_buttons h25 w125" id="shooting_ending" style="margin: 5px;" onclick="closeDialog($('opening'));$('command').value='end_dialogue';postCmd('gamecmd','command.php');this.disabled=true;">进入战场</div>
 	</div>
 </center></p>
-    <img class="dialog-background" src="img/profile.gif" id="x" onclick="closeDialog($('opening'));$('command').value='end_dialogue';postCmd('gamecmd','command.php');this.disabled=true;">
+    <img class="dialog-background" src="img/profile.gif" onclick="closeDialog($('opening'));$('command').value='end_dialogue';postCmd('gamecmd','command.php');this.disabled=true;">
 </dialog>

 <script>