Home Explore Help
Register Sign In
chenzhiguang
/
bigSceneEdit_java
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

# Conflicts:
#	css/lzb.css
#	edit.html
#	js/edit.js
#	js/main_2020_edit.js
#	js/main_2020_show.js
#	js/overlay.js
xzw 4 years ago
parent
b576e05cef 99f264b4e2
commit
c355f9baf2
7 changed files with 66238 additions and 759 deletions
Split View Show Diff Stats
  1. 1617 0
      edit_zh.html
  2. 347 68
      eforclient.html
  3. 598 679
      index.html
  4. 22 12
      js/edit.js
  5. 3953 0
      js/edit_zh.js
  6. 59689 0
      js/mainEdit.js
  7. 12 0
      js/main_2020_show.js

File diff suppressed because it is too large
+ 1617 - 0
edit_zh.html


+ 347 - 68
eforclient.html
View File 

@@ -24,7 +24,7 @@
 
         }
 
         if (number.indexOf("#") != -1) {
 
             number = number.substring(0, number.indexOf("#"));
 
-        } 
+        }
 
     </script>
 
     <script class="build keep">
 
         // Safari and Android does not support performance.timing.navigationStart :(
 
@@ -36,9 +36,9 @@
 
     </script>
 
 </head>
 
 
-<body> 
+<body>
 
     <div class="wrapper">
 
-        <div class="waiting"> 
+        <div class="waiting">
 
             <div class="overlay"></div>
 
             <div class="spinner">
 
                 <div class="bounce1"></div>
 
@@ -46,7 +46,7 @@
 
                 <div class="bounce3"></div>
 
             </div>
 
             <div class="text">请等待...</div>
 
-        </div> 
+        </div>
 
         <div class="toolTop hasPad unable">
 
             <!-- 顶部header -->
 
             <div class="btns"></div>
 
@@ -88,11 +88,19 @@
 
                     <li data-name="overlay">
 
                         <span class="overlay"></span>
 
                         <label>展览</label>
 
+<<<<<<< HEAD
 
+                    </li>
 
+=======
 
                     </li> 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                     <li data-name="panoVisible">
 
                         <span class="panoVisible"></span>
 
                         <label>漫游可行</label>
 
                     </li>
 
+                    <li data-name="cadMap">
 
+                        <span class="panoVisible"></span>
 
+                        <label>小地图</label>
 
+                    </li>
 
                 </ul>
 
             </div>
 
             <div class="toolMid">
 
@@ -100,7 +108,7 @@
 
                     <!-- 画布区域 -->
 
                     <div class="webgl-inside">
 
                         <div class="content">
 
-                            <div id="hot"> 
+                            <div id="hot">
 
                             </div>
 
                             <div id="popup">
 
                                 <div class="popup-content">
 
@@ -888,9 +896,9 @@
 
                     </div>
 
                 </div>
 
                 <div class="midBottom hasPad">
 
-                    <!-- 中间下部 --> 
+                    <!-- 中间下部 -->
 
                     <div class="confirmSnap innerBtn hide" id="camera-start">点此设置为初始画面</div>
 
-                    <!--  <div class="innerBtn hide cancel" data-lang="">隐藏该点</div>  -->	
+                    <!--  <div class="innerBtn hide cancel" data-lang="">隐藏该点</div>  -->
 
                 </div>
 
             </div>
 
             <div class="toolRight">
 
@@ -904,7 +912,7 @@
 
                         <!-- <li class="describ noBorderbott">
 
                             <label class="remark">通过添加热点，您可以进一步装饰您的场景；例如：说明文字、图片、音频、视频等。</label>
 
                         </li> -->
 
-                        <li data-name="MouseMarkerColor" class="tourSelectWarp hotListSwitch">
 
+                        <li class="tourSelectWarp hotListSwitch">
 
                             <div class="itemTitle hotListSwitchTitle">
 
                                 <span>热点列表</span>
 
                             </div>
 
@@ -914,7 +922,7 @@
 
                                 </label>
 
                             </ul>
 
                         </li>
 
-                        <li data-name="MouseMarkerColor" class="tourSelectWarp hotListSwitch">
 
+                        <li class="tourSelectWarp hotListSwitch">
 
                             <div class="itemTitle">
 
                                 <span>热点大小 (初始值为1)</span>
 
                             </div>
 
@@ -965,7 +973,8 @@
 
                                     </div>
 
                                     <ul>
 
                                         <li>
 
-                                            <input name="isSprite" class="editCheckbox" type="checkbox" value="isSprite" id="isSprite">
 
+                                            <input name="isSprite" class="editCheckbox" type="checkbox" value="isSprite"
 
+                                                id="isSprite">
 
                                             <label for="isSprite"></label>
 
                                             <label for="isSprite">恒朝向相机 </label>
 
                                         </li>
 
@@ -975,19 +984,23 @@
 
                                         <!-- <li class="halfCell" index="scale" data-lang="">缩放</li> -->
 
                                         <li class="halfCell" index="rotate" data-lang="">旋转</li>
 
                                     </ul>
 
-                                </li>  
+                                </li>
 
                                 <li class="style">
 
                                     <div class="itemTitle">
 
                                         <span>样式</span>
 
                                     </div>
 
                                     <ul class="MenuOptions innerBtn">
 
                                         <li class="halfCell chosen" index="default">默认</li>
 
-                                        <li class="halfCell" index="user" >自定义</li> 
+                                        <li class="halfCell" index="user">自定义</li>
 
                                     </ul>
 
                                     <div id="userUploadStyle" class="hide">
 
                                         <ul>
 
-                                            <li class="upload "><div> </div><a class="del"></a></li>
 
-                                            <li class="upload hide"><div> </div><a class="del"></a></li>
 
+                                            <li class="upload ">
 
+                                                <div> </div><a class="del"></a>
 
+                                            </li>
 
+                                            <li class="upload hide">
 
+                                                <div> </div><a class="del"></a>
 
+                                            </li>
 
                                         </ul>
 
                                     </div>
 
                                 </li>
 
@@ -1002,7 +1015,7 @@
 
                                             <div class="buttons">
 
                                                 <button class="submit innerBtn">更改</button>
 
                                             </div>
 
-                                            <input type="file">
 
+                                            <input type="file" accept="image/*">
 
                                         </div>
 
                                         <a class="del"></a>
 
                                     </div>
 
@@ -1018,7 +1031,7 @@
 
                                             <div class="buttons">
 
                                                 <button class="submit innerBtn">更改</button>
 
                                             </div>
 
-                                            <input type="file">
 
+                                            <input type="file" accept="video/*">
 
                                         </div>
 
                                         <a class="del"></a>
 
                                     </div>
 
@@ -1027,7 +1040,7 @@
 
                                     <div class="itemTitle">
 
                                         <span>添加音频</span>
 
                                         <div class="buttons">
 
-                                            <input type="file" id="upload-hotBgm">
 
+                                            <input type="file" id="upload-hotBgm" accept="audio/*">
 
                                             <button class="innerBtn submit">上传</button>
 
                                         </div>
 
                                     </div>
 
@@ -1055,7 +1068,11 @@
 
                                     <div class="itemTitle">
 
                                         <span>添加网页</span>
 
                                     </div>
 
+<<<<<<< HEAD
 
+
 
+=======
 
                                      
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                                     <!-- <ul>
 
                                         <li>
 
                                             <input name="linkOutside" class="editCheckbox" type="checkbox" value="linkOutside" id="linkOutside"></input>
 
@@ -1063,14 +1080,23 @@
 
                                             <label for="linkOutside">在新窗口打开（其他内容将失效） </label>
 
                                         </li>
 
                                     </ul>   
+<<<<<<< HEAD
 
+                                    -->
 
+=======
 
                                     --> 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
 
                                     <ul class="MenuOptions innerBtn" name="linkType">
 
                                         <li class="halfCell chosen" index="common" data-lang="">普通</li>
 
                                         <li class="halfCell" index="jumpLink" data-lang="">跳转</li>
 
                                         <li class="halfCell" index="iframeDiv" data-lang="">iframe</li>
 
+<<<<<<< HEAD
 
+                                    </ul>
 
+                                    <label class="remark">方式1须https， 方式2、3 除当前第一个链接外，其他内容将不展现。</label>
 
+=======
 
                                     </ul> 
                                     <label class="remark">方式1须https， 方式2、3  除当前第一个链接外，其他内容将不展现。</label>
 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                                     <div class="list"></div>
 
                                     <div class="linkBtns">
 
                                         <div class="buttons">
 
@@ -1085,11 +1111,20 @@
 
                                     </div>
 
                                     <ul>
 
                                         <li>
 
+<<<<<<< HEAD
 
+                                            <input name="noAction" class="editCheckbox" type="checkbox" value="noAction"
 
+                                                id="noAction">
 
+                                            <label for="noAction"></label>
 
+                                            <label for="noAction">仅用于指示（不弹窗）</label>
 
+                                        </li>
 
+                                    </ul>
 
