DESKTOP-BGJIU14\ck 1 день назад
Родитель
Сommit
c584033b40

+ 5 - 5
Assets/Res/Config/BuffConfig.json

@@ -510,7 +510,7 @@
     {
       "ID": 10291,
       "nameTest": "金伤势",
-      "decTest": "影响金的灵根",
+      "decTest": "金的灵根降低{0}",
       "icon": "icon_b1029",
       "buffName": 10749,
       "buffEffectDes": 10782,
@@ -530,7 +530,7 @@
     {
       "ID": 10301,
       "nameTest": "木伤势",
-      "decTest": "影响木的灵根",
+      "decTest": "木的灵根降低{0}",
       "icon": "icon_b1030",
       "buffName": 10750,
       "buffEffectDes": 10783,
@@ -550,7 +550,7 @@
     {
       "ID": 10311,
       "nameTest": "水伤势",
-      "decTest": "影响水的灵根",
+      "decTest": "水的灵根降低{0}",
       "icon": "icon_b1031",
       "buffName": 10751,
       "buffEffectDes": 10784,
@@ -570,7 +570,7 @@
     {
       "ID": 10321,
       "nameTest": "火伤势",
-      "decTest": "影响火的灵根",
+      "decTest": "火的灵根降低{0}",
       "icon": "icon_b1032",
       "buffName": 10752,
       "buffEffectDes": 10785,
@@ -590,7 +590,7 @@
     {
       "ID": 10331,
       "nameTest": "土伤势",
-      "decTest": "影响土的灵根",
+      "decTest": "土的灵根降低{0}",
       "icon": "icon_b1033",
       "buffName": 10753,
       "buffEffectDes": 10786,

+ 152 - 152
Assets/Res/Config/LanguageChineseConfig.json

@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10688,
@@ -39926,7 +39926,7 @@
     },
     {
       "ID": 10722,
-      "txt": "冻"
+      "txt": "冻"
     },
     {
       "ID": 10723,
@@ -39938,7 +39938,7 @@
     },
     {
       "ID": 10725,
-      "txt": "灼"
+      "txt": "灼"
     },
     {
       "ID": 10726,
@@ -39970,7 +39970,7 @@
     },
     {
       "ID": 10733,
-      "txt": "土沙"
+      "txt": "细尘"
     },
     {
       "ID": 10734,
@@ -40166,23 +40166,23 @@
     },
     {
       "ID": 10782,
-      "txt": "影响金的灵根"
+      "txt": "金的灵根降低{0}"
     },
     {
       "ID": 10783,
-      "txt": "影响木的灵根"
+      "txt": "木的灵根降低{0}"
     },
     {
       "ID": 10784,
-      "txt": "影响水的灵根"
+      "txt": "水的灵根降低{0}"
     },
     {
       "ID": 10785,
-      "txt": "影响火的灵根"
+      "txt": "火的灵根降低{0}"
     },
     {
       "ID": 10786,
-      "txt": "影响土的灵根"
+      "txt": "土的灵根降低{0}"
     },
     {
       "ID": 10787,

+ 116 - 116
Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2058,27 +2058,27 @@
     },
     {
       "ID": 1111010,
-      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。"
+      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111011,
-      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。"
+      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111012,
-      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。"
+      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111013,
-      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。\n如果敌人有减益状态,则细剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。\n如果敌人有减益状态,则细剑伤害提升{3}%。"
     },
     {
       "ID": 1111014,
-      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。\n如果敌人有减益状态,则细剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄细剑,每柄细剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。\n如果敌人有减益状态,则细剑伤害提升{3}%。"
     },
     {
       "ID": 1111015,
-      "txt": "身体周围幻化出{0}柄更加巨大的虚剑,每柄虚剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层流血。\n如果敌人有减益状态,则虚剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄更加巨大的虚剑,每柄虚剑造成{1}%攻击力的伤害,并有{2}%的几率对敌人造成1层<a href=10111>流血</a>。\n如果敌人有减益状态,则虚剑伤害提升{3}%。"
     },
     {
       "ID": 1111020,
@@ -2086,47 +2086,47 @@
     },
     {
       "ID": 1111021,
-      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或<a href=10121>放血</a>状态下的敌人造成的伤害+{2}%"
     },
     {
       "ID": 1111022,
-      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或<a href=10121>放血</a>状态下的敌人造成的伤害+{2}%"
     },
     {
       "ID": 1111023,
-      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接放血且不消耗流血层数"
+      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接<a href=10121>放血</a>且不消耗流血层数"
     },
     {
       "ID": 1111024,
-      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接放血且不消耗流血层数"
+      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接<a href=10121>放血</a>且不消耗流血层数"
     },
     {
       "ID": 1111025,
-      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接放血且不消耗流血层数\n大剑体型巨大化进入全盛状态,对拼强度+{3}%,伤害提升{4}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑,大剑旋转快速穿透敌人对其造成{1}%攻击力的伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后,如果目标没在放血状态,直接<a href=10121>放血且不</a>消耗流血层数\n大剑体型巨大化进入全盛状态,对拼强度+{3}%"
     },
     {
       "ID": 1111030,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。"
     },
     {
       "ID": 1111031,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111032,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111033,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111034,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。\n刀气命中目标后,恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111035,
-      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成流血。\n刀气命中目标后,恢复本次伤害{3}%的生命。\n刀气对流血状态下的敌人造成的伤害+{4}%"
+      "txt": "向前方挥动{0}次,每次挥动形成一道血刃剑气,每道剑气对敌人造成{1}%攻击力的伤害,并有{2}%概率对敌人造成<a href=10111>流血</a>。\n刀气命中目标后,恢复本次伤害{3}%的生命。\n刀气对流血状态下的敌人造成的伤害+{4}%"
     },
     {
       "ID": 1111040,
@@ -2154,75 +2154,75 @@
     },
     {
       "ID": 1111050,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111051,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111052,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111053,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111054,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1111055,
-      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层流血。"
+      "txt": "手中快速发射{0}枚金针,每枚金针对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10111>流血</a>。"
     },
     {
       "ID": 1112010,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112011,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112012,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112013,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112014,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112015,
-      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥,每道冰锥对敌人造成{1}%攻击力的伤害,每道冰锥有{2}%的概率对敌人施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112020,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112021,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112022,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112023,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112024,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112025,
-      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层寒气"
+      "txt": "身体散发出一团迷雾。从迷雾中飞出{0}个冰球,每个冰球对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10011>寒气</a>"
     },
     {
       "ID": 1112040,
@@ -2274,51 +2274,51 @@
     },
     {
       "ID": 1113010,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113011,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113012,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113013,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113014,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113015,
-      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层毒"
+      "txt": "发出{0}条细细的毒针,每颗毒针对敌人造成{1}%攻击力的伤害,每颗针有{2}%概率施加1层<a href=10031></a>"
     },
     {
       "ID": 1113020,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113021,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113022,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113023,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113024,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113025,
-      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌,每掌对敌人造成{1}%攻击力的伤害,并对敌人施加1层<a href=10031></a>,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113040,
@@ -2370,27 +2370,27 @@
     },
     {
       "ID": 1114010,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114011,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114012,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114013,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114014,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114015,
-      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层灼烧。\n每柄烈焰剑将会对敌人造成爆燃,爆燃额外造成{3}%攻击力的伤害。"
+      "txt": "向前方发出{0}柄飞剑,每柄飞剑对敌人造成{1}%攻击力的伤害,并有{2}%的概率施加1层<a href=10051>灼烧</a>。\n每柄烈焰剑将会对敌人造成爆燃,爆燃额外造成{3}%攻击力的伤害。"
     },
     {
       "ID": 1114020,
@@ -2410,59 +2410,59 @@
     },
     {
       "ID": 1114024,
-      "txt": "飞出{0}道巨龙,每道巨龙对敌人造成{1}%攻击力的伤害。\n并施加一层灼烧\n如果敌人处于灼烧中,每层灼烧对其有{2}%概率造成胆摄,眩晕敌人{3}秒。"
+      "txt": "飞出{0}道巨龙,每道巨龙对敌人造成{1}%攻击力的伤害。\n并施加一层<a href=10051>灼烧</a>\n如果敌人处于灼烧中,每层灼烧对其有{2}%概率造成胆摄,眩晕敌人{3}秒。"
     },
     {
       "ID": 1114025,
-      "txt": "飞出{0}道巨龙,每道巨龙对敌人造成{1}%攻击力的伤害。\n如果敌人处于灼烧造成伤害时,每层燃烧有{2}%的概率对其眩晕{3}秒\n并施加一层灼烧\n飞龙命中目标后引发天雷,对敌人额外造成{4}%攻击力的伤害。"
+      "txt": "飞出{0}道巨龙,每道巨龙对敌人造成{1}%攻击力的伤害。\n如果敌人处于灼烧造成伤害时,每层燃烧有{2}%的概率对其眩晕{3}秒\n并施加一层<a href=10051>灼烧</a>\n飞龙命中目标后引发天雷,对敌人额外造成{4}%攻击力的伤害。"
     },
     {
       "ID": 1114030,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。"
     },
     {
       "ID": 1114031,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。\n对有灼烧的敌人额外造成{3}%最终伤害。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。\n对有灼烧的敌人额外造成{3}%最终伤害。"
     },
     {
       "ID": 1114032,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。\n对有灼烧的敌人额外造成{3}%最终伤害。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。\n对有灼烧的敌人额外造成{3}%最终伤害。"
     },
     {
       "ID": 1114033,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。\n对有灼烧的敌人额外造成{3}%最终伤害。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。\n对有灼烧的敌人额外造成{3}%最终伤害。"
     },
     {
       "ID": 1114034,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。\n对有灼烧的敌人额外造成{3}%最终伤害。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。\n对有灼烧的敌人额外造成{3}%最终伤害。"
     },
     {
       "ID": 1114035,
-      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层灼烧。\n对有灼烧的敌人额外造成{3}%最终伤害。\n烈焰数量翻倍,但每道烈焰伤害降低{4}%。"
+      "txt": "身后出现一只大手,每个手指发射{0}道烈焰,每道对敌人造成{1}%攻击力的伤害,同时有{2}%概率施加1层<a href=10051>灼烧</a>。\n对有灼烧的敌人额外造成{3}%最终伤害。\n烈焰数量翻倍,但每道烈焰伤害降低{4}%。"
     },
     {
       "ID": 1114040,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114041,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114042,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114043,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114044,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114045,
-      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层灼烧"
+      "txt": "发射{0}枚火球,每枚火球对敌人造成{1}%攻击力的伤害。有{2}%概率对敌人施加1层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1114050,
@@ -2490,51 +2490,51 @@
     },
     {
       "ID": 1115010,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115011,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115012,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115013,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115014,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115015,
-      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层细尘。"
+      "txt": "沙尘汇聚成{0}枚土刺,每枚土刺对敌人造成{1}%攻击力的伤害,并有{2}%概率施加1层<a href=10131>细尘</a>。"
     },
     {
       "ID": 1115020,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115021,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115022,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115023,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115024,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115025,
-      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层细沙"
+      "txt": "一柄虚空形成的大刀,横空挥砍形成{0}个剑气,每道剑气对敌人造成{1}%攻击力的伤害,并叠加1层<a href=10131>细尘</a>"
     },
     {
       "ID": 1115040,
@@ -2774,7 +2774,7 @@
     },
     {
       "ID": 1120085,
-      "txt": "后方功法催动时释放{0}道剑气,对敌人造成{1}%攻击力的伤害,并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
+      "txt": "后方功法催动时释放{0}道剑气,对敌人造成{1}%攻击力的伤害,并无视护盾类效果\n该剑气会对敌人施加{2}层<a href=10111>流血</a>"
     },
     {
       "ID": 1120090,
@@ -2850,51 +2850,51 @@
     },
     {
       "ID": 1120120,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120121,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120122,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120123,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120124,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120125,
-      "txt": "前方功法对敌人造成伤害后额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层<a href=10111>流血</a>"
     },
     {
       "ID": 1120130,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120131,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120132,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120133,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120134,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120135,
-      "txt": "前方功法击中目标时额外施加一层毒,对流血中的敌人再额外施加一层"
+      "txt": "前方功法击中目标时额外施加一层<a href=10031></a>,对流血中的敌人再额外施加一层"
     },
     {
       "ID": 1120140,
@@ -2946,99 +2946,99 @@
     },
     {
       "ID": 1120160,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120161,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120162,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120163,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120164,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120165,
-      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后冰冻敌人。"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值。冰冻值到达一定程度后<a href=10021>冰冻</a>敌人。"
     },
     {
       "ID": 1120170,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120171,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120172,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120173,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120174,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120175,
-      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质,使火属性伤害提升{0}%并额外施加一层<a href=10051>灼烧</a>"
     },
     {
       "ID": 1120180,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120181,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120182,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120183,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120184,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120185,
-      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次细尘额外获得{3}层"
+      "txt": "每催动一次土系功法获得{0}层厚土增益,达到100层后防御力增加{1}%。持续{2}秒,每对敌人施加一次<a href=10131>细尘</a>额外获得{3}层"
     },
     {
       "ID": 1120190,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1120191,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1120192,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1120193,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1120194,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1120195,
-      "txt": "前方功法命中目标时额外施加1层细尘。并将细尘的的\n品质提升为金沙,效果提升{0}%"
+      "txt": "前方功法命中目标时额外施加1层<a href=10131>细尘</a>。并将细尘的效果提升{0}%"
     },
     {
       "ID": 1131010,

+ 8 - 5
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1191,7 +1191,7 @@ MonoBehaviour:
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
   - key: Text_GongFaDesc
-    gameObject: {fileID: 4031219864197847051}
+    gameObject: {fileID: 4793916368235423505}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -2535,7 +2535,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3289851963449376272}
   - component: {fileID: 7319464873274103757}
-  - component: {fileID: 4031219864197847051}
+  - component: {fileID: 4793916368235423505}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_GongFaDesc
@@ -2571,7 +2571,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5134635627656750439}
   m_CullTransparentMesh: 1
---- !u!114 &4031219864197847051
+--- !u!114 &4793916368235423505
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2580,11 +2580,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 5134635627656750439}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: 63e39bbb2ebd08b48aa8fd13011d373d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.23113191, g: 0.19003807, b: 0.12428789, a: 1}
+  m_Color: {r: 0.23137257, g: 0.18823531, b: 0.1254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2605,6 +2605,9 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5411\u524D\u65B9\u53D1\u51FA\u4E00\u67C4\u5251\uFF0C\u5BF9\u654C\u4EBA\u9020\u621030%\u706B\u7CFB\u4F24\u5BB3\u3002"
+  m_OnHrefClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5304678840201142599
 GameObject:
   m_ObjectHideFlags: 0

+ 220 - 0
Assets/Scripts/Core/UI/UTool/HyperlinkText.cs

@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+/// <summary>
+/// 文本控件,支持超链接
+/// </summary>
+public class HyperlinkText : Text, IPointerClickHandler
+{
+    /// <summary>
+    /// 超链接信息类
+    /// </summary>
+    private class HyperlinkInfo
+    {
+        public int startIndex;
+
+        public int endIndex;
+
+        public string name;
+
+        public readonly List<Rect> boxes = new List<Rect>();
+    }
+
+    /// <summary>
+    /// 解析完最终的文本
+    /// </summary>
+    private string m_OutputText;
+
+    /// <summary>
+    /// 超链接信息列表
+    /// </summary>
+    private readonly List<HyperlinkInfo> m_HrefInfos = new List<HyperlinkInfo>();
+
+    /// <summary>
+    /// 文本构造器
+    /// </summary>
+    protected static readonly StringBuilder s_TextBuilder = new StringBuilder();
+
+    [Serializable]
+    public class HrefClickEvent : UnityEvent<string>
+    {
+    }
+
+    [SerializeField] private HrefClickEvent m_OnHrefClick = new HrefClickEvent();
+
+    /// <summary>
+    /// 超链接点击事件
+    /// </summary>
+    public HrefClickEvent onHrefClick
+    {
+        get { return m_OnHrefClick; }
+        set { m_OnHrefClick = value; }
+    }
+
+
+    /// <summary>
+    /// 超链接正则
+    /// </summary>
+    private static readonly Regex s_HrefRegex = new Regex(@"<a href=([^>\n\s]+)>(.*?)(</a>)", RegexOptions.Singleline);
+
+    private HyperlinkText mHyperlinkText;
+
+    public System.Action<string> onClickCallBack;
+
+    public string GetHyperlinkInfo
+    {
+        get { return text; }
+    }
+
+    protected override void Awake()
+    {
+        base.Awake();
+        mHyperlinkText = GetComponent<HyperlinkText>();
+    }
+
+    protected override void OnEnable()
+    {
+        base.OnEnable();
+        mHyperlinkText.onHrefClick.AddListener(OnHyperlinkTextInfo);
+    }
+
+    protected override void OnDisable()
+    {
+        base.OnDisable();
+        mHyperlinkText.onHrefClick.RemoveListener(OnHyperlinkTextInfo);
+    }
+
+
+    public override void SetVerticesDirty()
+    {
+        base.SetVerticesDirty();
+#if UNITY_EDITOR
+        if (UnityEditor.PrefabUtility.GetPrefabType(this) == UnityEditor.PrefabType.Prefab)
+        {
+            return;
+        }
+#endif
+        //  m_OutputText = GetOutputText(text);
+        text = GetHyperlinkInfo;
+        m_OutputText = GetOutputText(text);
+    }
+
+
+    protected override void OnPopulateMesh(VertexHelper toFill)
+    {
+        var orignText = m_Text;
+        m_Text = m_OutputText;
+        base.OnPopulateMesh(toFill);
+        m_Text = orignText;
+        UIVertex vert = new UIVertex();
+
+        // 处理超链接包围框
+        foreach (var hrefInfo in m_HrefInfos)
+        {
+            hrefInfo.boxes.Clear();
+            if (hrefInfo.startIndex >= toFill.currentVertCount)
+            {
+                continue;
+            }
+
+            // 将超链接里面的文本顶点索引坐标加入到包围框
+            toFill.PopulateUIVertex(ref vert, hrefInfo.startIndex);
+            var pos = vert.position;
+            var bounds = new Bounds(pos, Vector3.zero);
+            for (int i = hrefInfo.startIndex, m = hrefInfo.endIndex; i < m; i++)
+            {
+                if (i >= toFill.currentVertCount)
+                {
+                    break;
+                }
+
+                toFill.PopulateUIVertex(ref vert, i);
+                pos = vert.position;
+                if (pos.x < bounds.min.x) // 换行重新添加包围框
+                {
+                    hrefInfo.boxes.Add(new Rect(bounds.min, bounds.size));
+                    bounds = new Bounds(pos, Vector3.zero);
+                }
+                else
+                {
+                    bounds.Encapsulate(pos); // 扩展包围框
+                }
+            }
+
+            hrefInfo.boxes.Add(new Rect(bounds.min, bounds.size));
+        }
+    }
+
+    /// <summary>
+    /// 获取超链接解析后的最后输出文本
+    /// </summary>
+    /// <returns></returns>
+    protected virtual string GetOutputText(string outputText)
+    {
+        s_TextBuilder.Length = 0;
+        m_HrefInfos.Clear();
+        var indexText = 0;
+        foreach (Match match in s_HrefRegex.Matches(outputText))
+        {
+            s_TextBuilder.Append(outputText.Substring(indexText, match.Index - indexText));
+         
+
+            var group = match.Groups[1];
+            var hrefInfo = new HyperlinkInfo
+            {
+                startIndex = s_TextBuilder.Length * 4, // 超链接里的文本起始顶点索引
+                endIndex = (s_TextBuilder.Length + match.Groups[2].Length - 1) * 4 + 3,
+                name = group.Value
+            };
+            s_TextBuilder.Append("<b><color=#CC5B13>"); // 超链接颜色
+            m_HrefInfos.Add(hrefInfo);
+
+            s_TextBuilder.Append(match.Groups[2].Value);
+            s_TextBuilder.Append("</color></b>");
+            indexText = match.Index + match.Length;
+        }
+
+        s_TextBuilder.Append(outputText.Substring(indexText, outputText.Length - indexText));
+        return s_TextBuilder.ToString();
+    }
+
+    /// <summary>
+    /// 点击事件检测是否点击到超链接文本
+    /// </summary>
+    /// <param name="eventData"></param>
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        Vector2 lp = Vector2.zero;
+        RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, eventData.position,
+            eventData.pressEventCamera, out lp);
+
+        foreach (var hrefInfo in m_HrefInfos)
+        {
+            var boxes = hrefInfo.boxes;
+            for (var i = 0; i < boxes.Count; ++i)
+            {
+                if (boxes[i].Contains(lp))
+                {
+                    m_OnHrefClick.Invoke(hrefInfo.name);
+                    return;
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// 当前点击超链接回调
+    /// </summary>
+    /// <param name="info">回调信息</param>
+    private void OnHyperlinkTextInfo(string info)
+    {
+        onClickCallBack?.Invoke(info);
+        // Debug.Log("超链接信息:" + info);
+    }
+}

+ 11 - 0
Assets/Scripts/Core/UI/UTool/HyperlinkText.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CXlKtiP/ASk4R/cdD9veI6hu+ji95LZUKfTv8lf+GPH/9VocqnRE17klcidM
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 4
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -7,6 +7,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Combat.Buff;
 using GameLogic.Hero;
 using GameLogic.Player;
 using UnityEngine;
@@ -48,6 +49,7 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            Text_GongFaDesc.onClickCallBack = OnClickBuff;
         }
 
         protected override void DelEvent()
@@ -195,7 +197,7 @@ namespace Fort23.Mono
             SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
 
             int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
-            
+
             //TODO 消耗:功法升星
             if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
             {
@@ -227,7 +229,6 @@ namespace Fort23.Mono
 
         private async void UpgradeClick()
         {
-           
             if (_skillInfo.SkillData == null)
             {
                 return;
@@ -289,7 +290,7 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData();
             ParticleSystemPool particleSystemPool =
                 await GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_gongfa_shengji.prefab");
-            particleSystemPool.own.transform.parent =   fx_ui_gongfa_shengji.transform.parent;
+            particleSystemPool.own.transform.parent = fx_ui_gongfa_shengji.transform.parent;
             particleSystemPool.own.transform.position = fx_ui_gongfa_shengji.transform.position;
         }
 
@@ -447,7 +448,7 @@ namespace Fort23.Mono
                         .GetComponent<RectTransform>());
                     Text_GongFaDesc.text =
                         UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), effs);
-
+                    Text_GongFaDesc.onClickCallBack = OnClickBuff;
                     // Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
                     if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
                     {
@@ -577,6 +578,16 @@ namespace Fort23.Mono
             return gongFaUpgradePanel;
         }
 
+        private void OnClickBuff(string info)
+        {
+            int buffId = 0;
+            if (int.TryParse(info, out buffId))
+            {
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(buffId, 1, null);
+                SkillInfopanel.OpenPanle(buffInfo);
+            }
+        }
+
         public async override CTask Close()
         {
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)

+ 3 - 3
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -76,13 +76,13 @@ namespace Fort23.Mono
 	      return _Content;
 	     }
 	   }
