Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

# Conflicts:
#	js/edit.js
#	js/manage.js

css/main.css

@@ -563,7 +563,7 @@ hr {
 
 .tooltip {
     position: absolute;
-    z-index: 1070;
+    z-index: 5070;
     display: block;
     visibility: visible;
     font-size: 12px;
@@ -985,7 +985,7 @@ hr {
     left: 0;
     display: table;
     background-color: rgba(0, 0, 0, .75);
-    z-index: 101;
+    z-index: 10001;
     font-weight: lighter;
     -webkit-transition: all 250ms ease-in-out;
     transition: all 250ms ease-in-out;
@@ -2509,7 +2509,7 @@ body, html {
 #gui-spinner {
     display: block;
     position: absolute;
-    z-index: 100;
+    z-index: 10000;
     top: 50%;
     left: 50%;
     width: 40px;
@@ -2850,7 +2850,7 @@ ul{
     display: flex;
     flex-direction: column;
     transition: right 0.4s, width 0.5s;
-    z-index: 100;
+    z-index: 10000;
 }
 
 
@@ -3093,7 +3093,7 @@ ul{
 
 #terms-modal {
     position: absolute;
-    z-index: 100;
+    z-index: 10000;
     left: 10%;
     top: 10%;
     bottom: 10%;
@@ -3122,7 +3122,7 @@ ul{
 
 @media only screen and (max-width: 487px), (max-height:487px) {
     #terms-modal {
-        z-index: 100;
+        z-index: 10000;
         left: 0;
         top: 0;
         bottom: 0;
@@ -3411,7 +3411,7 @@ a.hasHover:hover, a:active {
 
 .pinTop.left {
     left: 50%;
-    z-index: 99;
+    z-index: 9900;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -3420,14 +3420,14 @@ a.hasHover:hover, a:active {
 
 .pinTop.right {
     right: 10px;
-    z-index: 50
+    z-index: 500
 }
 
 .pinBottom-container {
     bottom: 0px;
     width: 100%;
     transition: all .5s;
-    z-index: 3;
+    z-index: 30000;
     position: absolute;
 }
 
@@ -3469,12 +3469,12 @@ a.hasHover:hover, a:active {
     float: right;
     right: 0;
     text-shadow: 0 0 1px rgba(0, 0, 0, .6);
-    z-index: 50;
+    z-index: 50000;
     bottom: 10px;
 }
 
 .pinBottom.left {
-    z-index: 50;
+    z-index: 50000;
     background: rgba(0, 0, 0, 0.2);
     border-radius: 10px;
     left: 10px;
@@ -3976,7 +3976,7 @@ a.hasHover:hover, a:active {
     transition-property: bottom, opacity;
     transition-duration: .5s;
     opacity: 1;
-    z-index: 3;
+    z-index: 10000;
     position: absolute;
 }
 

css/oldVer/main0.css

@@ -30,7 +30,7 @@ iframe{
 
 
 #popup {
-	z-index: 20;
+ 
 	text-align: center;
 	padding: 0;
 	position: relative;
@@ -38,16 +38,16 @@ iframe{
 	height: 100%;
 	/* margin: 80px auto; */
 	display: none;
-	z-index: 101;
+	z-index: 999999;
 	background:  rgba(0,0,0,0.6);
 }
 .popup-content{
 	position: relative;
 	width: 100%;
 	height: 100%;
-	overflow-x: hidden;
+	overflow: hidden;
 }
-#id1{ width: 100%; height: 99.4%;}
+#id1{ width: 100%; height: 100%;}
 #popup.wait{
 	opacity:0.1; 
 }

images/doll_label_corner.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="6px" viewBox="0 0 6 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>map_corner  </title>
+    <g id="页面-1" stroke="none" stroke-width="3" fill="none" fill-rule="evenodd">
+        <g id="展示界面-三维" transform="translate(-56.000000, -270.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-15" transform="translate(31.000000, 270.000000)">
+                <g id="形状结合-+-形状结合-蒙版" transform="translate(25.000000, 0.000000)">
+                    <path d="M6,6 L5,6 L5,2.705 L3.301,1 L0,1 L0,0 L3.71522641,0 L6,2.29344795 L6,6 Z" id="map_corner--" transform="translate(3.000000, 3.000000) scale(-1, 1) translate(-3.000000, -3.000000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

images/labelline.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4px" height="60px" viewBox="0 0 4 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>map_line</title>
+    <defs>
+        <linearGradient x1="50%" y1="50%" x2="50%" y2="11.688261%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="展示界面-三维" transform="translate(-78.000000, -298.000000)" fill="url(#linearGradient-1)">
+            <g id="编组-15" transform="translate(31.000000, 270.000000)">
+                <g id="编组-14" transform="translate(25.000000, 0.000000)">
+                    <polygon id="map_line" points="22 20 26 20 23.9752968 88"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

index.html

@@ -58,8 +58,8 @@
 </head>
 
 <body>
-    <div id="hot"> 
-    </div>
+    <div id="hot"> </div>
+    <div class='widgets-doll-labels'> </div> 
     <div id="popup">
         <div class="popup-content">
 
@@ -787,31 +787,68 @@
         <div class="cad">
             <div id="cad"></div>
         </div>
-
+        
     </div>
    
     <script>
      
         var changeLog = ()=>{
-        
-            if(number == "TEST" && browser.isMobile()){
-                var exchange = function (o) {
-                console["old" + o] = console[o];
-                console[o] = function () {
-                  var args =   Array.from(arguments)
-                  console["old" + o].apply(this, arguments)
-                  var t = document.getElementById("consoleLog").innerHTML;
-                  
-                  var str = ''
-                  args.forEach(a=>{
-                      str += a
-                  })
-                  document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;
+            browser
+            if((number == "TEST" || browser.valueFromHash('TEST')) && browser.isMobile()){
+            
+                
+                /*var t = $("<textarea id='consoleLog'></textarea>")
+                      $('body').append(t);
+                      
+                
+                    var exchange = function (o) {
+                    console["old" + o] = console[o];
+                    console[o] = function () {
+                      var args =   Array.from(arguments)
+                      console["old" + o].apply(this, arguments)
+                      //var t = document.getElementById("consoleLog").innerHTML;
+                      
+                      var str = ''
+                      args.forEach(a=>{
+                          str += a + ' '
+                      })
+                      document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;
+                    }
+                  }
+               */
                 }
-              }
+                
+                
+             if((number == "TEST" || browser.valueFromHash('TEST')) && browser.isMobile()){
+                var textarea = document.createElement('textarea');
+                  textarea.id = "consoleLog";
+
+                  document.getElementsByTagName("body")[0].appendChild(textarea);
+                  var list = ["log", "error", "warn", "debug", "info", "time", "timeEnd"]
+                  var exchange = function (o) {
+                    console["old" + o] = console[o];
+                    console[o] = function (str) {
+                    
+                    
+                        var args =   Array.from(arguments)
+                        console["old" + o].apply(this, arguments)
+                        var str = ''
+                        args.forEach(a=>{
+                            str += a + ','
+                        })
+                         textarea.innerHTML = str + "\n\n" + textarea.innerHTML;
+                    
+                      /*console["old" + o](str);
+                      var t = document.getElementById("consoleLog").innerHTML;
+                      document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;*/
+                    }
+                  }
+
+                  for (var i = 0; i < list.length; i++) {
+                    exchange(list[i])
+                  } 
            
-            }
-            
+            }   
         }
     </script>
 
@@ -829,7 +866,7 @@
     <script src="js/SpecialScene.js"></script>
     <script src="js/manage.js"></script> 
     <!-- <script src="js/lib/stats.min.js"></script> -->
-    <script src="js/Hot.js"></script>  
+    <script src="js/Hot.js?m=1"></script>  
     <script src="js/main_2020_show.js"></script>
     <script src="js/lib/OBJLoader.js"></script>
     <script src="/CAD/bundle.js"></script>