+=======
 
                                             <input name="noAction" class="editCheckbox" type="checkbox" value="noAction" id="noAction">
 
                                             <label for="noAction"></label>
 
                                             <label for="noAction">仅用于指示（不弹窗）</label>
 
                                         </li>
 
                                     </ul> 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                                 </li>
 
                             </ul>
 
                         </div>
 
@@ -1112,6 +1147,70 @@
 
                         </li>
 
                     </ul>
 
                 </div>
 
+                <div class="cadMap content hide">
 
+                    <ul>
 
+                        <li data-name="other">
 
+                            <ul class="other-item">
 
+                                <li>
 
+                                    <input name="show-cad" class="editCheckbox" type="checkbox">
 
+                                    <label for="show-cad"></label>
 
+                                    <label for="show-cad">开启小地图 </label>
 
+                                </li>
 
+                            </ul>
 
+                        </li>
 
+                        
+                        <li data-name="floorMarkerColor">
 
+                            <div class="itemTitle">
 
+                                <span>线条粗细</span>
 
+                            </div>
 
+                            <ul class="clearfix hotStyle-item colorWrap">
 
+                                <select class="cad-size" id="cad-size">
 
+                                    <option value="0.01">1px</option>
 
+                                    <option value="0.02">2px</option>
 
+                                    <option value="0.03">3px</option>
 
+                                    <option value="0.04">4px</option>
 
+                                    <option value="0.05">5px</option>
 
+                                    <option value="0.06">6px</option>
 
+                                </select>
 
+                            </ul>
 
+                        </li>
 
+                        <li data-name="floorMarkerColor">
 
+                            <div class="itemTitle">
 
+                                <span>线条颜色</span>
 
+                            </div>
 
+                            <ul class="clearfix hotStyle-item colorWrap">
 
+                                <input id="cadBorderColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
+                                <input id="cadBorderColor" type="color" />
 
+                            </ul>
 
+                        </li>
 
+                        <li data-name="MouseMarkerColor">
 
+                            <div class="itemTitle">
 
+                                <span>相机颜色</span>
 
+                            </div>
 
+                            <ul class="clearfix hotStyle-item colorWrap">
 
+                                <input id="cadSignColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
+                                <input id="cadSignColor" type="color" />
 
+                            </ul>
 
+                        </li>
 
+                        <!-- <ul class="cad-setting">
 
+                                <li>
 
+                                    <label for="">线宽</label>
 
+                                    <select name="" id="">
 
+                                        <option value="1">1px</option>
 
+                                        <option value="2">2px</option>
 
+                                        <option value="3">3px</option>
 
+                                        <option value="4">4px</option>
 
+                                        <option value="5">5px</option>
 
+                                    </select>
 
+                                </li>
 
+                                <li>
 
+                                    <label for="">相机颜色</label>
 
+                                    <input type="color" name="" id="">
 
+                                </li>
 
+                            </ul> -->
 
+                        </li>
 
+                    </ul>
 
+                </div>
 
                 <div class="information content">
 
                     <ul>
 
                         <li data-name="title">
 
@@ -1124,21 +1223,31 @@
 
                             <!-- <div class="unComplete">请填写项目名称</div> -->
 
                         </li>
 
                         <li data-name="description">
 
-                            <div class="itemTitle" data-size="200" id="project-intro2" >
 
+                            <div class="itemTitle" data-size="200" id="project-intro2">
 
                                 <span>简介内容</span>
 
                             </div>
 
 
-                            <textarea placeholder="大场景的简介" id="info-summary" class="editText" maxlength="200"></textarea>
 
+                            <textarea placeholder="大场景的简介" id="info-summary" class="editText"
 
+                                maxlength="200"></textarea>
 
 
                             <div class="itemTitle" data-size="200" id="project-intro2">
 
                                 <span>分享文字</span>
 
                             </div>
 
 
+<<<<<<< HEAD
 
+                            <textarea placeholder="微信分享的描述" id="weixin-summary" class="editText"
 
+                                maxlength="200"></textarea>
 
+
 
+                            <div class="itemTitle" data-size="建议图片为正方形">
 
+                                <span>分享图片</span>
 
+                            </div>
 
+=======
 
                             <textarea placeholder="微信分享的描述" id="weixin-summary" class="editText" maxlength="200"></textarea>
 
                             
                             <div class="itemTitle" data-size="建议图片为正方形" >
 
                                 <span>分享图片</span>
 
                             </div> 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                             <div class="list edit-fun-images clearfix forShareImg"></div>
 
                             <div class="upload" id="shareImgUpload">
 
                                 <div data-type="photo">
 
