Merge remote-tracking branch 'origin/work/prop'

# Conflicts:
#	branch/latest/md5.js

branch/latest/md5.js

@@ -7335,7 +7335,7 @@ var A = {
             _.I = null
         },
         jX: function jX() {},
-        jW: function jW() {},
+        boost_passive: function boost_passive() {}, // boostPassive
         jY: function jY() {},
         x: function x() {},
         aZ: function aZ() {},
@@ -7386,7 +7386,7 @@ var A = {
             this.a = a
             this.b = b
         },
-        q: function q() {},
+        Skill: function Skill() {},
         ActionSkill: function b5() {},
         h8: function h8(a) {
             var _ = this
@@ -16996,8 +16996,8 @@ T.Plr.prototype = {
         s = this_.t
         s = H.b(s.slice(0), H._arrayInstanceType(s))
         this_.E = s
-        this_.ac()
+        this_.ac() // createSkills, 对this.k1直接操作，顺序固定
-        this_.k2 = this_.X.dH(this_.k1, t.c5)
+        this_.k2 = this_.X.dH(this_.k1, t.c5) // 以某种方式打乱顺序？
     },
     bf() {
         var s, r = this,
@@ -17188,6 +17188,23 @@ T.Plr.prototype = {
         skills.push(new T.SkillVoid(0))
         skills.push(new T.SkillVoid(0))
     },
+    diy_skills(diyskills){
+        // MARK: 自定义技能
+        var skills=this.k1
+        // 遍历diyskills字典的键
+        for (var key in diyskills) {
+            // 遍历skills数组中的对象
+            for (var i = 0; i < skills.length; i++) {
+            
+            if (skills[i].name === key) {
+                // 如果找到匹配的对象，设置其f属性为diyskills字典中对应的值
+                skills[i].f = diyskills[key];
+                break; 
+            }
+            }
+        }
+  
+    },
     dm(list, original) {
         // initSkills
         var skill, sortedSkills, q, p, this_ = this,
@@ -17218,38 +17235,37 @@ T.Plr.prototype = {
         }
         // console.log("this_.k2:",this_.k2)
         for (; sortedSkills = this_.k2, n < sortedSkills.length; ++n) sortedSkills[n].ao(this_, 0)
-        // 最终的技能列表是this.k2, 其他地方也都是引用这个的
+        // sorted skills是this.k2, 
     },
     bs() {
         // addSkillsToProc
-        var s, r, sortedSkills, skl, o, n, m, this_ = this
+        var s, actions, sortedSkills, skl, o, act, boostPassive, this_ = this
-        for (s = 0, r = this_.k4; sortedSkills = this_.k2, s < sortedSkills.length; ++s) {
+        for (s = 0, actions = this_.k4; sortedSkills = this_.k2, s < sortedSkills.length; ++s) {
             skl = sortedSkills[s]
-            if (skl.f > 0 && skl instanceof T.ActionSkill) r.push(skl)
+            if (skl.f > 0 && skl instanceof T.ActionSkill) actions.push(skl)
         }
-        sortedSkills = r.length
+        
-        o = 0
+        if (actions.length > 0)
-        if (sortedSkills > o)
+            for (s = actions.length - 1; s >= 0; --s) {
-            for (s = sortedSkills - $.i(); s >= o; --s) {
+                act = actions[s]
-                n = r[s]
+                if (!act.e) { // !act.boosted
-                if (!n.e) {
+                    act.f = act.f * 2
-                    n.f = n.f * $.t()
+                    act.e = true
-                    n.e = true
                     break
                 }
             }
-        m = new T.jW()
+        boostPassive = new T.boost_passive()
-        r = this_.k2
+        var skills = this_.k2
-        if (r.length >= $.aR()) {
+        if (skills.length >= $.aR()) {
-            r = r[$.p7()]
+            skills = skills[$.p7()]
             sortedSkills = this_.t
-            m.$3(r, sortedSkills[$.a6()], sortedSkills[$.pR()])
+            boostPassive.boostPassive(skills, sortedSkills[$.a6()], sortedSkills[$.pR()])
             sortedSkills = this_.k2[$.eT()]
-            r = this_.t
+            skills = this_.t
-            m.$3(sortedSkills, r[$.n_()], r[$.b2()])
+            boostPassive.boostPassive(sortedSkills, skills[$.n_()], skills[$.b2()])
         }
-        for (s = 0, r = this_.k1; s < r.length; ++s) {
+        for (s = 0, skills = this_.k1; s < skills.length; ++s) {
-            skl = r[s]
+            skl = skills[s]
             if (skl.f > 0) skl.W()
         }
     },
@@ -17552,8 +17568,8 @@ T.jX.prototype = {
     },
     $S: 15
 }
-T.jW.prototype = {
+T.boost_passive.prototype = {
-    $3(a, b, c) {
+    boostPassive(a, b, c) {
         var s = a.f
         if (s > 0 && !a.e) {
             a.f = s + Math.min(Math.min(H.ar(b), H.ar(c)), s)
@@ -17634,7 +17650,7 @@ T.cp.prototype = {
     }
 }
 T.bG.prototype = {}
-T.q.prototype = {
+T.Skill.prototype = {
     ao(a, b) {
         var s
         this.r = a
@@ -18947,7 +18963,7 @@ LangData.k_.prototype = {
     s.dS = s.bP
     s.dR = s.bs
     s.dT = s.F
-    s = T.q.prototype
+    s = T.Skill.prototype
     s.bC = s.a9
     s.bZ = s.bx
     s.dU = s.aa
@@ -19107,8 +19123,8 @@ LangData.k_.prototype = {
     inherit(P.kx, P.kw)
     inherit(P.cF, P.p)
     inherit(HtmlRenderer.fW, HtmlRenderer.ax)
-    inherit_many(Sgls.n, [T.q, T.aZ, T.aB, T.bq, T.cB, T.bH, T.ah, T.aV, T.aF])
+    inherit_many(Sgls.n, [T.Skill, T.aZ, T.aB, T.bq, T.cB, T.bH, T.ah, T.aV, T.aF])
-    inherit_many(T.q,
+    inherit_many(T.Skill,
         [T.ActionSkill, T.h6, T.he, T.hn, T.hq, T.ea, T.ef,
             T.SklCounter, T.SklDefend, T.SklHide, T.SklMerge, T.SklProtect,
             T.SklReflect, T.SklReraise, T.SklShield, T.SklUpgrade, T.SklZombie