Skip to content

Y
Ygopro Arena Web
Commit a9445abf authored by GaiaXalter's avatar GaiaXalter 💬
Browse files
Options

手动合并:mycard/ygopro-arena-web:develop

parent 5ce3ebe5
Pipeline #9048 failed with stages
      in 2 minutes and 46 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 27 additions and 25 deletions
      .gitlab-ci.yml
      View file @ a9445abf
      ...@@ -13,6 +13,7 @@ build: ...@@ -13,6 +13,7 @@ build:
      script: script:
      - npm ci - npm ci
      - npm run build - npm run build
      - npm run replace
      artifacts: artifacts:
      paths: paths:
      - dist/ - dist/
      ......
      build/build.js
      View file @ a9445abf
      ...@@ -31,5 +31,6 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { ...@@ -31,5 +31,6 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
      ' Tip: built files are meant to be served over an HTTP server.\n' + ' Tip: built files are meant to be served over an HTTP server.\n' +
      ' Opening index.html over file:// won\'t work.\n' ' Opening index.html over file:// won\'t work.\n'
      )) ))
      process.exit(0)
      }) })
      }) })
      config/index.js
      View file @ a9445abf
      ...@@ -7,7 +7,7 @@ module.exports = { ...@@ -7,7 +7,7 @@ module.exports = {
      index: path.resolve(__dirname, '../dist/index.html'), index: path.resolve(__dirname, '../dist/index.html'),
      assetsRoot: path.resolve(__dirname, '../dist'), assetsRoot: path.resolve(__dirname, '../dist'),
      assetsSubDirectory: 'assets', assetsSubDirectory: 'assets',
      assetsPublicPath: './', assetsPublicPath: 'https://cdn02.moecube.com:444/ygopro/',
      productionSourceMap: false, productionSourceMap: false,
      // Gzip off by default as many popular static hosts such as // Gzip off by default as many popular static hosts such as
      // Surge or Netlify already gzip all static assets for you. // Surge or Netlify already gzip all static assets for you.
      ......
      index.html
      View file @ a9445abf
      ...@@ -4,21 +4,21 @@ ...@@ -4,21 +4,21 @@
      <head> <head>
      <meta charset="utf-8"> <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
      <title>MCPro决斗数据库</title> <title>MCPro 决斗数据库</title>
      <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/bootstrap/css/bootstrap.min.css">
      <link rel="stylesheet" href="assets/css/styles.css"> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/css/styles.css">
      <link rel="stylesheet" href="assets/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/css/font-awesome.min.css">
      <!--<link rel="stylesheet" href="assets/layui/css/layui.css">--> <!--<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/layui/css/layui.css">-->
      <!--<link rel="shortcut icon" href="assets/img/mycardlogo.ico">--> <!--<link rel="shortcut icon" href="https://cdn02.moecube.com:444/ygopro/assets/img/mycardlogo.ico">-->
      <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
      </head> </head>
      <body> <body>
      <div id="app"></div> <div id="app"></div>
      <!-- built files will be auto injected --> <!-- built files will be auto injected -->
      <script src="assets/js/jquery.min.js"></script> <script src="https://cdn02.moecube.com:444/ygopro/assets/js/jquery.min.js"></script>
      <script src="assets/layui/layui.all.js"></script> <script src="https://cdn02.moecube.com:444/ygopro/assets/layui/layui.all.js"></script>
      <script src="assets/bootstrap/js/bootstrap.min.js"></script> <script src="https://cdn02.moecube.com:444/ygopro/assets/bootstrap/js/bootstrap.min.js"></script>
      </body> </body>
      </html> </html>
      package.json
      View file @ a9445abf
      { {
      "name": "ygopro-arena-web-new", "name": "ygopro-arena-web",
      "version": "1.0.0", "version": "1.0.0",
      "description": "A Vue.js project", "description": "MCPro 决斗数据库前端",
      "author": "ganjingcun <343747757@qq.com>", "author": "ganjingcun <343747757@qq.com>,GaiaXalter <1239760263@qq.com>",
      "private": true, "private": true,
      "scripts": { "scripts": {
      "dev": "node build/dev-server.js", "dev": "node build/dev-server.js",
      "build": "node build/build.js" "build": "node build/build.js",
      "replace": "sed -r -i 's/href=\\.\\//href=https:\\/\\/cdn02.moecube.com:444\\/ygopro\\//g' ./dist/index.html"
      }, },
      "dependencies": { "dependencies": {
      "bootstrap": "5.1.3", "bootstrap": "5.1.3",
      ......
      src/api.js
      View file @ a9445abf
      ...@@ -57,7 +57,7 @@ export default class Api { ...@@ -57,7 +57,7 @@ export default class Api {
      } }
      static getAvatar(opt) { static getAvatar(opt) {
      return Vue.http.get(`https://api.moecube.com/accounts/users/${opt.username}.avatar`) return Vue.http.get(`https://sapi.moecube.com:444/accounts/users/${opt.username}.avatar`)
      } }
      static getCardInfo(opt) { static getCardInfo(opt) {
      ......
      src/components/lang.js
      View file @ a9445abf
      ...@@ -3,7 +3,7 @@ module.exports = { ...@@ -3,7 +3,7 @@ module.exports = {
      lang: 'Language', lang: 'Language',
      cn: '中文', cn: '中文',
      en: 'English', en: 'English',
      database: 'MCPro决斗数据库', database: 'MCPro 决斗数据库',
      forum: '社区', forum: '社区',
      rank: '玩家排行', rank: '玩家排行',
      battlelog: '战报系统', battlelog: '战报系统',
      ...@@ -224,4 +224,3 @@ module.exports = { ...@@ -224,4 +224,3 @@ module.exports = {
      } }
      } }
      static/konami.html
      View file @ a9445abf
      ...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
      <meta charset="utf-8" /> <meta charset="utf-8" />
      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
      <link rel="stylesheet" href="assets/deck/base.min.css" /> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/base.min.css" />
      <link rel="stylesheet" href="assets/deck/fancy.min.css" /> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/fancy.min.css" />
      <link rel="stylesheet" href="assets/deck/main.css" /> <link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/main.css" />
      <script src="assets/deck/compatibility.min.js"></script> <script src="https://cdn02.moecube.com:444/ygopro/assets/deck/compatibility.min.js"></script>
      <script src="assets/deck/theViewer.min.js"></script> <script src="https://cdn02.moecube.com:444/ygopro/assets/deck/theViewer.min.js"></script>
      <!--<script src="assets/js/dom-to-image.min.js"></script>--> <!--<script src="https://cdn02.moecube.com:444/ygopro/assets/js/dom-to-image.min.js"></script>-->
      <script> <script>
      try { try {
      theViewer.defaultViewer = new theViewer.Viewer({}); theViewer.defaultViewer = new theViewer.Viewer({});
      ...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
      <div id="page-container"> <div id="page-container">
      <div id="pf1" class="pf w0 h0" data-page-no="1"> <div id="pf1" class="pf w0 h0" data-page-no="1">
      <div class="pc pc1 w0 h0"> <div class="pc pc1 w0 h0">
      <img class="bi x0 y0 w1 h1" alt="" src="assets/deck/bg1.png" /> <img class="bi x0 y0 w1 h1" alt="" src="https://cdn02.moecube.com:444/ygopro/assets/deck/bg1.png" />
      <div class="c x1 y1 w2 h2"> <div class="c x1 y1 w2 h2">
      <div class="t m0 x2 h3 y2 ff1 fs0 fc0 sc0 ls0 ws0">Yu<span class="ls1">#<span class="ls2">Gi</span>#<span class="ls3">Oh!)Deck)Lis<span class="_ _0"></span>t)Form<span <div class="t m0 x2 h3 y2 ff1 fs0 fc0 sc0 ls0 ws0">Yu<span class="ls1">#<span class="ls2">Gi</span>#<span class="ls3">Oh!)Deck)Lis<span class="_ _0"></span>t)Form<span
      class="ls1">)<span class="_ _1"> </span>)</span> class="ls1">)<span class="_ _1"> </span>)</span>
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment