Merge remote-tracking branch 'origin/work/prop' + 换默认formatter

# Conflicts:
#	branch/latest/md5.js

branch/latest/md5.js

@@ -17079,7 +17079,6 @@ T.Plr.prototype = {
                 this.q = attrs
             }
             if (diyskills) {
-                console.log("this.k1", this.k1)
                 this.diy_skills(diyskills)
             } else this_.dm(C.Array.cL(this_.t, $.au()), C.Array.cL(this_.E, $.au())) // initSkills
         } else {
@@ -17197,19 +17196,26 @@ T.Plr.prototype = {
         skills.push(new T.SkillVoid(0))
     },
     diy_skills(diyskills) {
+        try {
             // MARK: 自定义技能
             var skills = this.k1
+            var this_ = this
+            // 初始化技能
+            for (var n = 0; n < this.k2.length; n++) this.k2[n].ao(this, 0)
             // 遍历diyskills字典的键
             for (var key in diyskills) {
                 // 遍历skills数组中的对象
                 for (var i = 0; i < skills.length; i++) {
-                if (skills[i].name === key) {
+                    if (skills[i].constructor.name === key) {
                         skills[i].f = diyskills[key];
+                        // skills[i].ao(this, this.f)
                         break;
                     }
                 }
             }
-
+        } catch (error) {
+            console.error(error)
+        }
     },
     dm(list, original) {
         // initSkills