场景中加入楼梯重新导出AB包

9 months ago · 9d13dd4655
12 changed files with 824 additions and 289 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -3,4 +3,4 @@
 	url = http://39.106.78.171:3000/AX-ORG/MscPublicChongQing.git
 [submodule "Assets/MscPublicChongQing"]
 	path = Assets/MscPublicChongQing
-	url = http://39.106.78.171:3000/AX-ORG/MscPublicChongQing.git
+url=http://121.36.37.70:3000/AX-ORG/MscPublicChongQing.git
--- a/Assets/01WanXiangCheng/Scene/Materials/ShenJing.mat
+++ b/Assets/01WanXiangCheng/Scene/Materials/ShenJing.mat
@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShenJing
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 4bf1482de0a203a48bfb11ffe363ef99, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
--- a/Assets/01WanXiangCheng/Scene/WXC_WXT_TiHuan.FBX
+++ b/Assets/01WanXiangCheng/Scene/WXC_WXT_TiHuan.FBX
--- a/Assets/01WanXiangCheng/Textures/ShenJing.png
+++ b/Assets/01WanXiangCheng/Textures/ShenJing.png
--- a/Assets/01WanXiangCheng/WanXiangCheng.prefab
+++ b/Assets/01WanXiangCheng/WanXiangCheng.prefab
--- a/Assets/BuildingScene.unity
+++ b/Assets/BuildingScene.unity
@ -316,6 +316,97 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
+--- !u!1 &46664787
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 46664788}
+  - component: {fileID: 46664790}
+  - component: {fileID: 46664789}
+  m_Layer: 0
+  m_Name: New Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &46664788
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 46664787}
+  m_LocalRotation: {x: 0.31689087, y: -0.94846207, z: 0, w: 0}
+  m_LocalPosition: {x: -72.8, y: -2.4, z: -71.3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2063633972}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: -180, z: -36.95}
+--- !u!102 &46664789
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 46664787}
+  m_Text: "\u6DF1\u4E95"
+  m_OffsetZ: 0
+  m_CharacterSize: 5
+  m_LineSpacing: 1
+  m_Anchor: 0
+  m_Alignment: 0
+  m_TabSize: 4
+  m_FontSize: 20
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4293481244
+--- !u!23 &46664790
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 46664787}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  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
 --- !u!1 &88105567
 GameObject:
  m_ObjectHideFlags: 0
@ -5610,6 +5701,11 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 792160848680625445, guid: 9d974d29d5c99c14fbda3f6efa9c3957,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 3185063093245239006, guid: 9d974d29d5c99c14fbda3f6efa9c3957,
        type: 3}
      propertyPath: m_Name
@ -5672,6 +5768,12 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 9d974d29d5c99c14fbda3f6efa9c3957, type: 3}
+--- !u!4 &1169638851 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 790034953271405693, guid: 9d974d29d5c99c14fbda3f6efa9c3957,
+    type: 3}
+  m_PrefabInstance: {fileID: 1169638850}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1195976293
 GameObject:
  m_ObjectHideFlags: 0
@ -8648,6 +8750,136 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
+--- !u!1001 &2063633971
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1169638851}
+    m_Modifications:
+    - target: {fileID: 100004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_Name
+      value: WXC_WXT_TiHuan
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+--- !u!4 &2063633972 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400004, guid: 2bbdf220fa9850e4c97df9505f596547,
+    type: 3}
+  m_PrefabInstance: {fileID: 2063633971}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2063633973 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100002, guid: 2bbdf220fa9850e4c97df9505f596547,
+    type: 3}
+  m_PrefabInstance: {fileID: 2063633971}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2063633974 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: 2bbdf220fa9850e4c97df9505f596547,
+    type: 3}
+  m_PrefabInstance: {fileID: 2063633971}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &2063633975
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2063633973}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 4300000, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
+--- !u!114 &2063633976
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2063633974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a2a4e91fa54862948a4c279f56286e12, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cloneOnFloorType: 2
+--- !u!114 &2063633977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2063633974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CloneableTypes: 
+  isHandleCloneHitPoint: 0
+--- !u!64 &2063633978
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2063633974}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 4300002, guid: 2bbdf220fa9850e4c97df9505f596547, type: 3}
 --- !u!1 &2064012228
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB
+++ b/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB
--- a/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB.manifest
+++ b/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/WanXiangChengAB.manifest
@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 136821113
+CRC: 2670953484
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
--- a/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene
+++ b/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene
--- a/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene.manifest
+++ b/Assets/StreamingAssets/AssetBundles/WanXiangChengAB/buildingscene.manifest
@ -1,12 +1,12 @@
 ManifestFileVersion: 0
-CRC: 3309171139
+CRC: 3502568158
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 62ccfc23bdfc7bf5093ff0f9581ec58f
+    Hash: beecaee3580c69f6df4911ebe98058f3
  TypeTreeHash:
    serializedVersion: 2
-    Hash: 36986f09ad3f66d9eebb8560e8cb5fe7
+    Hash: dde7917b53373114293baebb53d8f500
 HashAppended: 0
 ClassTypes:
 - Class: 1
@ -37,6 +37,8 @@ ClassTypes:
  Script: {instanceID: 0}
 - Class: 95
  Script: {instanceID: 0}
+- Class: 102
+  Script: {instanceID: 0}
 - Class: 104
  Script: {instanceID: 0}
 - Class: 108
@ -59,6 +61,8 @@ ClassTypes:
  Script: {fileID: 11500000, guid: 266abf87d2d3c094b88f03e0a73f7812, type: 3}
 - Class: 114
  Script: {fileID: 11500000, guid: 6ef88838896ae8944b6090f2aafdadb9, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: 616b0ba951b030b4299132c7ea78069a, type: 3}
 - Class: 114
  Script: {fileID: 11500000, guid: 8c17c20b2ca967847b4117564cdc4c84, type: 3}
 - Class: 114
@ -71,10 +75,10 @@ ClassTypes:
  Script: {fileID: 11500000, guid: a2a4e91fa54862948a4c279f56286e12, type: 3}
 - Class: 114
  Script: {fileID: 11500000, guid: 49a6ba4f46ec21b4c8a83dce618eda97, type: 3}
- Class: 114
-  Script: {fileID: 11500000, guid: 616b0ba951b030b4299132c7ea78069a, type: 3}
 - Class: 115
  Script: {instanceID: 0}
+- Class: 128
+  Script: {instanceID: 0}
 - Class: 136
  Script: {instanceID: 0}
 - Class: 157
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1 +1 @@
-m_EditorVersion: 2018.4.36f1
+m_EditorVersion: 2018.4.29f1
--- a/ProjectSettings/UPRSettings.asset
+++ b/ProjectSettings/UPRSettings.asset