Home Explore Help
Sign In
johan
/
twelve-heroes
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix webpack for building for windows and android

jojo 5 years ago
parent
1f35aa1643
commit
50e2a2f1f9
18 changed files with 2650 additions and 334 deletions
Split View Show Diff Stats
  1. 1 0
      .gitignore
  2. 2 0
      config.xml
  3. 44 0
      index.html
  4. 305 155
      package-lock.json
  5. 19 15
      package.json
  6. 72 0
      server/.gitignore
  7. 1 1
      server/main.js
  8. 2137 0
      server/package-lock.json
  9. 3 1
      server/package.json
  10. BIN
      src/assets/logo.png
  11. 4 5
      src/common/socket-service.js
  12. 0 1
      src/index.html
  13. 17 26
      src/main.js
  14. 2 3
      src/menu/control/menu-controller.js
  15. 11 9
      src/menu/views/main-menu-scene.js
  16. 32 30
      webpack.config.js
  17. 0 84
      webpack.config.prod.js
  18. 0 4
      www/.gitignore

+ 1 - 0
.gitignore
View File 

@@ -66,6 +66,7 @@ db.json
 
 #webpack dev build
 
 assets
 
 webpack
 
+www
 
 
 #cordova build
 
 platforms/

+ 2 - 0
config.xml
View File 

@@ -18,6 +18,8 @@
 
     <allow-intent href="geo:*" />
 
     <platform name="android">
 
         <allow-intent href="market:*" />
 
+        <preference name="android-minSdkVersion" value="26"/>
 
+        <preference name="android-targetSdkVersion" value="27"/>
 
     </platform>
 
 
     <platform name="windows">

+ 44 - 0
index.html
View File 

@@ -0,0 +1,44 @@
 
+<!DOCTYPE html>
 
+<!--
 
+    Licensed to the Apache Software Foundation (ASF) under one
 
+    or more contributor license agreements.  See the NOTICE file
 
+    distributed with this work for additional information
 
+    regarding copyright ownership.  The ASF licenses this file
 
+    to you under the Apache License, Version 2.0 (the
 
+    "License"); you may not use this file except in compliance
 
+    with the License.  You may obtain a copy of the License at
 
+
 
+    http://www.apache.org/licenses/LICENSE-2.0
 
+
 
+    Unless required by applicable law or agreed to in writing,
 
+    software distributed under the License is distributed on an
 
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 
+     KIND, either express or implied.  See the License for the
 
+    specific language governing permissions and limitations
 
+    under the License.
 
+-->
 
+<html>
 
+
 
+<head>
 
+  <!--
 
+        Customize this policy to fit your own app's needs. For more guidance, see:
 
+            https://github.com/apache/cordova-plugin-whitelist/blob/master/README.md#content-security-policy
 
+        Some notes:
 
+            * gap: is required only on iOS (when using UIWebView) and is needed for JS->native communication
 
+            * https://ssl.gstatic.com is required only on Android and is needed for TalkBack to function properly
 
+            * Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
 
+                * Enable inline JS: add 'unsafe-inline' to default-src
 
+        -->
 
+  <!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content: blob:;"> -->
 
+  <meta name="format-detection" content="telephone=no">
 
+  <meta name="msapplication-tap-highlight" content="no">
 
+  <meta name="viewport" content="initial-scale=1, width=device-width, viewport-fit=cover">
 
+  <!-- <link rel="stylesheet" type="text/css" href="css/index.css"> -->
 
+  <title>Hello World</title>
 
+</head>
 
+
 
+<body>
 
+  
+<script type="text/javascript" src="webpack/app.bundle.js"></script></body>
 
+
 
+</html>

+ 305 - 155
package-lock.json
View File 

@@ -622,7 +622,8 @@
 
     "@babel/parser": {
 
       "version": "7.6.2",
 
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
 
-      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="
 
+      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
 
+      "dev": true
 
     },
 
     "@babel/plugin-proposal-async-generator-functions": {
 
       "version": "7.2.0",
 
@@ -1941,6 +1942,7 @@
 
       "version": "1.0.10",
 
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
 
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 
+      "dev": true,
 
       "requires": {
 
         "sprintf-js": "~1.0.2"
 
       }
 
@@ -2395,7 +2397,8 @@
 
     "bluebird": {
 
       "version": "3.5.5",
 
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
 
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
 
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
 
+      "dev": true
 
     },
 
     "bn.js": {
 
       "version": "4.11.8",
 
@@ -3473,14 +3476,6 @@
 
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 
       "dev": true
 
     },
 
-    "catharsis": {
 
-      "version": "0.8.11",
 
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
 
-      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
 
-      "requires": {
 
-        "lodash": "^4.17.14"
 
-      }
 
-    },
 
     "chai": {
 
       "version": "4.2.0",
 
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
 
@@ -5178,6 +5173,37 @@
 
         "domelementtype": "1"
 
       }
 
     },
 