@@ -1146,7 +1255,11 @@
 
                                     <div class="buttons">
 
                                         <button class="submit innerBtn">更改</button>
 
                                     </div>
 
+<<<<<<< HEAD
 
+                                    <input type="file" accept="image/*">
 
+=======
 
                                     <input type="file" >
 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                                 </div>
 
                                 <a class="del hasHover"></a>
 
                             </div>
 
@@ -1161,28 +1274,31 @@
 
                                     class="active"></li>
 
                                 <li style="background-image: url(images/edit/hotStyle_2.png);"
 
                                     data-val='{"default":"images/point2.png","higt":"images/point2_light.png"}'>
 
-                                </li>
 
-                                <!-- <ul>
 
-                                    <li class="addSpot customizeHotStyle">
 
-                                        <div class="buttons">
 
-                                            <button class="innerBtn" id="customizeHot">自定义样式</button>
 
+                                </li>  
+                                <!-- <li class="addSpot customizeHotStyle" >
 
+                                    <div class="list edit-fun-images clearfix"></div>
 
+                                    <div class="upload" id="SpotStyle">
 
+                                        <div data-type='photo'> 
+                                            <div class="buttons">
 
+                                                <button class="submit innerBtn">更改</button>
 
+                                            </div>
 
+                                            <input type="file" accept="image/*">
 
                                         </div>
 
-                                    </li>
 
-                                </ul> -->
 
+                                        <a class="del"></a>
 
+                                    </div>
 
+                                </li>  -->
 
                             </ul>
 
                         </li>
 
                         <li data-name="floorMarkerColor">
 
                             <div class="itemTitle">
 
-                                <span>当前位置标记/导览标记颜色</span>
 
+                                <span>当前位置/导览路线</span>
 
                             </div>
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                                 <input id="floorMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
                                 <input id="floorMarkerColor" type="color" />
 
-                            </ul>
 
-                        </li>
 
-                        <li data-name="MouseMarkerColor">
 
+                            </ul> 
                             <div class="itemTitle">
 
-                                <span>鼠标标记颜色</span>
 
+                                <span>鼠标标记</span>
 
                             </div>
 
                             <ul class="clearfix hotStyle-item colorWrap">
 
                                 <input id="mouseMarkerColorTex" class="color-text" type="text" placeholder="请输入颜色" />
 
@@ -1217,7 +1333,7 @@
 
                                         value="hideMouseMarker" id="hideMouseMarker">
 
                                     <label for="hideMouseMarker"></label>
 
                                     <label for="hideMouseMarker">隐藏鼠标标记 </label>
 
-                                </li> 
+                                </li>
 
                                 <li>
 
                                     <input name="g_specialScene" class="editCheckbox" type="checkbox"
 
                                         value="g_specialScene" id="g_specialScene">
 
@@ -1233,10 +1349,11 @@
 
                             </ul>
 
                             <ul>
 
                                 <li>
 
-                                    <label class="remark">注： <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。
 
-                                    <br><br>启动二代数据：和tile贴图有关。</label>
 
+                                    <label class="remark">注：
 
+                                        <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。
 
+                                        <br><br>启动二代数据：和tile贴图有关。</label>
 
                                 </li>
 
-                            </ul>     
+                            </ul>
 
                         </li>
 
                     </ul>
 
                 </div>
 
@@ -1247,7 +1364,7 @@
 
                             <div class="itemTitle">
 
                                 <span>背景音乐</span>
 
                                 <div class="buttons">
 
-                                    <input type="file" id="upload-bgm">
 
+                                    <input type="file" accept="audio/*" id="upload-bgm">
 
                                     <button class="innerBtn submit">上传</button>
 
                                 </div>
 
                             </div>
 
@@ -1262,58 +1379,159 @@
 
                     </ul>
 
                 </div>
 
 
+
 
+
 
+
 
+
 
                 <div class="snapTour content hide">
 
-                    <ul>
 
-                        <div id="tourEdit" class="secondary  editDetail  atRight">
 
+                    <ul> 
+                        <li class="addTour">
 
+                            <div class="buttons begin">
 
+                                <button class="innerBtn">添加导览</button>
 
+                                <button class="innerBtn">添加片段</button>
 
+                            </div>
 
+                        </li>
 
+                        <li>
 
+                            <div class="itemTitle">
 
+                                <span>选择导览过渡效果</span>
 
+                            </div>
 
+                            <ul id="tourSwitch" class="switch clearfix hotStyle-item colorWrap">
 
+                                <label><input class="mui-switch mui-switch-animbg" type="checkbox">
 
