cleanup

This reverts commit 0cd5fe2b3d.

# Conflicts:
#	branch/latest/md5.js

branch/latest/md5.js

@@ -2161,9 +2161,9 @@ var A = {
             if (a == null) return a
             // set run time info
             else if (s.b(a)) return a
-            // console.log("faild nullable as check", a, s)
+            console.log("faild nullable as check", a, s)
             let stack = new Error().stack
-            // console.log(stack)
+            console.log(stack)
             H._failedAsCheck(a, s)
         },
         _failedAsCheck(a, b) {
@@ -3515,6 +3515,10 @@ var A = {
     },
     P = {
         _AsyncRun__initializeScheduleImmediate() {
+            // if (run_env.from_code) {
+            //     console.log("creating scheduleImmediate")
+            // }
+            logger.debug("creating scheduleImmediate")
             var s, r, q = {}
             if (self.scheduleImmediate != null) {
                 return P.uK()
@@ -4654,7 +4658,7 @@ var A = {
                 if (a.r2.J(0, $.a7())) s.fr = s.fr + 1
             }
         },
-        CharmState_init(a, b) {
+        CharmState(a, b) {
             var s = new T.CharmState(a, b, $.i())
             s.y = new T.PostActionImpl(s)
             return s
@@ -5862,7 +5866,6 @@ var A = {
             return T.DummyRunUpdates(s[r], b.e[r])
         },
         RunUpdate_init(message, caster, c, d, e, f, delay0, delay1) {
-            // logger.debug("RunUpdate_init", message, H.as_string(caster), H.as_string(c), H.as_string(d))
             var s = new T.RunUpdate(f, 0, 0, message, caster, c, e, d)
             // var s = new T.aX(f, delay0, delay1, message, caster, c, e, d)
             // s.aK(message, caster, c, d, e, f, delay0, delay1)
@@ -8083,6 +8086,7 @@ var A = {
                     case 2:
                         if (run_env.from_code) {
                             logger.debug("loading gAd data")
+                            // 暂时有问题, 还得调试
                             LangData.load_lang(t.cF.a(C.C.bt(0, assets_data.lang)))
                             // LangData.v1(assets_data.lang)
                             // LangData.load_lang(assets_data.lang)
@@ -8229,7 +8233,7 @@ var A = {
                 n = HtmlRenderer.add_div("hp"),
                 m = $.jU + 1
             $.jU = m
-            m = new HtmlRenderer.PlrView(a, s, r, q, p, o, n, m)
+            m = new HtmlRenderer.ax(a, s, r, q, p, o, n, m)
             m.cP(a, b, c, {})
             return m
         },
@@ -8251,7 +8255,7 @@ var A = {
             if (f > 0 && a.e != null) $.ay.h(0, a.e.gb2()).dc(f)
             s = H.b([], t.j)
             span_element = HtmlRenderer.add_span("u")
-            C.R.by(span_element, H.oO(a.d, $.rm(), new HtmlRenderer.lq(new HtmlRenderer._renderItem(s, a), a), null), $.bV())
+            C.R.by(span_element, H.oO(a.d, $.rm(), new HtmlRenderer.lq(new HtmlRenderer.lp(s, a), a), null), $.bV())
             for (f = s.length, q = t.A, p = 0; p < s.length; s.length === f || (0, H.F)(s), ++p) {
                 o = s[p]
                 if (o instanceof T.HPlr) {
@@ -8322,7 +8326,7 @@ var A = {
             _.c = c
             _.d = d
         },
-        addPlrToTable: function jz(a) {
+        jz: function jz(a) {
             this.a = a
         },
         jB: function jB() { },
@@ -8338,11 +8342,11 @@ var A = {
             _.d = d
             _.e = e
         },
-        PlrGroup: function jT(a) {
+        jT: function jT(a) {
             this.a = a
             this.b = null
         },
-        PlrView: function ax(a, b, c, d, e, f, g, h) {
+        ax: function ax(a, b, c, d, e, f, g, h) {
             var _ = this
             _.a = a
             _.b = null
@@ -8380,7 +8384,7 @@ var A = {
             _.fy = _.fx = _.fr = _.dy = _.dx = _.db = _.cy = null
             _.go = 0
         },
-        _renderItem: function lp(a, b) {
+        lp: function lp(a, b) {
             this.a = a
             this.b = b
         },
@@ -12542,7 +12546,7 @@ L.ProfileWinChance.prototype = {
                     o = new H.y(o, new L.iS(), H._arrayInstanceType(o).i("y<1,@>")).aV(0, "\r") + "\n" + new H.y(n, new L.iT(), H._arrayInstanceType(n).i("y<1,@>")).aV(0, "\r") + "\n"
                     o = C.e.gaB().ab(o)
                     // MARK: bun/nodejs 运行时报错
-                    // console.log(o)
+                    console.log(o)
                     n = H.instanceType(o).i("a9<z.E>")
                     l = n.i("y<M.E,l*>")
                     l = P.List_List_of(new H.y(new H.a9(o, n), new L.iU(this_), l), true, l.i("M.E"))
@@ -12723,7 +12727,7 @@ V.ProfileMain.prototype = {
                         // 实力评估中...[2]% + this.Q
                         // benchmarking = benchmarking + "胜场: " + this_.Q + "胜率: " + (this_.Q / this_.ch)
                         // debug 用, 输出csv格式
-                        // benchmarking = this_.Q + "," + this_.ch + "," + (this_.Q / this_.ch)
+                        benchmarking = this_.Q + "," + this_.ch + "," + (this_.Q / this_.ch)
                         outer_display.push(T.RunUpdate_init(benchmarking, null, null, C.JsInt.ag(this_.ch, 100), null, 0, 0, 0))
                         if (this_.ch >= this_.d) {
                             // 阶段目标场数达到
@@ -13067,15 +13071,10 @@ HtmlRenderer.inner_render.prototype = {
         if (this_.a == null) return
 
         // this.gfd -> this.fe
-        if (run_env.from_code) {
-            this_.b4()
-            logger.debug("主循环启动")
-            return
-        } else {
         A.vo(this_.gfd())
-        }
-        // this.gbc -> this.dI
         // this_.d = P.Timer_Timer(P.duration_milsec_sec(10, 0), this_.gbc(this_))
+
+        // this.gbc -> this.dI
         this_.d = P.Timer_Timer(P.duration_milsec_sec(0, 0), this.gbc(this_))
 
         if (!run_env.from_code) {
@@ -13146,33 +13145,33 @@ HtmlRenderer.inner_render.prototype = {
     },
     // MARK: main?
     fe(a0) {
-        // onNames()
+        // run update
         logger.debug("html.fq.fe start")
-        var s, r, q, p, o, group_raw, m, l, k, j, i, h, g, f, e, d, c, b, this_ = this
+        var s, r, q, p, o, n, m, l, k, j, i, h, g, f, e, d, c, b, this_ = this
         if (a0.length < 6) return
         s = X.f4(a0, 0)
         r = C.Array.al(s, 0, s.length - 8)
         q = H._arrayInstanceType(r).i("a9<1>")
         p = q.i("y<M.E,l*>")
         o = t.bQ
-        group_raw = P.List_List_of(new H.y(H.b(C.e.bt(0, P.List_List_of(new H.y(new H.a9(r, q),
+        n = P.List_List_of(new H.y(H.b(C.e.bt(0, P.List_List_of(new H.y(new H.a9(r, q),
             new HtmlRenderer.jx(this_), p), true, p.i("M.E"))).split("\n"), t.s),
             new HtmlRenderer.jy(), o), true, o.i("M.E"))
-        r = group_raw.length
+        r = n.length
         if (r > 1) {
             // if (!J.Y(J.J(J.J(n[0], 0), 0), "")) {
             // 如果第一个元素不是空字符串
-            if (group_raw[0][0][0] !== "") {
+            if (n[0][0][0] !== "") {
-                for (m = 0; m < group_raw.length; group_raw.length === r || (0, H.F)(group_raw), ++m) {
+                for (m = 0; m < n.length; n.length === r || (0, H.F)(n), ++m) {
-                    l = group_raw[m]
+                    l = n[m]
                     q = J.a3(l)
-                    if (q.gp(l) > 1) {this_.e = true}
+                    if (q.gp(l) > 1) this_.e = true
                     for (q = q.ga0(l); q.u();)
-                        if (J.aw(q.gC()) > 7) {this_.f = true}
+                        if (J.aw(q.gC()) > 7) this_.f = true
                 }
                 k = H.b([], t.t)
-                for (r = group_raw.length, q = this_.a, p = this_.b, m = 0; m < group_raw.length; group_raw.length === r || (0, H.F)(group_raw), ++m) {
+                for (r = n.length, q = this_.a, p = this_.b, m = 0; m < n.length; n.length === r || (0, H.F)(n), ++m) {
-                    l = group_raw[m]
+                    l = n[m]
                     o = J.a3(l)
                     if (o.gp(l) === 1 && J.aw(o.h(l, 0)) < 3) {
                         if (J.aw(o.h(l, 0)) > 1) k.push(o.h(l, 0))
@@ -13182,7 +13181,7 @@ HtmlRenderer.inner_render.prototype = {
                     j = this_.f
                     i = document.createElement("div")
                     i.classList.add("plrg_list")
-                    h = new HtmlRenderer.PlrGroup(i)
+                    h = new HtmlRenderer.jT(i)
                     h.e3(l, o, j)
                     q.appendChild(i)
                     p.appendChild(h.b)
@@ -13200,25 +13199,23 @@ HtmlRenderer.inner_render.prototype = {
             q = document
             r.appendChild(q.createElement("hr"))
             r.appendChild(q.createElement("br"))
+            q = $.ay
             // r -> 中间变量
             // this.y -> plrlen
             // this.r -> preboost
-            q = $.ay
             q = this_.y = q.gp(q)
             r = q > 10 ? this_.y = 10 : q
             r += this_.r
 
             // 这里才是有用的加速
-            // if this_.y > 2000
-            // = 2000
             this_.y = 2000
 
             if (this_.Q != null) return
 
             this_.b4()
-            this_.z = group_raw
+            this_.z = n
         } else {
-            e = group_raw[0]
+            e = n[0]
             r = J.a3(e)
             // q = J.J(r.h(e, 0), 0)
             q = r.h(e, 0)[0]
@@ -13253,7 +13250,7 @@ HtmlRenderer.inner_render.prototype = {
                     break
                 case 3:
                     async_goto = 5
-                    // O -> nextUpdates
+                    // 输出 "实力评估中...[2]%"
                     return P._asyncAwait(this_.c.O(), $async$b4)
                 case 5:
                     this_.Q = async_result
@@ -13280,7 +13277,6 @@ HtmlRenderer.inner_render.prototype = {
         return P._asyncStartSync($async$b4, async_complete)
     },
     ft(a) {
-        // renderUpdate()
         var s, r, q, p, this_ = this
         if (a == $.K()) {
             this_.db = null
@@ -13308,9 +13304,8 @@ HtmlRenderer.inner_render.prototype = {
         }
     },
     c5(a) {
-        // _doRenderUpdate
         var s, r, this_ = this
-        if (a && !run_env.from_code) {
+        if (a) {
             s = this_.b
             r = C.d.aI(s.scrollHeight) - s.clientHeight
             a = r - C.d.aI(s.scrollTop) < 50 || C.d.aI(s.scrollTop) / r > 0.95
@@ -13357,7 +13352,7 @@ HtmlRenderer.inner_render.prototype = {
         C.Array.bb(p, HtmlRenderer.oD())
         C.Array.bb(o, HtmlRenderer.oD())
         m = document_.createElement("table")
-        l = new HtmlRenderer.addPlrToTable(m)
+        l = new HtmlRenderer.jz(m)
         k = document_.createElement("tr")
         j = document_.createElement("td")
         k.appendChild(j)
@@ -13430,6 +13425,7 @@ HtmlRenderer.inner_render.prototype = {
         document_ = "" + (C.d.aI(m.offsetWidth) - C.d.aI(h.offsetWidth) - 8) + "px"
         d.marginLeft = document_
         if (W.ll(window.parent) !== window) {
+            // new Z.jE(f, p, o, n, $.ay.h(0, J.J(J.J(f.z[0], 0), 0))).$0()
             new HtmlRenderer.send_win_data(this_, p, o, n, $.ay.h(0, this_.z[0][0][0])).$0()
         }
 
@@ -13468,7 +13464,7 @@ HtmlRenderer.jA.prototype = {
     },
     $S: 37
 }
-HtmlRenderer.addPlrToTable.prototype = {
+HtmlRenderer.jz.prototype = {
     $1(a) {
         var s, r, q = "beforeend",
             p = document,
@@ -13553,7 +13549,7 @@ HtmlRenderer.send_win_data.prototype = {
     },
     $S: 40
 }
-HtmlRenderer.PlrGroup.prototype = {
+HtmlRenderer.jT.prototype = {
     e3(a, b, c) {
         var s, r, q, p, o = this
         if (b || c) o.b = HtmlRenderer.add_div("plrg_body_gouped")
@@ -13567,7 +13563,7 @@ HtmlRenderer.PlrGroup.prototype = {
         }
     }
 }
-HtmlRenderer.PlrView.prototype = {
+HtmlRenderer.ax.prototype = {
     da() {
         var s = this.b
         if (s != null) s.da()
@@ -13703,13 +13699,14 @@ HtmlRenderer.jV.prototype = {
     $S: 17
 }
 HtmlRenderer.fW.prototype = {}
-HtmlRenderer._renderItem.prototype = {
+HtmlRenderer.lp.prototype = {
     $1(a) {
-        // _renderItem
         var s, r, q
         if (a instanceof T.NPlr) return $.ay.h(0, a.a).fr
         if (a instanceof T.HPlr) {
             s = $.ay.h(0, a.a)
+            // plv.updateHp(obj.newHp);
+            // console.log("lp.$1", s)
             s.bU(a.d)
             a.b = s.cy
             this.a.push(a)
@@ -14285,7 +14282,7 @@ T.SklCharm.prototype = {
         }
         charm_state = t.o.a(o.r2.h(0, $.aE()))
         if (charm_state == null) {
-            charm_state = T.CharmState_init(this_.r.z, o)
+            charm_state = T.CharmState(this_.r.z, o)
             charm_state.aP(0)
         } else {
             s = this_.r.z
@@ -16484,7 +16481,7 @@ T.SklYuriControl.prototype = {
         q = t.o.a(n.r2.h(0, $.aE()))
         p = this.r
         if (q == null) {
-            q = T.CharmState_init(p.z, n)
+            q = T.CharmState(p.z, n)
             q.z = s
             q.aP(0)
         } else {
@@ -19239,7 +19236,7 @@ LangData.k_.prototype = {
         W.j8, W.m5, W.cP, W.cr, W.dN, W.eD, W.is, W.dv, W.kE, W.l_, W.ix,
         P._StructuredClone, P.kw, P.eJ, P.jQ, P.kT, Y.RC4, L.ProfileWinChance, V.ProfileMain, X.ProfileFind,
         S.fK,
-        HtmlRenderer.inner_render, HtmlRenderer.PlrGroup, HtmlRenderer.PlrView,
+        HtmlRenderer.inner_render, HtmlRenderer.jT, HtmlRenderer.ax,
         Sgls.a_, Sgls.MEntry,
         T.IMeta, T.Plr, T.CovidMeta, T.Engine, T.Grp, T.IPlr, T.HDamage, T.HRecover, T.RunUpdate, T.aq, T.bG, T.Weapon, T.DummyChargeMeta]
     )
@@ -19265,8 +19262,8 @@ LangData.k_.prototype = {
         L.iS, L.iT, L.iU,
         V.j0, V.j1,
         X.iX, X.iY, X.iZ,
-        HtmlRenderer.jx, HtmlRenderer.jy, HtmlRenderer.jw, HtmlRenderer.addPlrToTable, HtmlRenderer.jB,
+        HtmlRenderer.jx, HtmlRenderer.jy, HtmlRenderer.jw, HtmlRenderer.jz, HtmlRenderer.jB,
-        HtmlRenderer.jC, HtmlRenderer.jD, HtmlRenderer.jV, HtmlRenderer._renderItem, HtmlRenderer.lq,
+        HtmlRenderer.jC, HtmlRenderer.jD, HtmlRenderer.jV, HtmlRenderer.lp, HtmlRenderer.lq,
         Sgls.k5, Sgls.k6,
         T.SklCloneCallback, T.jk, T.jj, T.jl, T.ji, T.lD, T.BoostPassive, T.k3, T.kb, T.ko, T.kp,
         LangData.k_]
@@ -19331,7 +19328,7 @@ LangData.k_.prototype = {
     inherit(P._StructuredCloneDart2Js, P._StructuredClone)
     inherit(P.kx, P.kw)
     inherit(P.cF, P.p)
-    inherit(HtmlRenderer.fW, HtmlRenderer.PlrView)
+    inherit(HtmlRenderer.fW, HtmlRenderer.ax)
     inherit_many(Sgls.MEntry, [T.Skill, T.UpdateStateEntry, T.PostDefendEntry, T.PostActionEntry, T.cB, T.bH, T.PostDamageEntry, T.PreActionEntry, T.aF])
     inherit_many(T.Skill,
         [T.ActionSkill, T.SklAokijiDefend, T.SklCovidDefend, T.SklIkarugaDefend,
@@ -19660,8 +19657,6 @@ var t = (function rtii() {
     $.nI = null
     $.et = P.cu(t.N, t.Z)
     $.jU = 0
-    // PlrView plv = PlrView.dict[update.caster.idName];
-    // $.ay -> plv
     $.ay = P.cu(t.X, H.findType("ax*"))
     $.rW = function () {
         var s = t.X
@@ -21521,6 +21516,9 @@ function main() {
                 async_goto = 8
                 return P._asyncAwait(T.start_main(h), $async$iE)
             case 8:
+                // a0_getter = async_result
+                // HtmlRenderer.jt(a0_getter)
+                logger.debug("main case 8")
                 HtmlRenderer.outer_main(async_result)
                 switch_to = 2
                 async_goto = 7
@@ -21536,7 +21534,9 @@ function main() {
                 async_goto = 2
                 break
             case 7:
+                logger.debug("so just here?", async_goto, error_code)
             case 1:
+                logger.debug("返回中")
                 return P._asyncReturn(q, async_completer)
             case 2:
                 return P.async_rethrow(async_result_1, async_completer)