This commit is contained in:
高国正 2023-09-15 23:13:23 +08:00
parent f78004f626
commit 8a1ed776d7
53 changed files with 866 additions and 6682 deletions

View File

@ -310,9 +310,6 @@
<Reference Include="Interop.SpeechLib">
<HintPath>Assets\Adam\Plugins\Interop.SpeechLib.dll</HintPath>
</Reference>
<Reference Include="AutoMapper">
<HintPath>Assets\Packages\AutoMapper.12.0.1\lib\netstandard2.1\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>Assets\Adam\Plugins\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: dbf134857daf7df428aa31cdd055514f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: b3fad56c531ac5a4db190a745f589a8e
folderAsset: yes
timeCreated: 1510280304
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: 8dc1be91775c4bb469f6b74cef450eaa
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2018 Patrick McCarthy
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1d9014b99ad06af428514a5902d29ff3
timeCreated: 1573248500
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,110 +0,0 @@
What is NuGetForUnity?
NuGetForUnity is a NuGet client built from scratch to run inside the Unity Editor. NuGet is a package management system
which makes it easy to create packages that are distributed on a server and consumed by users. NuGet supports sematic
versioning for packages as well as dependencies on other packages.
You can learn more about NuGet here: nuget.org
NuGetForUnity provides a visual editor window to see available packages on the server, see installed packages, and see
available package updates. A visual interface is also provided to create and edit .nuspec files in order to define and publish
your own NuGet packages from within Unity.
How do I install NuGetForUnity?
Install the provided Unity package into your Unity project. Located here.
How do I use NuGetForUnity?
To launch, select NuGet → Manage NuGet Packages
After several seconds (it can take some time to query the server for packages), you should see a window like this:
The Online tab shows the packages available on the NuGet server.
Enable Show All Versions to list all old versions of a package (doesn't work with nuget.org).
Disable Show All Versions to only show the latest version of a package.
Enable Show Prelease to list prerelease versions of packages (alpha, beta, release candidate, etc).
Disable Show Prerelease to only show stable releases.
Type a search term in the Search box to filter what is displayed.
Press the Refresh button to refresh the window with the latest query settings. (Useful after pushing a new package to the
server and wanting to see it without closing and reopening the window.)
The name of the package, the version of the package (in square brakets), and a description are displayed.
Click the View License to open the license in a web browser.
Click the Install to install the package. Note: If the package is already installed an Uninstall button will be displayed which lets
you uninstall the package.
The Installed tabs shows the packages already installed in the current Unity project.
Click the Uninstall button to uninstall the package.
The Updates tab shows the packages currently installed that have updates available on the server.
The version in brackets on the left is the new version number. The version in brackets in the Update button is the currently
installed version.
Click the Update button to uninstall the current package and install the new package.
How does NuGetForUnity work?
NuGetForUnity loads the NuGet.config file in the Unity project (automatically created if there isn't already one) in order to
determine the server it should pull packages down from and push packages up to. By default, this server is set to the
nuget.org package source.
The default NuGet.config file:
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NuGet" value="http://www.nuget.org/api/v2/" />
</packageSources>
<activePackageSource>
<add key="NuGet" value="http://www.nuget.org/api/v2/" />
</activePackageSource>
<config>
<add key="repositoryPath" value="./Packages" />
<add key="DefaultPushSource" value="http://www.nuget.org/api/v2/" />
</config>
</configuration>
You can change this to any other NuGet server (such as NuGet.Server or ProGet - see below). The NuGet → Reload
NuGet.config menu item is useful if you are editing the NuGet.config file.
See more information about NuGet.config files here: https://docs.nuget.org/consume/nuget-config-settings
NuGetForUnity installs packages into the local repository path defined in the NuGet.config file ( repositoryPath ). By default,
this is set to the Assets/Packages folder. In the NuGet.config file, this can either be a full path, or it can be a relative path
based on the project's Assets folder. Note: You'll probably want your Packages folder to be ignored by your version control
software to prevent NuGet packages from being versioned in your repository.
When a package is installed, the packages.config file in the project is automatically updated with the specific package
information, as well as all of the dependencies that are also installed. This allows for the packages to be restored from scratch
at any point. The Restore operation is automatically run every time the project is opened or the code is recompiled in the
project. It can be run manually by selecting the NuGet → Restore Packages menu item.
Note: Depending on the size and number of packages you need to isntalled, the Restore operation could take a long time,
so please be patient. If it appears the Unity isn't launching or responding, wait a few more minutes before attempting to kill
the process.
If you are interested in the process NuGetForUnity follows or you are trying to debug an issue, you can force NuGetForUnity
to use verbose logging to output an increased amount of data to the Unity console. Add the line <add key="verbose"
value="true" /> to the <config> element in the NuGet.config file. You can disable verbose logging by either setting the
value to false or completely deleting the line.
The .nupkg files downloaded from the NuGet server are cached locally in the current user's Application Data folder.
( C:\Users\[username]\AppData\Local\NuGet\Cache ). Packages previously installed are installed via the cache folder instead of
downloading it from the server again.
How do I create my own NuGet packages from within Unity?
First, you'll need to create a .nuspec file that defines your package. In your Project window, right click where you want the
.nuspec file to go and select NuGet → Create Nuspec File.
Select the new .nuspec file and you should see something like this:
Input the appropriate information for your package (ID, Version, Author, Description, etc). Be sure to include whatever
dependencies are required by your package.
Press the Pack button to pack your package into a .nupkg file that is saved in the C:\Users\
[username]\AppData\Local\NuGet\Cache folder.
Press the Push button to push your package up to the server. Be sure to set the correct API Key that give you permission to
push to the server (if you server is configured to use one).
How do I create my own NuGet server to host NuGet
packages?
You can use NuGet.Server, NuGet Gallery, ProGet, etc to create your own NuGet server.
Alternatively, you can use a "local feed" which is just a folder on your hard-drive or a network share.
Be sure to set the proper URL/path in the NuGet.config file and you should be good to go!
Read more information here: http://docs.nuget.org/create/hosting-your-own-nuget-feeds

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 83c5d2001771f15429a88d67e81366d6
timeCreated: 1517876157
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 1738075a39a390447b7a620ca6962142
folderAsset: yes
timeCreated: 1510280362
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -1,88 +0,0 @@
fileFormatVersion: 2
guid: eec19781926cd2248b7c9abfde8db555
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 215e43cda847e6d44af8b40376eeed8a
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8ac4ba33e51537741aab4e936235035c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f5bc329c4e62b2c4c9070d24a2b67a41
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,75 +0,0 @@
![AutoMapper](https://camo.githubusercontent.com/603a9fdf1c6578e4df423ecdb784cb5d634e016850c10ba0798970fd48c55d41/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6175746f6d61707065722f6c6f676f2e706e67)
[![CI](https://github.com/automapper/automapper/workflows/CI/badge.svg)](https://github.com/AutoMapper/AutoMapper/actions?query=workflow%3ACI)
[![NuGet](http://img.shields.io/nuget/vpre/AutoMapper.svg?label=NuGet)](https://www.nuget.org/packages/AutoMapper/)
[![MyGet (dev)](https://img.shields.io/myget/automapperdev/vpre/AutoMapper.svg?label=MyGet)](https://myget.org/feed/automapperdev/package/nuget/AutoMapper)
### What is AutoMapper?
AutoMapper is a simple little library built to solve a deceptively complex problem - getting rid of code that mapped one object to another. This type of code is rather dreary and boring to write, so why not invent a tool to do it for us?
This is the main repository for AutoMapper, but there's more:
* [Microsoft DI Extensions](https://github.com/AutoMapper/AutoMapper.Extensions.Microsoft.DependencyInjection)
* [Collection Extensions](https://github.com/AutoMapper/AutoMapper.Collection)
* [Expression Mapping](https://github.com/AutoMapper/AutoMapper.Extensions.ExpressionMapping)
* [EF6 Extensions](https://github.com/AutoMapper/AutoMapper.EF6)
* [IDataReader/Record Extensions](https://github.com/AutoMapper/AutoMapper.Data)
* [Enum Extensions](https://github.com/AutoMapper/AutoMapper.Extensions.EnumMapping)
### How do I get started?
First, configure AutoMapper to know what types you want to map, in the startup of your application:
```csharp
var configuration = new MapperConfiguration(cfg =>
{
cfg.CreateMap<Foo, FooDto>();
cfg.CreateMap<Bar, BarDto>();
});
// only during development, validate your mappings; remove it before release
#if DEBUG
configuration.AssertConfigurationIsValid();
#endif
// use DI (http://docs.automapper.org/en/latest/Dependency-injection.html) or create the mapper yourself
var mapper = configuration.CreateMapper();
```
Then in your application code, execute the mappings:
```csharp
var fooDto = mapper.Map<FooDto>(foo);
var barDto = mapper.Map<BarDto>(bar);
```
Check out the [getting started guide](https://automapper.readthedocs.io/en/latest/Getting-started.html). When you're done there, the [wiki](https://automapper.readthedocs.io/en/latest/) goes in to the nitty-gritty details. If you have questions, you can post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/automapper) or in our [Gitter](https://gitter.im/AutoMapper/AutoMapper).
### Where can I get it?
First, [install NuGet](http://docs.nuget.org/docs/start-here/installing-nuget). Then, install [AutoMapper](https://www.nuget.org/packages/AutoMapper/) from the package manager console:
```
PM> Install-Package AutoMapper
```
Or from the .NET CLI as:
```
dotnet add package AutoMapper
```
### Do you have an issue?
First check if it's already fixed by trying the [MyGet build](https://automapper.readthedocs.io/en/latest/The-MyGet-build.html).
You might want to know exactly what [your mapping does](https://automapper.readthedocs.io/en/latest/Understanding-your-mapping.html) at runtime.
If you're still running into problems, file an issue above.
### License, etc.
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
AutoMapper is Copyright &copy; 2009 [Jimmy Bogard](https://jimmybogard.com) and other contributors under the [MIT license](LICENSE.txt).
### .NET Foundation
This project is supported by the [.NET Foundation](https://dotnetfoundation.org).

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2623992dedb8e904d9304fed457f1185
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -1,98 +0,0 @@
fileFormatVersion: 2
guid: a8100efd47f79b84b92592319e59764f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 311c404e58c1e2f49b0a29f2e6bd8d7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 35ee67e92be19cb4ca8e2c2da6507ddb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,23 +0,0 @@
fileFormatVersion: 2
guid: 67ea87c5c77cdbf439ff12f600ab45ba
labels:
- NuGetForUnity
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 1777d27f495eb7e4c810e03a88823eae
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f2f45a901a877f34d8af1dc431be9abf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 1d41f4959e2e98647938b30050873ab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4b90f445dcdc3d8438d24cc7e5c3b9f7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 523f8a50e06bb3b49ae4b47f7881a5ef
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -195017,11 +195017,11 @@ MonoBehaviour:
xlz_sc:
xllx_sc:
arguments:
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ2OTcxMjEsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.DU-CMUu87u2EZLScKoV5NIkoxfG013lNs9nrIh-HCZI
heatThresholdValueMax: 38
heatThresholdValueMin: 26
humidityThresholdValueMax: 90
humidityThresholdValueMin: 70
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ4NTAyODksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.j0JKoTpsQ3upAbreBLVTMZEsYMfN5WtEI810C7TCjLg
heatThresholdValueMax:
heatThresholdValueMin:
humidityThresholdValueMax:
humidityThresholdValueMin:
isLoading: 0
Cabinet_quYu:
- {fileID: 0}
@ -213116,8 +213116,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
is_open: 0
is_rotating: 0
close_angle: {x: 0, y: 0, z: 0}
open_angle: {x: 0, y: 0, z: -90}
close_angle: {x: 0, y: 0, z: -180}
open_angle: {x: 0, y: 0, z: 90}
another_door: {fileID: 0}
--- !u!1 &1983618591
GameObject:

View File

@ -0,0 +1,652 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1134598145
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1134598148}
- component: {fileID: 1134598147}
- component: {fileID: 1134598146}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1134598146
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1134598145}
m_Enabled: 1
--- !u!20 &1134598147
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1134598145}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1134598148
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1134598145}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1470320783
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1470320785}
- component: {fileID: 1470320784}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1470320784
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1470320783}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1470320785
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1470320783}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1789179022
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1789179026}
- component: {fileID: 1789179025}
- component: {fileID: 1789179024}
- component: {fileID: 1789179023}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1789179023
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789179022}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1789179024
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789179022}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1789179025
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789179022}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1789179026
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789179022}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2015993432
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2015993436}
- component: {fileID: 2015993435}
- component: {fileID: 2015993434}
- component: {fileID: 2015993433}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2015993433
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2015993432}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 625b10f037a004044958c13bd4a03e4e, type: 3}
m_Name:
m_EditorClassIdentifier:
Jk_URL:
sb_cx:
sb_xz:
sb_sc:
sb_bj:
dk_cx:
dk_xz:
dk_sc:
dk_bj:
hj_cx:
gj_cx:
gzp_cx:
jxp_cx:
xlz_cx:
xlz_xz:
xlz_sc:
xllx_sc:
arguments:
token:
heatThresholdValueMax:
heatThresholdValueMin:
humidityThresholdValueMax:
humidityThresholdValueMin:
isLoading: 0
Cabinet_quYu:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
nowDeviceID:
nowDevice: {fileID: 0}
lastDeviceID:
lastDevice: {fileID: 0}
nowCabine: {fileID: 0}
root_AllDevice:
code:
message:
data: []
serverTime:
Cabinets_go:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
Cabinets: []
Racks_go: []
Racks: []
MachineSlots_go: []
MachineSlots: []
TmsCards_go: []
TmsCards: []
root_AllPort:
code:
message:
totalRows:
pageSize: 0
pageNum: 0
data: []
TmsPorts_go: []
TmsPorts: []
nowLayerMask: 6
root_AllENV:
code:
message:
data: []
serverTime:
ENVs: []
root_AllAlarm:
code:
message:
data: []
serverTime:
tmsAlarms: []
search_box: {fileID: 0}
pop_ups:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
magnifyState: 0
isgonging: 0
editorMenu: {fileID: 0}
stagingPanel: {fileID: 0}
objectToShow: {fileID: 0}
objectToShow_add: {fileID: 0}
roomDoors: []
--- !u!114 &2015993434
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2015993432}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9c07789c54a1784784bce5a42fdbe09, type: 3}
m_Name:
m_EditorClassIdentifier:
current_videoNumber:
isVideoPlay: 0
isWorkPlay: 0
gameManager: {fileID: 2015993433}
bt: {fileID: 0}
--- !u!114 &2015993435
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2015993432}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 63d5830c029ba6d4eb84a0706081bc10, type: 3}
m_Name:
m_EditorClassIdentifier:
gameObjects: []
Uwei:
- {fileID: 0}
prefab: {fileID: 0}
port:
deviceId:
conDevice:
conPort:
UI_follow: {fileID: 0}
redactDevice: {fileID: 0}
f_old: {fileID: 0}
f_new: {fileID: 0}
font_old: {fileID: 12800000, guid: 2a077a6e99f4a0e48a49176c2bc40182, type: 3}
font_new: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
originalObject: {fileID: 0}
--- !u!4 &2015993436
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2015993432}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 778587e0d32548844ba4b2b8d6aae431
guid: d81bff3c4034dac4ab07829df3a17ed9
DefaultImporter:
externalObjects: {}
userData:

