Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/kaiPingWeb into master

code/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@ant-design/cssinjs": "^1.5.6",
-    "@dage/krpano": "^2.1.2",
+    "@dage/krpano": "^2.2.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

code/public/scene.xml

@@ -1,19 +1,99 @@
 <krpano>
-  <scene name="scene_zlc" title="zlc" onstart="" thumburl="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/thumb.jpg" lat="22.37682872" lng="112.57451278" heading="0.0">
+	<scene name="scene_ckgz" title="ckgz" onstart="" thumburl="panos/ckgz.tiles/thumb.jpg" lat="22.32834703" lng="112.58648550" heading="0.0">
+
+		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
+
+		<preview url="https://houseoss.4dkankan.com/project/kaiping/panos/ckgz.tiles/preview.jpg" />
+
+		<image type="CUBE" prealign="0|0.0|0" multires="true" tilesize="512">
+			<level tiledimagewidth="4608" tiledimageheight="4608">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/ckgz.tiles/%s/l3/%0v/l3_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="2304" tiledimageheight="2304">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/ckgz.tiles/%s/l2/%0v/l2_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="1152" tiledimageheight="1152">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/ckgz.tiles/%s/l1/%0v/l1_%s_%0v_%0h.jpg" />
+			</level>
+		</image>
+
+	</scene>
+
+	<scene name="scene_jjl" title="jjl" onstart="" thumburl="panos/jjl.tiles/thumb.jpg" lat="22.26063372" lng="112.52102386" heading="0.0">
+
+		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
+
+		<preview url="https://houseoss.4dkankan.com/project/kaiping/panos/jjl.tiles/preview.jpg" />
+
+		<image type="CUBE" prealign="0|0.0|0" multires="true" tilesize="512">
+			<level tiledimagewidth="4608" tiledimageheight="4608">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/jjl.tiles/%s/l3/%0v/l3_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="2304" tiledimageheight="2304">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/jjl.tiles/%s/l2/%0v/l2_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="1152" tiledimageheight="1152">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/jjl.tiles/%s/l1/%0v/l1_%s_%0v_%0h.jpg" />
+			</level>
+		</image>
+
+	</scene>
+
+	<scene name="scene_mjl" title="mjl" onstart="" thumburl="panos/mjl.tiles/thumb.jpg" lat="22.28958894" lng="112.56184300" heading="0.0">
+
+		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
+
+		<preview url="https://houseoss.4dkankan.com/project/kaiping/panos/mjl.tiles/preview.jpg" />
+
+		<image type="CUBE" prealign="0|0.0|0" multires="true" tilesize="512">
+			<level tiledimagewidth="4608" tiledimageheight="4608">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/mjl.tiles/%s/l3/%0v/l3_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="2304" tiledimageheight="2304">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/mjl.tiles/%s/l2/%0v/l2_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="1152" tiledimageheight="1152">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/mjl.tiles/%s/l1/%0v/l1_%s_%0v_%0h.jpg" />
+			</level>
+		</image>
+
+	</scene>
+
+	<scene name="scene_sml" title="sml" onstart="" thumburl="panos/sml.tiles/thumb.jpg" lat="22.35687161" lng="112.61404747" heading="0.0">
+
+		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
+
+		<preview url="https://houseoss.4dkankan.com/project/kaiping/panos/sml.tiles/preview.jpg" />
+
+		<image type="CUBE" prealign="0|0.0|0" multires="true" tilesize="512">
+			<level tiledimagewidth="4608" tiledimageheight="4608">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/sml.tiles/%s/l3/%0v/l3_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="2304" tiledimageheight="2304">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/sml.tiles/%s/l2/%0v/l2_%s_%0v_%0h.jpg" />
+			</level>
+			<level tiledimagewidth="1152" tiledimageheight="1152">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/sml.tiles/%s/l1/%0v/l1_%s_%0v_%0h.jpg" />
+			</level>
+		</image>
+
+	</scene>
+
+	<scene name="scene_zlc" title="zlc" onstart="" thumburl="panos/zlc.tiles/thumb.jpg" lat="22.37565397" lng="112.57624472" heading="0.0">
 
 		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
 		<preview url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/preview.jpg" />
 
 		<image type="CUBE" prealign="0|0.0|0" multires="true" tilesize="512">
-			<level tiledimagewidth="2624" tiledimageheight="2624">
-				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l3/%v/l3_%s_%v_%h.jpg" />
+			<level tiledimagewidth="4608" tiledimageheight="4608">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l3/%0v/l3_%s_%0v_%0h.jpg" />
 			</level>
-			<level tiledimagewidth="1280" tiledimageheight="1280">
-				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l2/%v/l2_%s_%v_%h.jpg" />
+			<level tiledimagewidth="2304" tiledimageheight="2304">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l2/%0v/l2_%s_%0v_%0h.jpg" />
 			</level>
-			<level tiledimagewidth="640" tiledimageheight="640">
-				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l1/%v/l1_%s_%v_%h.jpg" />
+			<level tiledimagewidth="1152" tiledimageheight="1152">
+				<cube url="https://houseoss.4dkankan.com/project/kaiping/panos/zlc.tiles/%s/l1/%0v/l1_%s_%0v_%0h.jpg" />
 			</level>
 		</image>
 

code/yarn.lock

@@ -1315,10 +1315,10 @@
   resolved "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
   integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
-"@dage/krpano@^2.1.2":
-  version "2.1.2"
-  resolved "http://192.168.20.245:4873/@dage/krpano/-/krpano-2.1.2.tgz#7598086f4226be847b24de4ba6e3dd55a85b7ccb"
-  integrity sha512-XXNomd5UMDikJLIi04UlPBsjGm3iZJ9rwx45mvX4VJl8QhFQIvYu+ES6xXYktJVgMXZw8QS48D+pexFPSYoy2w==
+"@dage/krpano@^2.2.0":
+  version "2.2.0"
+  resolved "http://192.168.20.245:4873/@dage/krpano/-/krpano-2.2.0.tgz#33651a7d99e9072fdbc5277b9ca5f9dc63cd7042"
+  integrity sha512-wuxl59g5OAozx/OXpJVQeCGreho3LVPzwJSnmnyxXG0pAfhN4+4r9r9w3oxY5EjPjEhT5Fnc8tnj8bxdGS/WiA==
   dependencies:
     escape-html "^1.0.3"