-	  private Text _Text_GongFaDesc;
-	  public Text Text_GongFaDesc
+	  private HyperlinkText _Text_GongFaDesc;
+	  public HyperlinkText Text_GongFaDesc
 	   {
 	   get{
 	      if (_Text_GongFaDesc == null)
 	       {
-	         _Text_GongFaDesc  = GetUIUnit<Text>("Text_GongFaDesc"); 
+	         _Text_GongFaDesc  = GetUIUnit<HyperlinkText>("Text_GongFaDesc"); 
 	       }
 	      return _Text_GongFaDesc;
 	     }

+ 12 - 6
Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -97,20 +97,20 @@ namespace Fort23.Mono
             }
         }
 
-        public void CustomInit(BuffBasic buffBasic)
+        public void CustomInit(BuffConfig buffConfig,int buffCount)
         {
             Icon_BuffIcon.gameObject.SetActive(true);
             Icon_SkillIcon.gameObject.SetActive(false);
             Icon_FabaoIcon.gameObject.SetActive(false);
-            Text_Name.text = LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
-            Text_Level.text = "层数:" +buffBasic.buffCount;
+            Text_Name.text = LanguageManager.Instance.Text(buffConfig.buffName);
+            Text_Level.text = "层数:" +buffCount;
             Text_Tag.text = "buff";
             Text_tip.text = "详情:";
             Text_Power.text = $"";
-            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(buffBasic.BuffConfig.buffEffectDes), buffBasic.BuffConfig.effectValue);
+            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(buffConfig.buffEffectDes),buffConfig.effectValue);
             Text_Power.gameObject.SetActive(true);
             StarRootGam.SetActive(false);
