diff --git a/xiaofang/Assets/Res/gsj/host.meta b/xiaofang/Assets/Res/gsj/host.meta new file mode 100644 index 00000000..05252b3d --- /dev/null +++ b/xiaofang/Assets/Res/gsj/host.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 791d21ac34833d243adbd2370abb7375 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png b/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png new file mode 100644 index 00000000..e2c6a22c Binary files /dev/null and b/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png differ diff --git a/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png.meta b/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png.meta new file mode 100644 index 00000000..2090fb7d --- /dev/null +++ b/xiaofang/Assets/Res/gsj/host/icn_duijiangji_light.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 04d8d49b4b0957f40833bbfb8718f451 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Res/gsj/icn_preparing.png b/xiaofang/Assets/Res/gsj/host/icn_preparing.png similarity index 100% rename from xiaofang/Assets/Res/gsj/icn_preparing.png rename to xiaofang/Assets/Res/gsj/host/icn_preparing.png diff --git a/xiaofang/Assets/Res/gsj/icn_preparing.png.meta b/xiaofang/Assets/Res/gsj/host/icn_preparing.png.meta similarity index 100% rename from xiaofang/Assets/Res/gsj/icn_preparing.png.meta rename to xiaofang/Assets/Res/gsj/host/icn_preparing.png.meta diff --git a/xiaofang/Assets/Res/gsj/icn_zbjx@3x.png b/xiaofang/Assets/Res/gsj/host/icn_zbjx@3x.png similarity index 100% rename from xiaofang/Assets/Res/gsj/icn_zbjx@3x.png rename to xiaofang/Assets/Res/gsj/host/icn_zbjx@3x.png diff --git a/xiaofang/Assets/Res/gsj/icn_zbjx@3x.png.meta b/xiaofang/Assets/Res/gsj/host/icn_zbjx@3x.png.meta similarity index 100% rename from xiaofang/Assets/Res/gsj/icn_zbjx@3x.png.meta rename to xiaofang/Assets/Res/gsj/host/icn_zbjx@3x.png.meta diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png b/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png new file mode 100644 index 00000000..d6f04596 Binary files /dev/null and b/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png differ diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png.meta b/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png.meta new file mode 100644 index 00000000..bb2e60df --- /dev/null +++ b/xiaofang/Assets/Res/gsj/host/img_intercom_point01.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: fdbd0836371595d46aad3d711a72f08d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png b/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png new file mode 100644 index 00000000..012ee6c2 Binary files /dev/null and b/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png differ diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png.meta b/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png.meta new file mode 100644 index 00000000..a0040164 --- /dev/null +++ b/xiaofang/Assets/Res/gsj/host/img_intercom_point02.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 7a69175e85b068a4ebe50630f2bb7d87 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png b/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png new file mode 100644 index 00000000..243db85e Binary files /dev/null and b/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png differ diff --git a/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png.meta b/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png.meta new file mode 100644 index 00000000..9f0a7e51 --- /dev/null +++ b/xiaofang/Assets/Res/gsj/host/img_intercom_point03.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 1becbe0696cf16946bf3a00a0909c483 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Res/gsj/img_recordtape_large.png b/xiaofang/Assets/Res/gsj/host/img_recordtape_large.png similarity index 100% rename from xiaofang/Assets/Res/gsj/img_recordtape_large.png rename to xiaofang/Assets/Res/gsj/host/img_recordtape_large.png diff --git a/xiaofang/Assets/Res/gsj/img_recordtape_large.png.meta b/xiaofang/Assets/Res/gsj/host/img_recordtape_large.png.meta similarity index 100% rename from xiaofang/Assets/Res/gsj/img_recordtape_large.png.meta rename to xiaofang/Assets/Res/gsj/host/img_recordtape_large.png.meta diff --git a/xiaofang/Assets/Res/gsj/jiejin1.wav b/xiaofang/Assets/Res/gsj/host/jiejin1.wav similarity index 100% rename from xiaofang/Assets/Res/gsj/jiejin1.wav rename to xiaofang/Assets/Res/gsj/host/jiejin1.wav diff --git a/xiaofang/Assets/Res/gsj/jiejin1.wav.meta b/xiaofang/Assets/Res/gsj/host/jiejin1.wav.meta similarity index 100% rename from xiaofang/Assets/Res/gsj/jiejin1.wav.meta rename to xiaofang/Assets/Res/gsj/host/jiejin1.wav.meta diff --git a/xiaofang/Assets/Res/gsj/scripts/Panel2.cs b/xiaofang/Assets/Res/gsj/scripts/Panel2.cs index 80d6e0c2..1c24e9fc 100644 --- a/xiaofang/Assets/Res/gsj/scripts/Panel2.cs +++ b/xiaofang/Assets/Res/gsj/scripts/Panel2.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; using System.Threading.Tasks; public class Panel2 : MonoBehaviour { + public static Panel2 instance; private Toggle toggle;//角色名是否出现 private Button follow;//跟随查按钮 private Button end;//结束按钮 @@ -16,11 +17,14 @@ public class Panel2 : MonoBehaviour private GameObject peopleposition; public Camera godView; // 上帝视角的位置 - + public List playerCameras = new List(); // 存储每个角色的摄像机 private bool isGodView = true; // 是否为上帝视角 + public int currentCameraIndex = -1; + // Start is called before the first frame update void Start() { + instance = this; godView=GameObject.Find("TopCamera").GetComponent(); toggle =transform.Find("right/under/Toggle").GetComponent(); toggle.onValueChanged.AddListener(OnToggleValueChanged); @@ -30,7 +34,7 @@ public class Panel2 : MonoBehaviour follow.onClick.AddListener(FollowBtn); end = transform.Find("left/btn_enddrill").GetComponent