tremble 4 anos atrás
pai
commit
129e83bee5

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/css/app.4b4e289b.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/css/app.9cc16458.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/css/app.b511b58b.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/css/app.f604da40.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
hot_online1/index.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 0
hot_online1/js/app.3b4b0263.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/js/app.3b4b0263.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 0
hot_online1/js/app.6ad7cb9d.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/js/app.6ad7cb9d.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 0
hot_online1/js/app.8b411bbe.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/js/app.8b411bbe.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 0
hot_online1/js/app.9c78e028.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
hot_online1/js/app.9c78e028.js.map


+ 10 - 14
index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>四维时代</title>
+    <title></title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">
@@ -14,6 +14,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon.png" class="keep">
     <link rel="stylesheet" href="css/oldVer/main0.css">
     <link rel="stylesheet" href="css/main.css?v=2.25">
+    <!-- <link rel="stylesheet" href="/CAD/cad.css?v=2.25"> -->
     <script>
         var number = window.location.href.substring(window.location.href.indexOf("=") + 1);
         if (number.indexOf("&") != -1) {
@@ -784,19 +785,11 @@
             </div>
         </div>
         <div id="tag-billboards" style="display: none;"></div>
-        <!--[if lte IE 9]>
- <div class="gui-error message-outer darkGlass">
- <div class='message-inner'>
- <div class='message-content' style='font-family: Helvetica Neue, sans-serif;'>
- <div class="error-problem-text">Browser not supported.</div>
- <div class="error-solution-text">Install a new browser to explore in 3D.</div>
- <div class="error-actions">For Matterport 3D Showcase support,
- <a class="link" target="_blank" href="https://matterportsupport.zendesk.com/hc/en-us/articles/208220058-Showcase-System-Requirements">see our troubleshooting guide</a>
- </div>
- </div>
- </div>
- </div>
- <![endif]-->
+
+        <div class="cad">
+            <div id="cad"></div>
+        </div>
+
     </div>
     <script>
         if(number == "TEST"){
@@ -828,6 +821,9 @@
     <script src="js/manage.js"></script>
     <script src="js/overlay.js"></script>
     <script src="js/main_2020_show.js"></script>
+    <script src="/CAD/bundle.js"></script>
+
+    <script src="js/loadCAD.js"></script>
 </body>
 
 </html>

+ 833 - 0
index_nologo.html

@@ -0,0 +1,833 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="description" content="">
+    <meta property="og:title" content="">
+    <meta property="og:description" content="">
+    <meta property="og:image:type" content="image/jpg">
+    <!-- <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon.png" class="keep"> -->
+    <link rel="stylesheet" href="css/oldVer/main0.css">
+    <link rel="stylesheet" href="css/main.css?v=2.25">
+    <link rel="stylesheet" href="/CAD/cad.css?v=2.25">
+    <script>
+        var number = window.location.href.substring(window.location.href.indexOf("=") + 1);
+        if (number.indexOf("&") != -1) {
+            number = number.substring(0, number.indexOf("&"));
+        }
+        if (number.indexOf("#") != -1) {
+            number = number.substring(0, number.indexOf("#"));
+        } 
+    </script>
+    <script>
+        var _hmt = _hmt || [];
+        (function() {
+          var hm = document.createElement("script");
+          hm.src = "https://hm.baidu.com/hm.js?73402bb08ff95cb21b7f1673250c532d";
+          var s = document.getElementsByTagName("script")[0]; 
+          s.parentNode.insertBefore(hm, s);
+        })();
+    </script>
+    <script class="build keep">
+        if (window.performance) {
+            window.navigationStart = window.performance.timing.navigationStart;
+        } else {
+            window.navigationStart = Date.now() + 300;
+        } 
+        
+    </script>
+    <style>
+        #consoleLog{ 
+          width: 120px;
+          height: 153px;
+          position: absolute;
+          right: 0px;
+          bottom: 160px;
+          z-index: 999999;
+          color: black;
+          opacity: 0.9;
+            font-size: 12px;
+        }
+    
+    </style>
+</head>
+
+<body>
+    <div id="hot"> 
+    </div>
+    <div id="popup">
+        <div class="popup-content">
+
+        </div>
+        <div id="closepop">close</div>
+    </div>
+    <div class="sidecontent" style="width:35%">
+        <h1><span class="side-client-close">关闭</span></h1>
+        <image id="sideimg" style="width:90%" /></br>
+        <p id="text">
+        </p>
+    </div>
+    <div id="gui-thumb" style="display: none;"></div>
+    <div id="player" style="display: none;"></div>
+    <div id="gui-parent">
+        <div id="memory-info"
+            style="display:none; position:fixed; right:10px; top:10px; background-color:#eeeeee; color:#222222; padding:3px 10px 3px 10px; font-size:100%;">
+            GPU memory used: <span id="memory-gpu"></span>
+        </div>
+        <div id="gui-loading" class="message-outer darkGlass" style="display: none;">
+            <h2 class="model-title"></h2>
+            <div class="message-inner">
+                <div class="loadingLogo"> 
+                    <div class="img"> 
+                    </div> 
+                </div> 
+                <div class="progressbar" data-perc="100">
+                    <div class="label">
+                        <div class="perc">0%</div>
+                    </div>
+                    <div class="bar"><span></span></div>
+                </div>
+                <div id="loaderCoBrand">
+                    <div class="vert-align">
+                        <!-- <h2 id="loaderCoBrandName">四维时代提供技术支持</h2> -->
+                    </div>
+                </div>
+                <div class="bottom-logo">
+                    <div class="img"></div>
+                </div>
+                <div class="specialPower">
+                    <span class="powered-by">{[{ POWERED_BY }]}</span>
+                    &#xA0;<div class="img"></div>
+                </div>
+            </div>
+        </div>
+        <div id="gui" style="display: none;">
+            <div id="vrOff">
+                <img id="vrOffImg" src="images/vrOffImg.png" alt="">
+            </div>
+            <div id="hotListWrap">
+                <div id="hotListTitle">
+                    <div>
+                        <span id="hotListText">热点列表</span>
+                        <img id="hotListIcon" src="images/hotlist.png" alt="">
+                    </div>
+
+                </div>
+                <div id="hotListContent">
+                    <ul>
+                    </ul>
+                </div>
+                <div id="hotListBottom">
+                    <img id="hotListClose" src="images/hotListClose.png" alt="">
+                </div>
+            </div>
+            <div class="pinTop left">
+                <div id="model-title">
+                    <div class="title-row">
+                        <div id="title-toggle">
+                            <a>
+                                <i class="icon icon-dpad-left"></i>
+                            </a>
+                        </div>
+                        <div id="title-container-wrapper" rel="tooltip" data-placement="bottom" data-html="true">
+                            <div class="title-container  meta-toggle">
+                                <div class="co-brand">
+                                    {[{ PRESENTED_BY }]}<span class="title" id="cobrandTitle"></span>
+                                </div>
+                                <div id="title-logo">
+                                    <i></i>
+                                </div>
+                                <div id="gui-name" class="titleText"></div>
+                                <a id="more-hint"><i class="icon icon-dpad-down"></i></a>
+                                <a id="less-hint"><i class="icon icon-dpad-up"></i></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="meta-info-wrapper">
+                    <div id="meta-info" class="darkGlass">
+                        <div id="meta-description"></div>
+                        <div class="contact-info">
+                            <i class="icon icon-user pull-left"></i>
+                            &#xA0;<div id="contact-data"></div>
+                        </div>
+                        <div class="address">
+                            <i class="icon icon-pin"></i>
+                            <span id="addressTxt"></span>
+                        </div>
+                        <div id="tag-toggles" class="menu-toggles hidden">
+                            <span>{[{ MATTERTAG_CONTENT }]}</span>
+                            <div id="tag-inputs" class="menu-radios">
+                                <div id="show-tag" class="menu-radio-show">
+                                    <input id="radio-tag-show" type="radio" name="tags" value="show">
+                                    <label for="radio-tag-show">{[{ SHOW }]}</label>
+                                </div>
+                                <div id="hide-tag" class="menu-radio-hide">
+                                    <input id="radio-tag-hide" type="radio" name="tags" value="hide">
+                                    <label for="radio-tag-hide">{[{ HIDE }]}</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="labels-toggles" class="menu-toggles hidden">
+                            <span>Labels</span>
+                            <div id="labels-inputs" class="menu-radios">
+                                <div id="show-label" class="menu-radio-show">
+                                    <input id="radio-labels-show" type="radio" name="labels" value="show">
+                                    <label for="radio-labels-show">Show</label>
+                                </div>
+                                <div id="hide-label" class="menu-radio-hide">
+                                    <input id="radio-labels-hide" type="radio" name="labels" value="hide">
+                                    <label for="radio-labels-hide">Hide</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="share-origin" class="hidden">
+                            <hr>
+                            <div>
+                                <i class="icon icon-ext-link"></i>
+                                <div id="share-link-wrapper"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="pinBottom-container">
+                <div class="pinBottom center">
+                    <div id="view-controllers">
+                        <!-- <div id="gui-modes-dollhouse" class="darkGlass">
+                                <span class="mode">{[{ DOLLHOUSE }]}</span>
+                            </div> -->
+                        <!-- <div id="gui-modes-floorplan" class="darkGlass">
+                                <span class="mode">{[{ FLOOR_PLAN }]}</span>
+                            </div> -->
+                    </div>
+                </div>
+                <!-- <div class="pinBottom zoomPanel">
+                        <div id="gui-zoomin" class="buttonZoom buttonZoomIn buttonZoomEnabled" data-placement="top">
+                            <div class="buttonZoomContent">
+                                <a>
+                                    <i rel="tooltip" title="{[{ ZOOM_IN }]}" class="icon icon-plus"></i>
+                                </a>
+                            </div>
+                        </div>
+                        <div id="gui-zoomout" class="buttonZoom buttonZoomOut buttonZoomEnabled" data-placement="top">
+                            <div class="buttonZoomContent">
+                                <a>
+                                    <i rel="tooltip" title="{[{ ZOOM_OUT }]}" class="icon icon-minus"></i>
+                                </a>
+                            </div>
+                        </div>
+                    </div> -->
+                <div class="pinBottom left">
+                    <div class="viewContainer">
+                        <!-- <div id="pullTab" class="ui-icon darkGlass">
+                                <a>
+                                    <i rel="tooltip" title="{[{ OPEN_HIGHLIGHTS }]}" class="icon icon-dpad-up"></i>
+                                </a>
+                            </div> -->
+                        <div id="previous" class="previous desktop-only ui-icon" style="display: none;">
+                            <a>
+                                <img rel="tooltip" title="" src="images/play.png" width="24" height="24"
+                                    data-original-title="播放">
+                            </a>
+                        </div>
+                        <div id="play" class="ui-icon" rel="tooltip" data-original-title="播放">
+                            <a>
+                                <img title="" src="images/play.png" width="24" height="24">
+                            </a>
+                        </div>
+                        <div id="pause" class="ui-icon" style="display: none;">
+                            <a>
+                                <img rel="tooltip" title="" src="images/pause.png" width="24" height="24"
+                                    data-original-title="暂停">
+                            </a>
+                        </div>
+                        <div id="next" class="next desktop-only ui-icon wide" style="display: none;">
+                            <a>
+                                <i rel="tooltip" title="" class="icon icon-dpad-right" data-original-title="下一个"></i>
+                            </a>
+                        </div>
+                        <!-- <div id="gui-modes-inside" class="ui-icon">
+                                <a>
+                                    <i rel="tooltip" title="{[{ EXPLORE_3D_SPACE }]}" class="icon icon-inside"></i>
+                                </a>
+                            </div> -->
+                        <!-- <div id="gui-modes-outside" class="ui-icon">
+                                <a>
+                                    <i rel="tooltip" title="{[{ VIEW_DOLLHOUSE }]}" class="icon icon-dollhouse"></i>
+                                </a>
+                            </div> -->
+                        <div id="gui-modes-map" class="ui-icon double active">
+                            <div data-original-title="导览" id="pullTab" rel="tooltip" title="">
+                                <img class="icon icon-inside" src="images/auto.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="热点列表" id="hotList" rel="tooltip" title="" style="display: none">
+                                <img class="icon icon-inside" src="images/hotlist.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="全景漫游" id="gui-modes-inside" rel="tooltip" title="" class="">
+                                <img class="icon icon-inside" src="images/inside.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip" title="" class="">
+                                <img class="icon icon-inside" src="images/dollhouse.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="">
+                                <img class="icon icon-inside" src="images/floor.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none;">
+                                <img class="icon icon-inside" src="images/VR.png" title="navigation icon" />
+                            </div>
+                            <div data-original-title="消除外壳" id="gui-remove-face" rel="tooltip" title=""
+                                style="display: none; float: left;">
+                                <img class="icon icon-inside" src="images/face.jpg" title="navigation icon" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="pinBottom right hideTarget">
+                    <div class="rightViewContainer clearfix">
+                        <div class="gui-floor">
+                            <div class="gui-floor-title"></div>
+                            <div class="gui-floor-icon"><span class="gui-floor-number"></span></div>
+                            <!-- <i class="icon icon-dpad-up"></i> -->
+                            <div class="container"></div>
+                        </div>
+                        <div id="volume" class="ui-icon wide">
+                            <a>
+                                <img src="images/Volume btn_on.png" width="24" height="24">
+                            </a>
+                        </div>
+                        <div id="vr" class="ui-icon wide hidden" style="display: none;">
+                            <a>
+                                <i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
+                            </a>
+                        </div>
+                        <div id="sharing" class="ui-icon wide hidden" style="display: none;">
+                            <a>
+                                <i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
+                            </a>
+                        </div>
+                        <div id="gui-fullscreen" class="ui-icon wide" data-placement="top" rel="tooltip"
+                            title="{[{ VIEW_FULLSCREEN }]}">
+                            <a>
+                                <i class="icon icon-fullscreen"></i>
+                            </a>
+                        </div>
+                        <div id="gui-fullscreen-exit" class="ui-icon wide" data-placement="top" rel="tooltip"
+                            title="{[{ EXIT_FULLSCREEN }]}" style="display: none;">
+                            <a>
+                                <i class="icon icon-fullscreen-exit"></i>
+                            </a>
+                        </div>
+                        <div class="pull-right terms terms2">
+                            <a>{[{ TERMS }]}</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="drawer-container">
+                <div id="drawer" class="fullWidth">
+                    <div class="frame-container darkGlass">
+                        <div id="scrollFrame" class="frame">
+                            <ul id="thumb-container" class="slidee"></ul>
+                        </div>
+                        <div class="scrollbar" id="scroller">
+                            <div class="handle"></div>
+                        </div>
+                    </div>
+                </div>
+                <div id="playHead">
+                    <div id="status">
+                        <span class="curIdx">1</span>
+                        of <span class="totalSteps"></span>
+                    </div>
+                    <div id="progressBar"></div>
+                </div>
+            </div>
+            <div id="myCompany"
+                style="width:100%;position:absolute;bottom:20px;text-align:center;font-size:14px;font-family: '微软雅黑';font-weight:580;color: rgba(255, 255, 255, 0.8);">
+                <!-- 四维时代提供技术支持 -->
+            </div>
+        </div>
+        <div class="webvr-popup" style="display:none">
+            <div class="messaging">
+                <div class="page p1">
+                    <div class="title">{[{ WEBVR_FOR_DAYDREAM }]}</div>
+                    <img class="image device-headset-side">
+                    <div class="enter-button">{[{ WEBVR_ENTER_WEBVR }]}</div>
+                    <span class="hrule"></span>
+                    <div class="alt-help">
+                        <span class="open-with-app">{[{ VR_APP_OPEN }]}</span>
+                    </div>
+                </div>
+                <div class="page p2 hidden">
+                    <div class="title">{[{ VR_WHAT_YOU_NEED }]}</div>
+                    <ul class="tabs">
+                        <li class="tabbutton" id="tabcardboard">{[{ VR_GOOGLE_CARDBOARD }]}</li>
+                        <li class="tabbutton" id="tabdaydream">{[{ VR_GOOGLE_DAYDREAM }]}</li>
+                        <li class="tabbutton" id="tabnative">{[{ VR_APP }]}</li>
+                    </ul>
+                    <div class="tab-content webvr">
+                        <img class="image device-headset">
+                        <span class="detail headset">
+                            <u>{[{ VR_GOOGLE_CARDBOARD }]}</u>
+                        </span>
+                        <img class="image device-phone">
+                        <span class="detail phone">
+                            <p>
+                                <b>
+                                    <u>{[{ VR_COMPATIBLE_ANDROID }]}</u>
+                                </b>
+                            </p>
+                            <p>{[{ VR_ANDROID_DETAIL }]}</p>
+                        </span>
+                        <div class="detail daydream-label">{[{ VR_NEED_DAYDREAM }]}</div>
+                    </div>
+                    <div class="tab-content native hidden">
+                        <div class="badge-label">{[{ VR_APP_FOR_ANDROID }]}</div>
+                        <span>
+                            <img class="image badge-cardboard">
+                            <img class="image badge-oculus">
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div class="close">
+                <a>
+                    <i class="icon icon-close"></i>
+                </a>
+            </div>
+            <div class="footer">
+                <div class="help">
+                    <a>{[{ HELP }]}</a>
+                </div>
+                <div>|</div>
+                <div class="terms">
+                    <a>{[{ MATTERPORT_TERMS }]}</a>
+                </div>
+                <!-- <img src="images/glyph.svg"> -->
+            </div>
+        </div>
+        <div id="gui-spinner" style="display: none;">
+            <div class="gui-spinner-icon"></div>
+        </div>
+        <div id="gui-message" class="message-outer darkGlass" style="display: none;">
+            <h2 class="model-title"></h2>
+            <div class="message-inner">
+                <div class="message-content">
+                    <a id="button-play">
+                        <i class="icon icon-play"></i>
+                    </a>
+                    <div class="explore">{[{ EXPLORE_3D_SPACE }]}</div>
+                </div>
+            </div>
+        </div>
+        <div id="share-modal" style="display: none;">
+            <div class="title">{[{ SOCIAL_SHARING }]}</div>
+            <div id="share-outer">
+                <div class="share-to">{[{ SHARE_TO }]}</div>
+                <div class="share-images">
+                    <a id="facebook-share">
+                        <div class="share-button">
+                            <span class="faceBookLink">
+                                <i class="icon icon-facebook"></i>
+                            </span>
+                        </div>
+                    </a>
+                    <a id="twitter-share">
+                        <div class="share-button">
+                            <span class="twitterLink">
+                                <i class="icon icon-twitter"></i>
+                            </span>
+                        </div>
+                    </a>
+                    <a id="mail-share">
+                        <div class="share-button">
+                            <span class="mailLink">
+                                <i class="icon icon-email"></i>
+                            </span>
+                        </div>
+                    </a>
+                </div>
+                <div class="direct-link">{[{ SHARE_LINK }]}</div>
+                <div id="share-url">
+                    <span id="share-url-text"></span>
+                </div>
+                <div id="copy-success" class="hidden">
+                    <span id="copy-success-text">{[{ SHARE_COPIED }]}</span>
+                </div>
+            </div>
+            <div id="share-close" class="close">
+                <i class="icon icon-close"></i>
+            </div>
+        </div>
+        <div id="terms-modal" class="fadeOut" style="display: none;">
+            <div id="terms-text"></div>
+            <div class="close">
+                <a>
+                    <i class="icon icon-close"></i>
+                </a>
+            </div>
+        </div>
+        <div class="gui-error message-outer" style="display: none;">
+            <div class="message-inner">
+                <div class="message-content">
+                    <div class="error-problem-text"></div>
+                    <div class="error-solution-text"></div>
+                    <div class="error-explanation"></div>
+                    <div class="error-actions"></div>
+                </div>
+            </div>
+        </div>
+        <div id="help-dialog" class="nav-help-dialog" style="display: none;">
+            <div class="nav-help-elements">
+                <div class="help-tabs">
+                    <div class="navigation-tab">
+                        <span>{[{ HELP_NAVIGATION_TAB }]}</span>
+                    </div>
+                    <div class="more-help-tab">
+                        <span>{[{ HELP_MORE_HELP_TAB }]}</span>
+                    </div>
+                </div>
+            </div>
+            <div id="navigation-help-wrapper">
+                <div id="navigation-help" class="help outer">
+                    <div class="interactions left">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <hr>
+                        <div class="bottom-info"></div>
+                        <img class="keyboard">
+                    </div>
+                    <div class="interactions middle">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <hr>
+                        <div class="bottom-info"></div>
+                        <img class="keyboard">
+                    </div>
+                    <div class="interactions right">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <hr>
+                        <div class="bottom-info"></div>
+                        <img class="keyboard">
+                    </div>
+                </div>
+            </div>
+            <div id="more-help-wrapper">
+                <div id="more-help">
+                    <div class="ui-instructions more-help-hlr">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-tour">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-dollhouse">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-inside">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-360">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-floors">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-tag">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-vr">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-fullscreen">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                    <div class="ui-instructions more-help-zoom">
+                        <h2 class="top-info"></h2>
+                        <img class="big-image">
+                        <div class="bottom-info"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="close">
+                <a>
+                    <i class="icon icon-close"></i>
+                </a>
+            </div>
+        </div>
+        <div id="vr-modal" class="vr-popup" style="display: none;">
+            <div class="title">{[{ VR_VIEW_SPACE }]}</div>
+            <div class="outer">
+                <div class="inner">
+                    <h3 class="vr-popup-title">
+                        <span class="show-supported p1">
+                            <p class="center">{[{ VR_SHOW_SUPPORTED }]}</p>
+                        </span>
+                        <span class="show-unsupported p1">{[{ VR_SHOW_UNSUPPORTED }]}</span>
+                        <span class="show-ios p1">
+                            {[{ VR_SHOW_IOS_1 }]}<br>
+                            <br>
+                        </span>
+                        <span class="show-ios p2">{[{ VR_WHAT_YOU_NEED }]}</span>
+                    </h3>
+                    <div class="vr-images">
+                        <div class="img-container cardboard first">
+                            <img class="vr-sm-image first">
+                            <div class="vr-img-caption first">
+                                <span class="show-supported show-desktop show-ios p1">
+                                    <b class="cardboard">{[{ VR_GOOGLE_CARDBOARD }]}</b>
+                                    <b class="gearvr hidden">{[{ VR_SAMSUNG_GEAR_VR }]}</b>
+                                </span>
+                                <span class="show-supported show-unsupported show-desktop p2">{[{ VR_NEED_CARDBOARD
+                                    }]}</span>
+                                <span class="show-supported show-unsupported show-desktop p3">{[{ VR_NEED_SAMSUNG
+                                    }]}</span>
+                                <span class="show-ios p2">
+                                    <b>{[{ VR_GOOGLE_CARDBOARD }]}</b>
+                                    <br>
+                                    <br>
+                                </span>
+                            </div>
+                        </div>
+                        <div class="front-close">
+                            <span class="front-close-x">&#x2715;</span>
+                        </div>
+                        <div class="img-container gearvr second">
+                            <img class="vr-sm-image second">
+                            <div class="vr-img-caption second">
+                                <span class="show-supported show-desktop p1">
+                                    <b>{[{ VR_SAMSUNG_GEAR_VR }]}</b>
+                                </span>
+                                <span class="show-supported p2">
+                                    <p>
+                                        <b>{[{ VR_COMPATIBLE_ANDROID }]}</b>
+                                    </p>
+                                    <p>{[{ VR_ANDROID_DETAIL }]}</p>
+                                </span>
+                                <span class="show-desktop p2">
+                                    <p>
+                                        <b>{[{ VR_COMPATIBLE_IPHONES_1 }]}</b>
+                                    </p>
+                                    <p>{[{ VR_COMPATIBLE_IPHONES_2 }]}</p>
+                                </span>
+                                <span class="show-ios p2">
+                                    <p>
+                                        <b b id="vr-compatible-iphones-3">{[{ VR_COMPATIBLE_IPHONES_3 }]}</b>
+                                    </p>
+                                    <p id="vr-compatible-iphones-2b">{[{ VR_COMPATIBLE_IPHONES_2 }]}</p>
+                                </span>
+                                <span class="show-unsupported p1 p2">
+                                    <p>
+                                        <b>{[{ VR_COMPATIBLE_ANDROID }]}</b>
+                                    </p>
+                                    <p>{[{ VR_ANDROID_DETAIL }]}</p>
+                                </span>
+                                <span class="show-supported show-unsupported show-desktop p3">
+                                    <p>
+                                        <b>{[{ VR_COMPATIBLE_SAMSUNG }]}</b>
+                                    </p>
+                                    <p>{[{ VR_SAMSUNG_DETAIL }]}</p>
+                                </span>
+                            </div>
+                        </div>
+                        <div class="img-container third">
+                            <img class="vr-sm-image third">
+                            <div class="vr-img-caption third">
+                                <span class="show-supported show-unsupported show-ios p2">
+                                    <p>
+                                        <b>{[{ VR_APP_FOR_CARDBOARD }]}</b>
+                                    </p>
+                                    <p>
+                                        <a class="cardboardLink">{[{ VR_DOWNLOAD_HERE }]}</a>
+                                    </p>
+                                </span>
+                                <span class="show-desktop p2">
+                                    <p>
+                                        <b>{[{ VR_ANDROID_DVICES }]}</b>
+                                    </p>
+                                    <p>{[{ VR_ANDROID_DETAIL }]}</p>
+                                </span>
+                                <span class="show-supported show-unsupported p3">
+                                    <p>
+                                        <b>{[{ VR_APP_FOR_SAMSUNG }]}</b>
+                                    </p>
+                                    <p>
+                                        <a class="gearLink">{[{ VR_DOWNLOAD_HERE }]}</a>
+                                    </p>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="vr-popup-body">
+                        <span class="show-supported p1">
+                            <p>
+                                <i>{[{ VR_REQUIRE_HEADSET }]}</i>
+                            </p>
+                            <br>
+                            <p>
+                                <i>{[{ VR_REDIRECT_TO_STORE }]}</i>
+                            </p>
+                            <br>
+                            <p class="improper-embed hidden">
+                                <i>{[{ VR_IMPROPER_EMBED }]}</i>
+                            </p>
+                        </span>
+                        <span class="show-ios p1">
+                            <p>
+                                <i id="show-ios-2">{[{ VR_SHOW_IOS_2 }]}</i>
+                            </p>
+                        </span>
+                        <span class="show-desktop p1">
+                            <p></p>
+                            <h3>{[{ VR_OPEN_ANDROID_LINK }]}</h3>
+                            <p>
+                                <br>
+                            </p>
+                            <p class="logo-button">
+                                <span class="modelLink"></span>
+                            </p>
+                            <br>
+                            <br>
+                            <p></p>
+                            <h3>{[{ VR_ANDROID_OPTIONS }]}</h3>
+                            <p></p>
+                        </span>
+                    </div>
+                </div>
+                <div class="vr-buttons">
+                    <div class="next-button"></div>
+                    <div class="prev-button">{[{ VR_PREVIOUS_CAPS }]}</div>
+                    <div class="vr-arrows prev-container">
+                        <!-- <img class="prev-arrow" src="images/arrow.png"> -->
+                    </div>
+                    <div class="vr-arrows next-container">
+                        <!-- <img class="next-arrow" src="images/arrow.png"> -->
+                    </div>
+                </div>
+                <div class="vr-page"></div>
+                <div class="close">
+                    <a>
+                        <i class="icon icon-close"></i>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div id="quick-blackout" class="quick" style="display: none;"></div>
+        <div id="quick-logo" class="quick-brand" style="display: none;">
+            <!-- <img src="images/powered-by-4dage.svg"> -->
+        </div>
+        <div id="hover-top" class="hover-row" style="display: none;"></div>
+        <div id="hover-bottom" class="hover-row" style="display: none;"></div>
+        <div id="call-to-action">
+            <div id="pause-overlay" style="display: none;">
+                <div id="pause-icon">
+                    <a>
+                        <i class="icon icon-pause"></i>
+                    </a>
+                </div>
+            </div>
+            <div id="interaction-modal">
+                <div id="interaction-modal-inner">
+                    <!-- <div class="tour-title">
+                            <span class="desktop-title">{[{ DESKTOP_SHORT_CTA }]}</span>
+                            <span class="mobile-title">{[{ MOBILE_SHORT_CTA }]}</span>
+                        </div>
+                        <div class="interaction left">
+                            <h2 class="top-info"></h2>
+                            <img class="big-image">
+                            <hr>
+                            <img class="keyboard">
+                        </div>
+                        <div class="interaction middle">
+                            <h2 class="top-info"></h2>
+                            <img class="big-image">
+                            <hr>
+                            <img class="keyboard">
+                        </div>
+                        <div class="interaction right">
+                            <h2 class="top-info"></h2>
+                            <img class="big-image">
+                            <hr>
+                            <img class="keyboard">
+                        </div> -->
+                    <div class="nav-icon">
+                        <img src="images/pc_step1.png" class="icon" title="navigation icon" data-page="1">
+                        <div class="nav-help-button">
+                            <div class="next-button nav-help-page" data-id="plus"></div>
+                            <div class="prev-button nav-help-page"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="tag-billboards" style="display: none;"></div>
+
+        <div class="cad">
+            <div id="cad"></div>
+        </div>
+
+    </div>
+    <script>
+        if(number == "TEST"){
+            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) {
+                  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>
+    <script src="js/lib/jquery-2.1.1.min.js" class="build keep"></script>
+    <script src="js/lib/player-0.0.12.min.js" class="build keep"></script>
+    <script src="js/Tween.js"></script>
+    <!-- <script src="js/app-preheater.js?v=2.25.6-0-gd87e5b1"></script> -->
+    <script src="js/myShow.js"></script>
+    <script src="js/SpecialScene.js"></script>
+    <script src="js/manage.js"></script>
+    <script src="js/overlay.js"></script>
+    <script src="js/main_2020_show.js"></script>
+    <script src="/CAD/bundle.js"></script>
+
+    <script src="/CAD/loadCAD.js"></script>
+<script>
+var m = getQueryStringArgs().m
+grentCAD('/CAD/static/data/'+ m +'/floor.json')
+</script>
+</body>
+
+</html>

+ 151 - 0
js/loadCAD.js

@@ -0,0 +1,151 @@
+window.grendCAD = (function grendCAD() {
+  let initFloor
+  let initScript
+  let initDOM
+  let point, dire
+
+  window.cad = {
+    setSign: function(p, d) {
+      point = p
+      dire = d
+    }
+  }
+
+  function loadScript(cb) {
+    if (initScript) return cb()
+
+    let $script = document.createElement('script')
+    $script.src = '//www.4dmodel.com/CAD/bundle.js'
+    $script.onload = function() {
+      initScript = true
+      cb()
+    }
+
+    document.documentElement.appendChild($script)
+  }
+
+  function loadDOM($parent) {
+    if (initDOM) return initDOM;
+    let $layer = document.createElement('div')
+    let $cad = document.createElement('div')
+
+    $layer.className = 'cad'
+    $cad.id = 'cad'
+    $layer.appendChild($cad)
+
+
+    let style = document.createElement('style')
+    style.innerHTML = `
+      .cad {
+        position: absolute;
+        right: 80px;
+        top: 16px;
+        width: 200px;
+        height: 200px;
+        background: rgba(0, 0, 0, .3);
+        border-radius: 5px;
+      }
+
+      .cad > div {
+        width: 100%;
+        height: 100%;
+      }
+
+      @media only screen and (max-width: 600px) { 
+        .cad {
+            position: absolute;
+            left: 16px;
+            top: 65px;
+            width: 100px;
+            height: 100px;
+            background: rgba(0, 0, 0, .3);
+            border-radius: 5px;
+        }
+      }
+    `
+
+    document.documentElement.appendChild(style)
+    document.documentElement.appendChild($layer)
+    $parent.appendChild(style)
+    $parent.appendChild($layer)
+    return $layer
+  }
+
+
+  function setStyle(signColor, borderColor, borderWidth) {
+    cad.setDefaultPointStyle({
+      fillColor: "rgba(0,0,0,0)",
+      storkeColor: "rgba(0,0,0,0)"
+    });
+
+    console.log(borderWidth)
+    cad.setDefaultLineStyle({
+      width: borderWidth,
+      color: borderColor
+    });
+
+    cad.setDefaultSignStyle({
+      color: signColor
+    })
+  }
+
+
+  return function(floor, $parent, signColor, borderColor, borderWidth) {
+    if (initFloor) {
+      console.log('cache')
+      return setStyle(signColor, borderColor, borderWidth)
+    }
+    console.log('load')
+    initFloor = floor
+
+    loadScript(function() {
+      let $layer = loadDOM($parent)
+
+      $layer.style.visibility = 'hidden'
+      window.cad = structureCAD({
+        data: {
+            block: [],
+            column: [],
+            door: [],
+            hole: [],
+            segment: [],
+            "vertex-xy": [],
+            "vertex-z": [],
+        }, 
+        layer: $layer.querySelector('#cad'),
+        edit: false
+      });
+      
+      setStyle(signColor, borderColor, borderWidth)
+      cad.hideDire()
+      cad.hideGauge()
+  
+      console.log('loadData')
+      cad.loadData(initFloor);
+      if (point && dire) {
+        window.cad.setSign(point, dire)
+      }
+      $layer.style.visibility = 'visible'
+    })
+
+  }
+})();
+
+
+$.ajax({
+  url: g_Prefix + "data/" + window.number + "/someData.json" + "?" + Date.now(),
+  method: 'GET',
+  success(data) {
+    if (!data.showCad) return
+
+
+    
+    $.ajax({
+      url: '//super.4dage.com/data/'+ window.number +'/floor.json', 
+      method: 'GET',
+      success(res) {
+        grendCAD(res, document.documentElement, data.cadSignColor, data.cadBorderColor, data.cadBorderWidth)
+      }
+    })
+  }
+})

Diferenças do arquivo suprimidas por serem muito extensas
+ 509 - 164
js/main_2020_show.js


+ 49 - 9
js/overlay.js

@@ -83,12 +83,31 @@ var initOverlay = function(THREE){
      
       
     Overlay.prototype.setFromInfo = function(info){//1 恢复到编辑之前 2 初始加载 
-        var plane = this.plane;
-        info.width && (this.scale.setX(info.width/settings.overlay.width),this.width = info.width)
-        info.height && (this.scale.setY(info.height/settings.overlay.height),this.height = info.height) 
+        var plane = this.plane; 
+        this.transformAtPanos = info.transformAtPanos || {} //在每个漫游点独立设置的position。  
+        var curPanoTransform = player.currentPano && this.transformAtPanos[player.currentPano.id] || {} 
+        
         info.depth && this.scale.setZ(info.depth/settings.overlay.depth)
-        info.pos && this.position.copy(info.pos);
-        info.qua && this.quaternion.copy(info.qua);
+        
+         
+        this.posCustom = info.pos ? info.pos.clone() : this.position.clone(); //没有单独设置position的漫游点使用的position
+        this.position.copy(curPanoTransform.pos || info.pos )
+        
+        this.quaCustom = info.qua ? info.qua.clone() : this.quaternion.clone()
+        this.quaternion.copy(curPanoTransform.qua || info.qua);
+        
+        
+        this.widthCustom = info.width  
+        this.heightCustom = info.height  
+        this.width = curPanoTransform.width || info.width 
+        this.height = curPanoTransform.height || info.height 
+        var a = this.getScaleBySize(this.width, this.height)
+        this.scale.setX( a.x )
+        this.scale.setY( a.y )
+        
+        
+        
+        
         if(info.type){
             if(!plane.material.map){
                 if(info.type == "video"){ 
@@ -110,6 +129,9 @@ var initOverlay = function(THREE){
         if(!!this.hasBox != !!info.hasBox){
             this.addBox(!this.hasBox); 
         }
+        
+        
+        
     } 
 
     Overlay.prototype.addBox = function(state){
@@ -132,9 +154,18 @@ var initOverlay = function(THREE){
         this.hasBox = state
     }
     
-    
-    
-    
+    Overlay.prototype.getSizeByScale = function(){ 
+        return {
+            width : settings.overlay.width * this.scale.x,
+            height : settings.overlay.height * this.scale.y
+        }
+    }
+    Overlay.prototype.getScaleBySize = function(width, height){ 
+        return {
+            x : width / settings.overlay.width,
+            y : height / settings.overlay.height,
+        }  
+    } 
     
     Overlay.prototype.preDeal = function(info){
         info.pos = new THREE.Vector3().fromArray(info.pos)
@@ -149,7 +180,16 @@ var initOverlay = function(THREE){
         info.qua.x = parseFloat(info.qua.x)
         info.qua.y = parseFloat(info.qua.y)
         info.qua.z = parseFloat(info.qua.z)
-        info.qua.w = parseFloat(info.qua.w) 
+        info.qua.w = parseFloat(info.qua.w)
+        
+        if(!info.transformAtPanos)info.transformAtPanos = {}
+               
+        for(let i in info.transformAtPanos){
+            info.transformAtPanos[i].pos = new THREE.Vector3().fromArray(info.transformAtPanos[i].pos)
+            info.transformAtPanos[i].qua = new THREE.Quaternion().fromArray(info.transformAtPanos[i].qua)
+                
+        }
+        
     }