diff --git a/Assets/Resources/Icons/100001.png b/Assets/Resources/Icons/100001.png index 669149b0f..d1647f046 100644 Binary files a/Assets/Resources/Icons/100001.png and b/Assets/Resources/Icons/100001.png differ diff --git a/Assets/Resources/Icons/100002.png b/Assets/Resources/Icons/100002.png index e9b685549..4a3a2c2ab 100644 Binary files a/Assets/Resources/Icons/100002.png and b/Assets/Resources/Icons/100002.png differ diff --git a/Assets/Resources/Icons/100003.png b/Assets/Resources/Icons/100003.png index 740bdef81..3e2d3c8f3 100644 Binary files a/Assets/Resources/Icons/100003.png and b/Assets/Resources/Icons/100003.png differ diff --git a/Assets/Resources/Icons/100004.png b/Assets/Resources/Icons/100004.png index 8e4a67813..f40bfd242 100644 Binary files a/Assets/Resources/Icons/100004.png and b/Assets/Resources/Icons/100004.png differ diff --git a/Assets/Resources/Icons/100005.png b/Assets/Resources/Icons/100005.png index 20f026bc2..fa23ba8f5 100644 Binary files a/Assets/Resources/Icons/100005.png and b/Assets/Resources/Icons/100005.png differ diff --git a/Assets/Resources/Icons/100006.png b/Assets/Resources/Icons/100006.png index 85af47b81..8b002ff08 100644 Binary files a/Assets/Resources/Icons/100006.png and b/Assets/Resources/Icons/100006.png differ diff --git a/Assets/Resources/Icons/100007.png b/Assets/Resources/Icons/100007.png index d5d9ad509..8c263c9a8 100644 Binary files a/Assets/Resources/Icons/100007.png and b/Assets/Resources/Icons/100007.png differ diff --git a/Assets/Resources/Icons/100008.png b/Assets/Resources/Icons/100008.png index 4522654b7..4d75d2b3d 100644 Binary files a/Assets/Resources/Icons/100008.png and b/Assets/Resources/Icons/100008.png differ diff --git a/Assets/Resources/Icons/100009.png b/Assets/Resources/Icons/100009.png index 86c560a7e..a641a3a1d 100644 Binary files a/Assets/Resources/Icons/100009.png and b/Assets/Resources/Icons/100009.png differ diff --git a/Assets/Resources/Icons/100010.png b/Assets/Resources/Icons/100010.png index dafe5c810..6a0fdf92e 100644 Binary files a/Assets/Resources/Icons/100010.png and b/Assets/Resources/Icons/100010.png differ diff --git a/Assets/Resources/Icons/30001.png b/Assets/Resources/Icons/30001.png index 364041643..0c25a328d 100644 Binary files a/Assets/Resources/Icons/30001.png and b/Assets/Resources/Icons/30001.png differ diff --git a/Assets/Resources/Icons/30002.png b/Assets/Resources/Icons/30002.png index 9aeae228d..9372d7449 100644 Binary files a/Assets/Resources/Icons/30002.png and b/Assets/Resources/Icons/30002.png differ diff --git a/Assets/Resources/Icons/30003.png b/Assets/Resources/Icons/30003.png index 9ab061ec5..2aa7aac24 100644 Binary files a/Assets/Resources/Icons/30003.png and b/Assets/Resources/Icons/30003.png differ diff --git a/Assets/Resources/Icons/30004.png b/Assets/Resources/Icons/30004.png index 9ab061ec5..2aa7aac24 100644 Binary files a/Assets/Resources/Icons/30004.png and b/Assets/Resources/Icons/30004.png differ diff --git a/Assets/Resources/Icons/30005.png b/Assets/Resources/Icons/30005.png index 9ab061ec5..2aa7aac24 100644 Binary files a/Assets/Resources/Icons/30005.png and b/Assets/Resources/Icons/30005.png differ diff --git a/Assets/Resources/Icons/30006.png b/Assets/Resources/Icons/30006.png index 9ab061ec5..2aa7aac24 100644 Binary files a/Assets/Resources/Icons/30006.png and b/Assets/Resources/Icons/30006.png differ diff --git a/Assets/Resources/Icons/30007.png b/Assets/Resources/Icons/30007.png index 9ab061ec5..2aa7aac24 100644 Binary files a/Assets/Resources/Icons/30007.png and b/Assets/Resources/Icons/30007.png differ diff --git a/Assets/Resources/Icons/40001.png b/Assets/Resources/Icons/40001.png index bf8e93ad3..2aa023954 100644 Binary files a/Assets/Resources/Icons/40001.png and b/Assets/Resources/Icons/40001.png differ diff --git a/Assets/Resources/Icons/40002.png b/Assets/Resources/Icons/40002.png index 8921f38bd..7e115b1d3 100644 Binary files a/Assets/Resources/Icons/40002.png and b/Assets/Resources/Icons/40002.png differ diff --git a/Assets/Resources/Icons/40003.png b/Assets/Resources/Icons/40003.png index b08a37597..4a57962f3 100644 Binary files a/Assets/Resources/Icons/40003.png and b/Assets/Resources/Icons/40003.png differ diff --git a/Assets/Resources/Icons/40004.png b/Assets/Resources/Icons/40004.png index c4220d5ec..978486e33 100644 Binary files a/Assets/Resources/Icons/40004.png and b/Assets/Resources/Icons/40004.png differ diff --git a/Assets/Resources/Icons/40005.png b/Assets/Resources/Icons/40005.png index 14aacc3fd..ad368fea3 100644 Binary files a/Assets/Resources/Icons/40005.png and b/Assets/Resources/Icons/40005.png differ diff --git a/Assets/Resources/Icons/40006.png b/Assets/Resources/Icons/40006.png index 2b1891277..a060ac02b 100644 Binary files a/Assets/Resources/Icons/40006.png and b/Assets/Resources/Icons/40006.png differ diff --git a/Assets/Resources/Icons/40007.png b/Assets/Resources/Icons/40007.png index 4067c5dc8..3eac0f281 100644 Binary files a/Assets/Resources/Icons/40007.png and b/Assets/Resources/Icons/40007.png differ diff --git a/Assets/Resources/Icons/40008.png b/Assets/Resources/Icons/40008.png index 82fab0b8b..f43c99d5d 100644 Binary files a/Assets/Resources/Icons/40008.png and b/Assets/Resources/Icons/40008.png differ diff --git a/Assets/Resources/Icons/40009.png b/Assets/Resources/Icons/40009.png index 1a80fc2d8..9d8585b1c 100644 Binary files a/Assets/Resources/Icons/40009.png and b/Assets/Resources/Icons/40009.png differ diff --git a/Assets/Resources/Icons/40010.png b/Assets/Resources/Icons/40010.png index 3e7520128..041c16440 100644 Binary files a/Assets/Resources/Icons/40010.png and b/Assets/Resources/Icons/40010.png differ diff --git a/Assets/Resources/Icons/50001.png b/Assets/Resources/Icons/50001.png index bd350ed1e..75ff35872 100644 Binary files a/Assets/Resources/Icons/50001.png and b/Assets/Resources/Icons/50001.png differ diff --git a/Assets/Resources/Icons/50002.png b/Assets/Resources/Icons/50002.png index 6d31487c8..c7c2e16b7 100644 Binary files a/Assets/Resources/Icons/50002.png and b/Assets/Resources/Icons/50002.png differ diff --git a/Assets/Resources/Icons/50003.png b/Assets/Resources/Icons/50003.png index ca84b90f6..06327b4a8 100644 Binary files a/Assets/Resources/Icons/50003.png and b/Assets/Resources/Icons/50003.png differ diff --git a/Assets/Resources/Icons/50004.png b/Assets/Resources/Icons/50004.png index 9fa52e4d1..b8f8d0f89 100644 Binary files a/Assets/Resources/Icons/50004.png and b/Assets/Resources/Icons/50004.png differ diff --git a/Assets/Resources/Icons/50005.png b/Assets/Resources/Icons/50005.png index 1853f66c3..19e4c44c3 100644 Binary files a/Assets/Resources/Icons/50005.png and b/Assets/Resources/Icons/50005.png differ diff --git a/Assets/Resources/Icons/50006.png b/Assets/Resources/Icons/50006.png index 8b94ecb16..22d2b48e4 100644 Binary files a/Assets/Resources/Icons/50006.png and b/Assets/Resources/Icons/50006.png differ diff --git a/Assets/Resources/Icons/50007.png b/Assets/Resources/Icons/50007.png index 21011f024..863917e7b 100644 Binary files a/Assets/Resources/Icons/50007.png and b/Assets/Resources/Icons/50007.png differ diff --git a/Assets/Resources/Icons/50008.png b/Assets/Resources/Icons/50008.png index 729a39e0b..dbe837c1f 100644 Binary files a/Assets/Resources/Icons/50008.png and b/Assets/Resources/Icons/50008.png differ diff --git a/Assets/Resources/Icons/50009.png b/Assets/Resources/Icons/50009.png index 35f760195..707dffb9c 100644 Binary files a/Assets/Resources/Icons/50009.png and b/Assets/Resources/Icons/50009.png differ diff --git a/Assets/Resources/Icons/50010.png b/Assets/Resources/Icons/50010.png index b842254da..152223185 100644 Binary files a/Assets/Resources/Icons/50010.png and b/Assets/Resources/Icons/50010.png differ diff --git a/Assets/Resources/Icons/50011.png b/Assets/Resources/Icons/50011.png index e90f59e9a..004262c5d 100644 Binary files a/Assets/Resources/Icons/50011.png and b/Assets/Resources/Icons/50011.png differ diff --git a/Assets/Resources/Icons/50012.png b/Assets/Resources/Icons/50012.png index 7e2c000bb..4e17a0579 100644 Binary files a/Assets/Resources/Icons/50012.png and b/Assets/Resources/Icons/50012.png differ diff --git a/Assets/Resources/Icons/50013.png b/Assets/Resources/Icons/50013.png index be5349d62..707d87644 100644 Binary files a/Assets/Resources/Icons/50013.png and b/Assets/Resources/Icons/50013.png differ diff --git a/Assets/Resources/Icons/50014.png b/Assets/Resources/Icons/50014.png index 43772ce0a..b48dc0de3 100644 Binary files a/Assets/Resources/Icons/50014.png and b/Assets/Resources/Icons/50014.png differ diff --git a/Assets/Resources/Icons/60001.png b/Assets/Resources/Icons/60001.png index 0c0512671..5d08959fb 100644 Binary files a/Assets/Resources/Icons/60001.png and b/Assets/Resources/Icons/60001.png differ diff --git a/Assets/Resources/Icons/60002.png b/Assets/Resources/Icons/60002.png index 57a1cf6f1..6e304b71f 100644 Binary files a/Assets/Resources/Icons/60002.png and b/Assets/Resources/Icons/60002.png differ diff --git a/Assets/Resources/Icons/60003.png b/Assets/Resources/Icons/60003.png index 64cd0de35..b0f4d2453 100644 Binary files a/Assets/Resources/Icons/60003.png and b/Assets/Resources/Icons/60003.png differ diff --git a/Assets/Resources/Icons/60004.png b/Assets/Resources/Icons/60004.png index 471b623f1..296f22b17 100644 Binary files a/Assets/Resources/Icons/60004.png and b/Assets/Resources/Icons/60004.png differ diff --git a/Assets/Resources/Icons/60005.png b/Assets/Resources/Icons/60005.png index dc9992f68..f19e03e04 100644 Binary files a/Assets/Resources/Icons/60005.png and b/Assets/Resources/Icons/60005.png differ diff --git a/Assets/Resources/Icons/60006.png b/Assets/Resources/Icons/60006.png index 837c980e9..faa1cd8ce 100644 Binary files a/Assets/Resources/Icons/60006.png and b/Assets/Resources/Icons/60006.png differ diff --git a/Assets/Resources/Icons/60007.png b/Assets/Resources/Icons/60007.png index 9a5e2deaf..94e7ac98c 100644 Binary files a/Assets/Resources/Icons/60007.png and b/Assets/Resources/Icons/60007.png differ diff --git a/Assets/Resources/Icons/60008.png b/Assets/Resources/Icons/60008.png index a9e602b49..04fdf8b68 100644 Binary files a/Assets/Resources/Icons/60008.png and b/Assets/Resources/Icons/60008.png differ diff --git a/Assets/Resources/Icons/60009.png b/Assets/Resources/Icons/60009.png index 22081f811..9582978d9 100644 Binary files a/Assets/Resources/Icons/60009.png and b/Assets/Resources/Icons/60009.png differ diff --git a/Assets/Resources/Icons/60010.png b/Assets/Resources/Icons/60010.png index 8bef0976b..071f4f590 100644 Binary files a/Assets/Resources/Icons/60010.png and b/Assets/Resources/Icons/60010.png differ diff --git a/Assets/Resources/Icons/70001.png b/Assets/Resources/Icons/70001.png index 11a3f83af..841b2ac97 100644 Binary files a/Assets/Resources/Icons/70001.png and b/Assets/Resources/Icons/70001.png differ diff --git a/Assets/Resources/Icons/70002.png b/Assets/Resources/Icons/70002.png index ef9b34c9e..041f42395 100644 Binary files a/Assets/Resources/Icons/70002.png and b/Assets/Resources/Icons/70002.png differ diff --git a/Assets/Resources/Icons/70003.png b/Assets/Resources/Icons/70003.png index 4d46f489f..6a1fec2d5 100644 Binary files a/Assets/Resources/Icons/70003.png and b/Assets/Resources/Icons/70003.png differ diff --git a/Assets/Resources/Icons/70004.png b/Assets/Resources/Icons/70004.png index d8fe2ef13..97ede859f 100644 Binary files a/Assets/Resources/Icons/70004.png and b/Assets/Resources/Icons/70004.png differ diff --git a/Assets/Resources/Icons/80001.png b/Assets/Resources/Icons/80001.png index b7a6894c7..0a471b612 100644 Binary files a/Assets/Resources/Icons/80001.png and b/Assets/Resources/Icons/80001.png differ diff --git a/Assets/Resources/Icons/80002.png b/Assets/Resources/Icons/80002.png index 3fdd29877..36f9868aa 100644 Binary files a/Assets/Resources/Icons/80002.png and b/Assets/Resources/Icons/80002.png differ diff --git a/Assets/Resources/Icons/80003.png b/Assets/Resources/Icons/80003.png index 2e67d44de..0b6920be7 100644 Binary files a/Assets/Resources/Icons/80003.png and b/Assets/Resources/Icons/80003.png differ diff --git a/Assets/Resources/Icons/80004.png b/Assets/Resources/Icons/80004.png index 3effe3ddc..c5b42b2c9 100644 Binary files a/Assets/Resources/Icons/80004.png and b/Assets/Resources/Icons/80004.png differ diff --git a/Assets/Resources/Icons/80005.png b/Assets/Resources/Icons/80005.png index 3647099cd..bb312cfa9 100644 Binary files a/Assets/Resources/Icons/80005.png and b/Assets/Resources/Icons/80005.png differ diff --git a/Assets/Resources/Icons/80006.png b/Assets/Resources/Icons/80006.png index d51972e9d..26e68d146 100644 Binary files a/Assets/Resources/Icons/80006.png and b/Assets/Resources/Icons/80006.png differ diff --git a/Assets/Resources/Icons/80007.png b/Assets/Resources/Icons/80007.png index b40cf0ad4..c9f903183 100644 Binary files a/Assets/Resources/Icons/80007.png and b/Assets/Resources/Icons/80007.png differ diff --git a/Assets/Resources/Icons/80008.png b/Assets/Resources/Icons/80008.png index 810a7ed43..c28ff5986 100644 Binary files a/Assets/Resources/Icons/80008.png and b/Assets/Resources/Icons/80008.png differ diff --git a/Assets/Resources/Icons/80009.png b/Assets/Resources/Icons/80009.png index 1ac767e87..2dfb06f8d 100644 Binary files a/Assets/Resources/Icons/80009.png and b/Assets/Resources/Icons/80009.png differ diff --git a/Assets/Resources/Icons/80010.png b/Assets/Resources/Icons/80010.png index fa6039c55..381129766 100644 Binary files a/Assets/Resources/Icons/80010.png and b/Assets/Resources/Icons/80010.png differ diff --git a/Assets/Resources/Icons/80011.png b/Assets/Resources/Icons/80011.png index 791bc176c..f0c17a7d3 100644 Binary files a/Assets/Resources/Icons/80011.png and b/Assets/Resources/Icons/80011.png differ diff --git a/Assets/Resources/Icons/80012.png b/Assets/Resources/Icons/80012.png index 7b4b543c1..4b068c843 100644 Binary files a/Assets/Resources/Icons/80012.png and b/Assets/Resources/Icons/80012.png differ diff --git a/Assets/Resources/Icons/80013.png b/Assets/Resources/Icons/80013.png index 91bd9fb38..5501c982e 100644 Binary files a/Assets/Resources/Icons/80013.png and b/Assets/Resources/Icons/80013.png differ diff --git a/Assets/Resources/Icons/90001.png b/Assets/Resources/Icons/90001.png index 9ba3f59d1..b2f3f64c4 100644 Binary files a/Assets/Resources/Icons/90001.png and b/Assets/Resources/Icons/90001.png differ diff --git a/Assets/Resources/Icons/90002.png b/Assets/Resources/Icons/90002.png index f82b4ff49..0202c13c7 100644 Binary files a/Assets/Resources/Icons/90002.png and b/Assets/Resources/Icons/90002.png differ diff --git a/Assets/Resources/Icons/90003.png b/Assets/Resources/Icons/90003.png index d9447557e..2b4142b0d 100644 Binary files a/Assets/Resources/Icons/90003.png and b/Assets/Resources/Icons/90003.png differ diff --git a/Assets/Resources/Icons/90004.png b/Assets/Resources/Icons/90004.png index 125992b8b..3061607e2 100644 Binary files a/Assets/Resources/Icons/90004.png and b/Assets/Resources/Icons/90004.png differ diff --git a/Assets/Resources/Icons/90005.png b/Assets/Resources/Icons/90005.png index 391284c34..47498c091 100644 Binary files a/Assets/Resources/Icons/90005.png and b/Assets/Resources/Icons/90005.png differ diff --git a/Assets/Resources/Icons/90006.png b/Assets/Resources/Icons/90006.png index 56997dc2a..0b40b6c91 100644 Binary files a/Assets/Resources/Icons/90006.png and b/Assets/Resources/Icons/90006.png differ diff --git a/Assets/Resources/Icons/90007.png b/Assets/Resources/Icons/90007.png index 6dfcc3fd8..3bc0d58e0 100644 Binary files a/Assets/Resources/Icons/90007.png and b/Assets/Resources/Icons/90007.png differ diff --git a/Assets/Resources/Icons/90008.png b/Assets/Resources/Icons/90008.png index 0e9874677..4e9a5e99c 100644 Binary files a/Assets/Resources/Icons/90008.png and b/Assets/Resources/Icons/90008.png differ diff --git a/Assets/Resources/Icons/90009.png b/Assets/Resources/Icons/90009.png index c440945db..b038156f4 100644 Binary files a/Assets/Resources/Icons/90009.png and b/Assets/Resources/Icons/90009.png differ diff --git a/Assets/Resources/Icons/90010.png b/Assets/Resources/Icons/90010.png index d4c30d2ed..7e3fd3754 100644 Binary files a/Assets/Resources/Icons/90010.png and b/Assets/Resources/Icons/90010.png differ diff --git a/Assets/Resources/Icons/90011.png b/Assets/Resources/Icons/90011.png index e55b43a5c..8c7dc0319 100644 Binary files a/Assets/Resources/Icons/90011.png and b/Assets/Resources/Icons/90011.png differ diff --git a/Assets/Resources/Icons/90012.png b/Assets/Resources/Icons/90012.png index 06f470f9f..6df9de595 100644 Binary files a/Assets/Resources/Icons/90012.png and b/Assets/Resources/Icons/90012.png differ diff --git a/Assets/Resources/Icons/90013.png b/Assets/Resources/Icons/90013.png index fc2d591ab..7518525c7 100644 Binary files a/Assets/Resources/Icons/90013.png and b/Assets/Resources/Icons/90013.png differ diff --git a/Assets/Resources/Icons/90014.png b/Assets/Resources/Icons/90014.png index 87f5a420e..d9a17487e 100644 Binary files a/Assets/Resources/Icons/90014.png and b/Assets/Resources/Icons/90014.png differ diff --git a/Assets/Resources/Icons/90015.png b/Assets/Resources/Icons/90015.png index b9dd4fb92..72700dd51 100644 Binary files a/Assets/Resources/Icons/90015.png and b/Assets/Resources/Icons/90015.png differ diff --git a/Assets/Resources/Icons/90016.png b/Assets/Resources/Icons/90016.png index ee16f20da..fd05e4281 100644 Binary files a/Assets/Resources/Icons/90016.png and b/Assets/Resources/Icons/90016.png differ diff --git a/Assets/Resources/Icons/90017.png b/Assets/Resources/Icons/90017.png index 9cb945801..007b0bfb6 100644 Binary files a/Assets/Resources/Icons/90017.png and b/Assets/Resources/Icons/90017.png differ diff --git a/Assets/Resources/Icons/90018.png b/Assets/Resources/Icons/90018.png index 25333cc68..5e333f72f 100644 Binary files a/Assets/Resources/Icons/90018.png and b/Assets/Resources/Icons/90018.png differ diff --git a/Assets/Resources/Icons/90019.png b/Assets/Resources/Icons/90019.png index f1a2b8795..208ddf3d3 100644 Binary files a/Assets/Resources/Icons/90019.png and b/Assets/Resources/Icons/90019.png differ diff --git a/Assets/Resources/Icons/90020.png b/Assets/Resources/Icons/90020.png index 5ecb523ce..f2ac61848 100644 Binary files a/Assets/Resources/Icons/90020.png and b/Assets/Resources/Icons/90020.png differ diff --git a/Assets/Scenes/StartUp.unity b/Assets/Scenes/StartUp.unity index 7aaab7e14..e6459fd20 100644 --- a/Assets/Scenes/StartUp.unity +++ b/Assets/Scenes/StartUp.unity @@ -578,6 +578,146 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1199298671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1199298675} + - component: {fileID: 1199298674} + - component: {fileID: 1199298673} + - component: {fileID: 1199298672} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1199298672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199298671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b189222c6db8433db1239d314f92cf9f, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DontDestroy +--- !u!114 &1199298673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199298671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &1199298674 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199298671} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 3 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &1199298675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199298671} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 10.38033, y: -13.40211, z: 12.3641} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1729919008 GameObject: m_ObjectHideFlags: 0 @@ -1040,3 +1180,4 @@ SceneRoots: - {fileID: 1729919011} - {fileID: 6620360613922641342} - {fileID: 174907469} + - {fileID: 1199298675} diff --git a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs index 1ac324ceb..b54a3d604 100644 --- a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs +++ b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs @@ -161,9 +161,9 @@ namespace NBF if (_renderTexture != null) return; - _renderTexture = new RenderTexture(512, 512, 24, RenderTextureFormat.ARGB32) + _renderTexture = new RenderTexture(1024, 1024, 24, RenderTextureFormat.ARGB32) { - antiAliasing = 1, + antiAliasing = 8, filterMode = FilterMode.Bilinear, anisoLevel = 0, useMipMap = false @@ -248,129 +248,7 @@ namespace NBF } #endregion - - #region MyRegion - - /// - /// The rendertexture is not transparent. So if you want to the UI elements can be seen in the back of the models/particles in rendertexture, - /// you can set a maximunm two images for background. - /// Be careful if your image is 9 grid scaling, you must make sure the place holder is inside the middle box(dont cover from border to middle). - /// - /// - public void SetBackground(GObject image) - { - SetBackground(image, null); - } - - /// - /// The rendertexture is not transparent. So if you want to the UI elements can be seen in the back of the models/particles in rendertexture, - /// you can set a maximunm two images for background. - /// - /// - /// - public void SetBackground(GObject image1, GObject image2) - { - Image source1 = (Image)image1.displayObject; - Image source2 = image2 != null ? (Image)image2.displayObject : null; - - Vector3 pos = _background.position; - pos.z = _camera.farClipPlane; - _background.position = pos; - - Vector2[] uv = new Vector2[4]; - Vector2[] uv2 = null; - - Rect rect = _image.TransformRect(new Rect(0, 0, this._width, this._height), source1); - Rect uvRect = GetImageUVRect(source1, rect, uv); - - if (source2 != null) - { - rect = _image.TransformRect(new Rect(0, 0, this._width, this._height), source2); - uv2 = new Vector2[4]; - GetImageUVRect(source2, rect, uv2); - } - - Vector3[] vertices = new Vector3[4]; - for (int i = 0; i < 4; i++) - { - Vector2 v = uv[i]; - vertices[i] = new Vector3((v.x - uvRect.x) / uvRect.width * 2 - 1, - (v.y - uvRect.y) / uvRect.height * 2 - 1, 0); - } - - Mesh mesh = new Mesh(); - mesh.vertices = vertices; - mesh.uv = uv; - if (uv2 != null) - mesh.uv2 = uv2; - mesh.colors32 = new Color32[] { Color.white, Color.white, Color.white, Color.white }; - mesh.triangles = new int[] { 0, 1, 2, 2, 3, 0 }; - - MeshFilter meshFilter = this._background.gameObject.GetComponent(); - if (meshFilter == null) - meshFilter = this._background.gameObject.AddComponent(); - meshFilter.mesh = mesh; - MeshRenderer meshRenderer = this._background.gameObject.GetComponent(); - if (meshRenderer == null) - meshRenderer = this._background.gameObject.AddComponent(); -#if (UNITY_5 || UNITY_5_3_OR_NEWER) - meshRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off; -#else - meshRenderer.castShadows = false; -#endif - meshRenderer.receiveShadows = false; - Shader shader = Shader.Find("Game/FullScreen"); - Material mat = new Material(shader); - mat.mainTexture = source1.texture.nativeTexture; - if (source2 != null) - mat.SetTexture("_Tex2", source2.texture.nativeTexture); - meshRenderer.material = mat; - } - - Rect GetImageUVRect(Image image, Rect localRect, Vector2[] uv) - { - Rect imageRect = new Rect(0, 0, image.size.x, image.size.y); - Rect bound = ToolSet.Intersection(ref imageRect, ref localRect); - Rect uvRect = image.texture.uvRect; - - if (image.scale9Grid != null) - { - Rect gridRect = (Rect)image.scale9Grid; - float sourceW = image.texture.width; - float sourceH = image.texture.height; - uvRect = Rect.MinMaxRect(Mathf.Lerp(uvRect.xMin, uvRect.xMax, gridRect.xMin / sourceW), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, (sourceH - gridRect.yMax) / sourceH), - Mathf.Lerp(uvRect.xMin, uvRect.xMax, gridRect.xMax / sourceW), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, (sourceH - gridRect.yMin) / sourceH)); - - float vw = imageRect.width - (sourceW - gridRect.width); - float vh = imageRect.height - (sourceH - gridRect.height); - uvRect = Rect.MinMaxRect(Mathf.Lerp(uvRect.xMin, uvRect.xMax, (bound.x - gridRect.x) / vw), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, - (imageRect.height - bound.yMax - (sourceH - gridRect.yMax)) / vh), - Mathf.Lerp(uvRect.xMin, uvRect.xMax, (bound.xMax - gridRect.x) / vw), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, (imageRect.height - bound.yMin - gridRect.y) / vh)); - } - else - { - uvRect = Rect.MinMaxRect(Mathf.Lerp(uvRect.xMin, uvRect.xMax, bound.xMin / imageRect.width), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, (imageRect.height - bound.yMax) / imageRect.height), - Mathf.Lerp(uvRect.xMin, uvRect.xMax, bound.xMax / imageRect.width), - Mathf.Lerp(uvRect.yMin, uvRect.yMax, (imageRect.height - bound.yMin) / imageRect.height)); - } - - uv[0] = uvRect.position; - uv[1] = new Vector2(uvRect.xMin, uvRect.yMax); - uv[2] = new Vector2(uvRect.xMax, uvRect.yMax); - uv[3] = new Vector2(uvRect.xMax, uvRect.yMin); - - if (image.texture.rotated) - ToolSet.RotateUV(uv, ref image.texture.uvRect); - - return uvRect; - } - - #endregion + #region MyRegion