From a9cc16b19d2b06c891312e1a910e9fd09c62b495 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Thu, 26 May 2022 08:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BE=93=E6=B2=B9=E7=AE=A1?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/config-manager.ts | 1 + src/app/babylon/controller/data-manager.ts | 3 +- .../property-data/in/property-data-xykg.ts | 22 ++++++ .../model/data/institution/jyz-show-data.ts | 6 +- src/app/babylon/model/data/mark/mark-data.ts | 4 -- .../babylon/model/data/mark/mark-plan-data.ts | 5 ++ .../data/model-data/model-data-facility.ts | 5 ++ .../model/info/model/model-info-facility.ts | 67 +++++++++++++++++- .../view/building-window/building-window.ts | 50 +++++++++++-- .../view/facility-window/facility-window.ts | 4 +- .../babylon/view/mark-window/mark-window.ts | 4 +- src/assets/images/mark/inside/syg.png | Bin 8703 -> 4435 bytes .../mesh/mark/inside/ygc/YGC.gltf.manifest | 2 +- 13 files changed, 154 insertions(+), 19 deletions(-) create mode 100644 src/app/babylon/model/data/institution/facility/property-data/in/property-data-xykg.ts diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index b8fbb67..ce1d165 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -100,6 +100,7 @@ export class ConfigManager { case FacilityType.JY_SYGX: result = "输油管线"; break; case FacilityType.JY_YQHSGX: result = "油气回收管线"; break; case FacilityType.JY_FM: result = "阀门"; break; + case FacilityType.JY_XYKG: result = "卸油口盖"; break; } return result; } diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index a192a75..0d7a7aa 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -16,6 +16,7 @@ import { PropertyData_FM } from '../model/data/institution/facility/property-dat import { PropertyData_JYJ } from '../model/data/institution/facility/property-data/in/property-data-jyj'; import { PropertyData_MHQ } from '../model/data/institution/facility/property-data/in/property-data-mhq'; import { PropertyData_SYGX } from '../model/data/institution/facility/property-data/in/property-data-sygx'; +import { PropertyData_XYKG } from '../model/data/institution/facility/property-data/in/property-data-xykg'; import { PropertyData_YG } from '../model/data/institution/facility/property-data/in/property-data-yg'; import { PropertyData_YQHSGX } from '../model/data/institution/facility/property-data/in/property-data-yqhsgx'; import { PropertyData_DWBZ } from '../model/data/institution/facility/property-data/out/property-data-dwbz'; @@ -487,7 +488,7 @@ export class DataManager { case FacilityType.JY_SYGX: result = new PropertyData_SYGX(key); break; case FacilityType.JY_YQHSGX: result = new PropertyData_YQHSGX(key); break; case FacilityType.JY_FM: result = new PropertyData_FM(key, ""); break; - + case FacilityType.JY_XYKG: result = new PropertyData_XYKG(key); break; } if (result == null) { diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-xykg.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-xykg.ts new file mode 100644 index 0000000..81d5113 --- /dev/null +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-xykg.ts @@ -0,0 +1,22 @@ + +import { FacilityType } from "../../../../model-data/model-data-facility"; +import { PropertyData_Base } from "../property-data-base"; + +/** + * 卸油口盖 + */ +export class PropertyData_XYKG extends PropertyData_Base { + + + constructor(key: string) { + super(key, FacilityType.JY_XYKG); + this.name = "卸油口盖"; + } + + clone(key: string) { + let result = new PropertyData_XYKG(key); + result.name = this.name; + return result; + } + +} \ No newline at end of file diff --git a/src/app/babylon/model/data/institution/jyz-show-data.ts b/src/app/babylon/model/data/institution/jyz-show-data.ts index b587ebb..e2a966d 100644 --- a/src/app/babylon/model/data/institution/jyz-show-data.ts +++ b/src/app/babylon/model/data/institution/jyz-show-data.ts @@ -23,12 +23,16 @@ export class JYZShowData { */ showZP: boolean; - constructor(moudleType: JYZInfoMoudleType, camera: ArcRotateCamera, showZP: boolean) { + closeXYKG: boolean = true; + + constructor(moudleType: JYZInfoMoudleType, camera: ArcRotateCamera, showZP: boolean, closeXYKG: boolean) { this.moudleType = moudleType; this.cameraData = new ArcRotateCameraData(); if (camera != null) { this.cameraData.getDataFromCamera(camera); } + this.showZP = showZP; + this.closeXYKG = closeXYKG; } diff --git a/src/app/babylon/model/data/mark/mark-data.ts b/src/app/babylon/model/data/mark/mark-data.ts index 597a50d..0f68788 100644 --- a/src/app/babylon/model/data/mark/mark-data.ts +++ b/src/app/babylon/model/data/mark/mark-data.ts @@ -10,10 +10,6 @@ import { MarkProperty } from "./mark-property"; * 标绘数据 */ export class MarkData extends ModelData { - - - - /** * 名称类型,标志其具体是什么 */ diff --git a/src/app/babylon/model/data/mark/mark-plan-data.ts b/src/app/babylon/model/data/mark/mark-plan-data.ts index b10e625..a5a37ac 100644 --- a/src/app/babylon/model/data/mark/mark-plan-data.ts +++ b/src/app/babylon/model/data/mark/mark-plan-data.ts @@ -234,6 +234,11 @@ export class MarkNodeData { */ showZP: boolean; + /** + * 关闭卸油口盖 + */ + closeXYKG: boolean = true; + /** * 所处环境的信息 */ diff --git a/src/app/babylon/model/data/model-data/model-data-facility.ts b/src/app/babylon/model/data/model-data/model-data-facility.ts index 99c7922..109920a 100644 --- a/src/app/babylon/model/data/model-data/model-data-facility.ts +++ b/src/app/babylon/model/data/model-data/model-data-facility.ts @@ -248,6 +248,11 @@ export enum FacilityType { */ JY_FM = "JY_FM", + /** + * 卸油口盖 + */ + JY_XYKG = "JY_XYKG", + /** * 油气回收管线 阻挡物 */ diff --git a/src/app/babylon/model/info/model/model-info-facility.ts b/src/app/babylon/model/info/model/model-info-facility.ts index 6084ee3..ee864c8 100644 --- a/src/app/babylon/model/info/model/model-info-facility.ts +++ b/src/app/babylon/model/info/model/model-info-facility.ts @@ -5,9 +5,11 @@ import { SceneManager } from "src/app/babylon/controller/scene-manager"; import { UIManager } from "src/app/babylon/controller/ui-manager"; import { BabylonUIStyleTool } from "src/app/babylon/tool/babylon-ui-style-tool"; import { TsTool } from "src/app/babylon/tool/ts-tool"; +import { BuildingWindow } from "src/app/babylon/view/building-window/building-window"; import { FacilityWindow } from "src/app/babylon/view/facility-window/facility-window"; import { FacilityInfoInSceneWindow } from "src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window"; import { PropertyBaseWindow } from "src/app/babylon/view/property-window/property-base-window"; +import { PropertyData_XYKG } from "../../data/institution/facility/property-data/in/property-data-xykg"; import { ModelData } from "../../data/model-data/model-data"; import { FacilityPosType, FacilityShowType, FacilityType, ModelData_facility } from "../../data/model-data/model-data-facility"; import { BuildingInfo } from "../building/building-info"; @@ -30,6 +32,9 @@ export class ModelInfo_facility extends ModelInfo { nameUIRoot: Rectangle; nameText: TextBlock; + //卸油口盖 + bg_xykg: Rectangle; + btn_xykg: Button; constructor( key: string, @@ -47,15 +52,45 @@ export class ModelInfo_facility extends ModelInfo { onCreateFollowUI() { let facilityData = this.modelData as ModelData_facility; + let instance = this; super.onCreateFollowUI(); BabylonUIStyleTool.setStyle_size(this.uiFollowRoot, ConfigManager.c_size_facilityIconSize + "px", ConfigManager.c_size_facilityIconSize + "px"); + + if (facilityData.facilityType == FacilityType.JY_XYKG) { + let l_propertyData = facilityData.propertyData as PropertyData_XYKG; + + this.bg_xykg = new Rectangle("bg_xykg"); + this.bg_xykg.thickness = 0; + this.bg_xykg.background = BabylonUIStyleTool.c_color_blueBtnBg; + this.bg_xykg.color = BabylonUIStyleTool.c_color_blue;//"#0CB7F7"; + this.bg_xykg.alpha = 0.9; + UIManager.Instance.uiRoot.addControl(this.bg_xykg); + this.bg_xykg.width = '100px'; + this.bg_xykg.height = '26px'; + this.bg_xykg.thickness = 2; + this.bg_xykg.linkWithMesh(this.head); + + this.btn_xykg = Button.CreateSimpleButton("btn_xykg", "卸油口盖") + this.bg_xykg.addControl(this.btn_xykg); + this.btn_xykg.color = "white"; + this.btn_xykg.top = "2px"; + this.btn_xykg.fontSize = 16; + this.btn_xykg.thickness = 0 + this.btn_xykg.onPointerClickObservable.add(() => { + instance.changeXYKG(undefined) + + }) + this.bg_xykg.linkWithMesh(this.modelBox) + this.bg_xykg.linkOffsetY = "-30px" + + // this.modelBox.setEnabled(l_propertyData.isClose) + // instance.changeXYKG(l_propertyData.isClose) + } + if (!ConfigManager.getFacilityNeedIcon(facilityData.facilityType)) { return; } - - let instance = this; - let posType = ConfigManager.getPosType(facilityData.facilityType); let iconPath = ConfigManager.getFacilityIconUrl(facilityData.facilityType, posType); @@ -220,6 +255,9 @@ export class ModelInfo_facility extends ModelInfo { */ playShowAnim(play: boolean) { this.showFollowUI(play); + if (this.bg_xykg != null) { + this.bg_xykg.isVisible = play; + } if (this.modelBox != null) { let facilityType = (this.modelData as ModelData_facility).facilityType; //消防 或 阀门 持续高亮 @@ -245,6 +283,25 @@ export class ModelInfo_facility extends ModelInfo { } } + /** + * 改变卸油口盖 + */ + changeXYKG(isClose: boolean | undefined) { + // let facilityData = this.modelData as ModelData_facility; + // let properData = facilityData.propertyData as PropertyData_XYKG + + // if (isClose == undefined) { + // isClose = !properData.isClose; + // } + // properData.isClose = isClose; + // this.modelBox.setEnabled(isClose); + if (isClose == undefined) { + isClose = !BuildingWindow.instance.currentCloseXYKG; + } + // console.log("改变卸油口" + isClose) + BuildingWindow.instance.closeXYKG(isClose) + + } dispose(disposeMesh?: boolean) { if (this.areaInfo != null) { @@ -258,6 +315,10 @@ export class ModelInfo_facility extends ModelInfo { this.nameText = null; } + if (this.bg_xykg != null) { + this.bg_xykg.dispose(); + this.bg_xykg = null; + } super.dispose(disposeMesh); } } diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index ba28401..b7e0787 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -275,7 +275,7 @@ export class BuildingWindow extends UIBase { // BabylonTool.AnimMoveCameraTargetAB(camera, 60, cameraData.target, cameraData.radius, cameraData.alpha, cameraData.beta); // this.showZP(showData.showZP); // PlanComponent.instance.isOpenAwning = showData.showZP; - this.revoverCamera(cameraData, showData.showZP); + this.revoverCamera(cameraData, showData.showZP, showData.closeXYKG); } } @@ -285,8 +285,9 @@ export class BuildingWindow extends UIBase { * @param cameraData * @param showZP */ - revoverCamera(cameraData: ArcRotateCameraData, showZP: boolean, onAnimationEnd?: () => void) { + revoverCamera(cameraData: ArcRotateCameraData, showZP: boolean, closeXYKG: boolean, onAnimationEnd?: () => void) { this.showZP(showZP); + this.closeXYKG(closeXYKG); PlanComponent.instance.isOpenAwning = showZP; let camera = SceneManager.Instance.defaultCamera; if (cameraData != null) { @@ -824,7 +825,10 @@ export class BuildingWindow extends UIBase { */ currentZPShow: boolean = true; - + /** + * 关闭卸油口盖 + */ + currentCloseXYKG: boolean = true; /** * 展示加油站信息模块 @@ -848,9 +852,11 @@ export class BuildingWindow extends UIBase { else { // console.log("退出应急处置"); MarkWindow.closeWindow(); - } - + } + } + else { + this.closeXYKG(true) } this.initFacilityTypeByMoudleType(type, this.currentBuidngItem.buildingInfo); @@ -1007,7 +1013,9 @@ export class BuildingWindow extends UIBase { else if (TsTool.stringContain(l_facilityByType.type, "_" + moudleTypeKey) || TsTool.stringContain(l_facilityByType.type, moudleTypeKey + "_")) { this.facilitysByMoudle.get(moudleType).push(l_facilityByType); } - + if (moudleType == JYZInfoMoudleType.YJCZ && l_facilityByType.type == FacilityType.JY_XYKG) { + this.facilitysByMoudle.get(moudleType).push(l_facilityByType); + } } } @@ -1029,6 +1037,33 @@ export class BuildingWindow extends UIBase { this.currentZPShow = show; } + /** + * 关闭卸油口盖 + */ + closeXYKG(close: boolean) { + this.initFacilityTypeByMoudleType(JYZInfoMoudleType.YJCZ, this.currentBuidngItem.buildingInfo); + if (this.facilitysByMoudle != null) { + if (this.facilitysByMoudle.has(JYZInfoMoudleType.YJCZ)) { + let YJCZList: FacilityInfoByType[] = this.facilitysByMoudle.get(JYZInfoMoudleType.YJCZ) + if (YJCZList != null) { + for (let i = 0; i < YJCZList.length; i++) { + let type = YJCZList[i].type; + let infos = YJCZList[i].facilityInfo; + if (type == FacilityType.JY_XYKG) { + for (let j = 0; j < infos.length; j++) { + if (close != undefined) { + infos[j].modelBox.setEnabled(close); + } + + } + } + } + } + } + } + this.currentCloseXYKG = close; + } + /** * 获取设备所需UV材质(如果有的话) * @param facilityType @@ -1144,12 +1179,13 @@ export class BuildingWindow extends UIBase { } } if (jyzShowData == null) { - jyzShowData = new JYZShowData(moudleType, camera, showZP); + jyzShowData = new JYZShowData(moudleType, camera, showZP, this.currentCloseXYKG); DataManager.institutionData.JYZShowDatas.push(jyzShowData); } jyzShowData.moudleType = moudleType; jyzShowData.cameraData.getDataFromCamera(camera); jyzShowData.showZP = showZP; + jyzShowData.closeXYKG = this.currentCloseXYKG console.log("保存展示数据", DataManager.institutionData.JYZShowDatas); } diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts index 6d9dd89..d34ee13 100644 --- a/src/app/babylon/view/facility-window/facility-window.ts +++ b/src/app/babylon/view/facility-window/facility-window.ts @@ -666,9 +666,11 @@ export class FacilityWindow extends UIBase { this.createNewFacilityByMesh(mesh, FacilityType.JY_YQHSGX); } else if (TsTool.stringContain(mesh.name, FacilityType.JY_FM)) { - console.log("找到阀门", mesh) this.createNewFacilityByMesh(mesh, FacilityType.JY_FM); } + else if (TsTool.stringContain(mesh.name, FacilityType.JY_XYKG)) { + this.createNewFacilityByMesh(mesh, FacilityType.JY_XYKG); + } } /** diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index 50a5444..5d111d4 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -1108,6 +1108,7 @@ export class MarkWindow extends UIBase { markNodeData.cameraData.getDataFromCamera(SceneManager.Instance.defaultCamera); markNodeData.showZP = BuildingWindow.instance.currentZPShow; + markNodeData.closeXYKG = BuildingWindow.instance.currentCloseXYKG; // console.log("记录节点", markNodeData); } @@ -1233,6 +1234,7 @@ export class MarkWindow extends UIBase { let environmentData = this.currentMarkNodeInfo.nodeData.getCurrentEnvironmentData(); let cameraData = this.currentMarkNodeInfo.nodeData.cameraData; let showZP = this.currentMarkNodeInfo.nodeData.showZP; + let closeXYKG = this.currentMarkNodeInfo.nodeData.closeXYKG; let instance = this; if (environmentData.isOutdoor) //要在室外 { @@ -1261,7 +1263,7 @@ export class MarkWindow extends UIBase { //仅此分支生效 //动画还原相机,结束后开始阅读 - BuildingWindow.instance.revoverCamera(cameraData, showZP, (() => { + BuildingWindow.instance.revoverCamera(cameraData, showZP, closeXYKG, (() => { if (readDescribe) { instance.readDescribe(instance.currentMarkNodeInfo.nodeData.describe); } diff --git a/src/assets/images/mark/inside/syg.png b/src/assets/images/mark/inside/syg.png index 955d0d16ca4bca5d62cfc2fb09846470c8b6b90f..548c828b5459d749fd3d900bf6ddcd15c984cc4b 100644 GIT binary patch literal 4435 zcmV-Z5v=ZsP)DOHgp;@;AV)^X##Yn{U_6=A^9_5LQ6|Y%Y-xpH&8;- zX=lhVKxu)RNx&iL^fjFX2ZNoY7$tvsEZLSHl59(>U1{HYADwf)bLDGAFWUmy zeDAW`>y8uJ{GxYp(6qy1|SX~3cv(l$n}VvQ*!~-6ga2pb5m$)_#{L@-Z;_d`k`!K`T~A8Tc_GA*Taph zp963fKvrC(c4@=EJOvQU+W<7nxf$|le-0rpwP_&*1)M>M7zJ=fT;rnKr6@obYcB(k z61eLj|NS6Zz$2b0feY@w{8Gk!tU>fk6&&J5J)a@QjYw5&s>NC zl4A8hc<=p4NEWFDxdkcV6o5eh6LUR!J{KT?SBUjvLUdSQs9UP$3oopY{`)0|xM&4X zjPDS_ONj6vG|^pZ^JUD-1q~-=BgWYjph=ipBmR%8NceE87a3~83BTd*vnhatUoD{y z;`3KB>}PAb$go<{=Ar5LO;>;>T3adcK8W*Iqwqn~M3%D5A@X4)Ojkfe{H9gDbFV_! z&(utjiO9S!%m>pIP$%IoC9pT}Y?>$na20E}KnFPUIRYl}bH)-*lW>-1R&& zl}f*J&tKoaiRuVJ6{k^-K=2tA@YEAeJkyYF!0_-83WXBZu3d*jB7wdmNBY*^xPI$L z)_-IuGnPqenieq(qXzi3WGYo^X=%QsYRz2DaUA{7fdk71`j4y}J$tq@o6U4i=5n1i zr3UP=r9ZgYTx%zt5tMCfM&`(KP@595va@vf8X^$v&W8Q9T*$SpuMdP z?d{8Obl~W9k3aVKmz$fLVc9mUh=o`zic+bBTD68$D&-ianU6;8@n|eM8jaecb}Ty9 z+0{9^wx?&bXKl~;d;*utWpjUT@5=tZzUxMYN7m$Wxo)Rcje4HTW70H0*EB@Ti28x1 z!O(TS4&R6CsCk^{`^aWNUX>lsVmv#Jx8D2}>g(&N z!%89%A4#QB!_Cc&^m+QG4I73gCnoG&Z@jVYojrT69~vHB)6(2*b#!zfo=Bilt-`h} zq#IH!Xth!%C8@qeDX!;1*Jwx{TRznE;o+fmCipGyIzX`)mvBVQ<>R4$=h zsqllN(I_0pg{JAO9BQuXq2@SnTpExET{oa<8Z^yBeX<^w9pUSBb#*8fi#9Z@C>4t< zM$dW}I&~Vqcw-j|g#s&(gpJxZM#si5F*%8JIt|x#x!;M&30M)6l}|#`czn<2zIYsP z;d>r@_<{z7f^+B2QaEf1T)+wmKdS<4+eWog;m)}#sq1{LrKN>@lC|$g6a;Iv8V}xe z9ZXK_NR;zO7qyX|ovId4>deC&Ra!f*qWr{9!c2`|D$o1m^0s;lh z8UA9?7$znNf(Ca`C=^)<*I$1F3rQ{!u`KpMvTDus_*$h>Wmpm_4AW$GX5!KzeyRb! z2G3L0qCqlbq3&Y{`#yiq|1=M=Sd3kOzJu@a;PZt%BZZDixy&f@JcrRzE)^O2?1l=V zT+$D_z`P1LbLJfT7+IWPO%UzsT8=e6*Kud#;~8dQ@_QN>bx0PbXh4=BtCOrX*I`I1 zmR4bktZnFuxyfpVVKO42F3rz}`AkVIV^ zg+d+^xd}E>G!|F<hkt6*)NMd{nSu{`@7-fkKjSUzZ z8$-2P;Ze~&%F{g=q&5|{80H$_IvOieg-wmEPbeS-5fKM0Z5k#gTofWBmZ_2~(p+c?}E zJ$4MySXB99#1uDhS$GnbI;6h|6&}ZGm6<shq$Ix>M&W3Go9H^Y2MX95TTqGi9NG z2S|nV%xbO5e={c-CXb1Prf5VcB|_9WUALIXwOLU5fww-PCw+Q8jz8nV+9%KOtniOg* z)09pW2~nQFX(x!uBRpXtXa*!l19aRP98Q+p^90B)K$cd*Y9iq`zV*!)ZoTccp|Jnc zb9QXs-udW5fA@J679oB6Q#pex*`d0h6jSEptz4?Wwk>@0V;gB1y-JItw*go$#X@I3 zB}{L{V$pcu{;&Q1f&B;8lcp7OpHFbej|q;!z$pqiGD)I@i2OL<4u}gp{K&)KyY=?l zPltt`t@Zv*&*EQ{%Lg~JmkPNu*5 z)lHvy@9^QeSky*WXBVQjr7AAIBAh^I5}1-6PfBTA+^AIW={x@9r}zHVz55nZ==s{g z{rggX@uy$BbH$2Pr=NQExu?_V^mYKfqySy^{@e=SqoRNrSA{Z}@z{e8KJ>Z4!Q&}P zb|}84Qz=eGePMBLYBHpXCZ6Q}bdBZ-KYDfRKZ(_sqD2aYf|f`mehJ`b07e4hqeX%d zfxbBt0;<)jv1!vopBm`zPf@8W7LOqjk584rR1Ej{UvN%ghpI&MnaPadmv6oKw5G^m zsn#6LL?TfUS*I38AgjQ%pN6J(*GN`)!8X*#zWu}}Pn|m5PJ~ColN8BRl5>G-xy;2- zWqp??OO*YQ% z7TgFSnq)f?-c~z(e*i5|^vWVBt)wA4iuI1t*sQ8gZ zI^Dp9PD(1MN=q3a*WkDa>Tr@n$Ce*_|G%eInwR1T5Kxuva_>%$aMKasi-z8$wZg5h zyn1_3iqfR8Q7KnA-6bBVx-Msa!Q>-2UfZ$byI05pYedNIkjOMP{f60gi5=Se_B&kz zM~`+h*;y7!#S%|clp;)Ke2VK_1a;l1QuyZ0oBvbes^yY5Qw&Pb-$}X9Oaq#ApgVW{ zytlor?UkUMrRj?84JlZvg$y>smxpH%@gS^3gEf4;xx zx;0# zckbH#J2&5S-_As&r$ z>3ieGTi*T3{r7!--MY2Urc%i)O%-@ylb607y!hgGezxxq!}J4luzOIP z$q1tpu?>g74Uk=lss^df)&5xvrV#e(w8of4|@R^Ih(Ho@=7aP98h3_t0Jd z0C2#_5N*M@YwvtOdl=vO?moke8>_dWtuFwuk9+6C1W38X4*={%xLev#Y)np|up}>e z436Z2m#2DpGtdBlx)#+NgZ02uz%F=KccKPlp{f=FcE@Qztd&h*Cf<5@H+MrC8Gnj) z(h^Jaz^dUOTAE;WDvBY%3s1p-sa~E$UldgX@?9>9(cbA+fPlY4C>|ORogIZ>8xu3I z9*K+xtH{HkSQtzZtg0ptS3w|<$Rl7ym?BI8rm6skK@}BIFcp-t68Pr@VQ3@c2q+7* z!B1U`Ck==jh2o7;PzVSJkPlFjCy`wh;A(1W3NS?lMMWqB0rfpcq+qB}qObVx63}>G zEZNlO_gX3RH}@0$d)pv!w4pZ#NQ!YBYS?g7>8BBd*Z$DM2as13;(5nL9L0&FZkcu;^p-V?Mu=3XDs6< zA%BbZwLIsISFphQlKjY6yuLp}qxkQu@ugVc|KRh#n9hLznoMyg{KMRxk-rdtr@H?G zbZ6uj)ElKo#$zZXvL%V+`Fre`{mwX8QBfWSma%px;z$9$hj-TSa{?ZXq2M(jj6i}z z;c%!D%n}YqDXO3p5ppmj3I_WDHDQD%4nx8G9axD0`zx4)b0?hpSLiQ)qx49gB(ez! z$FM^Q0>)uc1QOW`!|;u}7seH@;7xS>ZiR^n%82Mo!4R={BeVvDu>^T{cN_}uq5{KV zk*ZK-BnAmpb3q`WYRbw=P#g}XNvsK;7}J8Mhl5k!YjfMN@^;~_}`_OlHD1pkMaDo)E%pE42f_AMumV= z!$aX}E^vlH2qmbRstX>9N5BY*Z~`8QL%Kk~JKjby#4t?4?BtgQ1pc$rW+&=A{eE<+ zD#92SBg+}r&vDy-8UJJWG|`-{I~JV#srMA#=a&WG z@A;0xV1H1G-N_a_BQSn+yZ=pK{dX?>F+ac!&v4#<$f6%GUlM^5fFa{`Tp1q!*DO`| zC*yrF{{Pu@tTFWT{e9_wXZl}q`v1lB zpR{7#Fho~8V^dUs{NrM0RIo_`&TFZcZKVpjlh9sy;PU}Z+B->IhSV@2Pf*!S6972q zV}#bRq~7XDU5gW%N*>Yjv;I7!(XBD0q#>;)#HJ9RB{A~|`cS@U_=d|-kcxJ3KhW^1 zXqZF{poN{)MaFhg0mKKo1zsdv)4$N)*P`iJ%f!W^iXJiU;0Fi>4mW%0LLDKkg=^L?dM|7i#mcyp$?%Msjr#*LzzR* z4zBCf0sxR_o>L*n&?hk;rx&bsb{!q(3^8LV1Kk}@s~K~oXB>ykPG~1+2!CE(-5@UJc-2F0QlOzO){{B`dHk!3DDP8TBg*8J?8yyX`3n@Rev5dLQm*l&uiek>F};1a|3i0J_{-Lz_~#Ig<`#Yz|f!zdRI z2064yKiYR~vzEm5oFm;ZeNPDU6)yg#Fs5av(#-X&N$$X9WGLc+&%p+&Dgel=s%o6E zebKj;wQV6+hKXGz)MQoe+XYnsxlV`KnkDpA@a@Jeq6F8X_f@dxaOHB?Q6>(MSt?}l z>n^SB)aH#4AhTm7a7`~JD8XAAus3uV_ibD7!zKyU0#r8v^!B^5&jZ1_qx0h-0bhC- zgjc6cw>Ma7GWZkc8f9;|;5>Zg5(I@k+J#Y1Z$&m)HAx$ga+O-MK*QoPh$(4SK{s81U%#ytW+T z3oP$e@u;eJz42~iaPT)nm6F@XB|ZA>bKodc7nlChEEnuBP}ZB(M#?NIj_K+y5r5%; z$x`c)z=AU+wRG@)We+<<{_eA-ilt}c4XWrNkzm;sAx;i&b#`$cah|<*+-a&J^u#Rl zAcyN4^r)z)xj;=PQNdQL}dg1iw^5$?+n~tRCXnHzshjh(W>uwE2sosy7~|Aw^=+swk_I z5)i?7Z`^qr%~L7)_*`sUoKY+iFy?jOtSAGt6g7RZ;W~fTI3p!pxcnEaoGB-8WSkWUsb*6LH z(yhn%jmPepQV883nNVU>K9n)>jo$!xI%bqL3}-j=7+=-}EjjP$RXsZVw8C6@zn|)j zE4GHWzqI(&Mi z+R&?kSSEOLOzcE=_@%Gzxe3(eW06QrgFukvb+AxWraQ*-n9kdX&IUcSh0=aIVf$SA zke5Xv(R^qq>r8)UuUA-aW>2Zi0x{&S3qL3NS<=~_F7G>;`;+`*E-UMQ-mg~(b#%Np zSQ(g?cs!i(+hp9%@j-8iY|ZQjjyAvO#OgNB6wU--)xOI5X#>c?DrZx4i$CWW3;bF<~$?%u9<>AA4i_Kk|tyjC1tjoRsZ_Zb^f%2jR#yojZFeA z0Y&GbDeaKpW6OC;&PIy3B;0yFV-aJ)*-?*d*oSAvOJJ zkN8p5C5X|C$>o!B5hL#1-a%*`uxL;Juw$-eKF0xlR{RT)zQsKn(CC2JI#&%>{j%OY z17>ke14X4cY^nD{mAP+hJ)ijK2CODM{DOyay5=EKiW(*K-nooOc^S>hf{f<9;uY|$ zqBj$Ca*!;Su|V3?8vShcXvM2`Z$wSjAp={U>{n9&?U{>Ludf^O1DeJ9Z(e`|#$10i zB*W#ka8)HnB1u7U^8AyOh!4#ak`o3?OEa-XpK-i2Yy45uXODu`Nke5&wj!F2jNsEb zy+2U@#j+Y}dZcgfnd_#-OG$p0YCUKCO7T?An zPX)GvE=lUL2(d^!Yx+6_Hzl(TIFwJ@5Oge_+tCc|c+u`jbqm2<01jM?-Y#Aw0SLxkjk-l8Jo zffYV^i;hXNVk}zE2eKqVlhH9`AG_nyFVB3)p*81;9r|pqTUpg}3vqSI43Bs}us z4CJmo*as@H%b1s565c)cmUi`=8{~7>o_xM~P*dcKh{)#_XqUq)X4id58_~2SRD~t8 zxkYlDKGGj%jMCDPI$E3*w$|yjzCvS5o12IMw=!4CLta8^z@z6zk&q#R=?IkfbI*;` zhA9PyTfFwmt9jfds!{|t2Q}KK$#7sBizaSuWb&ohfY6^TtI;@MM{j{jZnHWxqM|(npIyHK$U-z zc=>YVY#3gz(8GLS2=Db-WnWB^?bEWl7cchM4Gair(L#b(%7dND&s#|*w`|UgHKlK8 z_fS$Z+$zhQc83=&-LaOGoO~s`MwoulHTTdu_)~YSt=vKCF_rQPRs?e(F_HizO%>`NMP5kVInmXYn5yC|QL`BPa)se&GS?|iZ2S+P}> zO5*4fk+9K{)Avg3-idLF>JG)*So_t-U?}2fMWy<_H;Dcy0W&U2N@qS_pN$=1?4=~% zL4}ga8iP`+#;?M0vbUEU8&GJWofLR|5>p><+*>JKE{>qpBv` z+3_O9>$X`*_#J&2S2lBj~eVtc%I8CfN#YLn~ zYPO@d01LN+njCB$s=iEUZ7FP5lUVkWowj-F67YDAqKO*N+qxT67W1 zmAfBzD|H{cL|fVmAIkJV8HTkv)ok*Otl0(EeZ;a<_>3Jmdr3b+d=DIIR4tgBB$V0n z;F0+NM&poJqWX!P@>cIPJ{E<|TLTr>Jaan0(K;$oqZ8|F!XLYrKyKzRki8!=Q{a48|4`s7tygw{H zRYRpzHP*a8mz;r8v>|+pcYgi-IJ8vs$q59D@r40rk7`!zJN7^cr>&ULJTEl)VJ$n4hC=B(Rzsx%;}m=Axa(1 zmb_-0cV>99zQ1>^)IH(kjJmp(zHI)|t4r)0ubf7okJ++`rZslrf!5L@>A9}{hv$ez zE>(S5;UCo^!}^?DK1GI8$jR_SgoFAC@i^92Hi$htQ`6_GXm1BW+eI@T-e=s?6x51( zD6Xw;xz2ArW8Qat=wvTRMQ)&WxocrVHu(f){V6R(vij3YxnrzZI{5TB9w3w0HKU|Y z6Q@!=Jj%<0*RvNCD$@$vUTLWh&Y?E?O}E|{vmFRfH$QkVkrmBvL>&E)8{3>KbP38&ux0=6K0#-6XLGw0rs5N78h^Kq1AK z9yBhRgYraj`gM7-GcJH*o{O{Y7Y~~aowETw0Wss0Y*899XYT74*}M8yHJhoQKnXM~ zt5+t{y(;)KWm?cFQA;iJB?>i*Wm)+bA%$<^cI^!~9cr4Dn|_Y)aA0mDUAG9fLE3&V z>X@9G>cQNrgk57KQ}4+^`{A?;QySG8Jwe|{?JlDN># zLy||;pRcR{=?22)vD|dmM|QKwSo&<}$ZY0}Z2Z-ekVIFqXLRYq1Bup!E_Qqc3z>$@ zS)jy;tY)q(uuF=AJv!?(PkxqP zn)HGo?+auP->K#q15Bma5&c4iArAHX&qDLe(MG?0nUV6avs-CnQ{uiRgoHIbe~xH2 zw<6lR$P|p9XD*ux1&bSL`WMC&xHYFd`}Reu-T(F-mMIx4!6SoD^-KEe101^a++AKH z`%fgsk73kD8a5+aH!M$d(mZ3a)Ur|g8{?_(v~;|LfKdpsiVof@6WwNo z5$xs;cXe=@?brZ>u$c*gUpp%pR~ACDWsHQ51`+V{;iVVe*RP+d@FZWjPep8x)t5Gp zf7%=UNdE#Zaw?s6g_e8q!6n#vKD(;jR&RTo2~Ei&f?@*uIOD=uFH!6}o|QSYIkM=T zb}NShaXHfLnfFi;lXs#;YD5wAwX`~7_KTi@@`{?`witz)6Y{C2zA}M3N%!Mf$-gP; zTzg%|F&vO>Wp25hsbnhOQD!G-oTPcHS>no_(#x^$AHDr&Z74Nl|&ivJ+1^m)eXfM zRbp|C!;8m4u_9`(8kSiu89aQ@csVcwLRyN7)l$CZj|Lq+D3Vr6UwZw-$p%{ zNH|}G^iYxOC-(AS4X$%9H=SFmIOw*jxIJgOB_5M>u!pIh-j=;D9)dKUw zUgL|vlu3w=Pp0g2)Xp+ly3qPPld-+yV;5>Gqy+hqBc08L`yfNR!$z2v?w zH_a-2j^!g?&-sl_cwEGcA{GaL#w`JJ_tz9Zw5tZIeQDZWJJxXm*Mv=R?t)jLyOlOR z(yj9>quWGikz84J%3@M;j4nk+Wc}yaZO;d zg%59sUy*R!!#Tf1YZ6vP`eyo3-8i1GIcF=Yt9qQpr=(e>r9gRPDA#i0i(Il?#fBTb zdT>O{drh^k*Xq1$u=Wk-HKfU-M9mM~+g*ow6gLh!QZIZS3b>%QIn1)}g=%_WN>^2F zhUL5Z&tRe0)r4_S+Co@&gRgoe;{{w1oGqQYr}wkT>FME{w_Arr(nUt*wER2M3OOFP zJM58NA35)uKI(jX5kGoZM4LiYz}c2jzI?3c5B}O9nnw1LeghYzpl;8zZ@pL;rmnP2 zWYho%kAxsG>It;o+|8pkAVi}*_A7$mWGh(6Iw5gqRF3#y$v1PowX^cW511}t)F ziS8P8)e062A=R$Z&y60fV`b(MePZ`i&^Gbm({EFSBCCa3TjsBP9LDTSwd^*kN47WZ z`aR#;+doZMjZqy&<*;6PNwa^%cm-ieoy#MoIX1@}3)MfAcd! zPNCiUt&ZW}9_(FA0s;chmaI&9C8Yz>_N0M938R`Z((E_)sA&RywvN`>0q2U+FHB4U zokvAPchwkki0>bq=w%AmNvqwvu^(yNxo4f9d|#dVdCtUjch#UMiTU-2 z-J{CPNneu%CHGJmfE1w0GYO7TwXj2BI#=BSPZwB7*$h4gL7qy6X-^GSYks&;){YNR z+Jx(Xg%6!iy(e-#djD~oi<0W0)i0*}n0l!E{^W7p1y%twjv0CshO-e7J4LO8*}2K0%YFy|A_R7Z2#5i&3Dy2jpY56DXOiKF^u8EJx-u;3?Eh%f>(QN!(8Sp- a(U}ALUfQ8=-P!qzhLQeBbb+pO*#802ti~n) diff --git a/src/assets/mesh/mark/inside/ygc/YGC.gltf.manifest b/src/assets/mesh/mark/inside/ygc/YGC.gltf.manifest index 1781cb5..e369002 100644 --- a/src/assets/mesh/mark/inside/ygc/YGC.gltf.manifest +++ b/src/assets/mesh/mark/inside/ygc/YGC.gltf.manifest @@ -1,5 +1,5 @@ { - "version" : 1, + "version" : 2, "enableSceneOffline" : true, "enableTexturesOffline" : true } \ No newline at end of file