View File

@ -44,9 +44,9 @@ public class CameraMgr : MonoSingleton<CameraMgr>
camera_Rt.SetTarget(viewTarget, _distance);
}
public void GotoView(Transform viewTarget, float _distance,Quaternion rotation)
public void GotoView(Transform viewTarget, float _distance, Quaternion rotation, float TargetPos_dis = -1)
{
camera_Rt.SetTarget(viewTarget, _distance,rotation);
camera_Rt.SetTarget(viewTarget, _distance, rotation, TargetPos_dis);
}
[ContextMenu("test")]

View File

@ -362,9 +362,11 @@ public class CameraRT : MonoBehaviour
x = _target.eulerAngles.y;
}
public void SetTarget(Transform _target, float _distance, Quaternion rotation)
public void SetTarget(Transform _target, float _distance, Quaternion rotation, float TargetPos_dis = -1)
{
target.position = _target.position;
if (TargetPos_dis == 0)
target.position += (Vector3.up * 2);
distance = _distance;
cameraTransform.rotation = rotation;

View File

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="12.0.1" />
<package id="SimpleJson" version="0.38.0" />
<package id="System.Security.Cryptography.ProtectedData" version="4.5.0" />
</packages>

View File

@ -866,7 +866,7 @@ public class GameManager : MonoBehaviour
{
if (string.IsNullOrEmpty(jsonResult))
{
return;
callback.Invoke(null);
}
try
{
@ -913,7 +913,7 @@ public class GameManager : MonoBehaviour
{
if (string.IsNullOrEmpty(jsonResult1))
{
return;
callback.Invoke(null);
}
try
{
@ -955,7 +955,7 @@ public class GameManager : MonoBehaviour
{
if (string.IsNullOrEmpty(jsonResult2))
{
return;
callback.Invoke(null);
}
try
{
@ -1003,7 +1003,7 @@ public class GameManager : MonoBehaviour
{
if (string.IsNullOrEmpty(jsonResult3))
{
return;
callback.Invoke(null);
}
try
{
@ -1559,7 +1559,7 @@ public class GameManager : MonoBehaviour
for (int i = 0; i < roomDoors.Count; i++)
{
if(!roomDoors[i].is_open)
if (!roomDoors[i].is_open)
roomDoors[i].DoorOpen(true);
}
}
@ -1854,7 +1854,15 @@ public class GameManager : MonoBehaviour
if (ct != null)
{
Jk_URL = new webURL(ct);
StartCoroutine(Initialize());
StartCoroutine(Initialize((x) =>
{
if (string.IsNullOrEmpty(x))
{
SecondConfirmPanel.DeleteConform(null, "进入场景失败");
Debug.Log("接口获取数据失败(手动-初始化失败)");
LoadScene();
}
}));
}
else
{
@ -1926,29 +1934,42 @@ public class GameManager : MonoBehaviour
string filePath = Application.streamingAssetsPath + "/dz.txt";
UnityWebRequest www = UnityWebRequest.Get(filePath);
DownloadHandlerBuffer dH = new DownloadHandlerBuffer();
www.downloadHandler = dH;
//www.timeout = 15;
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.Success)
{
// 等待一帧
yield return null;
// 检查请求是否已完成
while (!www.isDone)
{
yield return null;
}
string fileContent = www.downloadHandler.text;
Debug.Log("获取穿透成功" /*+ fileContent + "Token" + Inst.arguments.token*/);
if (string.IsNullOrEmpty(fileContent))
{
callback(null);
yield break;
}
callback(fileContent);
else
{
Debug.Log("获取穿透成功");
callback(fileContent);
}
}
else
{
Debug.LogError("获取穿透失败: " + www.error);
callback(null);
Debug.LogError("Error: " + www.error);
}
}
// 获取接口信息
public IEnumerator Initialize(Action<string> callback = null)
public IEnumerator Initialize(Action<string> callback)
{
yield return null;
//Debug.Log("@@10");
@ -1995,7 +2016,10 @@ public class GameManager : MonoBehaviour
}));
}
else
{
callback.Invoke(null);
//callback?.Invoke("1");
}
}));
//Debug.Log("@@13");//???
@ -2034,7 +2058,7 @@ public class GameManager : MonoBehaviour
Debug.Log("@@9");
//三维场景加载时显示地图
Application.ExternalCall("OnSceneLoaded", "三维加载完成");
Debug.Log("@@10");
Debug.Log("@@10 三维加载完成");
isLoading = true;
if (CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_线缆连接_配置)

View File

@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Networking;
@ -150,33 +151,49 @@ public static class CombineJSON
/// <returns></returns>
public static IEnumerator GetJson_POST(string apiUrl, string token, Action<string> callback)
{
using (UnityWebRequest request = UnityWebRequest.Post(apiUrl, ""))
//using (UnityWebRequest request = UnityWebRequest.Post(apiUrl, ""))
UnityWebRequest request = new UnityWebRequest(apiUrl, "POST");
{
request.SetRequestHeader("X-Token", token);
request.SetRequestHeader("Content-Type", "application/json");
DownloadHandlerBuffer dH = new DownloadHandlerBuffer();
request.downloadHandler = dH;
//request.timeout = 15;
yield return request.SendWebRequest();
if (!request.isNetworkError && !request.isHttpError)
{
if (request.downloadHandler != null)
// 等待一帧
yield return null;
// 检查请求是否已完成
while (!request.isDone)
{
yield return null;
}
//if (request.downloadHandler.text != null)
if (!string.IsNullOrEmpty(request.downloadHandler.text))
//byte[] responseData = request.downloadHandler.data;
//if (responseData != null && responseData.Length > 0)
{
string responseText = request.downloadHandler.text;
//Debug.Log(responseText);
//string responseText = Encoding.UTF8.GetString(responseData);
callback(responseText);
}
else
{
Debug.Log(apiUrl + " request.downloadHandler为null");
Debug.Log(apiUrl + " request.downloadHandler.text为null");
callback.Invoke(null);
}
}
else
{
Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
Debug.Log(apiUrl + " 请求POST接口失败: " + request.error + "\nURL: " + apiUrl + "\nrequest.downloadHandler:" + request.downloadHandler.text);
callback.Invoke(null);
}
}
}
}
/// <summary>
@ -189,32 +206,47 @@ public static class CombineJSON
/// <returns></returns>
public static IEnumerator UpdateJson_POST(string apiUrl, string token, string newData, Action<string> callback)
{
using (UnityWebRequest request = new UnityWebRequest(apiUrl, "POST"))
//using (UnityWebRequest request = new UnityWebRequest(apiUrl, "POST"))
UnityWebRequest request = new UnityWebRequest(apiUrl, "POST");
{
request.SetRequestHeader("X-Token", token);
request.SetRequestHeader("Content-Type", "application/json");
byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(newData);
DownloadHandlerBuffer dH = new DownloadHandlerBuffer();
request.uploadHandler = new UploadHandlerRaw(bodyRaw);
request.downloadHandler = new DownloadHandlerBuffer();
request.downloadHandler = dH;
//request.timeout = 15;
yield return request.SendWebRequest();
if (request.result == UnityWebRequest.Result.Success)
{
if (request.downloadHandler != null)
// 等待一帧
yield return null;
// 检查请求是否已完成
while (!request.isDone)
{
yield return null;
}
//if (request.downloadHandler.text != null)
if (!string.IsNullOrEmpty(request.downloadHandler.text))
//byte[] responseData = request.downloadHandler.data;
//if (responseData != null && responseData.Length > 0)
{
string responseText = request.downloadHandler.text;
//string responseText = Encoding.UTF8.GetString(responseData);
callback?.Invoke(responseText);
}
else
{
Debug.Log(apiUrl + " request.downloadHandler为空");
Debug.Log(apiUrl + " request.downloadHandler.text为空");
callback.Invoke(null);
}
}
else
{
Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
Debug.Log(apiUrl + " 请求POST接口失败: " + request.error + "\nURL: " + apiUrl);
callback.Invoke(null);
}
}
@ -233,7 +265,7 @@ public static class CombineJSON
if (!request.isNetworkError && !request.isHttpError)
{
if (request.downloadHandler != null)
if (request.downloadHandler.text != null)
{
string jsonResult = request.downloadHandler.text;
//Debug.Log(jsonResult);
@ -241,7 +273,7 @@ public static class CombineJSON
}
else
{
Debug.Log("request.downloadHandler为null");
Debug.Log("request.downloadHandler.text为null");
callback.Invoke(null);
}
}
@ -255,29 +287,44 @@ public static class CombineJSON
public static IEnumerator GetJson_GET(string apiUrl, string token, Action<string> callback)
{
using (UnityWebRequest request = UnityWebRequest.Get(apiUrl))
//using (UnityWebRequest request = UnityWebRequest.Get(apiUrl))
UnityWebRequest request = UnityWebRequest.Get(apiUrl);
{
request.SetRequestHeader("X-Token", token);
DownloadHandlerBuffer dH = new DownloadHandlerBuffer();
request.downloadHandler = dH;
//request.timeout = 15;
yield return request.SendWebRequest();
if (request.result == UnityWebRequest.Result.Success)
{
string responseBody = request.downloadHandler.text;
if (request.downloadHandler != null)
// 等待一帧
yield return null;
// 检查请求是否已完成
while (!request.isDone)
{
yield return null;
}
//string responseBody = request.downloadHandler.text;
//if (request.downloadHandler.text != null)
if (!string.IsNullOrEmpty(request.downloadHandler.text))
// byte[] responseData = request.downloadHandler.data;
//if (responseData != null && responseData.Length > 0)
{
string responseText = request.downloadHandler.text;
//string responseText = Encoding.UTF8.GetString(responseData);
callback?.Invoke(responseText);
}
else
{
Debug.Log(apiUrl + " request.downloadHandler为空");
Debug.Log(apiUrl + " request.downloadHandler.text为空");
callback.Invoke(null);
}
}
else
{
Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
Debug.Log(apiUrl + " 请求Get接口失败: " + request.error + "\nURL: " + apiUrl);
callback.Invoke(null);
}
}
@ -297,29 +344,44 @@ public static class CombineJSON
// yield return null;
//}
using (UnityWebRequest request = UnityWebRequest.Post(apiUrl, ""))
//using (UnityWebRequest request = UnityWebRequest.Post(apiUrl, ""))
UnityWebRequest request = new UnityWebRequest(apiUrl, "POST");
{
request.SetRequestHeader("X-Token", token);
request.SetRequestHeader("Content-Type", "application/json");
DownloadHandlerBuffer dH = new DownloadHandlerBuffer();
request.downloadHandler = dH;
request.timeout = 15;
yield return request.SendWebRequest();
if (!request.isNetworkError && !request.isHttpError)
{
if (request.downloadHandler != null)
// 等待一帧
yield return null;
// 检查请求是否已完成
while (!request.isDone)
{
yield return null;
}
//if (request.downloadHandler.text != null)
if (!string.IsNullOrEmpty(request.downloadHandler.text))
// byte[] responseData = request.downloadHandler.data;
//if (responseData != null && responseData.Length > 0)
{
string responseText = request.downloadHandler.text;
//Debug.Log(responseText);
//string responseText = Encoding.UTF8.GetString(responseData);
callback(responseText);
}
else
{
Debug.Log("request.downloadHandler为null");
Debug.Log("request.downloadHandler.text为null");
}
}
else
{
Debug.Log("请求POST接口失败: " + request.error);
callback.Invoke(null);
Debug.Log("请求POST接口失败: " + request.error + "\nURL: " + apiUrl);
}
}
yield return new WaitForSeconds(looptime);

View File

@ -1,4 +1,4 @@
using AutoMapper;
//using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
@ -222,19 +222,19 @@ public class TOOL : MonoBehaviour
[ContextMenu("修改机柜")]
public void dsadsa()
{
var objA = gameObjects[0].GetComponent<DeviceQuery>().deviceList;
//var objA = gameObjects[0].GetComponent<DeviceQuery>().deviceList;
MapperConfiguration config = new MapperConfiguration(cfg =>
{
cfg.CreateMap<RedactDevice.Body, DeviceQuery.DeviceList>();
cfg.CreateMap<DeviceQuery.DeviceList, RedactDevice.Body>();
});
//MapperConfiguration config = new MapperConfiguration(cfg =>
//{
// cfg.CreateMap<RedactDevice.Body, DeviceQuery.DeviceList>();
// cfg.CreateMap<DeviceQuery.DeviceList, RedactDevice.Body>();
//});
IMapper mapper = config.CreateMapper();
//IMapper mapper = config.CreateMapper();
// 转换 ClassA 到 ClassB
redactDevice.mybody = mapper.Map<RedactDevice.Body>(objA);
//// 转换 ClassA 到 ClassB
//redactDevice.mybody = mapper.Map<RedactDevice.Body>(objA);
}
[ContextMenu("xg端口碰撞器")]

View File

@ -51,7 +51,7 @@ public class WebInteraction : MonoBehaviour
/// 前端调用此方法传递Token
/// </summary>
/// <param name="token"></param>
public IEnumerator unity_token_value(string jsonData)
public void unity_token_value(string jsonData)
{
try
{
@ -72,11 +72,15 @@ public class WebInteraction : MonoBehaviour
}
//yield return null;
yield return (StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
{
if (ct != null)
{
GameManager.Inst.Jk_URL = new webURL(ct);
//Application.ExternalCall("OnSceneLoaded", "三维加载完成");
//Debug.Log("三维加载完成");
//return;
StartCoroutine(GameManager.Inst.Initialize((x) =>
{
if (!string.IsNullOrEmpty(x))
@ -135,13 +139,20 @@ public class WebInteraction : MonoBehaviour
gameManager.isgonging = true;
}
else
{
SecondConfirmPanel.DeleteConform(null, "进入场景失败");
Debug.Log("接口获取数据失败(初始化失败)");
gameManager.LoadScene();
}
}));
}
else
{
SecondConfirmPanel.DeleteConform(null, "接口地址错误");
Debug.Log("获取穿透错误!");
}
})));
}));
}

