Browse Source

调整且楼层定位点,添加丢失的消火栓信息,场景包

develop
徐冲 3 years ago
parent
commit
2c5ecfeb3b
  1. 370
      .gitignore
  2. 106723
      Assets/01WanXiangCheng/WanXiangCheng.prefab
  3. 2
      Assets/CloneTypesTemplate/Editor/SceneTool.cs
  4. 2
      Assets/StreamingAssets.meta
  5. BIN
      Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB
  6. 7
      Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB.manifest
  7. BIN
      Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene
  8. 90
      Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene.manifest

370
.gitignore vendored

@ -1,10 +1,38 @@
# ---> Unity # ---> Unity
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/ /[Ll]ibrary/
/[Tt]emp/ /[Tt]emp/
/[Oo]bj/ /[Oo]bj/
/[Bb]uild/ /[Bb]uild/
/Assets/StreamingAssets/AssetBundles/ /[Bb]uilds/
# Autogenerated VS/MD solution and project files /[Ll]ogs/
/[Uu]ser[Ss]ettings/
# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*
# Visual Studio cache directory
.vs/
# Gradle cache directory
.gradle/
# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj *.csproj
*.unityproj *.unityproj
*.sln *.sln
@ -14,38 +42,117 @@
*.userprefs *.userprefs
*.pidb *.pidb
*.booproj *.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta
# Unity3D Generated File On Crash Reports # Unity3D generated file on crash reports
sysinfo.txt sysinfo.txt
# ---> C Sharp # Builds
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs) *.apk
[Bb]in/ *.aab
[Oo]bj/ *.unitypackage
# Crashlytics generated file
crashlytics-build.properties
# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
# mstest test results # Temporary auto-generated Android Assets
TestResults /[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
# ---> VisualStudio
## Ignore Visual Studio temporary files, build results, and ## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons. ## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files # User-specific files
*.rsuser
*.suo *.suo
*.user *.user
*.userosscache
*.sln.docstates *.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Mono auto generated files
mono_crash.*
# Build results # Build results
[Dd]ebug/ [Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/ [Rr]elease/
[Rr]eleases/
x64/ x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c *_i.c
*_p.c *_p.c
*_h.h
*.ilk *.ilk
*.meta
*.obj *.obj
*.iobj
*.pch *.pch
*.pdb *.pdb
*.ipdb
*.pgc *.pgc
*.pgd *.pgd
*.rsp *.rsp
@ -54,35 +161,83 @@ x64/
*.tli *.tli
*.tlh *.tlh
*.tmp *.tmp
*.tmp_proj
*_wpftmp.csproj
*.log *.log
*.vspscc *.vspscc
*.vssscc *.vssscc
.builds .builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files # Visual C++ cache files
ipch/ ipch/
*.aps *.aps
*.ncb *.ncb
*.opendb
*.opensdf *.opensdf
*.sdf *.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler # Visual Studio profiler
*.psess *.psess
*.vsp *.vsp
*.vspx *.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit # Guidance Automation Toolkit
*.gpState *.gpState
# ReSharper is a .NET coding add-in # ReSharper is a .NET coding add-in
_ReSharper* _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch # NCrunch
*.ncrunch* _NCrunch_*
.*crunch*.local.xml .*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder # Installshield output folder
[Ee]xpress [Ee]xpress/
# DocProject is a documentation generator add-in # DocProject is a documentation generator add-in
DocProject/buildhelp/ DocProject/buildhelp/
@ -95,41 +250,188 @@ DocProject/Help/Html2
DocProject/Help/html DocProject/Help/html
# Click-Once directory # Click-Once directory
publish publish/
# Publish Web Output # Publish Web Output
*.Publish.xml *.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages Directory # NuGet Packages
packages *.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Windows Azure Build Output # Microsoft Azure Build Output
csx csx/
*.build.csdef *.build.csdef
# Windows Store app package directory # Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/ AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others # Others
[Bb]in ClientBin/
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$* ~$*
*~
*.dbmdl *.dbmdl
Generated_Code #added for RIA/Silverlight projects *.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Backup & report files from converting an old project file to a newer # Including strong name files can present a security risk
# Visual Studio version. Backup files are not needed, because we have git ;-) # (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/ _UpgradeReport_Files/
Backup*/ Backup*/
UpgradeLog*.XML UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd
/Logs
/.vs
/Assets/StreamingAssets/AssetBundles.meta
/Assets/StreamingAssets/ScenePics

106723
Assets/01WanXiangCheng/WanXiangCheng.prefab

File diff suppressed because it is too large Load Diff

2
Assets/CloneTypesTemplate/Editor/SceneTool.cs

@ -545,7 +545,7 @@ public class SceneTool
Transform[] obj = Selection.GetTransforms(SelectionMode.Deep); Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
for (int i = 0; i < obj.Length; i++) for (int i = 0; i < obj.Length; i++)
{ {
if (obj[i].name.ToLower().Contains("xhs") && if ((obj[i].name.ToLower().Contains("xhs")|| obj[i].name.ToLower().Contains("snxh")) &&
obj[i].GetComponent<MeshRenderer>()) obj[i].GetComponent<MeshRenderer>())
{ {
if (!obj[i].gameObject.GetComponent<BoxCollider>()) if (!obj[i].gameObject.GetComponent<BoxCollider>())

2
Assets/StreamingAssets.meta

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ae7265e77f5582c42a6004df191757fa guid: 0dd74b66f61ec6340878822f6fa0489b
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

BIN
Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB

Binary file not shown.

7
Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB.manifest

@ -0,0 +1,7 @@
ManifestFileVersion: 0
CRC: 82014895
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: buildingscene
Dependencies: {}

BIN
Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene

Binary file not shown.

90
Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene.manifest

@ -0,0 +1,90 @@
ManifestFileVersion: 0
CRC: 1512288015
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 6b1728f60dc6acdd7185b4304aa1d15b
TypeTreeHash:
serializedVersion: 2
Hash: 8033bb62be7cce7e15745ec0a5525caf
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 54
Script: {instanceID: 0}
- Class: 64
Script: {instanceID: 0}
- Class: 65
Script: {instanceID: 0}
- Class: 89
Script: {instanceID: 0}
- Class: 90
Script: {instanceID: 0}
- Class: 95
Script: {instanceID: 0}
- Class: 104
Script: {instanceID: 0}
- Class: 108
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: a2a4e91fa54862948a4c279f56286e12, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 8c17c20b2ca967847b4117564cdc4c84, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 0b9c305761a78ca41b5f94428fa22b82, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: b1b3b937514eb774497e3bf22acba90e, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: cd045cd576d08b7499b4bc0a0d498901, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 9d71527466ad15c4f8756733306d3825, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: e01c388cf4175aa49b4973deb437d754, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 49a6ba4f46ec21b4c8a83dce618eda97, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 136
Script: {instanceID: 0}
- Class: 157
Script: {instanceID: 0}
- Class: 193
Script: {instanceID: 0}
- Class: 205
Script: {instanceID: 0}
- Class: 226
Script: {instanceID: 0}
- Class: 227
Script: {instanceID: 0}
- Class: 228
Script: {instanceID: 0}
- Class: 238
Script: {instanceID: 0}
- Class: 258
Script: {instanceID: 0}
Assets:
- Assets/BuildingScene.unity
Dependencies: []
Loading…
Cancel
Save