Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/cocoroboBlockly

lcw 3 years ago
parent
commit
9569147c4f

+ 2 - 2
dist/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>cocoroboblockly</title><link href=/static/css/app.2ce57bd33f696e4a9340cb6e7b2c0832.css rel=stylesheet></head><style>@charset "utf-8";
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>cocoroboblockly</title><link href=/static/css/app.5ca4f1753c8c733f0df86a105e596017.css rel=stylesheet></head><style>@charset "utf-8";
 
   div::-webkit-scrollbar {
     /*滚动条整体样式*/
@@ -25,4 +25,4 @@
     height: 100%;
     width: 100%;
     background: #e6eaf0;
-  }</style><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e92bfe0d59979c2fbfd8.js></script><script type=text/javascript src=/static/js/app.803c47d6bf43982c1049.js></script></body></html>
+  }</style><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e92bfe0d59979c2fbfd8.js></script><script type=text/javascript src=/static/js/app.caafb6482c4575308aea.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.5ca4f1753c8c733f0df86a105e596017.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.5ca4f1753c8c733f0df86a105e596017.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.803c47d6bf43982c1049.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.caafb6482c4575308aea.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.caafb6482c4575308aea.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map


BIN
src/assets/img/tou1.png


+ 4 - 4
src/components/function.vue

@@ -80,7 +80,7 @@ export default {
       img: [
         require("../assets/img/light/screan.png"),
         require("../assets/img/ai.png"),
-        require("../assets/img/tou.png"),
+        require("../assets/img/tou1.png"),
         require("../assets/img/police.png"),
       ],
       isCamera: false,
@@ -255,7 +255,7 @@ body {
 #screan {
   width: 265px;
   position: absolute;
-  z-index: 4;
+  z-index: 5;
   top: 174px;
   left: 114.3px;
 }
@@ -271,8 +271,8 @@ body {
 #tou {
   width: 83px;
   position: absolute;
-  z-index: 5;
-  top: 123px;
+  z-index: 4;
+  top: 127px;
   left: 205px;
 }
 

+ 8 - 8
src/components/police.vue

@@ -15,7 +15,7 @@
         id="tou"
         v-drag="{ go, getK, setk, getC, setC, getA, setA, setPan, getPan }"
       >
-        <img src="../assets/img/tou.png" alt="" />
+        <img src="../assets/img/tou1.png" alt="" />
       </div>
       <div
         id="ai"
@@ -252,7 +252,7 @@ export default {
             dv.style.top = policeT - 70 + "px";
 
             dv1.style.left = policeL + 98 + "px";
-            dv1.style.top = policeT - 143 + "px";
+            dv1.style.top = policeT - 139 + "px";
             if (binding.value.getA() == 1) {
               binding.value.setC(3);
             } else {
@@ -286,7 +286,7 @@ export default {
 
           if (-70 < stL && stL < -15 && 45 < stP && stP < 100 && type == 2) {
             dv1.style.left = _panL + 42 + "px";
-            dv1.style.top = _panT - 73 + "px";
+            dv1.style.top = _panT - 69 + "px";
 
             if (binding.value.getA() == 1) {
               binding.value.setC(3);
@@ -316,7 +316,7 @@ export default {
         function moveP(nl, nt, type) {
           if (binding.value.getK() == 1 && type == 1) {
             dv1.style.left = nl + 42 + "px";
-            dv1.style.top = nt - 73 + "px";
+            dv1.style.top = nt - 69 + "px";
           }
 
           if (binding.value.getC() == 1 && type == 3) {
@@ -333,7 +333,7 @@ export default {
             dv.style.top = nt - 70 + "px";
 
             dv1.style.left = nl + 98 + "px";
-            dv1.style.top = nt - 143 + "px";
+            dv1.style.top = nt - 139 + "px";
           } else if (
             binding.value.getA() == 1 &&
             type == 3 &&
@@ -353,7 +353,7 @@ export default {
             dv.style.top = nt - 70 + "px";
 
             dv1.style.left = nl + 98 + "px";
-            dv1.style.top = nt - 143 + "px";
+            dv1.style.top = nt - 139 + "px";
           } else if (
             type == 3 &&
             binding.value.getC() == 3 &&
@@ -377,7 +377,7 @@ export default {
             dv.style.top = nt - 70 + "px";
 
             dv1.style.left = nl + 98 + "px";
-            dv1.style.top = nt - 143 + "px";
+            dv1.style.top = nt - 139 + "px";
           } else if (
             binding.value.getA() == 2 &&
             type == 3 &&
@@ -476,7 +476,7 @@ body {
   left: 10%;
   top: 50%;
   transform: translateY(-50%);
-  z-index: 4;
+  z-index: 5;
 }
 
 #ai {

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