View File

@ -1,4 +1,4 @@
using AutoMapper;
//using AutoMapper;
using Newtonsoft.Json;
using System;
using System.Collections;
@ -167,6 +167,11 @@ public class AddDevice : MonoBehaviour
GameManager.Inst.lastDeviceID = URlreturn.data;
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(新增设备-初始化失败)");
}
}));
}
@ -217,6 +222,8 @@ public class AddDevice : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

View File

@ -1,4 +1,4 @@
using AutoMapper;
//using AutoMapper;
using Newtonsoft.Json;
using System;
using System.Collections;
@ -234,6 +234,11 @@ public class AddPort : MonoBehaviour
GameManager.Inst.lastDeviceID = URlreturn.data;
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(新增端口-初始化失败)");
}
}));
}
@ -277,6 +282,8 @@ public class AddPort : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));

View File

@ -27,6 +27,11 @@ public class DeleteDevice : MonoBehaviour
{
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(删除设备-初始化失败)");
}
}));
}
else
@ -76,6 +81,8 @@ public class DeleteDevice : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

View File

@ -27,6 +27,11 @@ public class DeletePort : MonoBehaviour
{
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(删除端口-初始化失败)");
}
}));
}
else
@ -80,6 +85,8 @@ public class DeletePort : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

View File

