fix: fuck route infinite loop

Yukimir · Oct 15, 2020 · c955e63 · c955e63
1 parent b5edad9
commit c955e63
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/docs/asset-manifest.json b/docs/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.7a33811c.chunk.css",
-    "main.js": "/static/js/main.c67147f8.chunk.js",
-    "main.js.map": "/static/js/main.c67147f8.chunk.js.map",
+    "main.js": "/static/js/main.9e8d5e0d.chunk.js",
+    "main.js.map": "/static/js/main.9e8d5e0d.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.c42d8ef7.js",
     "runtime-main.js.map": "/static/js/runtime-main.c42d8ef7.js.map",
     "static/css/2.c3d7a629.chunk.css": "/static/css/2.c3d7a629.chunk.css",
     "static/js/2.4f39188a.chunk.js": "/static/js/2.4f39188a.chunk.js",
     "static/js/2.4f39188a.chunk.js.map": "/static/js/2.4f39188a.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.c5f96f7955d270cdd71c0928b30d5e4c.js": "/precache-manifest.c5f96f7955d270cdd71c0928b30d5e4c.js",
+    "precache-manifest.577037a298aa9668e6935721d1716bef.js": "/precache-manifest.577037a298aa9668e6935721d1716bef.js",
     "service-worker.js": "/service-worker.js",
     "static/css/2.c3d7a629.chunk.css.map": "/static/css/2.c3d7a629.chunk.css.map",
     "static/css/main.7a33811c.chunk.css.map": "/static/css/main.7a33811c.chunk.css.map",
@@ -22,6 +22,6 @@
     "static/css/2.c3d7a629.chunk.css",
     "static/js/2.4f39188a.chunk.js",
     "static/css/main.7a33811c.chunk.css",
-    "static/js/main.c67147f8.chunk.js"
+    "static/js/main.9e8d5e0d.chunk.js"
   ]
 }
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="zh"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="icon" type="image/png" href="/logo.png"/><link rel="manifest" href="/manifest.json"/><title>Naberius</title><link href="/static/css/2.c3d7a629.chunk.css" rel="stylesheet"><link href="/static/css/main.7a33811c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(p,t)&&p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpnaberius-frontend"]=this["webpackJsonpnaberius-frontend"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.4f39188a.chunk.js"></script><script src="/static/js/main.c67147f8.chunk.js"></script></body></html>
+<!doctype html><html lang="zh"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="icon" type="image/png" href="/logo.png"/><link rel="manifest" href="/manifest.json"/><title>Naberius</title><link href="/static/css/2.c3d7a629.chunk.css" rel="stylesheet"><link href="/static/css/main.7a33811c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(p,t)&&p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpnaberius-frontend"]=this["webpackJsonpnaberius-frontend"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.4f39188a.chunk.js"></script><script src="/static/js/main.9e8d5e0d.chunk.js"></script></body></html>
diff --git a/...ifest.c5f96f7955d270cdd71c0928b30d5e4c.js → ...ifest.577037a298aa9668e6935721d1716bef.js b/...ifest.c5f96f7955d270cdd71c0928b30d5e4c.js → ...ifest.577037a298aa9668e6935721d1716bef.js
@@ -1,14 +1,14 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "50c94b6360a33bfb70c0a42f149bb125",
+    "revision": "a96199c6acfe6ed8fe014c806353d7a1",
     "url": "/index.html"
   },
   {
     "revision": "f2cebb10d9840c2ed64d",
     "url": "/static/css/2.c3d7a629.chunk.css"
   },
   {
-    "revision": "ab66a9006f4a7a64afff",
+    "revision": "d4cb10f37ccd7e72be71",
     "url": "/static/css/main.7a33811c.chunk.css"
   },
   {
@@ -20,8 +20,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/static/js/2.4f39188a.chunk.js.LICENSE"
   },
   {
-    "revision": "ab66a9006f4a7a64afff",
-    "url": "/static/js/main.c67147f8.chunk.js"
+    "revision": "d4cb10f37ccd7e72be71",
+    "url": "/static/js/main.9e8d5e0d.chunk.js"
   },
   {
     "revision": "8bd58515cb0081862933",

diff --git a/docs/service-worker.js b/docs/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.c5f96f7955d270cdd71c0928b30d5e4c.js"
+  "/precache-manifest.577037a298aa9668e6935721d1716bef.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/docs/static/js/main.c67147f8.chunk.js → docs/static/js/main.9e8d5e0d.chunk.js b/docs/static/js/main.c67147f8.chunk.js → docs/static/js/main.9e8d5e0d.chunk.js
diff --git a/docs/static/js/main.9e8d5e0d.chunk.js.map b/docs/static/js/main.9e8d5e0d.chunk.js.map
diff --git a/docs/static/js/main.c67147f8.chunk.js.map b/docs/static/js/main.c67147f8.chunk.js.map
diff --git a/src/Components/Routes/Quest/EnemyTable.tsx b/src/Components/Routes/Quest/EnemyTable.tsx
@@ -147,10 +147,15 @@ const EnemyTableRows: React.FC<EnemyTableRowsProps> = ({
   );
 
   const routeNos = [enemies[0].RouteNo];
+  let f = false;
   for (let i = 0; i < routeNos.length; i++) {
     const routeNo = routeNos[i];
     for (const route of routes[routeNo]) {
-      if (route.RouteID !== 0) {
+      // 循环route
+      if (route.RouteID !== 0 && (!routeNos.includes(route.RouteID) || !f)) {
+        if (routeNos.includes(route.RouteID)) {
+          f = true;
+        }
         routeNos.push(route.RouteID);
         break;
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="zh"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="icon" type="image/png" href="/logo.png"/><link rel="manifest" href="/manifest.json"/><title>Naberius</title><link href="/static/css/2.c3d7a629.chunk.css" rel="stylesheet"><link href="/static/css/main.7a33811c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(p,t)&&p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u\|\|[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpnaberius-frontend"]=this["webpackJsonpnaberius-frontend"]\|\|[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.4f39188a.chunk.js"></script><script src="/static/js/main.c67147f8.chunk.js"></script></body></html>
		<!doctype html><html lang="zh"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="icon" type="image/png" href="/logo.png"/><link rel="manifest" href="/manifest.json"/><title>Naberius</title><link href="/static/css/2.c3d7a629.chunk.css" rel="stylesheet"><link href="/static/css/main.7a33811c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(p,t)&&p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u\|\|[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpnaberius-frontend"]=this["webpackJsonpnaberius-frontend"]\|\|[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.4f39188a.chunk.js"></script><script src="/static/js/main.9e8d5e0d.chunk.js"></script></body></html>