diff --git a/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs b/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs index 7175c4a..b3cd002 100644 --- a/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs +++ b/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs @@ -77,7 +77,7 @@ namespace UnityStandardAssets.ImageEffects // display info text when screen blend mode cannot be used Camera cam = (target as BloomAndFlares).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", UnityEditor.MessageType.Info); } } diff --git a/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs b/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs index bc3acf3..881edfe 100644 --- a/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs +++ b/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs @@ -85,7 +85,7 @@ namespace UnityStandardAssets.ImageEffects // display info text when screen blend mode cannot be used Camera cam = (target as Bloom).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", UnityEditor.MessageType.Info); } } diff --git a/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs b/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs index 9a4962c..60442e4 100644 --- a/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs +++ b/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs @@ -42,7 +42,7 @@ namespace UnityStandardAssets.ImageEffects Camera cam = (target as Tonemapping).GetComponent(); if (cam != null) { - if (!cam.hdr) { + if (!cam.allowHDR) { EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", UnityEditor.MessageType.Warning); } else if (!(target as Tonemapping).validRenderTextureFormat) { diff --git a/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs b/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs index 59791f5..215306e 100644 --- a/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs +++ b/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs @@ -3,12 +3,12 @@ using UnityEngine.PostProcessing; namespace UnityEditor.PostProcessing { - [CustomPropertyDrawer(typeof(MinAttribute))] + [CustomPropertyDrawer(typeof(UnityEngine.MinAttribute))] sealed class MinDrawer : PropertyDrawer { public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { - MinAttribute attribute = (MinAttribute)base.attribute; + UnityEngine.MinAttribute attribute = (UnityEngine.MinAttribute)base.attribute; if (property.propertyType == SerializedPropertyType.Integer) { diff --git a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs index d5fd7a6..15f39ff 100644 --- a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs +++ b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs @@ -106,7 +106,7 @@ namespace UnityStandardAssets.ImageEffects doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; } diff --git a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs index 3769c21..da269f5 100644 --- a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs +++ b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs @@ -109,7 +109,7 @@ namespace UnityStandardAssets.ImageEffects doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; diff --git a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs index 480ef25..508ea52 100644 --- a/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs +++ b/Assets/BoilOver/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs @@ -90,7 +90,7 @@ namespace UnityStandardAssets.ImageEffects sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold); if (!useDepthTexture) { - var format= GetComponent().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; + var format= GetComponent().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format); RenderTexture.active = tmpBuffer; GL.ClearWithSkybox (false, GetComponent()); diff --git a/Assets/DongYouLiQing/Models/Scene.FBX.meta b/Assets/DongYouLiQing/Models/Scene.FBX.meta index 51d3f77..e73e06e 100644 --- a/Assets/DongYouLiQing/Models/Scene.FBX.meta +++ b/Assets/DongYouLiQing/Models/Scene.FBX.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 378408775c6256848bb7ece10787b6ec -timeCreated: 1525515876 -licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: 020 100002: 059 @@ -7342,10 +7340,1208 @@ ModelImporter: 6402378: ZhuangZhi 6 7400000: Take 001 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 03 - Default + second: {fileID: 2100000, guid: d2606547ceaf35b43aae6b93d1ec1e21, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 11 - Default + second: {fileID: 2100000, guid: b3e5b0b465de45545b0f79fbb39495f7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 12 - Default + second: {fileID: 2100000, guid: 97e303c07fbc9584abaca7dd2d459861, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 15W_SeKuai + second: {fileID: 2100000, guid: 812304857784c8a49860373ecc59355e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 18 - Default + second: {fileID: 2100000, guid: 434703d8bf0c26441b77283e078c5772, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 19 - Default + second: {fileID: 2100000, guid: cfa00693db2560c41a8f858ae36d1e73, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 20 - Default + second: {fileID: 2100000, guid: bfdbb8fc1a64d6f479c8e0f778cba0b8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 21 - Default + second: {fileID: 2100000, guid: 3cfba441aa86f484eb9388a1355423d5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 22 - Default + second: {fileID: 2100000, guid: 629e23e2cf8d1f249b6f24c9efef6ddf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 23 - CGmolin + second: {fileID: 2100000, guid: 255d462868f3d0a47b9bc37413777904, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 23 - Default + second: {fileID: 2100000, guid: 260e17293850a484aa84fd1b9c2bc704, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 24 - Default + second: {fileID: 2100000, guid: 6412c0d7969d90b4691248918e1436f1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: BGL + second: {fileID: 2100000, guid: 082f0031e97e83344bc778adbdd789f8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: BGL_WD + second: {fileID: 2100000, guid: a74c7f53a8841b24c85cff9351916b83, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: BGL_Wall + second: {fileID: 2100000, guid: c97387e62a25b81478b639c0be0e075e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Body + second: {fileID: 2100000, guid: 7edccfaa3db022545994b66903acbf10, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Cap + second: {fileID: 2100000, guid: 2ffddae8be1901b4899e9573f79d24c5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: DYLQ_tietu + second: {fileID: 2100000, guid: 7c71dc79b508a8d4da23ea18c5859c40, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: FireHydrant1 + second: {fileID: 2100000, guid: 3353d5897903baf4d92c2cff4ddaf4cc, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: FuPan1 + second: {fileID: 2100000, guid: cb1250d29ef6bec46b558b99327e5b3c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: GuanBi2 + second: {fileID: 2100000, guid: f24d9ed3428e0874da25a2e996127b07, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: GuanBi3 + second: {fileID: 2100000, guid: 540c537f63f9ed54c825c0acd6bb6c7e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HL + second: {fileID: 2100000, guid: 04a72f8dc8f8ae44da8bf402a929b18b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HL03 + second: {fileID: 2100000, guid: c5702c4be1f608d40b330d0bbf6ecf9e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HL1 + second: {fileID: 2100000, guid: 6b67a2ebfb11df54e837fb24d7d9211a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HongSe + second: {fileID: 2100000, guid: 5f62f527d2bf949459debfdaa54e8ecf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Inside + second: {fileID: 2100000, guid: 907a4e224f118974e93a6a0f01ae9126, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: LouTi + second: {fileID: 2100000, guid: 5307fbc1eaaab9e4ab25bc5d697ad01d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Louding_02 + second: {fileID: 2100000, guid: 5e5e74957517095488739fbef094ed4a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #0' + second: {fileID: 2100000, guid: 4ecd2e73f59b5c24da250d7a898e2aad, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #1' + second: {fileID: 2100000, guid: f24d9ed3428e0874da25a2e996127b07, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #113' + second: {fileID: 2100000, guid: 969a0f2df55d4ad48ab0dc1a10ecba34, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #12' + second: {fileID: 2100000, guid: 9068f3059c0bd9a479f1f8033acdf4a7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #1275' + second: {fileID: 2100000, guid: 5fad63ab8f742cb49acd711fba5df60c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #130' + second: {fileID: 2100000, guid: 708c1be3c02a7c84bb04af9d99a380b1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #14' + second: {fileID: 2100000, guid: 2bbdf3231b6afb14cb7c477c18f3958d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #179' + second: {fileID: 2100000, guid: d9864f08ec8eeab40a5646392a8106ae, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #2157' + second: {fileID: 2100000, guid: c5702c4be1f608d40b330d0bbf6ecf9e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912358' + second: {fileID: 2100000, guid: 31e0bbef16bd904489adb3bf02ee7c36, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912359' + second: {fileID: 2100000, guid: 60eca587c65f8fa4b9358d5249a6cd61, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912460' + second: {fileID: 2100000, guid: fbfc8d822373f1a4483d6ba280091717, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912565' + second: {fileID: 2100000, guid: 9cb443c023ebb3b4aa1c6e2a6b7e7eb6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912567' + second: {fileID: 2100000, guid: c255daeb4df3dc844990eeb41413c2dd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912568' + second: {fileID: 2100000, guid: 644fbf972e706854dbf0d05c7bad2810, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912569' + second: {fileID: 2100000, guid: 357188c7a552ae74fbb59ccdcdb02b3a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918509' + second: {fileID: 2100000, guid: f8dfee9a443c8a0408cbcf3b9f06b7ad, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918511' + second: {fileID: 2100000, guid: c0a97272aec04a347b8f955281efef34, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918512' + second: {fileID: 2100000, guid: 4649f41b7795e634a87e78f8a946eee7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918513' + second: {fileID: 2100000, guid: 1a48dd73134c75b47b4aee003cbab8bb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918514' + second: {fileID: 2100000, guid: 55471076bdba1d043843157158b2ee63, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918515' + second: {fileID: 2100000, guid: 6cf6e23d16e98aa458bf2c1359606ad3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918516' + second: {fileID: 2100000, guid: ed212b613ac5b204d90ad1d9fa592504, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918517' + second: {fileID: 2100000, guid: 9592ed757fbd1134ab24dee4f43e9f4e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918518' + second: {fileID: 2100000, guid: 8b86f2a49a9121b43933127b0a94afde, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918519' + second: {fileID: 2100000, guid: 8899a0d2df4da1d4bb4d0e56a5ca8928, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918520' + second: {fileID: 2100000, guid: 7309ef50c50f30b4c8df43579b23bb12, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918522' + second: {fileID: 2100000, guid: 5e9176f508e61104c8e9d110885af3f7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918533' + second: {fileID: 2100000, guid: 435439fc3eae01945993362059f2377a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918534' + second: {fileID: 2100000, guid: c5817b1b7f9aaf94eb4602e67668c1c3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918535' + second: {fileID: 2100000, guid: 37eb9fe3511a83141b9c125b2ade2451, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918536' + second: {fileID: 2100000, guid: fa9a1a44bc31f124f8ad0ec6ba4f1c07, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918537' + second: {fileID: 2100000, guid: 687b1f4cb210e0a4fa20996541b41d56, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918539' + second: {fileID: 2100000, guid: 3cb2d65a183d3bc4a99887f53d70f3ab, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918540' + second: {fileID: 2100000, guid: e8783cbdee7faff4a875aa243e761756, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918542' + second: {fileID: 2100000, guid: eb0ba89f50f39324ebc30839201d2f58, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918552' + second: {fileID: 2100000, guid: 0bbb5b603e93c974e860822d8fbad849, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918554' + second: {fileID: 2100000, guid: 73367044e157e33439821f02508e49e4, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918565' + second: {fileID: 2100000, guid: e9750ee796f33dc47bd434aad5277650, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918566' + second: {fileID: 2100000, guid: 9d9af88d8afb14e438a2a238b679a86f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918568' + second: {fileID: 2100000, guid: bb5ec038f2c79a34a9e05d6bd360515f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918569' + second: {fileID: 2100000, guid: b402823aa10401245aafddb56730e988, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918570' + second: {fileID: 2100000, guid: 435439fc3eae01945993362059f2377a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918580' + second: {fileID: 2100000, guid: bdef9f98515fdc341a54d65abacca8c6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918593' + second: {fileID: 2100000, guid: d376185d6d423b849a2aabc172c3e4ba, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918597' + second: {fileID: 2100000, guid: 7b05f581ddda1a54298607614c0eb71e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918606' + second: {fileID: 2100000, guid: 8f00dec8fcfae5240aca93d4677798d5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918620' + second: {fileID: 2100000, guid: b85e4d5356b4ef24099939b833f31895, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918654' + second: {fileID: 2100000, guid: bbcebd047cd94464d90b3617f771adfa, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918665' + second: {fileID: 2100000, guid: faf1984095fc0e94da861e84faff4c84, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918678' + second: {fileID: 2100000, guid: 0b6d65da481342547ac47b798f0a7944, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918679' + second: {fileID: 2100000, guid: 7309ef50c50f30b4c8df43579b23bb12, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918680' + second: {fileID: 2100000, guid: bf6bb3150fb98a3418b92525d8daed70, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918691' + second: {fileID: 2100000, guid: 2a55a3b7a60788e4a9ba3d674c1bffa6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918695' + second: {fileID: 2100000, guid: 2caa9db13a61cce44ab9a6ead6267ec7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918710' + second: {fileID: 2100000, guid: 5c0ffe2b0685164499bcaffac21b55b6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918726' + second: {fileID: 2100000, guid: c2815bfeb5e2634448d4e693fa2a4b49, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918753' + second: {fileID: 2100000, guid: 2b5215a8326005943af9bc92c8d07cc5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918754' + second: {fileID: 2100000, guid: 8decc8084408fc44ca216f8f27096bd9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918762' + second: {fileID: 2100000, guid: 2c638632d62353d43957346ad7a50048, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918775' + second: {fileID: 2100000, guid: a3dc301bc9dac344d8e5d35fcebfb9cb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918777' + second: {fileID: 2100000, guid: 4e97e7a271cce7a4280ae42c2926f4ce, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918778' + second: {fileID: 2100000, guid: e6168cc66511ca340bd4973cf18bb3a0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918779' + second: {fileID: 2100000, guid: bb4f3f61a7683344baa39c1ff66e99a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918791' + second: {fileID: 2100000, guid: fbc0cb8be265aa1499b712fbce3b0273, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918792' + second: {fileID: 2100000, guid: 8decc8084408fc44ca216f8f27096bd9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918793' + second: {fileID: 2100000, guid: 5024c0c4064f72f4aa2e5ff78d96ba15, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918794' + second: {fileID: 2100000, guid: 5e50ad2c535f7634e86de1cb42d9d323, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918799' + second: {fileID: 2100000, guid: 9592ed757fbd1134ab24dee4f43e9f4e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918806' + second: {fileID: 2100000, guid: e6168cc66511ca340bd4973cf18bb3a0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918807' + second: {fileID: 2100000, guid: fbc0cb8be265aa1499b712fbce3b0273, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918808' + second: {fileID: 2100000, guid: fa9a1a44bc31f124f8ad0ec6ba4f1c07, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918846' + second: {fileID: 2100000, guid: e719f566f32a53640ae003ff30b870ea, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918853' + second: {fileID: 2100000, guid: 58c89dea93a111d4fb7861b61c0fd220, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918854' + second: {fileID: 2100000, guid: 9c26038e30eab45479192502491c3611, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918855' + second: {fileID: 2100000, guid: f10e34806a7b81c4f929b71965805e8b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918867' + second: {fileID: 2100000, guid: 3c3f0736b39343645b0c14e847803c63, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918903' + second: {fileID: 2100000, guid: 6c004f473865abf4889f599affd2c20f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918904' + second: {fileID: 2100000, guid: 9592ed757fbd1134ab24dee4f43e9f4e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918905' + second: {fileID: 2100000, guid: 435439fc3eae01945993362059f2377a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918906' + second: {fileID: 2100000, guid: 435439fc3eae01945993362059f2377a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918907' + second: {fileID: 2100000, guid: 8899a0d2df4da1d4bb4d0e56a5ca8928, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918908' + second: {fileID: 2100000, guid: 8b86f2a49a9121b43933127b0a94afde, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918909' + second: {fileID: 2100000, guid: 9592ed757fbd1134ab24dee4f43e9f4e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918910' + second: {fileID: 2100000, guid: 7309ef50c50f30b4c8df43579b23bb12, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918912' + second: {fileID: 2100000, guid: e1afa9c4b049fda4c981979dc70e5af3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918913' + second: {fileID: 2100000, guid: 7a467a8e5721d7c409e2ffb212b95c9a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918914' + second: {fileID: 2100000, guid: 1980ca2bb6104bb429171dc1a3f66b55, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918915' + second: {fileID: 2100000, guid: 5e50ad2c535f7634e86de1cb42d9d323, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918916' + second: {fileID: 2100000, guid: 7309ef50c50f30b4c8df43579b23bb12, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918917' + second: {fileID: 2100000, guid: 8b86f2a49a9121b43933127b0a94afde, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918918' + second: {fileID: 2100000, guid: 8899a0d2df4da1d4bb4d0e56a5ca8928, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918920' + second: {fileID: 2100000, guid: a7bb461d8d2ecad4b8678712c8ee9d79, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918921' + second: {fileID: 2100000, guid: b402823aa10401245aafddb56730e988, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918922' + second: {fileID: 2100000, guid: 85f855679f073a94f9c685f148066081, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918923' + second: {fileID: 2100000, guid: 12b7f132d7b944145be5d142c42f4165, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918936' + second: {fileID: 2100000, guid: 5024c0c4064f72f4aa2e5ff78d96ba15, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918937' + second: {fileID: 2100000, guid: 3899c5b57a5a80d4a8c1c7859b321f55, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918959' + second: {fileID: 2100000, guid: 1b11402c7f9472f47a1d4fbd52611873, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918972' + second: {fileID: 2100000, guid: 4e97e7a271cce7a4280ae42c2926f4ce, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918973' + second: {fileID: 2100000, guid: bb4f3f61a7683344baa39c1ff66e99a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219918996' + second: {fileID: 2100000, guid: e6168cc66511ca340bd4973cf18bb3a0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919008' + second: {fileID: 2100000, guid: fbfc8d822373f1a4483d6ba280091717, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919009' + second: {fileID: 2100000, guid: 9b870463aad2a9e41b2fd1394a0a04db, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919010' + second: {fileID: 2100000, guid: fbc0cb8be265aa1499b712fbce3b0273, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919022' + second: {fileID: 2100000, guid: 92b75ed5f6be6d549aab0c476accf831, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919056' + second: {fileID: 2100000, guid: 2b783cfaae3340342aadaf8fb709641d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919057' + second: {fileID: 2100000, guid: 5024c0c4064f72f4aa2e5ff78d96ba15, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919113' + second: {fileID: 2100000, guid: f24d9ed3428e0874da25a2e996127b07, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919125' + second: {fileID: 2100000, guid: 1de4e8d9585a6d64eb9c1364bd220d68, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919126' + second: {fileID: 2100000, guid: 4a881c62903000e45b7063eb113e2254, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919127' + second: {fileID: 2100000, guid: bb4f3f61a7683344baa39c1ff66e99a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919128' + second: {fileID: 2100000, guid: 6412c0d7969d90b4691248918e1436f1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919129' + second: {fileID: 2100000, guid: ad91f6fc160da8b49b90e8546f73df34, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919134' + second: {fileID: 2100000, guid: bb4f3f61a7683344baa39c1ff66e99a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919135' + second: {fileID: 2100000, guid: 6b67a2ebfb11df54e837fb24d7d9211a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919856' + second: {fileID: 2100000, guid: 9a0fd152b78abca4abb88e95073fb0bf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919858' + second: {fileID: 2100000, guid: b3d8876a04012484ab6654905511f073, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919859' + second: {fileID: 2100000, guid: b6e744e225104f74f9b61c40eb7ea92e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919860' + second: {fileID: 2100000, guid: a764041d452bdea4c92dbd6e3f06dbc5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919872' + second: {fileID: 2100000, guid: ad48301067f3eb54e94a5b3bf55442d0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919898' + second: {fileID: 2100000, guid: c4f0464ce3bb4d646a6e4c41a29f2667, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919899' + second: {fileID: 2100000, guid: 3f5226ebbb98eed4f8f786c9dd064ec1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919900' + second: {fileID: 2100000, guid: 5e9176f508e61104c8e9d110885af3f7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919912' + second: {fileID: 2100000, guid: 7651f76063fc33149a335cd5ea14d962, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919913' + second: {fileID: 2100000, guid: 5e50ad2c535f7634e86de1cb42d9d323, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219919925' + second: {fileID: 2100000, guid: cc43738b4610a9642869ebf4d14aa542, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219920031' + second: {fileID: 2100000, guid: d1e0013636dac9b4baba7b4204f27cd9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219920032' + second: {fileID: 2100000, guid: 812304857784c8a49860373ecc59355e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219920033' + second: {fileID: 2100000, guid: f4f8b088f9c2fef499c52259768425ca, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #25' + second: {fileID: 2100000, guid: 7d0f00214cd07144db7770c9b50b5a25, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #37' + second: {fileID: 2100000, guid: 51e653dc9025a424993ee541e541a5d7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #49' + second: {fileID: 2100000, guid: 354946927b50761419d60bcac3bdd165, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #50' + second: {fileID: 2100000, guid: f10e34806a7b81c4f929b71965805e8b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5051' + second: {fileID: 2100000, guid: 5796488de77b8d442aa5bd9a2b554fa2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5052' + second: {fileID: 2100000, guid: 5fad63ab8f742cb49acd711fba5df60c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5054' + second: {fileID: 2100000, guid: 60acd5a4099b52c429baa8a53c50c679, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5055' + second: {fileID: 2100000, guid: 2243f429ae1a96149a84beaf7fdb066c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #51' + second: {fileID: 2100000, guid: 7c927071c5eda514a9699ccae5e9994d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #64' + second: {fileID: 2100000, guid: 3899c5b57a5a80d4a8c1c7859b321f55, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #66' + second: {fileID: 2100000, guid: 51e653dc9025a424993ee541e541a5d7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #78' + second: {fileID: 2100000, guid: 31e0bbef16bd904489adb3bf02ee7c36, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Metal1 + second: {fileID: 2100000, guid: aa87973b0d0f63d40b509de5c904daa2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Metal2 + second: {fileID: 2100000, guid: 71bc95d1dd21c864fbc91d5e1681281f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Metal_Blue + second: {fileID: 2100000, guid: 9592ed757fbd1134ab24dee4f43e9f4e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Metal_Blue_F + second: {fileID: 2100000, guid: 7309ef50c50f30b4c8df43579b23bb12, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Metal_GX + second: {fileID: 2100000, guid: 017d87220d9ed074c843c2d0f98fdb81, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'MultiMat_1 Slot #1' + second: {fileID: 2100000, guid: 4f6f23d97c113c94a8c7fbfabee723ab, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Qiang_bai + second: {fileID: 2100000, guid: 71910d0fa29e204428c21b4a7b76f7b1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Qiang_hong + second: {fileID: 2100000, guid: 5c0a3e204638fe647adeecc4c8dd7a32, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: TM_langan05 + second: {fileID: 2100000, guid: 3a5f023bbb55e0a48a413b6517362c5a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Yellow + second: {fileID: 2100000, guid: 434703d8bf0c26441b77283e078c5772, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: ZZ_glass + second: {fileID: 2100000, guid: 9e9347588338a7243bd789650f6caff6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: ZZ_teitu + second: {fileID: 2100000, guid: 869871d7a458d5a47b26a43188d9a83e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Zssh_Xf_Ty28.ax + second: {fileID: 2100000, guid: 7c927071c5eda514a9699ccae5e9994d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: cao + second: {fileID: 2100000, guid: 2b2e3749cde039a478fd886df4196c50, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: cao2 + second: {fileID: 2100000, guid: d0c27c7f93ada4b4f8158877ebf46696, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: color_color + second: {fileID: 2100000, guid: f80fb3a72f8c38b44be0db8169d1d55b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal1 + second: {fileID: 2100000, guid: d1c0da66d641f984f90f16185d335cac, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal10 + second: {fileID: 2100000, guid: bbcebd047cd94464d90b3617f771adfa, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal12 + second: {fileID: 2100000, guid: 6d514ade5888d84459d0b9a16c60383f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal13 + second: {fileID: 2100000, guid: 435439fc3eae01945993362059f2377a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal2 + second: {fileID: 2100000, guid: 27416b62406e84e4e94461d919b9884a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal22 + second: {fileID: 2100000, guid: bdef9f98515fdc341a54d65abacca8c6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal25 + second: {fileID: 2100000, guid: 0b6d65da481342547ac47b798f0a7944, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal27 + second: {fileID: 2100000, guid: 2c638632d62353d43957346ad7a50048, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal28 + second: {fileID: 2100000, guid: a3dc301bc9dac344d8e5d35fcebfb9cb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal29 + second: {fileID: 2100000, guid: e719f566f32a53640ae003ff30b870ea, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal3 + second: {fileID: 2100000, guid: be1ce48f3a0f42b41abe1aa226ba3a00, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal31 + second: {fileID: 2100000, guid: 1a12eb7ac55c2ee46a3bd7ccfc0cc640, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal4 + second: {fileID: 2100000, guid: e4927f475bb417644ad184b49d822561, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-metal8 + second: {fileID: 2100000, guid: 982e9e848019f4049a080534de208a6a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-shuini1 + second: {fileID: 2100000, guid: b3d8876a04012484ab6654905511f073, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-shuini2 + second: {fileID: 2100000, guid: 7a467a8e5721d7c409e2ffb212b95c9a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall1 + second: {fileID: 2100000, guid: 7935732d3616e4b41943a933783ef0bb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall2 + second: {fileID: 2100000, guid: d9e54a6f9213edd4cb2ff530f69fbba4, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall3 + second: {fileID: 2100000, guid: 66c0fc289a2cff74791853eb48bc4fb8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall4 + second: {fileID: 2100000, guid: 73a428251321d06488b8cfa56170016a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall5 + second: {fileID: 2100000, guid: b137fc2335f6bb7498f49f727d28ea79, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall6 + second: {fileID: 2100000, guid: 4d107aaddf32d6048b16ad49f56928f0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wall7 + second: {fileID: 2100000, guid: 1d5c3974f5c75074ab68ef205fa3ed7d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wuding1 + second: {fileID: 2100000, guid: aec79aff33672864e9ce1ad82ac80d81, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wuding2 + second: {fileID: 2100000, guid: b6e744e225104f74f9b61c40eb7ea92e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wuding3 + second: {fileID: 2100000, guid: 48ad5c86e68af17459ee1c7c7d135033, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wuding4 + second: {fileID: 2100000, guid: d376185d6d423b849a2aabc172c3e4ba, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: dyl-wuding5 + second: {fileID: 2100000, guid: cf0ca9c3d2733714da9018c59f13e78d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: guan + second: {fileID: 2100000, guid: 4ecd2e73f59b5c24da250d7a898e2aad, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: hunningtu01 + second: {fileID: 2100000, guid: 096ec29ed79a89e419e8e8275f33511c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: langan01 + second: {fileID: 2100000, guid: 9e3c211fd54fe064fbe77cb1f79b9c3a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: langan03 + second: {fileID: 2100000, guid: 6b67a2ebfb11df54e837fb24d7d9211a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: langan04 + second: {fileID: 2100000, guid: ba0ae8b89d8d5f24b9bf0d515cd6ba2b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: luming + second: {fileID: 2100000, guid: d1e0013636dac9b4baba7b4204f27cd9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: luya + second: {fileID: 2100000, guid: c76ac55b3bef8f24b8d3a2f08c2589b6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lvli-01 + second: {fileID: 2100000, guid: a014a00980209804a95a74bbfe294333, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lvli-02 + second: {fileID: 2100000, guid: 73b37508702862940a612799dab00b29, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: matal05 + second: {fileID: 2100000, guid: 5072aba785e75ba4e9d9bc823dfcc1b5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: metal03 + second: {fileID: 2100000, guid: 26bcb1ae6ed2da24f9cacaf16222f0f7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: metel02 + second: {fileID: 2100000, guid: 3339238e95f0d4640a0d2bb51616ea76, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: shenlamen + second: {fileID: 2100000, guid: 0af0b450de6259a46ac48e91543ca9d5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: shui + second: {fileID: 2100000, guid: a764041d452bdea4c92dbd6e3f06dbc5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: taijie01 + second: {fileID: 2100000, guid: 459404724604c4347b7d130af2ad9240, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: tiexiu1 + second: {fileID: 2100000, guid: c01c0659e47aa3348b33ac56c77e9ec6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: tiexiu2 + second: {fileID: 2100000, guid: cc43738b4610a9642869ebf4d14aa542, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: tiexiu3 + second: {fileID: 2100000, guid: d65022c92d689fb4cac0ca541cc70fde, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: tiexiu4 + second: {fileID: 2100000, guid: b43c40e9d55672e4faafeac0f220e5a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: wa + second: {fileID: 2100000, guid: 0d47594418dac5946bcfaac23778263d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: wawa + second: {fileID: 2100000, guid: 1b50033d278496f4991e48bef86b5037, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: wawa1 + second: {fileID: 2100000, guid: c98caa6f4673cd64b8488c5b9c9afa7c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: wawa2 + second: {fileID: 2100000, guid: 4fdb010c2a2be134b9750f700e7bf35a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: "\u51AC\u9752\u6C42x" + second: {fileID: 2100000, guid: bb025b6c907473e42a75f6ac8964f430, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -7358,12 +8554,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -7371,22 +8570,34 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 1 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 0 humanDescription: @@ -7401,7 +8612,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 diff --git a/Assets/FBX/sundriesHeap.FBX.meta b/Assets/FBX/sundriesHeap.FBX.meta index 1897634..4ee4a38 100644 --- a/Assets/FBX/sundriesHeap.FBX.meta +++ b/Assets/FBX/sundriesHeap.FBX.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 18418cddf14c8bf4c8809a80e066a8d5 -timeCreated: 1499130393 -licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -12,10 +10,13 @@ ModelImporter: 4300000: ZWD 7400000: Take 001 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: {} materials: importMaterials: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,12 +29,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -41,22 +45,34 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 0 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 0 copyAvatar: 0 humanDescription: @@ -71,7 +87,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 diff --git a/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta b/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta index 00445cb..5b28d80 100644 --- a/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta +++ b/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 8274cfee54367d243a0115fb6d5be9da -timeCreated: 1507960014 -licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: YouGuanChe_MeshPart0 100002: YouGuanChe_MeshPart1 @@ -19,10 +17,93 @@ ModelImporter: 4300002: YouGuanChe_MeshPart1 7400000: Take 001 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 14 - Default + second: {fileID: 2100000, guid: af02aa07e9526754fbc8e44828a6592f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 15 - Default + second: {fileID: 2100000, guid: 265dc28796cc5f64a96151977ced58cf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: "21 - \u53F0\u706F\u73BB\u7483" + second: {fileID: 2100000, guid: a610af0ab45f24e4fbdf9907ba4cf822, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_black_plastic + second: {fileID: 2100000, guid: e41ba0a24564c6741a9a6a9166500229, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_chrome + second: {fileID: 2100000, guid: 28ee26497e5dd0a4290a03565e73eb53, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_glass + second: {fileID: 2100000, guid: a2175083570eb554ba5aa0c900ae8f83, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_glass_black + second: {fileID: 2100000, guid: fbd282103d2f2eb48b16ac34c805a4cd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_mirror + second: {fileID: 2100000, guid: 7594e605b5398ff42aa7c658d502dfe3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_orangelight + second: {fileID: 2100000, guid: d315194796d014f4c921aa7f854e5c5f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_orangelight2 + second: {fileID: 2100000, guid: abe0f28e187e7fa4a911d6b80aadeef0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_redlight + second: {fileID: 2100000, guid: 52ca801161bacaa41bd936ba688f0701, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Archmodels55_18_rims + second: {fileID: 2100000, guid: f2eef6ac008172746976461d214a9aae, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #4' + second: {fileID: 2100000, guid: 76d8ad62161ef714da548b772b12cb59, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: QIcaiche_baisequyu1 + second: {fileID: 2100000, guid: 68383ecd218f59146a23f38317d2ca4f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: QIcaiche_jingdeng1 + second: {fileID: 2100000, guid: 13479606a9bdad946ba473440c3b5566, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: QIcaiche_jingdenglanse1 + second: {fileID: 2100000, guid: ba38e642f4b1acb44881451861017cf2, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -35,12 +116,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -48,22 +132,34 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 0 humanDescription: @@ -78,7 +174,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 diff --git a/Assets/Models/FireRobot/Models/FireRobot.FBX.meta b/Assets/Models/FireRobot/Models/FireRobot.FBX.meta index 2ecda64..71a895e 100644 --- a/Assets/Models/FireRobot/Models/FireRobot.FBX.meta +++ b/Assets/Models/FireRobot/Models/FireRobot.FBX.meta @@ -24,6 +24,10 @@ ModelImporter: 100032: Right_wheel5 100034: Right_wheel6 100036: Right_wheel7 + 100038: LvDai + 100040: Pao1 + 100042: Pao2 + 100044: tank-treading 400000: Body 400002: //RootNode 400004: Gunturret @@ -43,6 +47,10 @@ ModelImporter: 400032: Right_wheel5 400034: Right_wheel6 400036: Right_wheel7 + 400038: LvDai + 400040: Pao1 + 400042: Pao2 + 400044: tank-treading 2300000: Body 2300002: Gunturret 2300004: Left_tread @@ -61,6 +69,10 @@ ModelImporter: 2300030: Right_wheel5 2300032: Right_wheel6 2300034: Right_wheel7 + 2300036: LvDai + 2300038: Pao1 + 2300040: Pao2 + 2300042: tank-treading 3300000: Body 3300002: Gunturret 3300004: Left_tread @@ -79,6 +91,10 @@ ModelImporter: 3300030: Right_wheel5 3300032: Right_wheel6 3300034: Right_wheel7 + 3300036: LvDai + 3300038: Pao1 + 3300040: Pao2 + 3300042: tank-treading 4300000: Body 4300002: Gunturret 4300004: Left_tread @@ -97,6 +113,11 @@ ModelImporter: 4300030: Right_wheel5 4300032: Right_wheel6 4300034: Right_wheel7 + 4300036: tank-treading + 4300038: LvDai + 4300040: Pao1 + 4300042: Pao2 + 7400000: Take 001 9500000: //RootNode materials: importMaterials: 1 diff --git a/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta b/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta index dd8d4cf..57f6bd7 100644 --- a/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta +++ b/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 7f3897eeab763384893aaa968540a171 ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: Chest 100002: chestProxy_geo @@ -479,10 +479,13 @@ ModelImporter: 4300114: l_hipProxy_geo 7400000: Idle 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: {} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -500,12 +503,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Idle @@ -541,22 +547,34 @@ ModelImporter: globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 0 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 1 humanDescription: @@ -1289,7 +1307,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 0 diff --git a/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta b/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta index 9b6082c..23d1e78 100644 --- a/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta +++ b/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 1377652ab79f573439a1e79074742376 ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: Character_Ctrl:Reference 100002: Chest @@ -627,10 +627,13 @@ ModelImporter: 4300114: l_hipProxy_geo 7400000: Run 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: {} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -645,12 +648,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Run @@ -686,22 +692,34 @@ ModelImporter: globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 0 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 1 humanDescription: @@ -1434,7 +1452,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 0 diff --git a/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta b/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta index 691a088..6efec6f 100644 --- a/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta +++ b/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 4daa93caa7f785a40a900f6203fd66da ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: Chest 100002: chestProxy_geo @@ -475,10 +475,13 @@ ModelImporter: 4300114: l_hipProxy_geo 7400000: Walk 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: {} materials: importMaterials: 0 materialName: 1 materialSearch: 2 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -493,12 +496,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Walk @@ -534,22 +540,34 @@ ModelImporter: globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 0 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 1 humanDescription: @@ -1282,7 +1300,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 0 diff --git a/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta b/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta index d06201c..6e3b10d 100644 --- a/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta +++ b/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 5a7103b964241fc44929c03f1f7170af -timeCreated: 1509586135 -licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: BHF_Body 100002: Bip01 @@ -175,10 +173,103 @@ ModelImporter: 13700028: pPipe1 2 13700030: XiaoFangYuan_Body 13700032: XiaoFangYuan_Hat + 2186277476908879412: ImportLogs + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 02 - Default2 + second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 02 - Default3 + second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 02 - Default4 + second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: FireMen_Helmet_T + second: {fileID: 2100000, guid: 329ecfa0474369241b7fa76da8417fec, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #1' + second: {fileID: 2100000, guid: ea7f8ced2ed04be47bb32c59251827ec, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #4' + second: {fileID: 2100000, guid: 9e439d4fcbe2a7a41971556416d99485, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn6 + second: {fileID: 2100000, guid: 5561cb983b27ded4aa19acde8c98c516, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn7 + second: {fileID: 2100000, guid: e77f9e7db788b464498572be0e0482da, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: body + second: {fileID: 2100000, guid: bc09a1939d950384e812f57f94622868, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: pasted__20 - Default + second: {fileID: 2100000, guid: 564834fe441ef45468327583db6dc0ca, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: xiaofangyuan_FHF1_xiaofangyuan_FHF_FHF_C + second: {fileID: 2100000, guid: be93f04e8df0c7747a01e43190491ed7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: xiaofangyuan_FHF1_xiaofangyuan_FHF_blinn3 + second: {fileID: 2100000, guid: 1e2ef6b47d719934ab00f79882ea5f77, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: xiaofangyuan_FHF1_xiaofangyuan_FHF_blinn4 + second: {fileID: 2100000, guid: 075a9cc0892dd8848bf6e368d47b8c57, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: xiaofangyuan_FHF1_xiaofangyuan_FHF_lambert3 + second: {fileID: 2100000, guid: 2a35e892ce4849f45b823855b53b32cf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: zhandoufuhong + second: {fileID: 2100000, guid: f079afa8605cbd944a4a10ab7a3160c0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: zhandoufuhongmao + second: {fileID: 2100000, guid: 4b127da3cbc4a224ebd28e8cc17775a8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: zhandoufulvse + second: {fileID: 2100000, guid: 41f8ce39755317c4dae99e1a64509a78, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: zhandoufuyellowmao + second: {fileID: 2100000, guid: b1029068f37526f4d8a5ec05f5c85521, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -191,12 +282,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -204,22 +298,34 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 0 humanDescription: @@ -833,7 +939,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 diff --git a/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta b/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta index 3637946..0345825 100644 --- a/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta +++ b/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 3f26a6b918203a44989f61fcceffa271 -timeCreated: 1488344590 -licenseType: Pro ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -11,26 +9,39 @@ ModelImporter: 3300000: //RootNode 4300000: Cylinder001 4300002: Plane001 + 2186277476908879412: ImportLogs + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: No Name + second: {fileID: 2100000, guid: 784435bd0eae8ab40977b72be635e81c, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -38,25 +49,38 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 0 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -68,6 +92,8 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab b/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab index 63e3eff..7a2d04a 100644 Binary files a/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab and b/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab differ diff --git a/Assets/Scene/DongYouLiQing.FBX.meta b/Assets/Scene/DongYouLiQing.FBX.meta index b154bac..9b0ffd8 100644 --- a/Assets/Scene/DongYouLiQing.FBX.meta +++ b/Assets/Scene/DongYouLiQing.FBX.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c64ffadc27310f046930f1e1d1f68b6d ModelImporter: - serializedVersion: 19 + serializedVersion: 23 fileIDToRecycleName: 100000: Arc017 100002: Arc018 @@ -1313,10 +1313,388 @@ ModelImporter: 4300514: XiaoFangShuiGuan_001 7400000: Take 001 9500000: //RootNode + 2186277476908879412: ImportLogs + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 02 - Default + second: {fileID: 2100000, guid: 080d85cf21dd0d847ba5960b5ee5209f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 03 - Default + second: {fileID: 2100000, guid: 6c46e11c514a0bd428d8be2f7164a7f2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 06 - Default + second: {fileID: 2100000, guid: 998f6526126a8734cb07ae53649dd895, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 11 - Default + second: {fileID: 2100000, guid: 86915af2fb9cb794896cf13b53919e00, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 16 - Default + second: {fileID: 2100000, guid: a760d645e6d42b142955b0339d665d5d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 22 - Default + second: {fileID: 2100000, guid: 5e43fdec0b03fd64ab11694a6781aed3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: DYLQ_tietu + second: {fileID: 2100000, guid: 5dbbb9e46e878944facf65b63ab46c0b, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: GuanDi + second: {fileID: 2100000, guid: 485a20310a0ead14686beb7abb6c06ac, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HL + second: {fileID: 2100000, guid: f154e3cb1adb86443b87ef63b2a73818, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HY-guanxian14 + second: {fileID: 2100000, guid: d9d8fd8208b55cf4b94c730d3c455b72, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HY-guanxian2 + second: {fileID: 2100000, guid: 3341202c0c0417c4a8a7dcf95a7e18f7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HY-wall1 + second: {fileID: 2100000, guid: 479665e2a7afb9d4286c067c5b952f71, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: HY-wall2 + second: {fileID: 2100000, guid: a1fc455f9abace94ba911798cca3a65c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #0' + second: {fileID: 2100000, guid: a41fb98fd02aa6441849d348aa72b81e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #1' + second: {fileID: 2100000, guid: a48959f9b00dd4c4d863fd709a5a51a4, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #113' + second: {fileID: 2100000, guid: 0ca063fa116a06d4bbfdc34ae7b205f2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #12' + second: {fileID: 2100000, guid: acac300248ab4c440a40303c5a168559, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #1275' + second: {fileID: 2100000, guid: d5102e94145b2b441a0765c4010d9927, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #130' + second: {fileID: 2100000, guid: c8b41873121af8f45927167d64edc59e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #131' + second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #14' + second: {fileID: 2100000, guid: 107712c012fe8f247bb71d57f0b18627, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #179' + second: {fileID: 2100000, guid: 3b6d3e13537735045a43e1a70647f65a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #2157' + second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912358' + second: {fileID: 2100000, guid: 4d6b716608482af439eb85b3773bbf9a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912359' + second: {fileID: 2100000, guid: 5eeead697dacf8442809e1a3bd74b580, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912460' + second: {fileID: 2100000, guid: c9e0143a801f0984a988cbaba7e8ae64, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912565' + second: {fileID: 2100000, guid: 01a816bd11a93be4c91d57f0bb009bbf, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912566' + second: {fileID: 2100000, guid: c8a9bdb5cd4044346a4301c172b417a5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912567' + second: {fileID: 2100000, guid: bb04b01be0f1cad4392bf08516b7640a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912568' + second: {fileID: 2100000, guid: 4dfa6bb5b8de83d499082904b0eae4eb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912569' + second: {fileID: 2100000, guid: 0915dcb0934c3b742b6053ce5af65333, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #219912870' + second: {fileID: 2100000, guid: 78d721bf7c9318243818f69ba10d6e50, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #25' + second: {fileID: 2100000, guid: 4b22de670fe4c7e408cbebeb83f3024f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #27' + second: {fileID: 2100000, guid: 36e6fbc6fa8a0d444925c71cd4ac4840, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #28' + second: {fileID: 2100000, guid: ac232a5cd29779044a135e767f0d5908, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #29' + second: {fileID: 2100000, guid: 67c0114ed458a5947be31023f5eacc82, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #332' + second: {fileID: 2100000, guid: b81865aaff3400946b79778390a0775a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #37' + second: {fileID: 2100000, guid: 3644d6601dafefc43886cae71894aec6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #39' + second: {fileID: 2100000, guid: 8db1fe63fab0f0c4ba938bf6af52647f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #44' + second: {fileID: 2100000, guid: 1d3d4cc83d70b194d8da1a117158ba73, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #4436' + second: {fileID: 2100000, guid: d0cfec909ce60bd4783da6501c3880a2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #49' + second: {fileID: 2100000, guid: 6f876b061885db44dae1e27857613109, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #50' + second: {fileID: 2100000, guid: c741a8476b80a7d4097d6f3cd5108ef7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5051' + second: {fileID: 2100000, guid: cb1082323130f8741ab2d1760dd6c7fb, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5052' + second: {fileID: 2100000, guid: d5102e94145b2b441a0765c4010d9927, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5054' + second: {fileID: 2100000, guid: 200ade67b4e8c1d4fb94c3efbeb1b96c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #5055' + second: {fileID: 2100000, guid: 4767bd1f86b944b499e489bd4e8e4f72, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #51' + second: {fileID: 2100000, guid: 23e6c552bc6787541bd3103a9bf4ee6d, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #64' + second: {fileID: 2100000, guid: 4b85e8684825f034a8facfacddb0b04f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #6447' + second: {fileID: 2100000, guid: 00e7540176c947f4bbc3ec43678a1f44, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #66' + second: {fileID: 2100000, guid: 3644d6601dafefc43886cae71894aec6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #74' + second: {fileID: 2100000, guid: 200ade67b4e8c1d4fb94c3efbeb1b96c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 'Material #78' + second: {fileID: 2100000, guid: 4d6b716608482af439eb85b3773bbf9a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: PeiLou + second: {fileID: 2100000, guid: cbca1e916569c7842a88d656898495b4, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Shiwai_color + second: {fileID: 2100000, guid: 1de313bec9d46904289f8cbdc687fe2a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Standard_9 + second: {fileID: 2100000, guid: 41e2f01d10a19e246a8508845ee8dbf5, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: baise + second: {fileID: 2100000, guid: b9074ca5fca87c34a9e15a97990367a3, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: biandao + second: {fileID: 2100000, guid: 6608a7ad6aa26eb40a991f0468d49a38, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: cao + second: {fileID: 2100000, guid: f56b97edbc446e24aaa535cdb124c1b8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: cao2 + second: {fileID: 2100000, guid: ae96b35877f305f409e72e05ad0620fd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: changjing + second: {fileID: 2100000, guid: cca046108d38eaf48b1f0a96f302b21f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: color_color + second: {fileID: 2100000, guid: 6c42d8646d4d58049bb3ec44ce770c50, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: langan03 + second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: langan04 + second: {fileID: 2100000, guid: 6f59d8971799d464397580ba9c472b5f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: luming + second: {fileID: 2100000, guid: 5d8cef50b658d7941ba5f2fce924b7e9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: luya + second: {fileID: 2100000, guid: 48dc44e270ac9dd4bbb78d469a1e7be2, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: malu + second: {fileID: 2100000, guid: e61f0623d910a434e8ea2c821257c540, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: malu1 + second: {fileID: 2100000, guid: b62a0dbee098c0a4991c6f600c3ce4fa, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: malu2 + second: {fileID: 2100000, guid: 139bd8edd768bfc4cb15f39f278cce52, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: malu3 + second: {fileID: 2100000, guid: 11d08f8a4983d3d4ca154c736014fea7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: malu4 + second: {fileID: 2100000, guid: d8a3d2de92ff1ce4ea18e7aef49a7877, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: pudi + second: {fileID: 2100000, guid: 4b85e8684825f034a8facfacddb0b04f, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: shenlamen + second: {fileID: 2100000, guid: 3e62e1f51edfff34f8a30e3f235bc93c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: shui + second: {fileID: 2100000, guid: b9a4b66d50908e24c84f057f911f9385, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: stair + second: {fileID: 2100000, guid: 36e6fbc6fa8a0d444925c71cd4ac4840, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -1329,12 +1707,15 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -1342,22 +1723,34 @@ ModelImporter: globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 0 + previousCalculatedGlobalScale: 0.01 + hasPreviousCalculatedGlobalScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 importAnimation: 1 copyAvatar: 0 humanDescription: @@ -1372,7 +1765,6 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 0 diff --git a/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs b/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs index 355ac86..3de25c2 100644 --- a/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs +++ b/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs @@ -44,7 +44,7 @@ public class FireLiquidLevelCtrl : MonoBehaviour boxCollider = GetComponent(); boxCol_fire = boxCollider.size; - box_smoke = smokePS.shape.box; + box_smoke = smokePS.shape.scale; pos_smoke = smokePS.transform.localPosition; FireScale = fireScale; @@ -156,7 +156,7 @@ public class FireLiquidLevelCtrl : MonoBehaviour SetRate(smokePS, 1f, 5f); SetStartSize(smokePS, 10f, 20f, 50f, 100f); var box_Smoke = smokePS.shape; - box_Smoke.box = new Vector3(GetValueAccordingStandardValue(1f, 20f), + box_Smoke.scale = new Vector3(GetValueAccordingStandardValue(1f, 20f), GetValueAccordingStandardValue(1f, 20f), GetValueAccordingStandardValue(0.5f, 10f)); smokePS.transform.localPosition = new Vector3(pos_smoke.x, GetValueAccordingStandardValue(20f, 28.4f), pos_smoke.z); diff --git a/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs b/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs index b9d7cc8..3d2896f 100644 --- a/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs +++ b/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs @@ -80,14 +80,14 @@ public class FireInitialSizeSet : MonoBehaviour { smokePSConstant = smokePS.emission.rateOverTime.constant; smokePSStartSizeCstMin = smokePS.main.startSize.constantMin; smokePSStartSizeCstMax = smokePS.main.startSize.constantMax; - smokePsShapBox = smokePS.shape.box; + smokePsShapBox = smokePS.shape.scale; smokePsLocalPos = smokePS.transform.localPosition; sparksConstant = Sparks.emission.rateOverTime.constant; sparksRadius = Sparks.shape.radius; glowConstant = Glow.emission.rateOverTime.constant; - glowShapBox = Glow.shape.box; + glowShapBox = Glow.shape.scale; fireLightRange = Firelight.range; @@ -145,7 +145,7 @@ public class FireInitialSizeSet : MonoBehaviour { SetEmission(ParticleType.smokePs, smokePS, factor); SetStartSize(ParticleType.smokePs, smokePS, factor); var box_Smoke = smokePS.shape; - box_Smoke.box = new Vector3(smokePsShapBox.x * factor, smokePsShapBox.y * factor, smokePsShapBox.z * factor); + box_Smoke.scale = new Vector3(smokePsShapBox.x * factor, smokePsShapBox.y * factor, smokePsShapBox.z * factor); smokePS.transform.localPosition = new Vector3(smokePsLocalPos.x, smokePsLocalPos.y * factor, smokePsLocalPos.z); SetEmission(ParticleType.sparksPs, Sparks, factor); @@ -154,7 +154,7 @@ public class FireInitialSizeSet : MonoBehaviour { SetEmission(ParticleType.glowPs, Glow, factor); var box_Glow = Glow.shape; - box_Glow.box = new Vector3(glowShapBox.x * factor, glowShapBox.y * factor, glowShapBox.z * factor); + box_Glow.scale = new Vector3(glowShapBox.x * factor, glowShapBox.y * factor, glowShapBox.z * factor); Firelight.range = fireLightRange * factor; diff --git a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs index c5e60dc..516c607 100644 --- a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs +++ b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs @@ -89,8 +89,8 @@ public class AssetBundleManager : Singleton if (Application.isEditor) //return "file://" + System.Environment.CurrentDirectory.Replace("\\", "/"); return "file://" + Application.streamingAssetsPath; - else if (Application.isWebPlayer) - return Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets"; + //else if (Application.isWebPlayer) + // return Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets"; else if (Application.isMobilePlatform || Application.isConsolePlatform) return Application.streamingAssetsPath; else @@ -113,7 +113,7 @@ public class AssetBundleManager : Singleton return "Windows"; case BuildTarget.StandaloneOSXIntel: case BuildTarget.StandaloneOSXIntel64: - case BuildTarget.StandaloneOSXUniversal: + case BuildTarget.StandaloneOSX: return "OSX"; default: return null; diff --git a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs index 3fd8a2f..9c56ba7 100644 --- a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs +++ b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs @@ -55,7 +55,7 @@ public class BuildScript return "/test.exe"; case BuildTarget.StandaloneOSXIntel: case BuildTarget.StandaloneOSXIntel64: - case BuildTarget.StandaloneOSXUniversal: + case BuildTarget.StandaloneOSX: return "/test.app"; case BuildTarget.WebGL: return ""; diff --git a/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs b/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs index 39d1fa6..be8b872 100644 --- a/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs +++ b/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs @@ -117,13 +117,13 @@ public class ParticleControl : MonoBehaviour //方形发射器大小 private void BoxShapContron() { - if (shap.box.x < BoxMax.x) - shap.box = new Vector3(shap.box.x + Time.deltaTime * BoxSpeed.x, shap.box.y, shap.box.z); - if (shap.box.y < BoxMax.y) - shap.box = new Vector3(shap.box.x, shap.box.y + Time.deltaTime * BoxSpeed.y, shap.box.z); - if (shap.box.z < BoxMax.z) - shap.box = new Vector3(shap.box.x, shap.box.y, shap.box.z + Time.deltaTime * BoxSpeed.z); - if (shap.box.x >= BoxMax.x && shap.box.y >= BoxMax.y && shap.box.z >= BoxMax.z) + if (shap.scale.x < BoxMax.x) + shap.scale = new Vector3(shap.scale.x + Time.deltaTime * BoxSpeed.x, shap.scale.y, shap.scale.z); + if (shap.scale.y < BoxMax.y) + shap.scale = new Vector3(shap.scale.x, shap.scale.y + Time.deltaTime * BoxSpeed.y, shap.scale.z); + if (shap.scale.z < BoxMax.z) + shap.scale = new Vector3(shap.scale.x, shap.scale.y, shap.scale.z + Time.deltaTime * BoxSpeed.z); + if (shap.scale.x >= BoxMax.x && shap.scale.y >= BoxMax.y && shap.scale.z >= BoxMax.z) CancelInvoke("BoxShapContron"); } } diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset new file mode 100644 index 0000000..a372f8e Binary files /dev/null and b/ProjectSettings/AudioManager.asset differ diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..244f35c Binary files /dev/null and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset new file mode 100644 index 0000000..07ee421 Binary files /dev/null and b/ProjectSettings/DynamicsManager.asset differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset new file mode 100644 index 0000000..bbe4e1b Binary files /dev/null and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset new file mode 100644 index 0000000..3fb039b Binary files /dev/null and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset new file mode 100644 index 0000000..a6c7c30 Binary files /dev/null and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset new file mode 100644 index 0000000..b83327a Binary files /dev/null and b/ProjectSettings/InputManager.asset differ diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..9035ea3 Binary files /dev/null and b/ProjectSettings/NavMeshAreas.asset differ diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset new file mode 100644 index 0000000..ea039cc Binary files /dev/null and b/ProjectSettings/NetworkManager.asset differ diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset new file mode 100644 index 0000000..740420b Binary files /dev/null and b/ProjectSettings/Physics2DSettings.asset differ diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..92591ba Binary files /dev/null and b/ProjectSettings/PresetManager.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset new file mode 100644 index 0000000..b6e0e70 Binary files /dev/null and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..0b705ce --- /dev/null +++ b/ProjectSettings/ProjectVersion.txt @@ -0,0 +1 @@ +m_EditorVersion: 2018.4.0f1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset new file mode 100644 index 0000000..565aa9d Binary files /dev/null and b/ProjectSettings/QualitySettings.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset new file mode 100644 index 0000000..f2aeecb Binary files /dev/null and b/ProjectSettings/TagManager.asset differ diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset new file mode 100644 index 0000000..bf2a750 Binary files /dev/null and b/ProjectSettings/TimeManager.asset differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..50131ff Binary files /dev/null and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..77cc49b Binary files /dev/null and b/ProjectSettings/VFXManager.asset differ