@ -1,4 +1,4 @@
using AutoMapper;
//using AutoMapper;
using Newtonsoft.Json;
using System;
using System.Collections;
@ -166,6 +166,11 @@ public class RedactDevice : MonoBehaviour
{
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(编辑设备-初始化失败)");
}
}));
}
@ -216,6 +221,8 @@ public class RedactDevice : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

View File

@ -1,4 +1,4 @@
using AutoMapper;
//using AutoMapper;
using Newtonsoft.Json;
using System;
using System.Collections;
@ -406,6 +406,11 @@ public class RedactPort : MonoBehaviour
{
refurbish();
}
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(编辑端口-初始化失败)");
}
}));
}
else
@ -447,6 +452,8 @@ public class RedactPort : MonoBehaviour
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

View File

@ -273,6 +273,7 @@ public class LineQuery : MonoBehaviour
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
Debug.Log("接口获取数据失败(线缆接口-初始化失败)");
callback.Invoke(null);
}
}));

View File

@ -834,13 +834,18 @@ public class ClickEvent : MonoBehaviour
Vector3 center = renderer.bounds.center;
//Vector3 targetPosition = new Vector3(center.x + yiDong_pos.x, center.y + yiDong_pos.y, center.z + yiDong_pos.z);
Vector3 targetPosition = new Vector3(center.x, center.y, center.z) + yiDong_pos;
Quaternion targetRotation = Quaternion.Euler(fangDa_rot);
Camera.main.transform.DOMove(targetPosition, 1f);
Camera.main.transform.DORotateQuaternion(targetRotation, 1f).OnComplete(() =>
{
//¸üÐÂÏà»ú³õʼÐýת½Ç¶È
//ExtendedFlycam.Inst.initialRotationEulerAngles = Camera.main.transform.localEulerAngles;
if (cabine.layer != 15)
//¾µÍ·Î¢µ÷
if (gameObject.name == "R69" || gameObject.name == "70")
CameraMgr.Instance.GotoView(cabine.transform, 2, targetRotation, 0);
else if (cabine.layer != 15)
CameraMgr.Instance.GotoView(cabine.transform, 2, targetRotation);
else
CameraMgr.Instance.GotoView(cabine.transform.parent, 2, targetRotation);

View File

@ -12,7 +12,7 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
companyName: GQ_TongXin
productName: GQ_TongXin
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
@ -162,7 +162,6 @@ PlayerSettings:
m_ColorGamuts: 00000000
targetPixelDensity: 30
resolutionScalingMode: 0
resetResolutionOnWindowResize: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier: {}
@ -690,7 +689,6 @@ PlayerSettings:
ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0
ps4CompatibilityPS5: 0
ps4AllowPS5Detection: 0
ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []