chenlei 9 månader sedan
förälder
incheckning
562e82ab09
100 ändrade filer med 47 tillägg och 27 borttagningar
  1. 1 1
      Code/public/myData/myData.js
  2. 3 3
      Code/src/pages/A2visit/PanoVideo/index.tsx
  3. 10 5
      Code/src/pages/A2visit2/A22Pano/index.tsx
  4. 21 11
      Code/src/pages/A3banPano/index.tsx
  5. 10 5
      Code/src/pages/A3banquet/PanoImg/index.tsx
  6. 2 2
      Code/src/pages/A6xian/A6PanoVideo/index.tsx
  7. BIN
      资源/pano/a22.tiles/b/l1/1/l1_b_1_1.jpg
  8. BIN
      资源/pano/a22.tiles/b/l1/1/l1_b_1_2.jpg
  9. BIN
      资源/pano/a22.tiles/b/l1/1/l1_b_1_3.jpg
  10. BIN
      资源/pano/a22.tiles/b/l1/2/l1_b_2_1.jpg
  11. BIN
      资源/pano/a22.tiles/b/l1/2/l1_b_2_2.jpg
  12. BIN
      资源/pano/a22.tiles/b/l1/2/l1_b_2_3.jpg
  13. BIN
      资源/pano/a22.tiles/b/l1/3/l1_b_3_1.jpg
  14. BIN
      资源/pano/a22.tiles/b/l1/3/l1_b_3_2.jpg
  15. BIN
      资源/pano/a22.tiles/b/l1/3/l1_b_3_3.jpg
  16. BIN
      资源/pano/a22.tiles/b/l2/1/l2_b_1_1.jpg
  17. BIN
      资源/pano/a22.tiles/b/l2/1/l2_b_1_2.jpg
  18. BIN
      资源/pano/a22.tiles/b/l2/1/l2_b_1_3.jpg
  19. BIN
      资源/pano/a22.tiles/b/l2/2/l2_b_2_1.jpg
  20. BIN
      资源/pano/a22.tiles/b/l2/2/l2_b_2_2.jpg
  21. BIN
      资源/pano/a22.tiles/b/l2/2/l2_b_2_3.jpg
  22. BIN
      资源/pano/a22.tiles/b/l2/3/l2_b_3_1.jpg
  23. BIN
      资源/pano/a22.tiles/b/l2/3/l2_b_3_2.jpg
  24. BIN
      资源/pano/a22.tiles/b/l2/3/l2_b_3_3.jpg
  25. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_1.jpg
  26. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_2.jpg
  27. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_3.jpg
  28. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_4.jpg
  29. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_5.jpg
  30. BIN
      资源/pano/a22.tiles/b/l3/1/l3_b_1_6.jpg
  31. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_1.jpg
  32. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_2.jpg
  33. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_3.jpg
  34. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_4.jpg
  35. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_5.jpg
  36. BIN
      资源/pano/a22.tiles/b/l3/2/l3_b_2_6.jpg
  37. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_1.jpg
  38. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_2.jpg
  39. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_3.jpg
  40. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_4.jpg
  41. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_5.jpg
  42. BIN
      资源/pano/a22.tiles/b/l3/3/l3_b_3_6.jpg
  43. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_1.jpg
  44. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_2.jpg
  45. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_3.jpg
  46. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_4.jpg
  47. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_5.jpg
  48. BIN
      资源/pano/a22.tiles/b/l3/4/l3_b_4_6.jpg
  49. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_1.jpg
  50. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_2.jpg
  51. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_3.jpg
  52. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_4.jpg
  53. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_5.jpg
  54. BIN
      资源/pano/a22.tiles/b/l3/5/l3_b_5_6.jpg
  55. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_1.jpg
  56. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_2.jpg
  57. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_3.jpg
  58. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_4.jpg
  59. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_5.jpg
  60. BIN
      资源/pano/a22.tiles/b/l3/6/l3_b_6_6.jpg
  61. BIN
      资源/pano/a22.tiles/d/l1/1/l1_d_1_1.jpg
  62. BIN
      资源/pano/a22.tiles/d/l1/1/l1_d_1_2.jpg
  63. BIN
      资源/pano/a22.tiles/d/l1/1/l1_d_1_3.jpg
  64. BIN
      资源/pano/a22.tiles/d/l1/2/l1_d_2_1.jpg
  65. BIN
      资源/pano/a22.tiles/d/l1/2/l1_d_2_2.jpg
  66. BIN
      资源/pano/a22.tiles/d/l1/2/l1_d_2_3.jpg
  67. BIN
      资源/pano/a22.tiles/d/l1/3/l1_d_3_1.jpg
  68. BIN
      资源/pano/a22.tiles/d/l1/3/l1_d_3_2.jpg
  69. BIN
      资源/pano/a22.tiles/d/l1/3/l1_d_3_3.jpg
  70. BIN
      资源/pano/a22.tiles/d/l2/1/l2_d_1_1.jpg
  71. BIN
      资源/pano/a22.tiles/d/l2/1/l2_d_1_2.jpg
  72. BIN
      资源/pano/a22.tiles/d/l2/1/l2_d_1_3.jpg
  73. BIN
      资源/pano/a22.tiles/d/l2/2/l2_d_2_1.jpg
  74. BIN
      资源/pano/a22.tiles/d/l2/2/l2_d_2_2.jpg
  75. BIN
      资源/pano/a22.tiles/d/l2/2/l2_d_2_3.jpg
  76. BIN
      资源/pano/a22.tiles/d/l2/3/l2_d_3_1.jpg
  77. BIN
      资源/pano/a22.tiles/d/l2/3/l2_d_3_2.jpg
  78. BIN
      资源/pano/a22.tiles/d/l2/3/l2_d_3_3.jpg
  79. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_1.jpg
  80. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_2.jpg
  81. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_3.jpg
  82. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_4.jpg
  83. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_5.jpg
  84. BIN
      资源/pano/a22.tiles/d/l3/1/l3_d_1_6.jpg
  85. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_1.jpg
  86. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_2.jpg
  87. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_3.jpg
  88. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_4.jpg
  89. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_5.jpg
  90. BIN
      资源/pano/a22.tiles/d/l3/2/l3_d_2_6.jpg
  91. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_1.jpg
  92. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_2.jpg
  93. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_3.jpg
  94. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_4.jpg
  95. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_5.jpg
  96. BIN
      资源/pano/a22.tiles/d/l3/3/l3_d_3_6.jpg
  97. BIN
      资源/pano/a22.tiles/d/l3/4/l3_d_4_1.jpg
  98. BIN
      资源/pano/a22.tiles/d/l3/4/l3_d_4_2.jpg
  99. BIN
      资源/pano/a22.tiles/d/l3/4/l3_d_4_3.jpg
  100. 0 0
      资源/pano/a22.tiles/d/l3/4/l3_d_4_4.jpg

+ 1 - 1
Code/public/myData/myData.js

@@ -3,7 +3,7 @@ window.isHH = document.documentElement.clientWidth >= document.documentElement.c
 const isPcTemp = document.documentElement.clientWidth >= 1200
 
 // 本地开发静态资源目录
-const baseUrlLoc = ' http://192.168.20.55:8080/staticData/'
+const baseUrlLoc = ' http://192.168.0.18:8081/staticData/'
 
 const myBaseUrl = 'https://houseoss.4dkankan.com/project/henan/'
 

+ 3 - 3
Code/src/pages/A2visit/PanoVideo/index.tsx

@@ -34,13 +34,13 @@ function PanoVideo() {
         >
           <VideoScene
             name='scene1'
-            videointerfaceXmlUrl='/skin/videointerface.xml'
-            videoplayerUrl='/plugins/videoplayer.js'
+            videointerfaceXmlUrl='./skin/videointerface.xml'
+            videoplayerUrl='./plugins/videoplayer.js'
             sourceList={[
               {
                 res: '2000x1000',
                 url: otherUrl + 'pano/1.mp4',
-                poster: ''
+                poster: otherUrl + 'pano/pano1.jpg'
               }
             ]}
             playRes='2000x1000'

+ 10 - 5
Code/src/pages/A2visit2/A22Pano/index.tsx

@@ -26,13 +26,18 @@ function A22Pano() {
           }}
           images={[
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
-              url: otherUrl + 'pano/a22.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
+              tiledImageWidth: 2816,
+              tiledImageHeight: 2816,
+              url: otherUrl + 'pano/a22.tiles/%s/l3/%v/l3_%s_%v_%h.jpg'
+            },
+            {
+              tiledImageWidth: 1536,
+              tiledImageHeight: 1536,
+              url: otherUrl + 'pano/a22.tiles/%s/l2/%v/l2_%s_%v_%h.jpg'
             },
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
+              tiledImageWidth: 768,
+              tiledImageHeight: 768,
               url: otherUrl + 'pano/a22.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
             }
           ]}

+ 21 - 11
Code/src/pages/A3banPano/index.tsx

@@ -49,13 +49,18 @@ function A3banPano() {
           }}
           images={[
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
-              url: otherUrl + 'pano/pano3.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
+              tiledImageWidth: 2816,
+              tiledImageHeight: 2816,
+              url: otherUrl + 'pano/pano3.tiles/%s/l3/%v/l3_%s_%v_%h.jpg'
+            },
+            {
+              tiledImageWidth: 1536,
+              tiledImageHeight: 1536,
+              url: otherUrl + 'pano/pano3.tiles/%s/l2/%v/l2_%s_%v_%h.jpg'
             },
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
+              tiledImageWidth: 768,
+              tiledImageHeight: 768,
               url: otherUrl + 'pano/pano3.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
             }
           ]}
@@ -144,18 +149,23 @@ function A3banPano() {
           }}
           images={[
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
-              url: otherUrl + 'pano/pano4.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
+              tiledImageWidth: 2816,
+              tiledImageHeight: 2816,
+              url: otherUrl + 'pano/pano4.tiles/%s/l3/%v/l3_%s_%v_%h.jpg'
+            },
+            {
+              tiledImageWidth: 1536,
+              tiledImageHeight: 1536,
+              url: otherUrl + 'pano/pano4.tiles/%s/l2/%v/l2_%s_%v_%h.jpg'
             },
             {
-              tiledImageWidth: 1152,
-              tiledImageHeight: 1152,
+              tiledImageWidth: 768,
+              tiledImageHeight: 768,
               url: otherUrl + 'pano/pano4.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
             }
           ]}
         >
-          <View hlookat={50} vlookat={0} fovType='MFOV' fov={120} fovMin={70} fovMax={130} />
+          <View hlookat={75} vlookat={10} fovType='MFOV' fov={120} fovMin={70} fovMax={130} />
 
           <HotSpot
             name='indoor'

+ 10 - 5
Code/src/pages/A3banquet/PanoImg/index.tsx

@@ -41,13 +41,18 @@ function PanoImg() {
             }}
             images={[
               {
-                tiledImageWidth: 1152,
-                tiledImageHeight: 1152,
-                url: otherUrl + 'pano/pano2.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
+                tiledImageWidth: 2816,
+                tiledImageHeight: 2816,
+                url: otherUrl + 'pano/pano2.tiles/%s/l3/%v/l3_%s_%v_%h.jpg'
+              },
+              {
+                tiledImageWidth: 1536,
+                tiledImageHeight: 1536,
+                url: otherUrl + 'pano/pano2.tiles/%s/l2/%v/l2_%s_%v_%h.jpg'
               },
               {
-                tiledImageWidth: 1152,
-                tiledImageHeight: 1152,
+                tiledImageWidth: 768,
+                tiledImageHeight: 768,
                 url: otherUrl + 'pano/pano2.tiles/%s/l1/%v/l1_%s_%v_%h.jpg'
               }
             ]}

+ 2 - 2
Code/src/pages/A6xian/A6PanoVideo/index.tsx

@@ -27,8 +27,8 @@ function A6PanoVideo() {
         >
           <VideoScene
             name='scene1'
-            videointerfaceXmlUrl='/skin/videointerface.xml'
-            videoplayerUrl='/plugins/videoplayer.js'
+            videointerfaceXmlUrl='./skin/videointerface.xml'
+            videoplayerUrl='./plugins/videoplayer.js'
             sourceList={[
               {
                 res: '2000x1000',

BIN
资源/pano/a22.tiles/b/l1/1/l1_b_1_1.jpg


BIN
资源/pano/a22.tiles/b/l1/1/l1_b_1_2.jpg


BIN
资源/pano/a22.tiles/b/l1/1/l1_b_1_3.jpg


BIN
资源/pano/a22.tiles/b/l1/2/l1_b_2_1.jpg


BIN
资源/pano/a22.tiles/b/l1/2/l1_b_2_2.jpg


BIN
资源/pano/a22.tiles/b/l1/2/l1_b_2_3.jpg


BIN
资源/pano/a22.tiles/b/l1/3/l1_b_3_1.jpg


BIN
资源/pano/a22.tiles/b/l1/3/l1_b_3_2.jpg


BIN
资源/pano/a22.tiles/b/l1/3/l1_b_3_3.jpg


BIN
资源/pano/a22.tiles/b/l2/1/l2_b_1_1.jpg


BIN
资源/pano/a22.tiles/b/l2/1/l2_b_1_2.jpg


BIN
资源/pano/a22.tiles/b/l2/1/l2_b_1_3.jpg


BIN
资源/pano/a22.tiles/b/l2/2/l2_b_2_1.jpg


BIN
资源/pano/a22.tiles/b/l2/2/l2_b_2_2.jpg


BIN
资源/pano/a22.tiles/b/l2/2/l2_b_2_3.jpg


BIN
资源/pano/a22.tiles/b/l2/3/l2_b_3_1.jpg


BIN
资源/pano/a22.tiles/b/l2/3/l2_b_3_2.jpg


BIN
资源/pano/a22.tiles/b/l2/3/l2_b_3_3.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_1.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_2.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_3.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_4.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_5.jpg


BIN
资源/pano/a22.tiles/b/l3/1/l3_b_1_6.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_1.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_2.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_3.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_4.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_5.jpg


BIN
资源/pano/a22.tiles/b/l3/2/l3_b_2_6.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_1.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_2.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_3.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_4.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_5.jpg


BIN
资源/pano/a22.tiles/b/l3/3/l3_b_3_6.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_1.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_2.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_3.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_4.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_5.jpg


BIN
资源/pano/a22.tiles/b/l3/4/l3_b_4_6.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_1.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_2.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_3.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_4.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_5.jpg


BIN
资源/pano/a22.tiles/b/l3/5/l3_b_5_6.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_1.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_2.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_3.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_4.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_5.jpg


BIN
资源/pano/a22.tiles/b/l3/6/l3_b_6_6.jpg


BIN
资源/pano/a22.tiles/d/l1/1/l1_d_1_1.jpg


BIN
资源/pano/a22.tiles/d/l1/1/l1_d_1_2.jpg


BIN
资源/pano/a22.tiles/d/l1/1/l1_d_1_3.jpg


BIN
资源/pano/a22.tiles/d/l1/2/l1_d_2_1.jpg


BIN
资源/pano/a22.tiles/d/l1/2/l1_d_2_2.jpg


BIN
资源/pano/a22.tiles/d/l1/2/l1_d_2_3.jpg


BIN
资源/pano/a22.tiles/d/l1/3/l1_d_3_1.jpg


BIN
资源/pano/a22.tiles/d/l1/3/l1_d_3_2.jpg


BIN
资源/pano/a22.tiles/d/l1/3/l1_d_3_3.jpg


BIN
资源/pano/a22.tiles/d/l2/1/l2_d_1_1.jpg


BIN
资源/pano/a22.tiles/d/l2/1/l2_d_1_2.jpg


BIN
资源/pano/a22.tiles/d/l2/1/l2_d_1_3.jpg


BIN
资源/pano/a22.tiles/d/l2/2/l2_d_2_1.jpg


BIN
资源/pano/a22.tiles/d/l2/2/l2_d_2_2.jpg


BIN
资源/pano/a22.tiles/d/l2/2/l2_d_2_3.jpg


BIN
资源/pano/a22.tiles/d/l2/3/l2_d_3_1.jpg


BIN
资源/pano/a22.tiles/d/l2/3/l2_d_3_2.jpg


BIN
资源/pano/a22.tiles/d/l2/3/l2_d_3_3.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_1.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_2.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_3.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_4.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_5.jpg


BIN
资源/pano/a22.tiles/d/l3/1/l3_d_1_6.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_1.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_2.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_3.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_4.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_5.jpg


BIN
资源/pano/a22.tiles/d/l3/2/l3_d_2_6.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_1.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_2.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_3.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_4.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_5.jpg


BIN
资源/pano/a22.tiles/d/l3/3/l3_d_3_6.jpg


BIN
资源/pano/a22.tiles/d/l3/4/l3_d_4_1.jpg


BIN
资源/pano/a22.tiles/d/l3/4/l3_d_4_2.jpg


BIN
资源/pano/a22.tiles/d/l3/4/l3_d_4_3.jpg


+ 0 - 0
资源/pano/a22.tiles/d/l3/4/l3_d_4_4.jpg


Vissa filer visades inte eftersom för många filer har ändrats