-            Icon_BuffIcon.icon_name = buffBasic.BuffConfig.icon;
+            Icon_BuffIcon.icon_name = buffConfig.icon;
         }
 
         public static async CTask<SkillInfopanel> OpenPanle(FaBaoInfo faBaoInfo)
@@ -129,7 +129,13 @@ namespace Fort23.Mono
         public static async  CTask<SkillInfopanel> OpenPanle(BuffBasic faBaoInfo)
         {
             SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
-            skillInfopanel.CustomInit(faBaoInfo);
+            skillInfopanel.CustomInit(faBaoInfo.BuffConfig,faBaoInfo.buffCount);
+            return skillInfopanel;
+        }
+        public static async  CTask<SkillInfopanel> OpenPanle(BuffInfo buffInfo)
+        {
+            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            skillInfopanel.CustomInit(buffInfo.BuffConfig,1);
             return skillInfopanel;
         }
     }

+ 7 - 0
Assets/StreamingAssets/assetBundle.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Excel2Json/Excel/Buff.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Language_skill.xlsx


BIN
Excel2Json/Excel/skill.xlsx


+ 9 - 9
UserSettings/EditorUserSettings.asset

@@ -21,31 +21,31 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
+      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
+      value: 5009075552535a5d5b565c2446260844401548287a7d743674704963e1e1673c
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5009075552535a5d5b565c2446260844401548287a7d743674704963e1e1673c
+      value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
+      value: 5650035003045b5e5a0a082141265944464f4f7f2e7b233629714831e0e6636c
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5650035003045b5e5a0a082141265944464f4f7f2e7b233629714831e0e6636c
+      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 5a52520506055c0b5c5e082740725b4413161b7d7f7c7761297b1c67bbb26168
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a52520506055c0b5c5e082740725b4413161b7d7f7c7761297b1c67bbb26168
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 515550500753580a085d5e7314735a44144e49797e2b27637b711e6ab6e3363e
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

+ 196 - 178
UserSettings/Layouts/default-2022.dwlt

@@ -15,12 +15,12 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1357
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 7}
+  m_Title: Inspector
+  m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
@@ -34,49 +34,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneHierarchyWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1227
     y: 0
-    width: 403.50003
-    height: 962.00006
+    width: 781
+    height: 998
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 564.00006
-    y: 0
-    width: 538.50006
-    height: 570.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,21 +63,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 10}
-  - {fileID: 5}
+  - {fileID: 9}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1307
+  m_MinSize: {x: 300, y: 100}
+  m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 1094
+  controlID: 141
   draggingID: 0
---- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,18 +91,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1506.0001
+    x: 2008
     y: 0
-    width: 414
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 552
+    height: 1307
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -145,18 +118,18 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 570.00006
-    width: 1102.5001
-    height: 392
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
+    y: 998
+    width: 2008
+    height: 309
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
   - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -169,22 +142,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 7}
+  - {fileID: 3}
   - {fileID: 8}
-  - {fileID: 4}
-  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 2560
+    height: 1357
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -201,12 +174,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: lt
---- !u!114 &9
+  m_LastLoadedLayoutName: 
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -222,12 +195,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1337
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &10
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -240,20 +213,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 6}
+  - {fileID: 10}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
-    x: 403.50003
+    x: 0
     y: 0
-    width: 1102.5001
-    height: 962.00006
+    width: 2008
+    height: 1307
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 1095
+  controlID: 79
   draggingID: 0
---- !u!114 &11
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -266,20 +239,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 3}
+  - {fileID: 11}
+  - {fileID: 2}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1102.5001
-    height: 570.00006
+    width: 2008
+    height: 998
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 1096
+  controlID: 42
   draggingID: 0
---- !u!114 &12
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -296,15 +269,60 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 564.00006
-    height: 570.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 1227
+    height: 998
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
+  - {fileID: 12}
+  - {fileID: 17}
   m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 2
+--- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1226
+    height: 753
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -321,14 +339,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 403.50006
-    y: 632.00006
-    width: 1100.5001
-    height: 371
+    x: 0
+    y: 1071
+    width: 2007
+    height: 288
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -340,7 +358,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: Boss_QiongQi
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -350,40 +368,40 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX/UIFXprefab
+    - Assets/Art/ArtHero
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: Boss_QiongQi
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/VFX/UIFXprefab
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 833}
-    m_SelectedIDs: aaf50100
-    m_LastClickedID: 128426
-    m_ExpandedIDs: 00000000d86a0000bef30100c0f30100c2f30100c4f30100c6f30100c8f30100caf30100ccf30100cef30100d0f30100d2f30100d4f30100d6f30100d8f30100daf30100dcf30100def30100e0f30100e2f30100e4f30100e6f30100e8f30100eaf30100ecf30100eef30100f0f30100f2f30100f4f30100f6f3010054f60100860502008805020000ca9a3b
+    scrollPos: {x: 0, y: 131}
+    m_SelectedIDs: d2fb0000
+    m_LastClickedID: 64466
+    m_ExpandedIDs: 0000000026a8000016d0000018d000001ad000001cd000001ed0000020d0000022d0000024d0000026d0000028d000002ad000002cd000002ed0000030d0000032d0000034d0000036d0000038d000003ad000003cd000003ed0000040d0000042d0000044d0000046d0000048d0000060d0000084d00000d2fb000084020100d602010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Noise
-      m_OriginalName: Noise
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 128414
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -395,7 +413,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d86a0000bef30100c0f30100c2f30100c4f30100c6f30100c8f30100caf30100ccf30100cef30100d0f30100d2f30100d4f30100d6f30100d8f30100daf30100dcf30100def30100e0f30100e2f30100e4f30100e6f30100e8f30100eaf30100ecf30100eef30100f0f30100f2f30100f4f30100f6f3010000ca9a3b
+    m_ExpandedIDs: 0000000026a8000016d0000018d000001ad000001cd000001ed0000020d0000022d0000024d0000026d0000028d000002ad000002cd000002ed0000030d0000032d0000034d0000036d0000038d000003ad000003cd000003ed0000040d0000042d0000044d0000046d0000048d00000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -420,9 +438,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: a0c6fcff
-    m_LastClickedInstanceID: -211296
-    m_HadKeyboardFocusLastEvent: 0
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c623000004f70100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -439,7 +457,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -467,14 +485,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1506.0001
-    y: 62.000008
-    width: 413
-    height: 941.00006
+    x: 2008
+    y: 73
+    width: 551
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -491,7 +509,7 @@ MonoBehaviour:
     m_CachedPref: 443.00006
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -211296
+  m_LastInspectedObjectInstanceID: -1
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
@@ -514,14 +532,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 967.5001
-    y: 62.000008
-    width: 536.50006
-    height: 549.00006
+    x: 1227
+    y: 73
+    width: 779
+    height: 977
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -535,25 +553,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: a0c6fcff
-      m_LastClickedID: -211296
-      m_ExpandedIDs: 4c9df5ff4e9df5ff689df5ff1c9ef5ff269ef5ff349ef5ffd49ef5ffd89ef5fff09ef5ff2ceaf5ff2eeaf5ffd2eaf5ffe2eaf5ff64ebf5ff66ebf5ff20edf5ff2aedf5ffa632f6ffa832f6ff3839f6ff8e97f6ff1a98f6ff12a1f6ffaaa1f6ffb6e3f7ff6e78f8ffde7bf8ffe4eaf8ff90d6fbff6ad8fbff76d8fbff50f8fbffc6f8fbff20f9fbff5657fcff6257fcff8cc3fcff92c3fcff52c4fcff5ac4fcff32c6fcff38c6fcff3cc6fcff40c6fcffa0c6fcffe8ecfcfff0ecfcff00edfcff86edfcff8cedfcffc8edfcffbe13fdff4451ffff9851ffffc051ffffc651ffffce51ffff0253ffff3253ffffa653ffffac53ffffb053ffffb453ffff1454ffffb877ffffc477ffff9ef5ffffb4faffff42fbffff90c80000d6d0000094d4000080d5000084d800005adc000064e200000ae3000008e50000ece70000dce9000024f20000b0f20000e2ff0000da04010026050100c60801006c0e010058040300a40c0300621003004e1103005014030028180300de200300b82303008c2e0300ba3b0300aa400300f64003009a440300404a0300
+      m_SelectedIDs: 36c60000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 4aecfcff52ecfcff6cecfcff84ecfcff708cfeff2611ffff2e11ffff4811ffff6011ffff8e43ffff9443ffff1af9ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fx_ui_fb_shifang
-        m_OriginalName: fx_ui_fb_shifang
+        m_Name: hitpos
+        m_OriginalName: hitpos
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -616412
+        m_UserData: 89420
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 3}
+        m_ClientGUIView: {fileID: 2}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -577,14 +595,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 403.50006
-    y: 62.000008
-    width: 562.00006
-    height: 549.00006
+    x: 0
+    y: 73
+    width: 1226
+    height: 977
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -625,7 +643,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-scene-view-toolbar
@@ -820,7 +838,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -231.00003, y: -199.00003}
+      snapOffset: {x: -231, y: -199}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Scene View/Particles
@@ -934,18 +952,18 @@ MonoBehaviour:
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.94368494, y: -3.7347584, z: 0.055999573}
+    m_Target: {x: 1.078628, y: 25.151554, z: 27.77744}
     speed: 2
-    m_Value: {x: 0.94368494, y: -3.7347584, z: 0.055999573}
+    m_Value: {x: -0.23000002, y: 22.0132, z: 13.884082}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -954,11 +972,11 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
-    showImageEffects: 1
+    showImageEffects: 0
     showParticleSystems: 1
     showVisualEffectGraphs: 1
     m_FxEnabled: 1
@@ -973,17 +991,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -991,17 +1009,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.26959315, y: -0.5258957, z: 0.18031429, w: 0.78628236}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: -1}
+    m_Value: {x: 0.41992724, y: 0.08284696, z: -0.038528886, w: 0.90294695}
   m_Size:
-    m_Target: 1.8339963
+    m_Target: 1.4267751
     speed: 2
-    m_Value: 1.8339963
+    m_Value: 3.9317834
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1017,7 +1035,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.17223626, y: 0.23740639, z: -0.04261252, w: -0.95502657}
+  m_LastSceneViewRotation: {x: 0.26959315, y: -0.5258957, z: 0.18031429, w: 0.78628236}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -1040,14 +1058,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 402.50003
-    height: 941.00006
+    y: 73
+    width: 1226
+    height: 977
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1073,16 +1091,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000013000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -1091,7 +1109,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -1100,26 +1118,26 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 402.50003
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 201.25002, y: 460.00003}
+      width: 1226
+      height: 956
+    m_Scale: {x: 0.58866996, y: 0.58866996}
+    m_Translation: {x: 613, y: 478}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -201.25002
-      y: -460.00003
-      width: 402.50003
-      height: 920.00006
+      x: -1041.3306
+      y: -812
+      width: 2082.6611
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 805, y: 1882}
+  m_defaultScale: 0.58866996
+  m_LastWindowPixelSize: {x: 1226, y: 977}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
   m_showToolbar: 1
@@ -1139,14 +1157,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 403.50006
-    y: 632.00006
-    width: 1100.5001
-    height: 371
+    x: 0
+    y: 1071
+    width: 2007
+    height: 288
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0