zjs_project 1 рік тому
батько
коміт
a1003cb436

+ 2 - 0
src/components/krpanoVideo/index.vue

@@ -161,6 +161,7 @@
 					if(image_hotspot){
 						image_hotspot.scale = item.scale;
 					}
+					this.scale = item.scale;
 				}
 				if(item.ath){
 					let object = this.panoramicKrpano.get("hotspot[video]");
@@ -332,6 +333,7 @@
 					// this.playVideo();//播放绿幕视频
 					if(this.peopleData && this.peopleData.ath){
 						this.initPeople(this.peopleData)
+						this.updataVideoSize(this.peopleData);
 					}
 					if(this.petData && this.petData.ath){
 						this.initPet(this.petData)

+ 6 - 3
src/components/krpanoVideo/panoramic_no_drag.xml

@@ -84,9 +84,9 @@
 		>
 		</hotspot>
 		<!-- 电子人的阴影 -->
-		<!-- <hotspot name="image_hotspot" ath="50.082" atv="14" rotate="-45.0" zorder="1"
-			distorted="true" scale="0.5" alpha="0.5"
-			url="https://dm.static.elab-plus.com/miniProgram/grass.jpg" keep="true"></hotspot> -->
+		<hotspot name="image_hotspot" ath="50.082" atv="14" rotate="0" zorder="1"
+			distorted="true" scale="1" alpha="0.5" visible="false" width="180" height="320"
+			url="https://dm.static.elab-plus.com/miniProgram/shadow11.png" keep="true"></hotspot>
 		<!-- 宠物视频 -->
 		<hotspot name="petVideo"
 			ath="80.0" 
@@ -150,6 +150,8 @@
 		    <!-- showlog(true, top); -->
 		    <!-- mobilescale(); -->
 		    <!-- 播放视频 -->
+			set(hotspot[video].visible, 'true');
+			set(hotspot[image_hotspot].visible, 'true');
 		    hotspot[video].playvideo(%1, '', false);
 			set(hotspot[video].scale, get(scale));
 		</action>
@@ -158,6 +160,7 @@
 			<!-- hotspot[video].playvideo('', '', false); -->
 			hotspot[video].stop();
 			set(hotspot[video].visible, get(false));
+			set(hotspot[image_hotspot].visible, get(false));
 		</action>
 		<!-- 显示数字宠物 -->
 		<action name="playPetVideo">

+ 3 - 0
src/components/newBottomCom/viewAI/viewAI.vue

@@ -575,7 +575,10 @@
 								url:this.leftList[this.peopleIndex].url,
 								ath:_ps.peopleAth,
 								atv:_ps.peopleAtv,
+								width:this.leftList[this.peopleIndex].width || '',
+								height:this.leftList[this.peopleIndex].height || '',
 								scale:this.$parent.peopleScale,
+								userUpload:this.peopleIndex==0?true:false,//是否使用了个人形象
 							}
 							url += '&AIPeople=' + encodeURIComponent(JSON.stringify(people))
 						}