+    "dot-case": {
 
+      "version": "3.0.3",
 
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz",
 
+      "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==",
 
+      "dev": true,
 
+      "requires": {
 
+        "no-case": "^3.0.3",
 
+        "tslib": "^1.10.0"
 
+      },
 
+      "dependencies": {
 
+        "lower-case": {
 
+          "version": "2.0.1",
 
+          "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
 
+          "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "tslib": "^1.10.0"
 
+          }
 
+        },
 
+        "no-case": {
 
+          "version": "3.0.3",
 
+          "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
 
+          "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
 
+          "dev": true,
 
+          "requires": {
 
+            "lower-case": "^2.0.1",
 
+            "tslib": "^1.10.0"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "dot-prop": {
 
       "version": "4.2.0",
 
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
 
@@ -5187,11 +5213,6 @@
 
         "is-obj": "^1.0.0"
 
       }
 
     },
 
-    "dts-dom": {
 
-      "version": "3.4.0",
 
-      "resolved": "https://registry.npmjs.org/dts-dom/-/dts-dom-3.4.0.tgz",
 
-      "integrity": "sha512-wTgCa1h6zn9ecCkUkMk9md8RxJB+MxmxoOJTLzI0ITLFOb7zRVsVGAjCPm9QXL7VeNnmkl2uj7iS+ZhWaa+xZQ=="
 
-    },
 
     "duplexer": {
 
       "version": "0.1.1",
 
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
 
@@ -6149,22 +6170,57 @@
 
       }
 
     },
 
     "file-loader": {
 
-      "version": "4.2.0",
 
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz",
 
-      "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==",
 
+      "version": "6.0.0",
 
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
 
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
 
       "dev": true,
 
       "requires": {
 
-        "loader-utils": "^1.2.3",
 
-        "schema-utils": "^2.0.0"
 
+        "loader-utils": "^2.0.0",
 
+        "schema-utils": "^2.6.5"
 
       },
 
       "dependencies": {
 
+        "ajv": {
 
+          "version": "6.12.0",
 
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
 
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
 
+          "dev": true,
 
+          "requires": {
 
+            "fast-deep-equal": "^3.1.1",
 
+            "fast-json-stable-stringify": "^2.0.0",
 
+            "json-schema-traverse": "^0.4.1",
 
+            "uri-js": "^4.2.2"
 
+          }
 
+        },
 
+        "emojis-list": {
 
+          "version": "3.0.0",
 
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
 
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
 
+          "dev": true
 
+        },
 
+        "fast-deep-equal": {
 
+          "version": "3.1.1",
 
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
 
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
 
+          "dev": true
 
+        },
 
+        "loader-utils": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
 
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "big.js": "^5.2.2",
 
+            "emojis-list": "^3.0.0",
 
+            "json5": "^2.1.2"
 
+          }
 
+        },
 
         "schema-utils": {
 
-          "version": "2.4.1",
 
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz",
 
-          "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
 
+          "version": "2.6.5",
 
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
 
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
 
           "dev": true,
 
           "requires": {
 
-            "ajv": "^6.10.2",
 
+            "ajv": "^6.12.0",
 
             "ajv-keywords": "^3.4.1"
 
           }
 
         }
 
@@ -7433,6 +7489,104 @@
 
       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
 
       "dev": true
 
     },
 
+    "html-loader": {
 
+      "version": "1.0.0",
 
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-1.0.0.tgz",
 
+      "integrity": "sha512-acPyjP9Mo05jEbe/oejXu5gFwtKWdFewPoaVa47VCnHmRbR43jtdx/kPhPEbCBm2qWtIn+a8uTJAW4Ocnn4olw==",
 
+      "dev": true,
 
+      "requires": {
 
+        "html-minifier-terser": "^5.0.4",
 
+        "htmlparser2": "^4.1.0",
 
+        "loader-utils": "^2.0.0",
 
+        "parse-srcset": "^1.0.2",
 
+        "schema-utils": "^2.6.5"
 
+      },
 
+      "dependencies": {
 
+        "ajv": {
 
+          "version": "6.12.0",
 
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
 
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
 
+          "dev": true,
 
+          "requires": {
 
+            "fast-deep-equal": "^3.1.1",
 
+            "fast-json-stable-stringify": "^2.0.0",
 
+            "json-schema-traverse": "^0.4.1",
 
+            "uri-js": "^4.2.2"
 
+          }
 
+        },
 
+        "domelementtype": {
 
+          "version": "2.0.1",
 
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
 
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
 
+          "dev": true
 
+        },
 
+        "domhandler": {
 
+          "version": "3.0.0",
 
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz",
 
+          "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==",
 
+          "dev": true,
 
+          "requires": {
 
+            "domelementtype": "^2.0.1"
 
+          }
 
+        },
 
+        "domutils": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.0.0.tgz",
 
+          "integrity": "sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "dom-serializer": "^0.2.1",
 
+            "domelementtype": "^2.0.1",
 
+            "domhandler": "^3.0.0"
 
+          }
 
+        },
 
+        "emojis-list": {
 
+          "version": "3.0.0",
 
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
 
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
 
+          "dev": true
 
+        },
 
+        "fast-deep-equal": {
 
+          "version": "3.1.1",
 
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
 
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
 
+          "dev": true
 
+        },
 
+        "htmlparser2": {
 
+          "version": "4.1.0",
 
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
 
+          "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
 
+          "dev": true,
 
+          "requires": {
 
+            "domelementtype": "^2.0.1",
 
+            "domhandler": "^3.0.0",
 
+            "domutils": "^2.0.0",
 
+            "entities": "^2.0.0"
 
+          }
 
+        },
 
+        "loader-utils": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
 
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "big.js": "^5.2.2",
 
+            "emojis-list": "^3.0.0",
 
+            "json5": "^2.1.2"
 
+          }
 
+        },
 
+        "schema-utils": {
 
+          "version": "2.6.5",
 
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
 
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ajv": "^6.12.0",
 
+            "ajv-keywords": "^3.4.1"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "html-minifier": {
 
       "version": "3.5.21",
 
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
 
@@ -7456,6 +7610,83 @@
 
         }
 
       }
 
     },
 