+                                    启用瞬间过渡
 
+                                </label>
 
+                            </ul>
 
+                        </li>
 
+                        
+                        
+                        <li id="tourList" class='tourList'>  <!-- 总目录-->
 
+                            <ul>
 
+
 
+                            </ul>
 
+                        </li>
 
+                        
+                        <!-- <li id="tourFolderList">
 
+                            <ul>
 
+
 
+                            </ul>
 
+                        </li> -->
 
+                        
+                        
+                        
+                        
+                        <div id="tourFolderEdit" class="secondary  editDetail  atRight">
 
                             <div class="itemTitle head">
 
                                 <span>导览编辑</span>
 
                                 <!-- <a class="close"></a> -->
 
                             </div>
 
                             <div class="content">
 
                                 <ul>
 
-                                    <li id="tourName" class="info">
 
+                                    <li class="tourName info">
 
                                         <div class="itemTitle" data-size="15" id="project-name1">
 
                                             <span>导览名称</span>
 
+                                        </div> 
+                                        <div class="name">
 
+                                            <input spellcheck="false" placeholder="最多15字" class="right" type="text" minlength="1" maxlength="15" placeholder="" data-oper=tour-input>
 
+                                        </div><!-- 必填，限15字 ？？-->
 
+                                    </li>
 
+                                    <li class="audio mediaUpload">
 
+                                        <div class="itemTitle itemMargin">
 
+                                            <span>添加音频</span>
 
+                                            <div class="buttons">
 
+                                                <input type="file"  accept="audio/*">
 
+                                                <button class="innerBtn submit">上传</button>
 
+                                            </div>
 
                                         </div>
 
-                                        <!-- <span class="redPoint" id="project-name2" data-size="15">标题</span> -->
 
+                                        <div class="playBox hide" data-type='music'>
 
+                                            <div><a target="_blank"></a></div>
 
+                                            <div>
 
+                                                <span class="title">background</span>
 
+                                                <span class="delete">删除</span>
 
+                                            </div>
 
+                                        </div>
 
+                                    </li>
 
+                                    <li>
 
+                                        <div class="itemTitle">
 
+                                            <span>选择导览过渡效果</span>
 
+                                        </div>
 
+                                        <ul id="folderTourSwitch" class="switch clearfix hotStyle-item colorWrap">
 
+                                            <label><input class="mui-switch mui-switch-animbg" type="checkbox">
 
+                                                启用瞬间过渡
 
+                                            </label>
 
+                                        </ul>
 
+                                    </li>
 
+                                    <li class="snapATourView">
 
+                                        <div class="buttons begin">
 
+                                            <button class="innerBtn">添加片段</button>
 
+                                        </div>
 
+                                    </li>
 
+                                    
+                                    <li id="tourItemList" class='tourList'>
 
+                                        <ul>
 
+
 
+                                        </ul>
 
+                                    </li>
 
+                                </ul>
 
+                            </div>
 
+                            <div class="buttons tail">
 
+                                <button class="tourSubmit submit innerBtn">完成</button> 
+                            </div> 
+                        </div>
 
+                    
+                    
+                    
+                        
+                    
+                    
+                    
+                    
+                    
+                        <div id="tourItemEdit" class="secondary  editDetail  atRight">
 
+                            <div class="itemTitle head">
 
+                                <span>片段编辑</span>
 
+                                <!-- <a class="close"></a> -->
 
+                            </div>
 
+                            <div class="content">
 
+                                <ul>
 
+                                    <li class="tourName info">
 
+                                        <div class="itemTitle" data-size="15" id="project-name1">
 
+                                            <span>片段名称</span>
 
+                                        </div> 
                                         <div class="name">
 
-                                            <input id="tourNameInput" spellcheck="false" placeholder="导览的名称"
 
-                                                class="right" type="text" minlength="1" maxlength="15" placeholder=""
 
-                                                data-oper=tour-input>
 
+                                            <input spellcheck="false" placeholder="导览的名称" class="right" type="text" minlength="1" maxlength="15" placeholder="" data-oper=tour-input>
 
                                         </div><!-- 必填，限15字 ？？-->
 
                                     </li>
 
                                     <li class="audio mediaUpload">
 
                                         <div class="itemTitle itemMargin">
 
                                             <span>添加音频</span>
 
                                             <div class="buttons">
 
-                                                <input type="file" id="uploadTourBgm">
 
+                                                <input type="file"  accept="audio/*">
 
                                                 <button class="innerBtn submit">上传</button>
 
                                             </div>
 
                                         </div>
 
                                         <div class="playBox hide" data-type='music'>
 
                                             <div><a target="_blank"></a></div>
 
                                             <div>
 
-                                                <span id="tourMusicName" class="title">background</span>
 
+                                                <span class="title">background</span>
 
                                                 <span class="delete">删除</span>
 
                                             </div>
 
                                         </div>
 
                                     </li>
 
-                                    <li id="tourRenew" class="info">
 
-                                        <!-- <div class="itemTitle" data-size="0.94 ~ 3.18" id="project-name1">
 
-                                                <span></span>
 
-                                            </div> -->
 
-                                        <!-- <span class="redPoint" id="project-name2" data-size="15">标题</span> -->
 
+                                    <li id="tourRenew" class="info"> 
                                         <div class="name itemMargin">
 
                                             <div class="buttons begin">
 
                                                 <button id="renewTourBtn" class="innerBtn">重新录制当前导览</button>
 
-                                            </div>
 
-                                            <!-- <input spellcheck="false" placeholder=" 1" class="right" type="text"
 
-                                                                minlength="1" maxlength="15"> -->
 
+                                            </div> 
                                         </div><!-- 必填，限15字 ？？-->
 
                                     </li>
 
                                 </ul>
 
                             </div>
 
                             <div class="buttons tail">
 
+<<<<<<< HEAD
 
+                                <button class="tourSubmit submit innerBtn">完成</button> 
+                            </div> 
+                        </div> 
+                        
+=======
 
                                 <button id="tourSubmit" class="submit innerBtn">完成</button>
 
                                 <!-- <button class="cancel innerBtn">取消</button> -->
 
                             </div>
 
@@ -1339,11 +1557,12 @@
 
 
                             </ul>
 
                         </li>
 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                     </ul>
 
                 </div>
 
                 <div class="VR content hide">
 
                     <ul>
 
-                        <li data-name="MouseMarkerColor" class="tourSelectWarp hotListSwitch">
 
+                        <li class="tourSelectWarp hotListSwitch">
 
                             <div class="itemTitle">
 
                                 <span>VR</span>
 
                             </div>
 
@@ -1357,14 +1576,25 @@
 
                 </div>
 
                 <div class="wallDesign content hide"></div>
 
                 <div class="panoVisible content hide">
 
-                    <ul class="view-setting"><li ><div class="itemTitle"><span>漫游可行</span></div>
 
-                        <div  class="remark">通过设置漫游可行，进一步优化在漫游时出现的体验；例如，您在漫游时，出现穿透房间的情况。</div>  
-                        <div  class="remark">点击“保存当前设置”后展示页面立即生效。</div>
 
+                    <ul class="view-setting">
 
+                        <li>
 
+                            <div class="itemTitle"><span>漫游可行</span></div>
 
+                            <div class="remark">通过设置漫游可行，进一步优化在漫游时出现的体验；例如，您在漫游时，出现穿透房间的情况。</div>
 
+                            <div class="remark">点击“保存当前设置”后展示页面立即生效。</div>
 
                         </li>
 
                     </ul>
 
                 </div>
 
                 <div class="overlay content hide">
 
                     <ul>
 
+<<<<<<< HEAD
 
+                        <li class="addBtn">
 
+                            <div class="buttons">
 
+                                <button class="innerBtn" data-type='video'>添加视频</button>
 
+                                <button class="innerBtn" data-type='photo'>添加图片</button>
 
+                            </div>
 
+                        </li>
 
+                        <li class="overlayList ">
 
+=======
 
 						<li class="addBtn"> 
 							<div class="buttons">
 
 								<button class="innerBtn" data-type = 'video' >添加视频</button>
 
@@ -1372,15 +1602,70 @@
 
 							</div>
 
 						</li>
 
 						<li class="overlayList ">
 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                             <div class="itemTitle">
 
                                 <span>已添加的视频</span>
 
                             </div>
 
                             <ul>
 
-                            
+
 
                             </ul>
 
-                        </li> 
-					</ul>                
+                        </li>
 
+                    </ul>
 
+                </div>
 
+<<<<<<< HEAD
 
+
 
+                <div id="overlayProp" class="secondary atRight ">
 
+                    <div class="itemTitle head">
 
+                        <span data-lang="">展览属性</span>
 
+                        <a class="close"></a>
 
+                    </div>
 
+                    <div class="content">
 
+                        <ul>
 
+                            <li id="overlayUpload">
 
+                                <div class="itemTitle">
 
+                                    <span data-lang="">预览</span>
 
+                                    <div class="buttons" name="upload">
 
+                                        <button class="innerBtn" data-lang="">上传视频</button>
 
+                                    </div>
 
+                                </div>
 
+                                <div class="preview"><span class="text">支持MP4、MOV等，＜20M</span> <span
 
+                                        attr-type="height"></span><span attr-type="width"></span></div>
 
+                                <div class="buttons" name="useImgRatio">
 
+                                    <button class="innerBtn" data-lang="">恢复原始比例</button>
 
+                                </div>
 
+                                <ul class="MenuOptions innerBtn" name="transform">
 
+                                    <li class="halfCell chosen" index="translate" data-lang="">位移</li>
 
+                                    <li class="halfCell" index="scale" data-lang="">缩放</li>
 
+                                    <li class="halfCell" index="rotate" data-lang="">旋转</li>
 
+                                </ul>
 
+                                <ul id='setOverlayPosForPano' class="switch clearfix hotStyle-item colorWrap"
 
+                                    style="margin-top:20px">
 
+                                    <label><input class="mui-switch mui-switch-animbg" type="checkbox">
 
+                                        当前漫游点独立调整
 
+                                    </label>
 
+
 
+                                </ul>
 
+                                <label class="remark">如在其他点位出现错位，请开启此开关，独立调整在特定点位的位移/缩放/旋转。
 
+                                </label>
 
+                            </li>
 
+
 
+
 
+
 
+                            <li>
 
+                                <div class="itemTitle">
 
+                                    <span data-lang="">厚度</span>
 
+                                </div>
 
+                                <div id="videoDepth"></div>
 
+                            </li>
 
+                        </ul>
 
+                    </div>
 
+                    <div class="buttons tail">
 
+                        <button class="submit innerBtn" data-lang="">完成</button>
 
+                        <button class="delete cancel innerBtn" data-lang="">删除</button>
 
+                    </div>
 
                 </div>
 
+
 
+=======
 
                 
 				<div id="overlayProp" class="secondary atRight ">
 
 					<div class="itemTitle head">
 
@@ -1431,6 +1716,7 @@
 
 					</div>					
 				</div>
 
                 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
             </div>
 
             <div data-label="video">
 
                 <div class="fun-view-video">
 
@@ -1448,8 +1734,6 @@
 
         </div>
 
     </div>
 
 
-    
-
 
     <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>
 
@@ -1460,19 +1744,14 @@
 
     <script src="js/overlay.js"></script>
 
     <script src="js/TransformControls.js"></script>
 
     <script src="js/main_2020_edit.js"></script>
 
-
 
+    <script src="js/loadCAD.js"></script>
 
     <script>
 
         let clientCode = getQueryVariable('cmp')
 
-
 
-        if (clientCode) {
 
-            
-        }
 
         var ceshi = ''//'http://47.107.252.54:8105';
 
         var token = ''
 
         //if (!token) {
 
          //  window.location.href = '../list/index.html'
 
         //}
 
-         
     </script>
 
 </body>

File diff suppressed because it is too large
+ 598 - 679
index.html


+ 22 - 12
js/edit.js
View File 

@@ -821,12 +821,14 @@ Hotpoint.prototype.addmedia = function() {
 
     // 图片与视频加载
 
     function fileHandle() {
 
         var $seft = $(this) //input
 
+        
          
         var file = this.files[0];
 
         var type = this.activeElem ? this.activeElem.attr('data-type') : $seft.parent().attr('data-type');
 
+        
         var $din = $(document.createElement('div'));
 
-        var fnc = type === 'photo' ? imageSuccess : type === 'video' ? videoSuccess : thumbSuccess  
-        var $dom = fnc(file, $din, $seft)// 封面图thumbSuccess的话在此处理
 
+        var fnc = type === 'photo' ? imageSuccess : type === 'video' ? videoSuccess : thumbSuccess //再次传都会是thumSuccess
 
+        var $dom = fnc(file, $din, $seft)
 
 
         if (type === 'photo' || type === 'video') {
 
             if (!$dom)
 
@@ -836,7 +838,9 @@ Hotpoint.prototype.addmedia = function() {
 
                 var $layout = $seft.closest("li"); 
                 var $addLayout = $(document.createElement('a'));
 
                 $addLayout.attr("data-type", type)
 
+                 
                 var $close = $(document.createElement('span'));
 
+                 
                 $addLayout[0].file = file;
 
                 
                 $addLayout.append($close);
 
@@ -874,6 +878,7 @@ Hotpoint.prototype.addmedia = function() {
 
     
     
     
+    
     //用于重传的input
 
     var imgInput = $("<input accept='image/*'  type='file'></input>")
 
     var videoInput = $("<input accept='video/*' type='file'></input>")
 
@@ -1159,8 +1164,6 @@ Hotpoint.prototype.addwebPack = function() {
 
         $(this).closest(".webPage").find(".list > div:last").remove();
 
     });
 
 }
 
-
 
-
 
 // 保存热点信息
 
 Hotpoint.prototype.initSaveHot = function() {
 
     var $layout = $(".edit-loading");
 
@@ -1204,13 +1207,15 @@ Hotpoint.prototype.initSaveHot = function() {
 
             //获取视频路径
 
             return new Promise(function(resolve, reject) {
 
                 upload($videos, 'videos', resolve)
 
-            })
 
+            }
 
+            )
 
         }).then(function(videoUrls) {
 
             args.video = videoUrls
 
             //获取视频封面路径
 
             return new Promise(function(resolve, reject) {
 
                 upload($thums, 'images', resolve)
 
-            })
 
+            }
 
+            )
 
         }).then(function(thums) {
 
             args.video = args.video.map(function(video, index) {//整合视频+封面
 
                 return {
 
@@ -1219,14 +1224,15 @@ Hotpoint.prototype.initSaveHot = function() {
 
                 }
 
             })
 
         }).then(function() {
 
-            //获取音乐路径
 
+            //获取热点音乐所有的路径
 
             //console.log($miusc)
 
             if ($miusc[0].files.length > 0) {
 
                 return new Promise(function(resolve) {
 
                     upload($miusc, 'miusc', function(res) {
 
                         resolve(res[0])
 
                     })
 
-                })
 
+                }
 
+                )
 
             } else {
 
                 return $miusc.attr('data-hotBgm')
 
             }
 
@@ -1246,6 +1252,7 @@ Hotpoint.prototype.initSaveHot = function() {
 
             if (currStyle == "user" && currentHotStyleImg.length) {
 
                 currentHotStyleImg.forEach((img)=>{
 
                     if (img.needSave)
 
+                       
                         uploadFile(img.file, 'hot/image', function(rs) {
 
                             if (rs.code === 0) {
 
                                 img.needSave = false;
 
@@ -1275,12 +1282,14 @@ Hotpoint.prototype.initSaveHot = function() {
 
             if (currStyle == "user") {
 
                 currentHotStyleImg.forEach((img)=>{
 
                     args.styleImg.push(img.saveURL || img.src)
 
-                })
 
+                }
 
+                )
 
                 hot.styleTex = currentHotStyleImg.slice(0)
 
             } else {
 
                 hot.styleTex = [];
 
             }
 
             hot.changeTex();//更新材质     
+             
         }
 
         ).then(function() {
 
             //获取热点标题、内容、内嵌网页、模型网页。
 
@@ -2229,14 +2238,15 @@ function _css(el, prop, val) {
 
     }
 
 }
 
 
-function upload($files, type, cb) {//保存系列文件
 
+function upload($files, type, cb) {
 
     var length = $files.length
 
     var rcount = 0
 
     var result = []
 
 
     Array.from($files).forEach(function(dFile, index) {
 
-       
-       
+        //a 标签的success 是用来判断是否是已经上传过的文件
 
+        //attr-thum 属性是视频的图片
 
+        //videoURL 是判断是否有视频
 
         var $file = $(dFile)
 
         var $image = type == 'videos' ? $file.find('img.play-video') : $file.find('img')

File diff suppressed because it is too large
+ 3953 - 0
js/edit_zh.js


File diff suppressed because it is too large
+ 59689 - 0
js/mainEdit.js


+ 12 - 0
js/main_2020_show.js
View File 

@@ -4754,6 +4754,17 @@ window.Modernizr = function(n, e, t) {
 
             ,
 
             n.prototype.goToDestination = function(e, t, i, n) {
 
                         
+<<<<<<< HEAD
 
+                //音频
 
+                var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
 
+                if(musicInfo && musicInfo.music){
 
+                         
+                    var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
 
+                    g_tourAudio.src = manage.dealURL(o);
 
+                    g_tourAudio.load()  
+                }
 
+                
+=======
 
                 //音频 
                 //if(this.destinationItem[1] == 0){//如果是每个folder的起始
 
                     var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
 
@@ -4777,6 +4788,7 @@ window.Modernizr = function(n, e, t) {
 
                         
                     }
 
                 //}
 
+>>>>>>> b82e8fc10c1f2cdf49d8cb4e20f09622457e33bb
 
                 
                 if (this.onTheBus = !0,
 
                 this.emit("update.controls"),