+    "html-minifier-terser": {
 
+      "version": "5.0.5",
 
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz",
 
+      "integrity": "sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==",
 
+      "dev": true,
 
+      "requires": {
 
+        "camel-case": "^4.1.1",
 
+        "clean-css": "^4.2.3",
 
+        "commander": "^4.1.1",
 
+        "he": "^1.2.0",
 
+        "param-case": "^3.0.3",
 
+        "relateurl": "^0.2.7",
 
+        "terser": "^4.6.3"
 
+      },
 
+      "dependencies": {
 
+        "camel-case": {
 
+          "version": "4.1.1",
 
+          "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz",
 
+          "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==",
 
+          "dev": true,
 
+          "requires": {
 
+            "pascal-case": "^3.1.1",
 
+            "tslib": "^1.10.0"
 
+          }
 
+        },
 
+        "clean-css": {
 
+          "version": "4.2.3",
 
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
 
+          "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
 
+          "dev": true,
 
+          "requires": {
 
+            "source-map": "~0.6.0"
 
+          }
 
+        },
 
+        "commander": {
 
+          "version": "4.1.1",
 
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
 
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
 
+          "dev": true
 
+        },
 
+        "param-case": {
 
+          "version": "3.0.3",
 
+          "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
 
+          "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
 
+          "dev": true,
 
+          "requires": {
 
+            "dot-case": "^3.0.3",
 
+            "tslib": "^1.10.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.6.1",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 
+          "dev": true
 
+        },
 
+        "terser": {
 
+          "version": "4.6.7",
 
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
 
+          "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
 
+          "dev": true,
 
+          "requires": {
 
+            "commander": "^2.20.0",
 
+            "source-map": "~0.6.1",
 
+            "source-map-support": "~0.5.12"
 
+          },
 
+          "dependencies": {
 
+            "commander": {
 
+              "version": "2.20.3",
 
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 
+              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 
+              "dev": true
 
+            }
 
+          }
 
+        }
 
+      }
 
+    },
 
     "html-webpack-plugin": {
 
       "version": "3.2.0",
 
       "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
 
@@ -8257,48 +8488,12 @@
 
         "esprima": "^4.0.0"
 
       }
 
     },
 
-    "js2xmlparser": {
 
-      "version": "4.0.0",
 
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.0.tgz",
 
-      "integrity": "sha512-WuNgdZOXVmBk5kUPMcTcVUpbGRzLfNkv7+7APq7WiDihpXVKrgxo6wwRpRl9OQeEBgKCVk9mR7RbzrnNWC8oBw==",
 
-      "requires": {
 
-        "xmlcreate": "^2.0.0"
 
-      }
 
-    },
 
     "jsbn": {
 
       "version": "0.1.1",
 
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
 
       "dev": true
 
     },
 
-    "jsdoc": {
 
-      "version": "3.6.3",
 
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz",
 
-      "integrity": "sha512-Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==",
 
-      "requires": {
 
-        "@babel/parser": "^7.4.4",
 
-        "bluebird": "^3.5.4",
 
-        "catharsis": "^0.8.11",
 
-        "escape-string-regexp": "^2.0.0",
 
-        "js2xmlparser": "^4.0.0",
 
-        "klaw": "^3.0.0",
 
-        "markdown-it": "^8.4.2",
 
-        "markdown-it-anchor": "^5.0.2",
 
-        "marked": "^0.7.0",
 
-        "mkdirp": "^0.5.1",
 
-        "requizzle": "^0.2.3",
 
-        "strip-json-comments": "^3.0.1",
 
-        "taffydb": "2.6.2",
 
-        "underscore": "~1.9.1"
 
-      },
 
-      "dependencies": {
 
-        "escape-string-regexp": {
 
-          "version": "2.0.0",
 
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
 
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
 
-        }
 
-      }
 
-    },
 
     "jsesc": {
 
       "version": "2.5.2",
 
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
 
@@ -8396,14 +8591,6 @@
 
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 
       "dev": true
 
     },
 
-    "klaw": {
 
-      "version": "3.0.0",
 
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
 
-      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
 
-      "requires": {
 
-        "graceful-fs": "^4.1.9"
 
-      }
 
-    },
 
     "latest-version": {
 
       "version": "3.1.0",
 
       "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
 
@@ -8438,14 +8625,6 @@
 
       "integrity": "sha512-XCpr5bElgDI65vVgstP8TWjv6/QKWm9GU5UG0Pr5sLQ3QLo8NVKsioe+Jed5/3vFOe3IQuqE7DKwTvKQkjTHvg==",
 
       "dev": true
 
     },
 
-    "linkify-it": {
 
-      "version": "2.2.0",
 
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
 
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
 
-      "requires": {
 
-        "uc.micro": "^1.0.1"
 
-      }
 
-    },
 
     "load-json-file": {
 
       "version": "2.0.0",
 
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
 
@@ -8734,7 +8913,8 @@
 
     "lodash": {
 
       "version": "4.17.15",
 
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
 
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
 
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 
+      "dev": true
 
     },
 
     "lodash.debounce": {
 
       "version": "4.0.8",
 
@@ -8881,35 +9061,6 @@
 
         "object-visit": "^1.0.0"
 
       }
 
     },
 
-    "markdown-it": {
 
-      "version": "8.4.2",
 
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
 
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
 
-      "requires": {
 
-        "argparse": "^1.0.7",
 
-        "entities": "~1.1.1",
 
-        "linkify-it": "^2.0.0",
 
-        "mdurl": "^1.0.1",
 
-        "uc.micro": "^1.0.5"
 
-      },
 
-      "dependencies": {
 
-        "entities": {
 
-          "version": "1.1.2",
 
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
 
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
-        }
 
-      }
 
-    },
 
-    "markdown-it-anchor": {
 
-      "version": "5.2.4",
 
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.4.tgz",
 
-      "integrity": "sha512-n8zCGjxA3T+Mx1pG8HEgbJbkB8JFUuRkeTZQuIM8iPY6oQ8sWOPRZJDFC9a/pNg2QkHEjjGkhBEl/RSyzaDZ3A=="
 
-    },
 
-    "marked": {
 
-      "version": "0.7.0",
 
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
 
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
 
-    },
 
     "md5": {
 
       "version": "2.2.1",
 
       "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
 
@@ -8938,11 +9089,6 @@
 
         "safe-buffer": "^5.1.2"
 
       }
 
     },
 
-    "mdurl": {
 
-      "version": "1.0.1",
 
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
 
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
 
-    },
 
     "media-typer": {
 
       "version": "0.3.0",
 
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 
@@ -9090,7 +9236,8 @@
 
     "minimist": {
 
       "version": "1.2.5",
 
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
 
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
 
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 
+      "dev": true
 
     },
 
     "mississippi": {
 
       "version": "3.0.0",
 
@@ -9141,6 +9288,7 @@
 
       "version": "0.5.3",
 
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
 
       "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
 
+      "dev": true,
 
       "requires": {
 
         "minimist": "^1.2.5"
 
       }
 
@@ -10120,6 +10268,12 @@
 
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
 
       "dev": true
 
     },
 
+    "parse-srcset": {
 
+      "version": "1.0.2",
 
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
 
+      "integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=",
 
+      "dev": true
 
+    },
 
     "parseqs": {
 
       "version": "0.0.5",
 
       "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
 
@@ -10141,6 +10295,37 @@
 
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
 
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
 
     },
 
+    "pascal-case": {
 
+      "version": "3.1.1",
 
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz",
 
+      "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==",
 
+      "dev": true,
 
+      "requires": {
 
+        "no-case": "^3.0.3",
 
+        "tslib": "^1.10.0"
 
+      },
 
+      "dependencies": {
 
+        "lower-case": {
 
+          "version": "2.0.1",
 
+          "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
 
+          "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "tslib": "^1.10.0"
 
+          }
 
+        },
 
+        "no-case": {
 
+          "version": "3.0.3",
 
+          "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
 
+          "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
 
+          "dev": true,
 
+          "requires": {
 
+            "lower-case": "^2.0.1",
 
+            "tslib": "^1.10.0"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "pascalcase": {
 
       "version": "0.1.1",
 
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
 
@@ -10250,18 +10435,14 @@
 
       "dev": true
 
     },
 
     "phaser": {
 
-      "version": "3.19.0",
 
-      "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.19.0.tgz",
 
-      "integrity": "sha512-dEohGFXik3bDCpNqk/b8yxpyMbP99jaP2Aoa1V4UcagLpHOYsNDYt4R+swJv9bCl6qaxvPGPstx7qJALtgDJOg==",
 
+      "version": "3.22.0",
 
+      "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.22.0.tgz",
 
+      "integrity": "sha512-tTmLlnsz+NU9nnVq7jwy1pprpNo1+oFTWlMoSk76VJIdvQ0UIxNXToSijq/Ku2K4PqEuUY4QSYYHxmKv0Mbzhw==",
 
       "requires": {
 
-        "dts-dom": "^3.2.0",
 
         "eventemitter3": "^3.1.0",
 
         "exports-loader": "^0.7.0",
 
         "imports-loader": "^0.8.0",
 
-        "jsdoc": "^3.6.1",
 
-        "path": "^0.12.7",
 
-        "remove-files-webpack-plugin": "^1.1.3",
 
-        "typescript": "^3.4.5"
 
+        "path": "^0.12.7"
 
       }
 
     },
 
     "picomatch": {
 
@@ -11003,11 +11184,6 @@
 
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
 
       "dev": true
 
     },
 
-    "remove-files-webpack-plugin": {
 
-      "version": "1.1.3",
 
-      "resolved": "https://registry.npmjs.org/remove-files-webpack-plugin/-/remove-files-webpack-plugin-1.1.3.tgz",
 
-      "integrity": "sha512-r53wQ/IlTkmcv11wri71CZ27S+GhFI5SjHbTbaAJbisPC3qGwg87vlA2C5Z1PuVA+aMI8SgimnE4SqI+ZYzu6Q=="
 
-    },
 
     "remove-trailing-separator": {
 
       "version": "1.1.0",
 
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
 
@@ -11120,14 +11296,6 @@
 
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
 
       "dev": true
 
     },
 
-    "requizzle": {
 
-      "version": "0.2.3",
 
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
 
-      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
 
-      "requires": {
 
-        "lodash": "^4.17.14"
 
-      }
 
-    },
 
     "resolve": {
 
       "version": "1.12.0",
 
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
 
@@ -11939,7 +12107,8 @@
 
     "sprintf-js": {
 
       "version": "1.0.3",
 
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
 
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
 
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
 
+      "dev": true
 
     },
 
     "sshpk": {
 
       "version": "1.16.1",
 
@@ -12153,7 +12322,8 @@
 
     "strip-json-comments": {
 
       "version": "3.0.1",
 
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
 
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
 
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
 
+      "dev": true
 
     },
 
     "supports-color": {
 
       "version": "5.5.0",
 
@@ -12194,11 +12364,6 @@
 
         }
 
       }
 
     },
 
-    "taffydb": {
 
-      "version": "2.6.2",
 
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
 
-      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg="
 
-    },
 
     "tapable": {
 
       "version": "1.1.3",
 
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
 
@@ -12580,22 +12745,12 @@
 
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 
       "dev": true
 
     },
 
-    "typescript": {
 
-      "version": "3.6.3",
 
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz",
 
-      "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw=="
 
-    },
 
     "ua-parser-js": {
 
       "version": "0.7.17",
 
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
 
       "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==",
 
       "dev": true
 
     },
 
-    "uc.micro": {
 
-      "version": "1.0.6",
 
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
 
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
 
-    },
 
     "uglify-js": {
 
       "version": "3.4.10",
 
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
 
@@ -13706,11 +13861,6 @@
 
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 
     },
 
-    "xmlcreate": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.1.tgz",
 
-      "integrity": "sha512-MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA=="
 
-    },
 
     "xmldom": {
 
       "version": "0.1.27",
 
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",

+ 19 - 15
package.json
View File 

@@ -7,12 +7,15 @@
 
   ],
 
   "scripts": {
 
     "server": "cd server && npm start",
 
-    "dev": "DEV=true webpack --watch",
 
-    "prepare": "cordova prepare",
 
-    "browser-build": "cordova build browser -- --webpackConfig webpack.config.prod.js",
 
-    "win-build": "cordova build windows -- --webpackConfig webpack.config.prod.js --win",
 
-    "browser": "cordova run browser -- -w webpack.config.prod.js",
 
-    "win": "cordova run windows -- -w webpack.config.prod.js --win",
 
+    "dev": "DEV=true SERVER_PORT=2610 SERVER_URL='http://localhost' webpack --watch",
 
+    "build": "webpack --mode=production",
 
+    "postbuild": "cordova prepare",
 
+    "win-build": "cordova build windows --win",
 
+    "preandroid-build": "set ORG_GRADLE_PROJECT_cdvMinSdkVersion=20 ",
 
+    "android-build": "cordova build android",
 
+    "browser": "cordova run browser",
 
+    "win": "cordova run windows --win",
 
+    "android": "cordova run android --emulator",
 
     "start": "npm-run-all --parallel server dev lint:watch",
 
     "start-client": "npm-run-all --parallel dev lint:watch",
 
     "lint": "esw webpack.config.* src --color",
 
@@ -21,12 +24,13 @@
 
     "share": "npm-run-all --parallel open:src localtunnel",
 
     "test": "mocha --reporter progress \"src/**/*.test.js\"",
 
     "test:watch": "npm run test -- --watch",
 
-    "clean": "rm -rf platforms plugins webpack www/dist www/index.html www/assets"
 
+    "clean": "rm -rf platforms plugins webpack www/dist www/index.html www/assets",
 
+    "export": "export PATH=$(npm bin):$PATH"
 
   },
 
   "author": "JOJO",
 
   "license": "MIT",
 
   "dependencies": {
 
-    "phaser": "3.19.0",
 
+    "phaser": "^3.21.0",
 
     "socket.io-client": "^2.3.0",
 
     "cordova-android": "^8.1.0",
 
     "cordova-browser": "^6.0.0",
 
@@ -35,8 +39,8 @@
 
   "devDependencies": {
 
     "@babel/cli": "7.6.2",
 
     "@babel/core": "^7.9.0",
 
-    "@babel/polyfill": "7.6.0",
 
     "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
 
+    "@babel/polyfill": "7.6.0",
 
     "@babel/preset-env": "7.6.2",
 
     "@babel/register": "^7.9.0",
 
     "are-you-es5": "^1.3.3",
 
@@ -48,13 +52,13 @@
 
     "clean-webpack-plugin": "3.0.0",
 
     "copy-webpack-plugin": "^5.1.1",
 
     "cordova": "^9.0.0",
 
-    "cordova-plugin-webpack": "^0.4.7",
 
     "cordova-plugin-whitelist": "^1.3.4",
 
     "eslint": "6.4.0",
 
     "eslint-plugin-import": "2.18.2",
 
     "eslint-watch": "6.0.1",
 
     "express": "^4.17.1",
 
-    "file-loader": "4.2.0",
 
+    "file-loader": "6.0.0",
 
+    "html-loader": "^1.0.0",
 
     "html-webpack-plugin": "3.2.0",
 
     "mocha": "^7.1.1",
 
     "npm-run-all": "4.1.5",
 
@@ -69,12 +73,12 @@
 
   },
 
   "cordova": {
 
     "plugins": {
 
-      "cordova-plugin-whitelist": {},
 
-      "cordova-plugin-webpack": {}
 
+      "cordova-plugin-whitelist": {}
 
     },
 
     "platforms": [
 
       "browser",
 
-      "windows"
 
+      "windows",
 
+      "android"
 
     ]
 
   }
 
-}
 
+}

+ 72 - 0
server/.gitignore
View File 

@@ -0,0 +1,72 @@
 
+# Logs
 
+logs
 
+*.log
 
+npm-debug.log*
 
+yarn-debug.log*
 
+yarn-error.log*
 
+
 
+# Runtime data
 
+pids
 
+*.pid
 
+*.seed
 
+*.pid.lock
 
+
 
+# Directory for instrumented libs generated by jscoverage/JSCover
 
+lib-cov
 
+
 
+# Coverage directory used by tools like istanbul
 
+coverage
 
+
 
+# nyc test coverage
 
+.nyc_output
 
+
 
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 
+.grunt
 
+
 
+# Bower dependency directory (https://bower.io/)
 
+bower_components
 
+
 
+# node-waf configuration
 
+.lock-wscript
 
+
 
+# Compiled binary addons (https://nodejs.org/api/addons.html)
 
+build/Release
 
+
 
+# Dependency directories
 
+node_modules/
 
+jspm_packages/
 
+
 
+# TypeScript v1 declaration files
 
+typings/
 
+
 
+# Optional npm cache directory
 
+.npm
 
+
 
+# Optional eslint cache
 
+.eslintcache
 
+
 
+# Optional REPL history
 
+.node_repl_history
 
+
 
+# Output of 'npm pack'
 
+*.tgz
 
+
 
+# Yarn Integrity file
 
+.yarn-integrity
 
+
 
+# dotenv environment variables file
 
+.env
 
+
 
+# next.js build output
 
+.next
 
+
 
+#mock db
 
+db.json
 
+
 
+#webpack dev build
 
+assets
 
+webpack
 
+
 
+#cordova build
 
+platforms/
 
+plugins/

+ 1 - 1
server/main.js
View File 

@@ -5,7 +5,7 @@ import DuelController from './game-server/duel-controller';
 
 console.log('Starting 12 heroes server');
 
 
 const io = require('socket.io');
 
-const server = io.listen(4000);
 
+const server = io.listen(2610);
 
 
 let players = [];

File diff suppressed because it is too large
+ 2137 - 0
server/package-lock.json


+ 3 - 1
server/package.json
View File 

@@ -11,9 +11,11 @@
 
   "author": "JOJO",
 
   "license": "MIT",
 
   "dependencies": {
 
+    "mariadb": "^2.3.1",
 
     "socket.io": "^2.3.0"
 
   },
 
   "devDependencies": {
 
-    "@babel/node": "7.6.2"
 
+    "@babel/node": "7.6.2",
 
+    "heroku": "^7.39.1"
 
   }
 
 }

BIN
src/assets/logo.png
View File


+ 4 - 5
src/common/socket-service.js
View File 

@@ -9,16 +9,14 @@ import io from 'socket.io-client';
 
     - reconnect_failed
 
     -
 
 */
 
-const SERVER_URL = process.env.SERVER_URL || 'http://localhost';
 
-const SERVER_PORT = process.env.SERVER_PORT || 4000;
 
+const SERVER_URL = process.env.SERVER_URL;
 
+const SERVER_PORT = process.env.SERVER_PORT;
 
 
 
 
 export default class SocketService {
 
   constructor() {
 
-    //this.ioClient = io.connect(SERVER_URL + ":" + SERVER_PORT + '/');
 
     this.lostConnectionListeners = new Set();
 
-    // this.ioClient = {};
 
   }
 
 
   addlostConnectionListener(listener) {
 
@@ -32,7 +30,8 @@ export default class SocketService {
 
 
   connect(name) {
 
     let promise = new Promise((resolve, reject) => {
 
-      this.ioClient = io('http://localhost:4000',
 
+      console.log('Connecting socket service to : ' + SERVER_URL + ':' + SERVER_PORT);
 
+      this.ioClient = io(SERVER_URL+':'+SERVER_PORT,
 
         { reconnectionAttempts: 2 });
 
 
       this.ioClient.on('disconnect', (reason) => {

+ 0 - 1
src/index.html
View File 

@@ -41,7 +41,6 @@
 
   <% if (!process.env.DEV || process.env.DEV === false) { %>
 
 
   <div class="app">
 
-    <h1>Twelve Heroes</h1>
 
     <div id="deviceready" class="blink">
 
       <p class="event listening"></p>
 
       <p class="event received"></p>

+ 17 - 26
src/main.js
View File 

@@ -10,20 +10,28 @@ function startGame() {
 
 
   let phaserConfig = {
 
     type: Phaser.AUTO,
 
-    width: 800,
 
-    height: 500,
 
-    scene: [],
 
+    pixelArt: true,
 
+    scale: {
 
+      mode: Phaser.Scale.RESIZE,
 
+      autoCenter: Phaser.Scale.CENTER_BOTH,
 
+      width: window.innerWidth,
 
+      height: window.innerHeight
 
+    },
 
+    physics: {
 
+      default: 'arcade',
 
+      arcade: {
 
+        debug: true,
 
+        gravity: { y: 250 },
 
+      }
 
+    },
 
     parent: 'phaser-parent',
 
     dom: {
 
-        createContainer: true
 
-    },
 
-    backgroundColor: 'rgba(34,139,34 ,1 )'
 
+      createContainer: true
 
+    }
 
   };
 
   let phaserEngine = new Phaser.Game(phaserConfig);
 
   let menuController = new MenuController(phaserEngine);
 
-  console.log(phaserEngine.config);
 
   menuController.displayMainMenu();
 
-
 
 }
 
 
 let app = {
 
@@ -33,30 +41,13 @@ let app = {
 
     document.addEventListener('deviceready', this.onDeviceReady.bind(this), false);
 
   },
 
 
-  // deviceready Event Handler
 
-  //
 
-  // Bind any cordova events here. Common events are:
 
-  // 'pause', 'resume', etc.
 
   onDeviceReady: function () {
 
-    this.receivedEvent('deviceready');
 
     startGame();
 
   },
 
 
-  // Update DOM on a Received Event
 
-  receivedEvent: function (id) {
 
-    var parentElement = document.getElementById(id);
 
-    var listeningElement = parentElement.querySelector('.listening');
 
-    var receivedElement = parentElement.querySelector('.received');
 
-
 
-    listeningElement.setAttribute('style', 'display:none;');
 
-    receivedElement.setAttribute('style', 'display:block;');
 
-
 
-    console.log('Received Event: ' + id);
 
-  }
 
 };
 
 
-console.log('cordova  :', process.env.DEV );
 
-
 
+console.log('cordova  :', process.env.DEV);
 
 
 if (!process.env.DEV || process.env.DEV === false) {

+ 2 - 3
src/menu/control/menu-controller.js
View File 

@@ -10,11 +10,10 @@ export default class MenuController {
 
 
   constructor(phaserEngine) {
 
     this.phaserEngine = phaserEngine;
 
-    console.log("In constructor MenuController " + this.phaserEngine);
 
-
 
-    this.mainMenuScene = new MainMenuScene(this.menuEventListener());
 
 
     this.socketService = new SocketService();
 
+
 
+    this.mainMenuScene = new MainMenuScene(this.menuEventListener());
 
   }
 
 
   displayMainMenu() {

+ 11 - 9
src/menu/views/main-menu-scene.js
View File 

@@ -1,5 +1,4 @@
 
 'use strict';
 
-import { GameDeckMode } from '../../common/utils/const/game-deck-mode-enum';
 
 import { PhaserScene } from '../../common/utils/const/phaser-scene-enum';
 
 import Phaser from 'phaser';
 
 
@@ -7,6 +6,9 @@ import LoginDivPage from './menu-pages/login-div-page';
 
 import OnlineRoomDivPage from './menu-pages/online-room-div-page';
 
 import GameCreationDivPage from './menu-pages/game-creation-div-page';
 
 
+import MenuPages from '../../assets/html/main-menu.html';
 
+import Cover from '../../assets/twelveHeroes_cover.png';
 
+
 
 export default class MainMenuScene extends Phaser.Scene {
 
 
   constructor(menuEventListener) {
 
@@ -18,29 +20,27 @@ export default class MainMenuScene extends Phaser.Scene {
 
   }
 
 
   preload() {
 
-    console.log('Preload');
 
-    this.load.image('game-cover', '../../assets/twelveHeroes_cover.png');
 
-    this.load.html('main-menu', '../../assets/html/main-menu.html');
 
+    this.load.image('game-cover', Cover);
 
   }
 
 
 
   // create is call automatically by Phaser engine
 
   create() {
 
-    console.log('create');
 
     let background = this.add.image(0, 0, 'game-cover');
 
     background.setOrigin(0, 0);
 
 
     // Add main-menu HTML
 
-    let element = this.add.dom(250, 0).createFromCache('main-menu');
 
+    let element = this.add.dom(250, 0).createFromHTML(MenuPages);
 
+    element.setPerspective(800);
 
+
 
     // Menu div pages
 
     this.loginDivPage = new LoginDivPage(element,this.loginPageListener());
 
     this.onlineRoomDivPage = new OnlineRoomDivPage(element, this.onlineRoomPageListener());
 
     this.gameCreationDivPage = new GameCreationDivPage(element, this.gameCreationPageListener());
 
 
-    setTimeout(() => {
 
 
+    setTimeout(() => {
 
       this.loginDivPage.show();
 
-      element.setPerspective(800);
 
       this.tweens.add({
 
         targets: element,
 
         y: 190,
 
@@ -49,7 +49,9 @@ export default class MainMenuScene extends Phaser.Scene {
 
 
       });
 
 
-     }, 1000);
 
+     }, 700);
 
+
 
+
 
 
     // TODO : Display main menu
 
     // Create new scenes : Local player room / Multi player room

+ 32 - 30
webpack.config.js
View File 

@@ -2,11 +2,13 @@ var path = require('path');
 
 var webpack = require('webpack');
 
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 
 var BrowserSyncPlugin = require('browser-sync-webpack-plugin');
 
-var CopyWebpackPlugin = require('copy-webpack-plugin');
 
+// var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 var { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 
 var definePlugin = new webpack.DefinePlugin({
 
-  'process.env.DEV': JSON.stringify(JSON.parse(process.env.DEV || 'false'))
 
+  'process.env.DEV': JSON.stringify(JSON.parse(process.env.DEV || 'false')),
 
+  'process.env.SERVER_URL': JSON.stringify(process.env.SERVER_URL || 'http://172.112.37.58'),
 
+  'process.env.SERVER_PORT': JSON.stringify(process.env.SERVER_PORT || '2610')
 
 });
 
 
 var outpath = './webpack/';
 
@@ -17,45 +19,30 @@ if (!process.env.DEV || process.env.DEV === false) {
 
 } else {
 
   console.log('DEV environment');
 
 }
 
-
 
+// new CopyWebpackPlugin([
 
+//   {
 
+//     context: path.resolve(__dirname, 'src', 'assets'),
 
+//     from: '**/*',
 
+//     to: path.resolve(__dirname, outpath, 'assets')
 
+//   }
 
+// ]),
 
 module.exports = {
 
-  devtool: 'eval-source-map',
 
+  devtool: 'cheap-source-map',
 
   mode: 'development',
 
   entry: {
 
     app: path.resolve(__dirname, 'src/main.js')
 
   },
 
-  target: 'web',
 
-  watch: true,
 
   output: {
 
     filename: 'app.bundle.js',
 
-    path: path.resolve(__dirname, outpath + 'dist')
 
+    path: path.resolve(__dirname, outpath)
 
   },
 
 
   plugins: [
 
     definePlugin,
 
     new CleanWebpackPlugin(),
 
-    new CopyWebpackPlugin([
 
-      {
 
-        context: path.resolve(__dirname, 'src', 'assets'),
 
-        from: '**/*',
 
-        to: path.resolve(__dirname, outpath, 'assets')
 
-      }
 
-    ]),
 
+
 
     new HtmlWebpackPlugin({
 
-      filename: '../index.html',
 
-      template: './src/index.html',
 
-      minify: {
 
-        removeAttributeQuotes: false,
 
-        collapseWhitespace: false,
 
-        html5: false,
 
-        minifyCSS: false,
 
-        minifyJS: false,
 
-        minifyURLs: false,
 
-        removeComments: false,
 
-        removeEmptyAttributes: false
 
-      },
 
-      hash: false,
 
-      inject: true
 
+      template: './src/index.html'
 
     }),
 
     new BrowserSyncPlugin({
 
       host: process.env.IP || 'localhost',
 
@@ -82,8 +69,23 @@ module.exports = {
 
     rules: [
 
       { test: /\.js$/, exclude: /(node_modules|server)/, loaders: "babel-loader" },
 
       {
 
-        test: /\.(gif|png|jpe?g|svg|xml)$/i,
 
-        use: "file-loader"
 
+        test: /\.(png|svg|jpg|gif)$/,
 
+        use: {
 
+          loader: 'file-loader',
 
+          options: {
 
+            esModule: false
 
+          }
 
+        }
 
+      },
 
+      {
 
+        test: /\.html$/,
 
+        exclude: /index.html/,
 
+        use: [
 
+          {
 
+            loader: 'html-loader',
 
+            options: { minimize: true }
 
+          }
 
+        ]
 
       },
 
       {
 
         test: [/\.vert$/, /\.frag$/],

+ 0 - 84
webpack.config.prod.js
View File 

@@ -1,84 +0,0 @@
 
-var path = require('path');
 
-var webpack = require('webpack');
 
-var HtmlWebpackPlugin = require('html-webpack-plugin');
 
-var CopyWebpackPlugin = require('copy-webpack-plugin');
 
-var { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
-
 
-var definePlugin = new webpack.DefinePlugin({
 
-  'process.env.DEV': JSON.stringify(JSON.parse(process.env.DEV || 'false'))
 
-});
 
-
 
-var outpath = './webpack/';
 
-
 
-if (!process.env.DEV || process.env.DEV === false) {
 
-  console.log('CORDOVA environment');
 
-  outpath = 'www/';
 
-} else {
 
-  console.log('DEV environment');
 
-}
 
-
 
-// optimization: {
 
-//   splitChunks: {
 
-//  chunks: 'all',
 
-//   },
 
-// },
 
-module.exports = {
 
-  devtool: 'cheap-source-map',
 
-  mode: 'development',
 
-  target: 'web',
 
-  entry: {
 
-    app: path.resolve(__dirname, 'src/main.js')
 
-    // socketio: path.resolve(__dirname, 'node_modules/socket.io-client/dist/socket.io.slim'),
 
-    // phaser: 'phaser'
 
-  },
 
-  output: {
 
-    filename: 'app.bundle.js',
 
-    path: path.resolve(__dirname, outpath + 'dist')
 
-  },
 
-
 
-
 
-  plugins: [
 
-    definePlugin,
 
-    new CleanWebpackPlugin(),
 
-    new CopyWebpackPlugin([
 
-      {
 
-        context: path.resolve(__dirname, 'src', 'assets'),
 
-        from: '**/*',
 
-        to: path.resolve(__dirname, outpath, 'assets')
 
-      }
 
-    ]),
 
-    new HtmlWebpackPlugin({
 
-      filename: '../index.html',
 
-      template: './src/index.html',
 
-      minify: {
 
-        removeAttributeQuotes: false,
 
-        collapseWhitespace: false,
 
-        html5: false,
 
-        minifyCSS: false,
 
-        minifyJS: false,
 
-        minifyURLs: false,
 
-        removeComments: false,
 
-        removeEmptyAttributes: false
 
-      },
 
-      hash: false,
 
-      inject: true
 
-    }),
 
-    new webpack.DefinePlugin({
 
-      CANVAS_RENDERER: JSON.stringify(true),
 
-      WEBGL_RENDERER: JSON.stringify(true)
 
-    })
 
-  ],
 
-  module: {
 
-    rules: [
 
-      { test: /\.js$/, exclude: /(node_modules|server)/, loaders: "babel-loader" },
 
-      {
 
-        test: /\.(gif|png|jpe?g|svg|xml)$/i,
 
-        use: "file-loader"
 
-      },
 
-      {
 
-        test: [/\.vert$/, /\.frag$/],
 
-        use: "raw-loader"
 
-      }
 
-    ]
 
-  }
 
-};

+ 0 - 4
www/.gitignore
View File 

@@ -1,4 +0,0 @@
 
-# Ignore everything in this directory
 
-*
 
-# Except this file
 
-!.gitignore

Some files were not shown because too many files changed in this diff